May 2012 - tor-commits - lists.torproject.org

[metrics-lib/master] Parse v1 directories and contained server descriptors.
by karsten＠torproject.org 19 May '12

19 May '12

commit 466725e2ea478420fddd4a8bc6d6e199d5d31b8e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat May 19 19:30:28 2012 +0200 Parse v1 directories and contained server descriptors. --- .../torproject/descriptor/NetworkStatusEntry.java | 2 + src/org/torproject/descriptor/RelayDirectory.java | 41 ++ .../torproject/descriptor/RouterStatusEntry.java | 20 + .../torproject/descriptor/ServerDescriptor.java | 4 +- .../descriptor/impl/BandwidthHistoryImpl.… [View More]java | 38 +- .../torproject/descriptor/impl/DescriptorImpl.java | 5 + .../descriptor/impl/RelayDirectoryImpl.java | 513 ++++++++++++++++++++ .../descriptor/impl/RouterStatusEntryImpl.java | 37 ++ .../descriptor/impl/ServerDescriptorImpl.java | 28 +- 9 files changed, 671 insertions(+), 17 deletions(-) diff --git a/src/org/torproject/descriptor/NetworkStatusEntry.java b/src/org/torproject/descriptor/NetworkStatusEntry.java index ba5939c..3bda176 100644 --- a/src/org/torproject/descriptor/NetworkStatusEntry.java +++ b/src/org/torproject/descriptor/NetworkStatusEntry.java @@ -5,6 +5,8 @@ package org.torproject.descriptor; import java.util.List; import java.util.SortedSet; +/* Status entry contained in a network status with version 2 or higher or + * in a bridge network status. */ public interface NetworkStatusEntry { /* Return the raw status entry bytes. */ diff --git a/src/org/torproject/descriptor/RelayDirectory.java b/src/org/torproject/descriptor/RelayDirectory.java new file mode 100644 index 0000000..b8a9472 --- /dev/null +++ b/src/org/torproject/descriptor/RelayDirectory.java @@ -0,0 +1,41 @@ +/* Copyright 2012 The Tor Project + * See LICENSE for licensing information */ +package org.torproject.descriptor; + +import java.util.List; + +/* Contains a v1 signed directory. */ +public interface RelayDirectory extends Descriptor { + + /* Return the published time in milliseconds. */ + public long getPublishedMillis(); + + /* Return the directory signing key digest. */ + public String getDirSigningKey(); + + /* Return recommended software versions or null if the directory doesn't + * list recommended software. */ + public List<String> getRecommendedSoftware(); + + /* Return the directory signature. */ + public String getDirectorySignature(); + + /* Return router status entries, one for each contained relay. */ + public List<RouterStatusEntry> getRouterStatusEntries(); + + /* Return a list of server descriptors contained in the signed + * directory. */ + public List<ServerDescriptor> getServerDescriptors(); + + /* Return a (very likely empty) list of exceptions from parsing the + * contained server descriptors. */ + public List<Exception> getServerDescriptorParseExceptions(); + + /* Return the directory nickname. */ + public String getNickname(); + + /* Return the directory digest that the directory authority used to sign + * the directory. */ + public String getDirectoryDigest(); +} + diff --git a/src/org/torproject/descriptor/RouterStatusEntry.java b/src/org/torproject/descriptor/RouterStatusEntry.java new file mode 100644 index 0000000..6652e94 --- /dev/null +++ b/src/org/torproject/descriptor/RouterStatusEntry.java @@ -0,0 +1,20 @@ +/* Copyright 2012 The Tor Project + * See LICENSE for licensing information */ +package org.torproject.descriptor; + +/* Status entry contained in a v1 signed directory. */ +public interface RouterStatusEntry { + + /* Return the relay nickname, or null if the relay is unverified. */ + public String getNickname(); + + /* Return the relay fingerprint. */ + public String getFingerprint(); + + /* Return whether the relay is verified. */ + public boolean isVerified(); + + /* Return whether the relay is live. */ + public boolean isLive(); +} + diff --git a/src/org/torproject/descriptor/ServerDescriptor.java b/src/org/torproject/descriptor/ServerDescriptor.java index bcc4913..a7f76c7 100644 --- a/src/org/torproject/descriptor/ServerDescriptor.java +++ b/src/org/torproject/descriptor/ServerDescriptor.java @@ -40,7 +40,9 @@ public interface ServerDescriptor extends Descriptor { public int getBandwidthBurst(); /* Return the observed bandwidth in bytes per second as an estimate of - * the capacity that the relay can handle. */ + * the capacity that the relay can handle, or -1 if the descriptor + * doesn't contain an observed bandwidth value (which is the case for + * Tor versions 0.0.8 or older). */ public int getBandwidthObserved(); /* Return the platform string containing the Tor software version and diff --git a/src/org/torproject/descriptor/impl/BandwidthHistoryImpl.java b/src/org/torproject/descriptor/impl/BandwidthHistoryImpl.java index 56ae512..65def52 100644 --- a/src/org/torproject/descriptor/impl/BandwidthHistoryImpl.java +++ b/src/org/torproject/descriptor/impl/BandwidthHistoryImpl.java @@ -12,32 +12,42 @@ public class BandwidthHistoryImpl implements BandwidthHistory { protected BandwidthHistoryImpl(String line, String lineNoOpt, String[] partsNoOpt) throws DescriptorParseException { boolean isValid = false; - if (partsNoOpt.length >= 5) { + this.line = line; + if (lineNoOpt.startsWith("read-history ")) { + lineNoOpt = "read-history " + + lineNoOpt.substring("read-history ".length()); + partsNoOpt = lineNoOpt.split(" "); + } + if (partsNoOpt.length == 5 || partsNoOpt.length == 6) { try { - this.line = line; - if (lineNoOpt.startsWith("read-history ")) { - lineNoOpt = "read-history " - + lineNoOpt.substring("read-history ".length()); - partsNoOpt = lineNoOpt.split(" "); - } this.historyEndMillis = ParseHelper.parseTimestampAtIndex(line, partsNoOpt, 1, 2); if (partsNoOpt[3].startsWith("(") && - partsNoOpt[4].equals("s)")) { + partsNoOpt[4].startsWith("s)")) { this.intervalLength = Long.parseLong(partsNoOpt[3]. substring(1)); if (this.intervalLength <= 0L) { throw new DescriptorParseException("Only positive interval " + "lengths are allowed in line '" + line + "'."); } - if (partsNoOpt.length > 6) { - /* Invalid line, handle below. */ - } else if (partsNoOpt.length == 5) { - /* No bandwidth values to parse. */ + String[] values = null; + if (partsNoOpt.length == 5 && + partsNoOpt[4].equals("s)")) { + /* There are no bandwidth values to parse. */ isValid = true; - } else { + } else if (partsNoOpt.length == 6) { + /* There are bandwidth values to parse. */ + values = partsNoOpt[5].split(",", -1); + } else if (partsNoOpt[4].length() > 2) { + /* There are bandwidth values to parse, but there is no space + * between "s)" and "0,0,0,0". Very old Tor versions around + * Tor 0.0.8 wrote such history lines, and even though + * dir-spec.txt implies a space here, the old format isn't + * totally broken. Let's pretend there's a space. */ + values = partsNoOpt[4].substring(2).split(",", -1); + } + if (values != null) { long endMillis = this.historyEndMillis; - String[] values = partsNoOpt[5].split(",", -1); for (int i = values.length - 1; i >= 0; i--) { long bandwidthValue = Long.parseLong(values[i]); if (bandwidthValue < 0L) { diff --git a/src/org/torproject/descriptor/impl/DescriptorImpl.java b/src/org/torproject/descriptor/impl/DescriptorImpl.java index afaacc7..27e5153 100644 --- a/src/org/torproject/descriptor/impl/DescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/DescriptorImpl.java @@ -78,6 +78,11 @@ public abstract class DescriptorImpl implements Descriptor { firstLines.contains("\nnetwork-status-version 2\n")) { parsedDescriptors.add(new RelayNetworkStatusImpl(rawDescriptorBytes, failUnrecognizedDescriptorLines)); + } else if (firstLines.startsWith("@type directory 1.0\n") || + firstLines.startsWith("signed-directory\n") || + firstLines.contains("\nsigned-directory\n")) { + parsedDescriptors.add(new RelayDirectoryImpl(rawDescriptorBytes, + failUnrecognizedDescriptorLines)); } else { throw new DescriptorParseException("Could not detect descriptor " + "type in descriptor starting with '" + firstLines + "'."); diff --git a/src/org/torproject/descriptor/impl/RelayDirectoryImpl.java b/src/org/torproject/descriptor/impl/RelayDirectoryImpl.java new file mode 100644 index 0000000..03d727e --- /dev/null +++ b/src/org/torproject/descriptor/impl/RelayDirectoryImpl.java @@ -0,0 +1,513 @@ +/* Copyright 2012 The Tor Project + * See LICENSE for licensing information */ +package org.torproject.descriptor.impl; + +import java.io.UnsupportedEncodingException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Scanner; +import java.util.Set; + +import org.apache.commons.codec.digest.DigestUtils; +import org.torproject.descriptor.RelayDirectory; +import org.torproject.descriptor.RouterStatusEntry; +import org.torproject.descriptor.ServerDescriptor; + +/* TODO Write unit tests. */ + +public class RelayDirectoryImpl extends DescriptorImpl + implements RelayDirectory { + + protected static List<RelayDirectory> parseDirectories( + byte[] directoriesBytes, boolean failUnrecognizedDescriptorLines) + throws DescriptorParseException { + List<RelayDirectory> parsedDirectories = + new ArrayList<RelayDirectory>(); + List<byte[]> splitDirectoriesBytes = + DescriptorImpl.splitRawDescriptorBytes(directoriesBytes, + "signed-directory\n"); + for (byte[] directoryBytes : splitDirectoriesBytes) { + RelayDirectory parsedDirectory = + new RelayDirectoryImpl(directoryBytes, + failUnrecognizedDescriptorLines); + parsedDirectories.add(parsedDirectory); + } + return parsedDirectories; + } + + protected RelayDirectoryImpl(byte[] directoryBytes, + boolean failUnrecognizedDescriptorLines) + throws DescriptorParseException { + super(directoryBytes, failUnrecognizedDescriptorLines, true); + this.splitAndParseParts(rawDescriptorBytes); + this.calculateDigest(); + Set<String> exactlyOnceKeywords = new HashSet<String>(Arrays.asList(( + "signed-directory,recommended-software," + + "directory-signature").split(","))); + this.checkExactlyOnceKeywords(exactlyOnceKeywords); + Set<String> atMostOnceKeywords = new HashSet<String>(Arrays.asList( + "dir-signing-key,running-routers,router-status".split(","))); + this.checkAtMostOnceKeywords(atMostOnceKeywords); + this.checkFirstKeyword("signed-directory"); + } + + private void calculateDigest() throws DescriptorParseException { + try { + String ascii = new String(this.getRawDescriptorBytes(), "US-ASCII"); + String startToken = "signed-directory\n"; + String sigToken = "\ndirectory-signature "; + if (!ascii.contains(sigToken)) { + return; + } + int start = ascii.indexOf(startToken); + int sig = ascii.indexOf(sigToken) + sigToken.length(); + sig = ascii.indexOf("\n", sig) + 1; + if (start >= 0 && sig >= 0 && sig > start) { + byte[] forDigest = new byte[sig - start]; + System.arraycopy(this.getRawDescriptorBytes(), start, + forDigest, 0, sig - start); + this.directoryDigest = DigestUtils.shaHex(forDigest); + } + } catch (UnsupportedEncodingException e) { + /* Handle below. */ + } + if (this.directoryDigest == null) { + throw new DescriptorParseException("Could not calculate v1 " + + "directory digest."); + } + } + + private void splitAndParseParts(byte[] rawDescriptorBytes) + throws DescriptorParseException { + if (this.rawDescriptorBytes.length == 0) { + throw new DescriptorParseException("Descriptor is empty."); + } + String descriptorString = new String(rawDescriptorBytes); + int startIndex = 0; + int firstRouterIndex = this.findFirstIndexOfKeyword(descriptorString, + "router"); + int directorySignatureIndex = this.findFirstIndexOfKeyword( + descriptorString, "directory-signature"); + int endIndex = descriptorString.length(); + if (directorySignatureIndex < 0) { + directorySignatureIndex = endIndex; + } + if (firstRouterIndex < 0) { + firstRouterIndex = directorySignatureIndex; + } + if (firstRouterIndex > startIndex) { + this.parseHeaderBytes(descriptorString, startIndex, + firstRouterIndex); + } + if (directorySignatureIndex > firstRouterIndex) { + this.parseServerDescriptorBytes(descriptorString, firstRouterIndex, + directorySignatureIndex); + } + if (endIndex > directorySignatureIndex) { + this.parseDirectorySignatureBytes(descriptorString, + directorySignatureIndex, endIndex); + } + } + + private int findFirstIndexOfKeyword(String descriptorString, + String keyword) { + if (descriptorString.startsWith(keyword)) { + return 0; + } else if (descriptorString.contains("\n" + keyword + " ")) { + return descriptorString.indexOf("\n" + keyword + " ") + 1; + } else if (descriptorString.contains("\n" + keyword + "\n")) { + return descriptorString.indexOf("\n" + keyword + "\n") + 1; + } else { + return -1; + } + } + + private void parseHeaderBytes(String descriptorString, int start, + int end) throws DescriptorParseException { + byte[] headerBytes = new byte[end - start]; + System.arraycopy(this.rawDescriptorBytes, start, + headerBytes, 0, end - start); + this.parseHeader(headerBytes); + } + + private void parseServerDescriptorBytes(String descriptorString, + int start, int end) throws DescriptorParseException { + List<byte[]> splitServerDescriptorBytes = + this.splitByKeyword(descriptorString, "router", start, end); + for (byte[] statusEntryBytes : splitServerDescriptorBytes) { + this.parseServerDescriptor(statusEntryBytes); + } + } + + private void parseDirectorySignatureBytes(String descriptorString, + int start, int end) throws DescriptorParseException { + List<byte[]> splitDirectorySignatureBytes = this.splitByKeyword( + descriptorString, "directory-signature", start, end); + for (byte[] directorySignatureBytes : splitDirectorySignatureBytes) { + this.parseDirectorySignature(directorySignatureBytes); + } + } + + private List<byte[]> splitByKeyword(String descriptorString, + String keyword, int start, int end) { + List<byte[]> splitParts = new ArrayList<byte[]>(); + int from = start; + while (from < end) { + int to = descriptorString.indexOf("\n" + keyword + " ", from); + if (to < 0) { + to = descriptorString.indexOf("\n" + keyword + "\n", from); + } + if (to < 0) { + to = end; + } else { + to += 1; + } + int toNoNewline = to; + while (toNoNewline > from && + descriptorString.charAt(toNoNewline - 1) == '\n') { + toNoNewline--; + } + byte[] part = new byte[toNoNewline - from]; + System.arraycopy(this.rawDescriptorBytes, from, part, 0, + toNoNewline - from); + from = to; + splitParts.add(part); + } + return splitParts; + } + + private void parseHeader(byte[] headerBytes) + throws DescriptorParseException { + Scanner s = new Scanner(new String(headerBytes)).useDelimiter("\n"); + String publishedLine = null, nextCrypto = null, + runningRoutersLine = null, routerStatusLine = null; + StringBuilder crypto = null; + while (s.hasNext()) { + String line = s.next(); + if (line.isEmpty() || line.startsWith("@")) { + continue; + } + String lineNoOpt = line.startsWith("opt ") ? + line.substring("opt ".length()) : line; + String[] partsNoOpt = lineNoOpt.split(" "); + String keyword = partsNoOpt[0]; + if (keyword.equals("signed-directory")) { + this.parseSignedDirectoryLine(line, lineNoOpt, partsNoOpt); + } else if (keyword.equals("published")) { + if (publishedLine != null) { + throw new DescriptorParseException("Keyword 'published' is " + + "contained more than once, but must be contained exactly " + + "once."); + } else { + publishedLine = line; + } + } else if (keyword.equals("dir-signing-key")) { + this.parseDirSigningKeyLine(line, lineNoOpt, partsNoOpt); + nextCrypto = "dir-signing-key"; + } else if (keyword.equals("recommended-software")) { + this.parseRecommendedSoftwareLine(line, lineNoOpt, partsNoOpt); + } else if (keyword.equals("running-routers")) { + runningRoutersLine = line; + } else if (keyword.equals("router-status")) { + routerStatusLine = line; + } else if (line.startsWith("-----BEGIN")) { + crypto = new StringBuilder(); + crypto.append(line + "\n"); + } else if (line.startsWith("-----END")) { + crypto.append(line + "\n"); + String cryptoString = crypto.toString(); + crypto = null; + if (nextCrypto.equals("dir-signing-key") && + this.dirSigningKey == null) { + this.dirSigningKey = cryptoString; + } else { + throw new DescriptorParseException("Unrecognized crypto " + + "block in v1 directory."); + } + nextCrypto = null; + } else if (crypto != null) { + crypto.append(line + "\n"); + } else { + if (this.failUnrecognizedDescriptorLines) { + throw new DescriptorParseException("Unrecognized line '" + + line + "' in v1 directory."); + } else { + if (this.unrecognizedLines == null) { + this.unrecognizedLines = new ArrayList<String>(); + } + this.unrecognizedLines.add(line); + } + } + } + if (publishedLine == null) { + throw new DescriptorParseException("Keyword 'published' is " + + "contained 0 times, but must be contained exactly once."); + } else { + String publishedLineNoOpt = publishedLine.startsWith("opt ") ? + publishedLine.substring("opt ".length()) : publishedLine; + String[] publishedPartsNoOpt = publishedLineNoOpt.split(" "); + this.parsePublishedLine(publishedLine, publishedLineNoOpt, + publishedPartsNoOpt); + } + if (routerStatusLine != null) { + String routerStatusLineNoOpt = routerStatusLine.startsWith("opt ") ? + routerStatusLine.substring("opt ".length()) : routerStatusLine; + String[] routerStatusPartsNoOpt = routerStatusLineNoOpt.split(" "); + this.parseRouterStatusLine(routerStatusLine, routerStatusLineNoOpt, + routerStatusPartsNoOpt); + } else if (runningRoutersLine != null) { + String runningRoutersLineNoOpt = + runningRoutersLine.startsWith("opt ") ? + runningRoutersLine.substring("opt ".length()) : + runningRoutersLine; + String[] runningRoutersPartsNoOpt = + runningRoutersLineNoOpt.split(" "); + this.parseRunningRoutersLine(runningRoutersLine, + runningRoutersLineNoOpt, runningRoutersPartsNoOpt); + } else { + throw new DescriptorParseException("Either running-routers or " + + "router-status line must be given."); + } + } + + protected void parseServerDescriptor(byte[] serverDescriptorBytes) { + try { + ServerDescriptorImpl serverDescriptor = new ServerDescriptorImpl( + serverDescriptorBytes, this.failUnrecognizedDescriptorLines); + this.serverDescriptors.add(serverDescriptor); + } catch (DescriptorParseException e) { + this.serverDescriptorParseExceptions.add(e); + } + } + + private void parseDirectorySignature(byte[] directorySignatureBytes) + throws DescriptorParseException { + Scanner s = new Scanner(new String(directorySignatureBytes)). + useDelimiter("\n"); + String nextCrypto = null; + StringBuilder crypto = null; + while (s.hasNext()) { + String line = s.next(); + String lineNoOpt = line.startsWith("opt ") ? + line.substring("opt ".length()) : line; + String[] partsNoOpt = lineNoOpt.split(" "); + String keyword = partsNoOpt[0]; + if (keyword.equals("directory-signature")) { + this.parseDirectorySignatureLine(line, lineNoOpt, partsNoOpt); + nextCrypto = "directory-signature"; + } else if (line.startsWith("-----BEGIN")) { + crypto = new StringBuilder(); + crypto.append(line + "\n"); + } else if (line.startsWith("-----END")) { + crypto.append(line + "\n"); + String cryptoString = crypto.toString(); + crypto = null; + if (nextCrypto.equals("directory-signature")) { + this.directorySignature = cryptoString; + } else { + throw new DescriptorParseException("Unrecognized crypto " + + "block in v2 network status."); + } + nextCrypto = null; + } else if (crypto != null) { + crypto.append(line + "\n"); + } else if (this.failUnrecognizedDescriptorLines) { + throw new DescriptorParseException("Unrecognized line '" + line + + "' in v2 network status."); + } else { + if (this.unrecognizedLines == null) { + this.unrecognizedLines = new ArrayList<String>(); + } + this.unrecognizedLines.add(line); + } + } + } + + private void parseSignedDirectoryLine(String line, String lineNoOpt, + String[] partsNoOpt) throws DescriptorParseException { + if (!lineNoOpt.equals("signed-directory")) { + throw new DescriptorParseException("Illegal line '" + line + "'."); + } + } + + private void parsePublishedLine(String line, String lineNoOpt, + String[] partsNoOpt) throws DescriptorParseException { + this.publishedMillis = ParseHelper.parseTimestampAtIndex(line, + partsNoOpt, 1, 2); + } + + private void parseDirSigningKeyLine(String line, String lineNoOpt, + String[] partsNoOpt) throws DescriptorParseException { + if (partsNoOpt.length > 2) { + throw new DescriptorParseException("Illegal line '" + line + "'."); + } else if (partsNoOpt.length == 2) { + /* Early directories didn't have a crypto object following the + * "dir-signing-key" line, but had the key base64-encoded in the + * same line. */ + StringBuilder sb = new StringBuilder(); + sb.append("-----BEGIN RSA PUBLIC KEY-----\n"); + String keyString = partsNoOpt[1]; + while (keyString.length() > 64) { + sb.append(keyString.substring(0, 64) + "\n"); + keyString = keyString.substring(64); + } + if (keyString.length() > 0) { + sb.append(keyString + "\n"); + } + sb.append("-----END RSA PUBLIC KEY-----\n"); + this.dirSigningKey = sb.toString(); + } + } + + private void parseRecommendedSoftwareLine(String line, String lineNoOpt, + String[] partsNoOpt) throws DescriptorParseException { + List<String> result = new ArrayList<String>(); + if (partsNoOpt.length > 2) { + throw new DescriptorParseException("Illegal versions line '" + line + + "'."); + } else if (partsNoOpt.length == 2) { + String[] versions = partsNoOpt[1].split(",", -1); + for (int i = 0; i < versions.length; i++) { + String version = versions[i]; + if (version.length() < 1) { + throw new DescriptorParseException("Illegal versions line '" + + line + "'."); + } + result.add(version); + } + } + this.recommendedSoftware = result; + } + + private void parseRunningRoutersLine(String line, String lineNoOpt, + String[] partsNoOpt) throws DescriptorParseException { + for (int i = 1; i < partsNoOpt.length; i++) { + String part = partsNoOpt[i]; + String debugLine = "running-routers [...] " + part + " [...]"; + boolean isLive = true; + if (part.startsWith("!")) { + isLive = false; + part = part.substring(1); + } + boolean isVerified; + String fingerprint = null, nickname = null; + if (part.startsWith("$")) { + isVerified = false; + fingerprint = ParseHelper.parseTwentyByteHexString(debugLine, + part.substring(1)); + } else { + isVerified = true; + nickname = ParseHelper.parseNickname(debugLine, part); + } + this.statusEntries.add(new RouterStatusEntryImpl(fingerprint, + nickname, isLive, isVerified)); + } + } + + private void parseRouterStatusLine(String line, String lineNoOpt, + String[] partsNoOpt) throws DescriptorParseException { + for (int i = 1; i < partsNoOpt.length; i++) { + String part = partsNoOpt[i]; + String debugLine = "router-status [...] " + part + " [...]"; + RouterStatusEntry entry = null; + if (part.contains("=")) { + String[] partParts = part.split("="); + if (partParts.length == 2) { + boolean isVerified = true, isLive; + String nickname; + if (partParts[0].startsWith("!")) { + isLive = false; + nickname = ParseHelper.parseNickname(debugLine, + partParts[0].substring(1)); + } else { + isLive = true; + nickname = ParseHelper.parseNickname(debugLine, partParts[0]); + } + String fingerprint = ParseHelper.parseTwentyByteHexString( + debugLine, partParts[1].substring(1)); + entry = new RouterStatusEntryImpl(fingerprint, nickname, isLive, + isVerified); + } + } else { + boolean isVerified = false, isLive; + String nickname = null, fingerprint; + if (part.startsWith("!")) { + isLive = false; + fingerprint = ParseHelper.parseTwentyByteHexString( + debugLine, part.substring(2)); + } else { + isLive = true; + fingerprint = ParseHelper.parseTwentyByteHexString( + debugLine, part.substring(1));; + } + entry = new RouterStatusEntryImpl(fingerprint, nickname, isLive, + isVerified); + } + if (entry == null) { + throw new DescriptorParseException("Illegal router-status entry '" + + part + "' in v1 directory."); + } + this.statusEntries.add(entry); + } + } + + private void parseDirectorySignatureLine(String line, String lineNoOpt, + String[] partsNoOpt) throws DescriptorParseException { + if (partsNoOpt.length < 2) { + throw new DescriptorParseException("Illegal line '" + line + "'."); + } + this.nickname = ParseHelper.parseNickname(line, partsNoOpt[1]); + } + + private long publishedMillis; + public long getPublishedMillis() { + return this.publishedMillis; + } + + private String dirSigningKey; + public String getDirSigningKey() { + return this.dirSigningKey; + } + + private List<String> recommendedSoftware; + public List<String> getRecommendedSoftware() { + return this.recommendedSoftware == null ? null : + new ArrayList<String>(this.recommendedSoftware); + } + + private String directorySignature; + public String getDirectorySignature() { + return this.directorySignature; + } + + private List<RouterStatusEntry> statusEntries = + new ArrayList<RouterStatusEntry>(); + public List<RouterStatusEntry> getRouterStatusEntries() { + return new ArrayList<RouterStatusEntry>(this.statusEntries); + } + + private List<ServerDescriptor> serverDescriptors = + new ArrayList<ServerDescriptor>(); + public List<ServerDescriptor> getServerDescriptors() { + return new ArrayList<ServerDescriptor>(this.serverDescriptors); + } + + private List<Exception> serverDescriptorParseExceptions = + new ArrayList<Exception>(); + public List<Exception> getServerDescriptorParseExceptions() { + return new ArrayList<Exception>(this.serverDescriptorParseExceptions); + } + + private String nickname; + public String getNickname() { + return this.nickname; + } + + private String directoryDigest; + public String getDirectoryDigest() { + return this.directoryDigest; + } +} + diff --git a/src/org/torproject/descriptor/impl/RouterStatusEntryImpl.java b/src/org/torproject/descriptor/impl/RouterStatusEntryImpl.java new file mode 100644 index 0000000..68f549e --- /dev/null +++ b/src/org/torproject/descriptor/impl/RouterStatusEntryImpl.java @@ -0,0 +1,37 @@ +/* Copyright 2012 The Tor Project + * See LICENSE for licensing information */ +package org.torproject.descriptor.impl; + +import org.torproject.descriptor.RouterStatusEntry; + +public class RouterStatusEntryImpl implements RouterStatusEntry { + + protected RouterStatusEntryImpl(String fingerprint, String nickname, + boolean isLive, boolean isVerified) { + this.fingerprint = fingerprint; + this.nickname = nickname; + this.isLive = isLive; + this.isVerified = isVerified; + } + + private String nickname; + public String getNickname() { + return this.nickname; + } + + private String fingerprint; + public String getFingerprint() { + return this.fingerprint; + } + + private boolean isLive; + public boolean isLive() { + return this.isLive; + } + + private boolean isVerified; + public boolean isVerified() { + return this.isVerified; + } +} + diff --git a/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java b/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java index 77b06dd..5237348 100644 --- a/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java @@ -123,6 +123,8 @@ public class ServerDescriptorImpl extends DescriptorImpl this.parseProtocolsLine(line, lineNoOpt, partsNoOpt); } else if (keyword.equals("allow-single-hop-exits")) { this.parseAllowSingleHopExitsLine(line, lineNoOpt, partsNoOpt); + } else if (keyword.equals("dircacheport")) { + this.parseDircacheportLine(line, lineNoOpt, partsNoOpt); } else if (line.startsWith("-----BEGIN")) { crypto = new StringBuilder(); crypto.append(line + "\n"); @@ -183,7 +185,7 @@ public class ServerDescriptorImpl extends DescriptorImpl private void parseBandwidthLine(String line, String lineNoOpt, String[] partsNoOpt) throws DescriptorParseException { - if (partsNoOpt.length != 4) { + if (partsNoOpt.length < 3 || partsNoOpt.length > 4) { throw new DescriptorParseException("Wrong number of values in line " + "'" + line + "'."); } @@ -191,11 +193,18 @@ public class ServerDescriptorImpl extends DescriptorImpl try { this.bandwidthRate = Integer.parseInt(partsNoOpt[1]); this.bandwidthBurst = Integer.parseInt(partsNoOpt[2]); - this.bandwidthObserved = Integer.parseInt(partsNoOpt[3]); + if (partsNoOpt.length == 4) { + this.bandwidthObserved = Integer.parseInt(partsNoOpt[3]); + } if (this.bandwidthRate >= 0 && this.bandwidthBurst >= 0 && this.bandwidthObserved >= 0) { isValid = true; } + if (partsNoOpt.length < 4) { + /* Tor versions 0.0.8 and older only wrote bandwidth lines with + * rate and burst values, but no observed value. */ + this.bandwidthObserved = -1; + } } catch (NumberFormatException e) { /* Handle below. */ } @@ -435,6 +444,21 @@ public class ServerDescriptorImpl extends DescriptorImpl this.allowSingleHopExits = true; } + private void parseDircacheportLine(String line, String lineNoOpt, + String[] partsNoOpt) throws DescriptorParseException { + /* The dircacheport line was only contained in server descriptors + * published by Tor 0.0.8 and before. It's only specified in old + * tor-spec.txt versions. */ + if (partsNoOpt.length != 2) { + throw new DescriptorParseException("Illegal line '" + line + "'."); + } + if (this.dirPort != 0) { + throw new DescriptorParseException("At most one of dircacheport " + + "and the directory port in the router line may be non-zero."); + } + this.dirPort = ParseHelper.parsePort(line, partsNoOpt[1]); + } + private void calculateDigest() throws DescriptorParseException { try { String ascii = new String(this.getRawDescriptorBytes(), "US-ASCII"); [View Less]

1 0

[metrics-web/master] Organize a few imports.
by karsten＠torproject.org 19 May '12

19 May '12

commit 360b24fb26c99b218e44b98fb5f711ccdaa74324 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat May 19 14:35:26 2012 +0200 Organize a few imports. --- src/org/torproject/ernie/cron/ArchiveReader.java | 4 ---- src/org/torproject/ernie/web/CsvServlet.java | 1 - .../torproject/ernie/web/GraphImageServlet.java | 1 - src/org/torproject/ernie/web/RObjectGenerator.java | 1 - 4 files changed, 0 insertions(+), 7 deletions(-) diff --git a/src/org/… [View More]torproject/ernie/cron/ArchiveReader.java b/src/org/torproject/ernie/cron/ArchiveReader.java index acdbdb5..9126787 100644 --- a/src/org/torproject/ernie/cron/ArchiveReader.java +++ b/src/org/torproject/ernie/cron/ArchiveReader.java @@ -3,14 +3,11 @@ package org.torproject.ernie.cron; import java.io.File; -import java.io.UnsupportedEncodingException; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.TimeZone; import java.util.logging.Logger; import org.apache.commons.codec.DecoderException; @@ -23,7 +20,6 @@ import org.torproject.descriptor.DescriptorSourceFactory; import org.torproject.descriptor.ExtraInfoDescriptor; import org.torproject.descriptor.NetworkStatusEntry; import org.torproject.descriptor.RelayNetworkStatusConsensus; -import org.torproject.descriptor.RelayNetworkStatusVote; import org.torproject.descriptor.ServerDescriptor; /** diff --git a/src/org/torproject/ernie/web/CsvServlet.java b/src/org/torproject/ernie/web/CsvServlet.java index 3d0e06d..5e170e3 100644 --- a/src/org/torproject/ernie/web/CsvServlet.java +++ b/src/org/torproject/ernie/web/CsvServlet.java @@ -4,7 +4,6 @@ package org.torproject.ernie.web; import java.io.IOException; import java.util.SortedSet; -import java.util.TreeSet; import java.util.logging.Logger; import javax.servlet.ServletException; diff --git a/src/org/torproject/ernie/web/GraphImageServlet.java b/src/org/torproject/ernie/web/GraphImageServlet.java index 88d5755..5777172 100644 --- a/src/org/torproject/ernie/web/GraphImageServlet.java +++ b/src/org/torproject/ernie/web/GraphImageServlet.java @@ -4,7 +4,6 @@ package org.torproject.ernie.web; import java.io.BufferedOutputStream; import java.io.IOException; -import java.util.Map; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; diff --git a/src/org/torproject/ernie/web/RObjectGenerator.java b/src/org/torproject/ernie/web/RObjectGenerator.java index 005da85..8350de9 100644 --- a/src/org/torproject/ernie/web/RObjectGenerator.java +++ b/src/org/torproject/ernie/web/RObjectGenerator.java @@ -8,7 +8,6 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; -import java.io.FileReader; import java.io.IOException; import java.io.InputStreamReader; import java.util.ArrayList; [View Less]

1 0

[doctor/master] Don't fail with a NullPointerException if a vote cannot be parsed.
by karsten＠torproject.org 19 May '12

19 May '12

commit 82078b5f1ca20be25bc4b4194c39d12d53020ef8 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat May 19 13:32:27 2012 +0200 Don't fail with a NullPointerException if a vote cannot be parsed. --- src/org/torproject/doctor/Checker.java | 3 +++ src/org/torproject/doctor/DownloadStatistics.java | 3 +++ src/org/torproject/doctor/Downloader.java | 13 ++----------- .../torproject/doctor/MetricsWebsiteReport.java | 3 +++ 4 files changed,… [View More] 11 insertions(+), 11 deletions(-) diff --git a/src/org/torproject/doctor/Checker.java b/src/org/torproject/doctor/Checker.java index eeedb5e..2cfb68b 100644 --- a/src/org/torproject/doctor/Checker.java +++ b/src/org/torproject/doctor/Checker.java @@ -59,6 +59,9 @@ public class Checker { new ArrayList<RelayNetworkStatusVote>(); private void storeDownloads(List<DescriptorRequest> downloads) { for (DescriptorRequest request : downloads) { + if (request.getDescriptors() == null) { + continue; + } for (Descriptor descriptor : request.getDescriptors()) { if (descriptor instanceof RelayNetworkStatusConsensus) { this.downloadedConsensuses.put(request.getDirectoryNickname(), diff --git a/src/org/torproject/doctor/DownloadStatistics.java b/src/org/torproject/doctor/DownloadStatistics.java index e30aed8..212931b 100644 --- a/src/org/torproject/doctor/DownloadStatistics.java +++ b/src/org/torproject/doctor/DownloadStatistics.java @@ -18,6 +18,9 @@ public class DownloadStatistics { BufferedWriter bw = new BufferedWriter(new FileWriter( this.statisticsFile, true)); for (DescriptorRequest request : downloads) { + if (request.getDescriptors() == null) { + continue; + } for (Descriptor descriptor : request.getDescriptors()) { if (descriptor instanceof RelayNetworkStatusConsensus) { String authority = request.getDirectoryNickname(); diff --git a/src/org/torproject/doctor/Downloader.java b/src/org/torproject/doctor/Downloader.java index 060ed63..3295870 100644 --- a/src/org/torproject/doctor/Downloader.java +++ b/src/org/torproject/doctor/Downloader.java @@ -41,17 +41,8 @@ public class Downloader { List<DescriptorRequest> allRequests = new ArrayList<DescriptorRequest>(); while (descriptorRequests.hasNext()) { - try { - allRequests.add(descriptorRequests.next()); - } catch (NoSuchElementException e) { - /* TODO In theory, this exception shouldn't be thrown. This is a - * bug in metrics-lib. */ - System.err.println("Internal error: next() doesn't provide an " - + "element even though hasNext() returned true. Got " - + allRequests.size() + " elements so far. Stopping to " - + "request further elements."); - break; - } + DescriptorRequest request = descriptorRequests.next(); + allRequests.add(request); } /* We downloaded everything we wanted. */ diff --git a/src/org/torproject/doctor/MetricsWebsiteReport.java b/src/org/torproject/doctor/MetricsWebsiteReport.java index 23e59ab..9c634ca 100644 --- a/src/org/torproject/doctor/MetricsWebsiteReport.java +++ b/src/org/torproject/doctor/MetricsWebsiteReport.java @@ -31,6 +31,9 @@ public class MetricsWebsiteReport { List<DescriptorRequest> downloads) { long mostRecentValidAfterMillis = -1L; for (DescriptorRequest request : downloads) { + if (request.getDescriptors() == null) { + continue; + } for (Descriptor descriptor : request.getDescriptors()) { if (descriptor instanceof RelayNetworkStatusConsensus) { RelayNetworkStatusConsensus downloadedConsensus = [View Less]

1 0

[metrics-lib/master] Add @type annotations for sanitized bridge descriptors.
by karsten＠torproject.org 19 May '12

19 May '12

commit 49a88e7eaaf3fea6736aba5df44905d3e7210eb7 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat May 19 11:48:29 2012 +0200 Add @type annotations for sanitized bridge descriptors. Spotted by Damian. --- .../torproject/descriptor/impl/DescriptorImpl.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/descriptor/impl/DescriptorImpl.java b/src/org/torproject/descriptor/impl/DescriptorImpl.java index 7062b58..… [View More]

1 0

[metrics-lib/master] Fix unit tests.
by karsten＠torproject.org 19 May '12

19 May '12

commit 26083ebde4421711641b2f01fe6436f24314144e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat May 19 11:42:21 2012 +0200 Fix unit tests. - Annotation lines starting with @ are now recognized. - Unrecognized keywords in "w" lines are now ignored. --- .../impl/RelayNetworkStatusConsensusImplTest.java | 4 ++-- .../impl/RelayNetworkStatusVoteImplTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/org/… [View More]

1 0

[metrics-lib/master] Ignore unknown keywords in "w" lines.
by karsten＠torproject.org 19 May '12

19 May '12

commit 316e956bc05b5805b387ae75076233f76f69c8ae Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat May 19 10:14:54 2012 +0200 Ignore unknown keywords in "w" lines. moria1 added a Capped= keyword to debug #2286 which made DocTor and metrics-db freak out. The correct behavior is to ignore unknown keywords. --- .../descriptor/impl/NetworkStatusEntryImpl.java | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/… [View More]

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 19 May '12

19 May '12

commit 958a3934dce9dd621c19bcbe2954f6d33f793b11 Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 19 07:15:31 2012 +0000 Update translations for https_everywhere_completed --- zh_TW/ssl-observatory.dtd | 86 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 86 insertions(+), 0 deletions(-) diff --git a/zh_TW/ssl-observatory.dtd b/zh_TW/ssl-observatory.dtd new file mode 100644 index 0000000..486d764 --- /dev/null +++ b/zh_TW/ssl-observatory.… [View More]dtd @@ -0,0 +1,86 @@ + +<!ENTITY ssl-observatory.popup.details "詳細資料與隱私訊息"> +<!ENTITY ssl-observatory.popup.later "稍後再詢問"> +<!ENTITY ssl-observatory.popup.no "取消"> + +<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere 能將您收到的憑證送到觀測站，以偵測出對您瀏覽器的攻擊。要啟用本功能嗎？"> + + + +<!ENTITY ssl-observatory.popup.title +"要讓 HTTPS Everywhere 使用 SSL 觀測站嗎？"> + +<!ENTITY ssl-observatory.popup.yes "確定"> + + + +<!ENTITY ssl-observatory.prefs.adv_priv_opts1 +"啟用這個選項是安全的，除非您使用高侵入性的企業網路（corporate network）:"> + +<!ENTITY ssl-observatory.prefs.adv_priv_opts2 +"啟用這個選項是安全的，除非您使用含有隱密內部網路伺服器名稱的企業網路（corporate network）:"> + +<!ENTITY ssl-observatory.prefs.alt_roots +"送出並檢查由非正規的根憑證所簽署的憑證"> + +<!ENTITY ssl-observatory.prefs.alt_roots_tooltip +"啟用這個選項是安全的（而且也推薦啟用），除非您使用侵入性的企業網路，或者 Kaspersky 防毒軟體監控到您透過 TLS proxy 瀏覽並使用私人的根憑證。在這類的網路環境啟用此選項，可能會因為所產生的特有憑證，導致經由此代理伺服器瀏覽特定 https:// 網域的證明被公開。因此預設為不啟用此選項。"> + +<!ENTITY ssl-observatory.prefs.anonymous "以 Tor 匿名檢測憑證"> +<!ENTITY ssl-observatory.prefs.anonymous_unavailable +"以 Tor 匿名檢測憑證（需安裝 Torbutton）"> +<!ENTITY ssl-observatory.prefs.anonymous_tooltip +"這個選項必須安裝 Tor 及 Torbutton"> + +<!ENTITY ssl-observatory.prefs.asn +"看到新的憑證時，告訴觀測站您連線的 ISP"> + +<!ENTITY ssl-observatory.prefs.asn_tooltip +"這個選項會取得並回傳您的網路的自治系統號碼（Autonomous System Number）。這個動作能協助我們定位對 HTTPS 的攻擊，並判定我們所觀測到發自伊朗及敘利亞等地網路的攻擊是否較為常見。"> + +<!ENTITY ssl-observatory.prefs.done "完成"> + +<!ENTITY ssl-observatory.prefs.explanation +"HTTPS Everywhere 可以使用 EFF 的 SSL 觀測站。這麼做有兩個效果：(1) 將 HTTPS 憑證的副本傳送到觀測站，協助我們偵測「中間人」攻擊並增進網路安全性；(2) 當您遇到不安全的連線或瀏覽器遭到攻擊時，我們能夠提出警告。"> + + + +<!ENTITY ssl-observatory.prefs.explanation2 + +"例如當您開啟 https://www.something.com（範例網址）時，觀測站所收到的憑證會顯示有人瀏覽 www.something.com，但不會指出瀏覽者身分或者觀看的是哪些特定頁面。將游標移至選項上可得到詳細說明:"> + +<!ENTITY ssl-observatory.prefs.hide "隱藏進階選項"> + +<!ENTITY ssl-observatory.prefs.nonanon +"在 Tor 無法使用時仍檢查憑證"> + +<!ENTITY ssl-observatory.prefs.nonanon_tooltip +"我們仍會試圖維持資料的匿名性，但這個選項的安全性較低"> + +<!ENTITY ssl-observatory.prefs.priv_dns +"送出並檢查非公共域名系統（non-public DNS）名稱的憑證"> + +<!ENTITY ssl-observatory.prefs.priv_dns_tooltip +"觀測站不會記錄名稱未經 DNS 系統解析的憑證，除非您有勾選這個選項。"> + +<!ENTITY ssl-observatory.prefs.show "顯示進階選項"> + +<!ENTITY ssl-observatory.prefs.title "SSL 觀測站偏好設定"> + +<!ENTITY ssl-observatory.prefs.use "使用觀測站？"> +<!ENTITY ssl-observatory.warning.title "EFF 的 SSL 觀測站提出警告"> +<!ENTITY ssl-observatory.warning.showcert "顯示憑證鍊（certificate chain）"> +<!ENTITY ssl-observatory.warning.okay "我了解"> +<!ENTITY ssl-observatory.warning.text "EFF 的 SSL 觀測站對這個網站的 HTTPS 憑證提出警告:"> +<!ENTITY ssl-observatory.warning.defense "若您已登入此網站，當您能使用安全連線時最好變更一下密碼。"> + +<!ENTITY ssl-observatory.prefs.self_signed +"送出並檢查自我簽署的憑證"> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +"建議啟用；加密問題在自我簽署的嵌入式裝置極為常見。"> [View Less]

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 19 May '12

19 May '12

commit 2ab1acabf8564ff5c0f3e4ec3fab967df06186e1 Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 19 07:15:28 2012 +0000 Update translations for https_everywhere --- zh_TW/ssl-observatory.dtd | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/zh_TW/ssl-observatory.dtd b/zh_TW/ssl-observatory.dtd index 3a48a11..486d764 100644 --- a/zh_TW/ssl-observatory.dtd +++ b/zh_TW/ssl-observatory.dtd @@ -83,4 +83,4 @@ Mouseover the options for … [View More]

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 19 May '12

19 May '12

commit 747dca3d7a2f7fe3ee156072213e7c2f65719e35 Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 19 06:45:27 2012 +0000 Update translations for https_everywhere --- zh_TW/ssl-observatory.dtd | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_TW/ssl-observatory.dtd b/zh_TW/ssl-observatory.dtd index 0c1ed2f..3a48a11 100644 --- a/zh_TW/ssl-observatory.dtd +++ b/zh_TW/ssl-observatory.dtd @@ -27,7 +27,7 @@ to turn it on?">--> … [View More]

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 19 May '12

19 May '12

commit b24b5583276b377a29f606969ab2e68cdb2cf243 Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 19 06:15:27 2012 +0000 Update translations for https_everywhere --- zh_TW/ssl-observatory.dtd | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_TW/ssl-observatory.dtd b/zh_TW/ssl-observatory.dtd index c894e7d..0c1ed2f 100644 --- a/zh_TW/ssl-observatory.dtd +++ b/zh_TW/ssl-observatory.dtd @@ -78,9 +78,9 @@ Mouseover the options for … [View More]

1 0