- tor-commits - lists.torproject.org

[tor-cloud/master] Created Tor Cloud image in Sao Paulo
by runa＠torproject.org 16 Dec '11

16 Dec '11

commit 5087a7d75c346ecb2522ce2b4fc5f557e2162054 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Fri Dec 16 15:42:35 2011 +0000 Created Tor Cloud image in Sao Paulo --- BUILD | 2 ++ html/index.html | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/BUILD b/BUILD index 183ebdc..f2bf00b 100644 --- a/BUILD +++ b/BUILD @@ -37,6 +37,7 @@ images in the Amazon EC2 cloud. root@tor-build:~# ec2-describe-regions REGION eu-west-1 ec2.eu-west-1.amazonaws.com + REGION sa-east-1 ec2.sa-east-1.amazonaws.com REGION us-east-1 ec2.us-east-1.amazonaws.com REGION ap-northeast-1 ec2.ap-northeast-1.amazonaws.com REGION us-west-2 ec2.us-west-2.amazonaws.com @@ -54,6 +55,7 @@ images in the Amazon EC2 cloud. images for: root@tor-build:~# ec2-add-keypair --region us-east-1 tor-cloud-us-east-1 > keys/tor-cloud-us-east-1.pem + root@tor-build:~# ec2-add-keypair --region sa-east-1 tor-cloud-sa-east-1 > keys/tor-cloud-sa-east-1.pem root@tor-build:~# ec2-add-keypair --region us-west-1 tor-cloud-us-west-1 > keys/tor-cloud-us-west-1.pem root@tor-build:~# ec2-add-keypair --region us-west-2 tor-cloud-us-west-2 > keys/tor-cloud-us-west-2.pem root@tor-build:~# ec2-add-keypair --region eu-west-1 tor-cloud-eu-west-1 > keys/tor-cloud-eu-west-1.pem diff --git a/html/index.html b/html/index.html index 3f53e08..7bd7f69 100644 --- a/html/index.html +++ b/html/index.html @@ -143,6 +143,8 @@ <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-65b3…" target="_blank">eu-west-1<br>Ireland</a></li> <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchAmi=ami…" target="_blank">ap-northeast-1<br>Tokyo</a></li> <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchAmi=ami…" target="_blank">ap-southeast-1<br>Singapore</a></li> + <br /> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=sa-east-1#launchAmi=ami-a833…" target="_blank">sa-east-1<br>Sao Paulo</a></li> </ul> <hgroup>

1 0

[metrics-lib/master] Improve vote parsing and unit tests.
by karsten＠torproject.org 16 Dec '11

16 Dec '11

commit c2dac40a033f332078617ba6adb379f28efdbdbb Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Dec 16 12:56:23 2011 +0100 Improve vote parsing and unit tests. --- .../impl/RelayNetworkStatusVoteImpl.java | 41 ++- .../impl/RelayNetworkStatusVoteImplTest.java | 524 +++++++++++++++++--- 2 files changed, 481 insertions(+), 84 deletions(-) diff --git a/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java b/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java index fd17e7b..ab4da77 100644 --- a/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java +++ b/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java @@ -16,9 +16,6 @@ import java.util.TreeMap; import java.util.TreeSet; import org.torproject.descriptor.RelayNetworkStatusVote; -/* TODO Find out if all keywords in the dir-source section are required. - * They are not all mentioned in dir-spec.txt. */ - /* Contains a network status vote. */ public class RelayNetworkStatusVoteImpl extends NetworkStatusImpl implements RelayNetworkStatusVote { @@ -51,11 +48,13 @@ public class RelayNetworkStatusVoteImpl extends NetworkStatusImpl "vote-status,consensus-methods,published,valid-after,fresh-until," + "valid-until,voting-delay,known-flags,dir-source," + "dir-key-certificate-version,fingerprint,dir-key-published," - + "dir-key-expires,directory-footer").split(","))); + + "dir-key-expires,dir-identity-key,dir-signing-key," + + "dir-key-certification,directory-footer,directory-signature"). + split(","))); this.checkExactlyOnceKeywords(exactlyOnceKeywords); Set<String> atMostOnceKeywords = new HashSet<String>(Arrays.asList(( - "client-versions,server-versions,params,contact,legacy-key"). - split(","))); + "client-versions,server-versions,params,contact,legacy-key," + + "dir-key-crosscert,dir-address").split(","))); this.checkAtMostOnceKeywords(atMostOnceKeywords); this.checkFirstKeyword("network-status-version"); } @@ -252,9 +251,10 @@ public class RelayNetworkStatusVoteImpl extends NetworkStatusImpl this.parseContactLine(line, parts); } else if (keyword.equals("dir-key-certificate-version")) { this.parseDirKeyCertificateVersionLine(line, parts); + } else if (keyword.equals("dir-address")) { + this.parseDirAddressLine(line, parts); } else if (keyword.equals("fingerprint")) { - /* Nothing new to learn here. We already know the fingerprint - * from the dir-source line. */ + this.parseFingerprintLine(line, parts); } else if (keyword.equals("legacy-key")) { this.parseLegacyKeyLine(line, parts); } else if (keyword.equals("dir-key-published")) { @@ -286,8 +286,16 @@ public class RelayNetworkStatusVoteImpl extends NetworkStatusImpl private void parseDirSourceLine(String line, String[] parts) throws DescriptorParseException { + if (parts.length != 7) { + throw new DescriptorParseException("Illegal line '" + line + + "' in vote."); + } this.nickname = ParseHelper.parseNickname(line, parts[1]); this.identity = ParseHelper.parseTwentyByteHexString(line, parts[2]); + if (parts[3].length() < 1) { + throw new DescriptorParseException("Illegal hostname in '" + line + + "'."); + } this.address = ParseHelper.parseIpv4Address(line, parts[4]); this.dirPort = ParseHelper.parsePort(line, parts[5]); this.orPort = ParseHelper.parsePort(line, parts[6]); @@ -320,6 +328,23 @@ public class RelayNetworkStatusVoteImpl extends NetworkStatusImpl } } + private void parseDirAddressLine(String line, String[] parts) { + /* Nothing new to learn here. Also, this line hasn't been observed + * "in the wild" yet. Maybe it's just an urban legend. */ + } + + private void parseFingerprintLine(String line, String[] parts) + throws DescriptorParseException { + /* Nothing new to learn here. We already know the fingerprint from + * the dir-source line. But we should at least check that there's a + * valid fingerprint in this line. */ + if (parts.length != 2) { + throw new DescriptorParseException("Illegal line '" + line + + "' in vote."); + } + ParseHelper.parseTwentyByteHexString(line, parts[1]); + } + private void parseLegacyKeyLine(String line, String[] parts) throws DescriptorParseException { if (parts.length != 2) { diff --git a/test/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java b/test/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java index b34e143..cdf2a01 100644 --- a/test/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java +++ b/test/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java @@ -11,21 +11,6 @@ import org.junit.*; import org.junit.rules.*; import static org.junit.Assert.*; -/* TODO Add tests (and possibly a DirSourceLineBuilder) to test the - * following methods: - * - String getNickname(); - * - String getIdentity(); - * - String getAddress(); - * - int getDirport(); - * - int getOrport(); - * - String getContactLine(); - * - int getDirKeyCertificateVersion(); - * - String getLegacyKey(); - * - long getDirKeyPublishedMillis(); - * - long getDirKeyExpiresMillis(); - * - String getSigningKeyDigest(); - */ - /* Test parsing of network status votes. Some of the vote-parsing code is * already tested in the consensus-parsing tests. The tests in this class * focus on the differences between votes and consensuses that are mostly @@ -139,7 +124,126 @@ public class RelayNetworkStatusVoteImplTest { vb.paramsLine = line; return new RelayNetworkStatusVoteImpl(vb.buildVote()); } - private List<String> dirSources = new ArrayList<String>(); + private String dirSourceLine = "dir-source urras " + + "80550987E1D626E3EBA5E5E75A458DE0626D088C 208.83.223.34 " + + "208.83.223.34 443 80"; + private static RelayNetworkStatusVote + createWithDirSourceLine(String line) + throws DescriptorParseException { + VoteBuilder vb = new VoteBuilder(); + vb.dirSourceLine = line; + return new RelayNetworkStatusVoteImpl(vb.buildVote()); + } + private String contactLine = "contact 4096R/E012B42D Jacob Appelbaum " + + "<jacob(a)appelbaum.net>"; + private static RelayNetworkStatusVote + createWithContactLine(String line) + throws DescriptorParseException { + VoteBuilder vb = new VoteBuilder(); + vb.contactLine = line; + return new RelayNetworkStatusVoteImpl(vb.buildVote()); + } + private String dirKeyCertificateVersionLine = + "dir-key-certificate-version 3"; + private static RelayNetworkStatusVote + createWithDirKeyCertificateVersionLine(String line) + throws DescriptorParseException { + VoteBuilder vb = new VoteBuilder(); + vb.dirKeyCertificateVersionLine = line; + return new RelayNetworkStatusVoteImpl(vb.buildVote()); + } + private String fingerprintLine = "fingerprint " + + "80550987E1D626E3EBA5E5E75A458DE0626D088C"; + private static RelayNetworkStatusVote + createWithFingerprintLine(String line) + throws DescriptorParseException { + VoteBuilder vb = new VoteBuilder(); + vb.fingerprintLine = line; + return new RelayNetworkStatusVoteImpl(vb.buildVote()); + } + private String dirKeyPublishedLine = "dir-key-published 2011-04-27 " + + "05:34:37"; + private static RelayNetworkStatusVote + createWithDirKeyPublishedLine(String line) + throws DescriptorParseException { + VoteBuilder vb = new VoteBuilder(); + vb.dirKeyPublishedLine = line; + return new RelayNetworkStatusVoteImpl(vb.buildVote()); + } + private String dirKeyExpiresLine = "dir-key-expires 2012-04-27 " + + "05:34:37"; + private static RelayNetworkStatusVote + createWithDirKeyExpiresLine(String line) + throws DescriptorParseException { + VoteBuilder vb = new VoteBuilder(); + vb.dirKeyExpiresLine = line; + return new RelayNetworkStatusVoteImpl(vb.buildVote()); + } + private String dirIdentityKeyLines = "dir-identity-key\n" + + "-----BEGIN RSA PUBLIC KEY-----\n" + + "MIIBigKCAYEAtKpuLgVK25sfScjsxfVU1ljofrDygt9GP7bNJl/rghX42KUT97" + + "5W\nrGp/fbhF7p+FcKCzNOhJFINQbRf/5E3lN8mzoamIU43QqQ9RRVf94688Us" + + "azVsAN\nNVT0v9J0cr387WePjenRuIE1MmiP0nmw/XdvbPTayqax7VYlcUMXGH" + + "l8DnWix1EN\nRwmeig+JBte0JS12oo2HG9zcSfjLJVjY6ZmvRrVycXiRxGc/Jg" + + "NlSrV4cxUNykaB\nJ6pO6J499OZfQu7m1vAPTENrVJ4yEfRGRwFIY+d/s8BkKc" + + "aiWtXAfTe31uBI6GEH\nmS3HNu1JVSuoaUiQIvVYDLMfBvMcNyAx97UT1l6E0T" + + "n6a7pgChrquGwXai1xGzk8\n58aXwdSFoFBSTCkyemopq5H20p/nkPAO0pHL1k" + + "TvcaKz9CEj4XcKm+kOmzejYmIa\nkbWNcRpXPiUZ+xmwGtsq30xrzqiONmERkx" + + "qlmf7bVQPFvh3Kz6hGcmTBhTbHSe9h\nzDgmdaTNn3EHAgMBAAE=\n" + + "-----END RSA PUBLIC KEY-----"; + private static RelayNetworkStatusVote + createWithDirIdentityKeyLines(String lines) + throws DescriptorParseException { + VoteBuilder vb = new VoteBuilder(); + vb.dirIdentityKeyLines = lines; + return new RelayNetworkStatusVoteImpl(vb.buildVote()); + } + private String dirSigningKeyLines = "dir-signing-key\n" + + "-----BEGIN RSA PUBLIC KEY-----\n" + + "MIGJAoGBAN05qyHFQlTqykMP8yLuD4G2UuYulD4Xs8iSX5uqF+WGsUA1E4zZh4" + + "8h\nDFj8+drFiCu3EqhMEmVG4ACtJK2uz6D1XohUsbPWTR6LSnWJ8q6/zfTSLu" + + "mBGsN7\nPUXyMNjwRKL6UvrcbYk1d2mRBLO7SAP/sFW5fHhIBVeLIWrzQ19rAg" + + "MBAAE=\n" + + "-----END RSA PUBLIC KEY-----"; + private static RelayNetworkStatusVote + createWithDirSigningKeyLines(String lines) + throws DescriptorParseException { + VoteBuilder vb = new VoteBuilder(); + vb.dirSigningKeyLines = lines; + return new RelayNetworkStatusVoteImpl(vb.buildVote()); + } + private String dirKeyCrosscertLines = "dir-key-crosscert\n" + + "-----BEGIN ID SIGNATURE-----\n" + + "rPBFn6IJ6TvAHj4pSwlg+RTn1fP89JGSVa08wuyJr5dAvZsdakQXvRjamT9oJU" + + "aZ\nnY5Rl/tRlGuSQ0BglTPPKoXdKERK0FUr9f0EKrQy7NDUgE2j9losiRuyKz" + + "hA3neZ\nK4yF8bhqAwM51u7fzAhIjNeRif9c04rhFJJCseco84w=\n" + + "-----END ID SIGNATURE-----"; + private static RelayNetworkStatusVote + createWithDirKeyCrosscertLines(String lines) + throws DescriptorParseException { + VoteBuilder vb = new VoteBuilder(); + vb.dirKeyCrosscertLines = lines; + return new RelayNetworkStatusVoteImpl(vb.buildVote()); + } + private String dirKeyCertificationLines = "dir-key-certification\n" + + "-----BEGIN SIGNATURE-----\n" + + "hPSh6FuohNF5ccjiMbkvr8cZJwGFuL11cNtwN9k0X3pUdFZVATIEkqBe7z+rE2" + + "PX\nPw+BGyC6wYAieoTVIhLpwKqd7DXLYjuhPZ28+7MQaDL01AqYeRp5PT01Px" + + "rFY0Um\nlVf95uqUitgvDT76Ne4ExWk6UvGlYB9OBgBySZz8VWe9znoMqb0uHn" + + "/p8IzqTApT\nAxRWXBHClntMeRqtGxaj8DcdJFn8yMxQiZG7MfDg2sq2ySPJyG" + + "lN+neoVDVhZiDI\n9LTNmw60gWlUp2erFeam8Mo1ZBC4DPNjQEm6QeHZFZMkhD" + + "uO6SwS/FL712A42+Co\nYtMaVot/p5FG2ZSBXbgl2XP5/z8ELnpmXqMbPAoWRo" + + "3BPNSJkIQQNog8Q5ZrK+av\nZDw5eGPltGKsXOkvuzIMM8nBeAnDPDgYvzrIFO" + + "bEGbvY/P8mzVAZxp3Yz+sRtNel\nC1SWz/Fx+Saex5oI7DJ3xtSD4XqKb/wYwZ" + + "FT8IxDYq1t2tFXdHxd4QPRVcvc0zYC\n" + + "-----END SIGNATURE-----"; + private static RelayNetworkStatusVote + createWithDirKeyCertificationLines(String lines) + throws DescriptorParseException { + VoteBuilder vb = new VoteBuilder(); + vb.dirKeyCertificationLines = lines; + return new RelayNetworkStatusVoteImpl(vb.buildVote()); + } private List<String> statusEntries = new ArrayList<String>(); private String directoryFooterLine = "directory-footer"; private static RelayNetworkStatusVote @@ -149,55 +253,22 @@ public class RelayNetworkStatusVoteImplTest { vb.directoryFooterLine = line; return new RelayNetworkStatusVoteImpl(vb.buildVote()); } - private List<String> directorySignatures = new ArrayList<String>(); - private VoteBuilder() { - this.dirSources.add("dir-source urras " - + "80550987E1D626E3EBA5E5E75A458DE0626D088C 208.83.223.34 " - + "208.83.223.34 443 80\n" - + "contact 4096R/E012B42D Jacob Appelbaum " - + "<jacob(a)appelbaum.net>\n" - + "dir-key-certificate-version 3\n" - + "fingerprint 80550987E1D626E3EBA5E5E75A458DE0626D088C\n" - + "dir-key-published 2011-04-27 05:34:37\n" - + "dir-key-expires 2012-04-27 05:34:37\n" - + "dir-identity-key\n" - + "-----BEGIN RSA PUBLIC KEY-----\n" - + "MIIBigKCAYEAtKpuLgVK25sfScjsxfVU1ljofrDygt9GP7bNJl/rghX42KUT" - + "975W\nrGp/fbhF7p+FcKCzNOhJFINQbRf/5E3lN8mzoamIU43QqQ9RRVf946" - + "88UsazVsAN\nNVT0v9J0cr387WePjenRuIE1MmiP0nmw/XdvbPTayqax7VYl" - + "cUMXGHl8DnWix1EN\nRwmeig+JBte0JS12oo2HG9zcSfjLJVjY6ZmvRrVycX" - + "iRxGc/JgNlSrV4cxUNykaB\nJ6pO6J499OZfQu7m1vAPTENrVJ4yEfRGRwFI" - + "Y+d/s8BkKcaiWtXAfTe31uBI6GEH\nmS3HNu1JVSuoaUiQIvVYDLMfBvMcNy" - + "Ax97UT1l6E0Tn6a7pgChrquGwXai1xGzk8\n58aXwdSFoFBSTCkyemopq5H2" - + "0p/nkPAO0pHL1kTvcaKz9CEj4XcKm+kOmzejYmIa\nkbWNcRpXPiUZ+xmwGt" - + "sq30xrzqiONmERkxqlmf7bVQPFvh3Kz6hGcmTBhTbHSe9h\nzDgmdaTNn3EH" - + "AgMBAAE=\n" - + "-----END RSA PUBLIC KEY-----\n" - + "dir-signing-key\n" - + "-----BEGIN RSA PUBLIC KEY-----\n" - + "MIGJAoGBAN05qyHFQlTqykMP8yLuD4G2UuYulD4Xs8iSX5uqF+WGsUA1E4zZ" - + "h48h\nDFj8+drFiCu3EqhMEmVG4ACtJK2uz6D1XohUsbPWTR6LSnWJ8q6/zf" - + "TSLumBGsN7\nPUXyMNjwRKL6UvrcbYk1d2mRBLO7SAP/sFW5fHhIBVeLIWrz" - + "Q19rAgMBAAE=\n" - + "-----END RSA PUBLIC KEY-----\n" - + "dir-key-crosscert\n" - + "-----BEGIN ID SIGNATURE-----\n" - + "rPBFn6IJ6TvAHj4pSwlg+RTn1fP89JGSVa08wuyJr5dAvZsdakQXvRjamT9o" - + "JUaZ\nnY5Rl/tRlGuSQ0BglTPPKoXdKERK0FUr9f0EKrQy7NDUgE2j9losiR" - + "uyKzhA3neZ\nK4yF8bhqAwM51u7fzAhIjNeRif9c04rhFJJCseco84w=\n" - + "-----END ID SIGNATURE-----\n" - + "dir-key-certification\n" + private String directorySignatureLines = "directory-signature " + + "80550987E1D626E3EBA5E5E75A458DE0626D088C " + + "EEB9299D295C1C815E289FBF2F2BBEA5F52FDD19\n" + "-----BEGIN SIGNATURE-----\n" - + "hPSh6FuohNF5ccjiMbkvr8cZJwGFuL11cNtwN9k0X3pUdFZVATIEkqBe7z+r" - + "E2PX\nPw+BGyC6wYAieoTVIhLpwKqd7DXLYjuhPZ28+7MQaDL01AqYeRp5PT" - + "01PxrFY0Um\nlVf95uqUitgvDT76Ne4ExWk6UvGlYB9OBgBySZz8VWe9znoM" - + "qb0uHn/p8IzqTApT\nAxRWXBHClntMeRqtGxaj8DcdJFn8yMxQiZG7MfDg2s" - + "q2ySPJyGlN+neoVDVhZiDI\n9LTNmw60gWlUp2erFeam8Mo1ZBC4DPNjQEm6" - + "QeHZFZMkhDuO6SwS/FL712A42+Co\nYtMaVot/p5FG2ZSBXbgl2XP5/z8ELn" - + "pmXqMbPAoWRo3BPNSJkIQQNog8Q5ZrK+av\nZDw5eGPltGKsXOkvuzIMM8nB" - + "eAnDPDgYvzrIFObEGbvY/P8mzVAZxp3Yz+sRtNel\nC1SWz/Fx+Saex5oI7D" - + "J3xtSD4XqKb/wYwZFT8IxDYq1t2tFXdHxd4QPRVcvc0zYC\n" - + "-----END SIGNATURE-----"); + + "iHEU3Iidya5RIrjyYgv8tlU0R+rF56/3/MmaaZi0a67e7ZkISfQ4dghScHxn" + + "F3Yh\nrXVaaoP07r6Ta+s0g1Zijm3lms50Nk/4tV2p8Y63c3F4Q3DAnK40Oi" + + "kfOIwEj+Ny\n+zBRQssP3hPhTPOj/A7o3mZZwtL6x1sxpeu/nME1l5E=\n" + + "-----END SIGNATURE-----"; + private static RelayNetworkStatusVote + createWithDirectorySignatureLines(String lines) + throws DescriptorParseException { + VoteBuilder vb = new VoteBuilder(); + vb.directorySignatureLines = lines; + return new RelayNetworkStatusVoteImpl(vb.buildVote()); + } + private VoteBuilder() { this.statusEntries.add("r right2privassy3 " + "ADQ6gCT3DiFHKPDFr3rODBUI8HM lJY5Vf7kXec+VdkGW2flEsfkFC8 " + "2011-11-12 00:03:40 50.63.8.215 9023 0\n" @@ -211,14 +282,6 @@ public class RelayNetworkStatusVoteImplTest { + "19638\n" + "m 8,9,10,11 " + "sha256=9ciEx9t0McXk9A06I7qwN7pxuNOdpCP64RV/6cx2Zkc"); - this.directorySignatures.add("directory-signature " - + "80550987E1D626E3EBA5E5E75A458DE0626D088C " - + "EEB9299D295C1C815E289FBF2F2BBEA5F52FDD19\n" - + "-----BEGIN SIGNATURE-----\n" - + "iHEU3Iidya5RIrjyYgv8tlU0R+rF56/3/MmaaZi0a67e7ZkISfQ4dghScHxn" - + "F3Yh\nrXVaaoP07r6Ta+s0g1Zijm3lms50Nk/4tV2p8Y63c3F4Q3DAnK40Oi" - + "kfOIwEj+Ny\n+zBRQssP3hPhTPOj/A7o3mZZwtL6x1sxpeu/nME1l5E=\n" - + "-----END SIGNATURE-----"); } private byte[] buildVote() { StringBuilder sb = new StringBuilder(); @@ -264,8 +327,35 @@ public class RelayNetworkStatusVoteImplTest { if (this.paramsLine != null) { sb.append(this.paramsLine + "\n"); } - for (String dirSource : this.dirSources) { - sb.append(dirSource + "\n"); + if (this.dirSourceLine != null) { + sb.append(this.dirSourceLine + "\n"); + } + if (this.contactLine != null) { + sb.append(this.contactLine + "\n"); + } + if (this.dirKeyCertificateVersionLine != null) { + sb.append(this.dirKeyCertificateVersionLine + "\n"); + } + if (this.fingerprintLine != null) { + sb.append(this.fingerprintLine + "\n"); + } + if (this.dirKeyPublishedLine != null) { + sb.append(this.dirKeyPublishedLine + "\n"); + } + if (this.dirKeyExpiresLine != null) { + sb.append(this.dirKeyExpiresLine + "\n"); + } + if (this.dirIdentityKeyLines != null) { + sb.append(this.dirIdentityKeyLines + "\n"); + } + if (this.dirSigningKeyLines != null) { + sb.append(this.dirSigningKeyLines + "\n"); + } + if (this.dirKeyCrosscertLines != null) { + sb.append(this.dirKeyCrosscertLines + "\n"); + } + if (this.dirKeyCertificationLines != null) { + sb.append(this.dirKeyCertificationLines + "\n"); } } private void appendBody(StringBuilder sb) { @@ -277,8 +367,8 @@ public class RelayNetworkStatusVoteImplTest { if (this.directoryFooterLine != null) { sb.append(this.directoryFooterLine + "\n"); } - for (String directorySignature : this.directorySignatures) { - sb.append(directorySignature + "\n"); + if (this.directorySignatureLines != null) { + sb.append(directorySignatureLines + "\n"); } } } @@ -571,5 +661,287 @@ public class RelayNetworkStatusVoteImplTest { public void testKnownFlagsOneSpace() throws DescriptorParseException { VoteBuilder.createWithKnownFlagsLine("known-flags "); } + + @Test(expected = DescriptorParseException.class) + public void testNicknameMissing() throws DescriptorParseException { + VoteBuilder.createWithDirSourceLine("dir-source " + + "80550987E1D626E3EBA5E5E75A458DE0626D088C 208.83.223.34 " + + "208.83.223.34 443 80"); + } + + @Test(expected = DescriptorParseException.class) + public void testNicknameTooLong() throws DescriptorParseException { + VoteBuilder.createWithDirSourceLine("dir-source " + + "urrassssssssssssssssssssssssssssssssssssssssssssssss " + + "80550987E1D626E3EBA5E5E75A458DE0626D088C 208.83.223.34 " + + "208.83.223.34 443 80"); + } + + @Test(expected = DescriptorParseException.class) + public void testNicknameIllegalCharacters() + throws DescriptorParseException { + VoteBuilder.createWithDirSourceLine("dir-source urra$ " + + "80550987E1D626E3EBA5E5E75A458DE0626D088C 208.83.223.34 " + + "208.83.223.34 443 80"); + } + + @Test(expected = DescriptorParseException.class) + public void testFingerprintLowerCase() throws DescriptorParseException { + VoteBuilder.createWithDirSourceLine("dir-source urras " + + "80550987e1d626e3eba5e5e75a458de0626d088c 208.83.223.34 " + + "208.83.223.34 443 80"); + } + + @Test(expected = DescriptorParseException.class) + public void testFingerprintTooShort() throws DescriptorParseException { + VoteBuilder.createWithDirSourceLine("dir-source urras " + + "80550987E1D626E3EBA5E5E75A458DE0626D 208.83.223.34 " + + "208.83.223.34 443 80"); + } + + @Test(expected = DescriptorParseException.class) + public void testFingerprintTooLong() throws DescriptorParseException { + VoteBuilder.createWithDirSourceLine("dir-source urras " + + "80550987E1D626E3EBA5E5E75A458DE0626D088C8055 208.83.223.34 " + + "208.83.223.34 443 80"); + } + + @Test(expected = DescriptorParseException.class) + public void testFingerprintIllegalCharacters() + throws DescriptorParseException { + VoteBuilder.createWithDirSourceLine("dir-source urras " + + "ABCDEFGHIJKLM6E3EBA5E5E75A458DE0626D088C 208.83.223.34 " + + "208.83.223.34 443 80"); + } + + @Test(expected = DescriptorParseException.class) + public void testFingerprintMissing() + throws DescriptorParseException { + VoteBuilder.createWithDirSourceLine("dir-source urras " + + " 208.83.223.34 208.83.223.34 443 80"); + } + + @Test() + public void testHostname256() + throws DescriptorParseException { + /* This test doesn't fail, because we're not parsing the hostname. */ + VoteBuilder.createWithDirSourceLine("dir-source urras " + + "80550987E1D626E3EBA5E5E75A458DE0626D088C 256.256.256.256 " + + "208.83.223.34 443 80"); + } + + @Test(expected = DescriptorParseException.class) + public void testHostnameMissing() + throws DescriptorParseException { + VoteBuilder.createWithDirSourceLine("dir-source urras " + + "80550987E1D626E3EBA5E5E75A458DE0626D088C 208.83.223.34 443 " + + "80"); + } + + @Test(expected = DescriptorParseException.class) + public void testAddress256() + throws DescriptorParseException { + VoteBuilder.createWithDirSourceLine("dir-source urras " + + "80550987E1D626E3EBA5E5E75A458DE0626D088C 208.83.223.34 " + + "256.256.256.256 443 80"); + } + + @Test(expected = DescriptorParseException.class) + public void testAddressMissing() + throws DescriptorParseException { + VoteBuilder.createWithDirSourceLine("dir-source urras " + + "80550987E1D626E3EBA5E5E75A458DE0626D088C 208.83.223.34 443 " + + "80"); + } + + @Test(expected = DescriptorParseException.class) + public void testDirPortMinus443() + throws DescriptorParseException { + VoteBuilder.createWithDirSourceLine("dir-source urras " + + "80550987E1D626E3EBA5E5E75A458DE0626D088C 208.83.223.34 " + + "208.83.223.34 -443 80"); + } + + @Test(expected = DescriptorParseException.class) + public void testDirPortFourFourThree() + throws DescriptorParseException { + VoteBuilder.createWithDirSourceLine("dir-source urras " + + "80550987E1D626E3EBA5E5E75A458DE0626D088C 208.83.223.34 " + + "208.83.223.34 four-four-three 80"); + } + + @Test() + public void testDirPort0() throws DescriptorParseException { + /* This test doesn't fail, because we're accepting DirPort 0, even + * though it doesn't make sense from Tor's view. */ + VoteBuilder.createWithDirSourceLine("dir-source urras " + + "80550987E1D626E3EBA5E5E75A458DE0626D088C 208.83.223.34 " + + "208.83.223.34 0 80"); + } + + @Test(expected = DescriptorParseException.class) + public void testOrPortMissing() throws DescriptorParseException { + VoteBuilder.createWithDirSourceLine("dir-source urras " + + "80550987E1D626E3EBA5E5E75A458DE0626D088C 208.83.223.34 " + + "208.83.223.34 443 "); + } + + @Test() + public void testDirPortOrPortIdentical() + throws DescriptorParseException { + /* This test doesn't fail, even though identical OR and Dir port don't + * make much sense from Tor's view. */ + VoteBuilder.createWithDirSourceLine("dir-source urras " + + "80550987E1D626E3EBA5E5E75A458DE0626D088C 208.83.223.34 " + + "208.83.223.34 80 80"); + } + + @Test(expected = DescriptorParseException.class) + public void testDirSourceLineMissing() + throws DescriptorParseException { + VoteBuilder.createWithDirSourceLine(null); + } + + @Test(expected = DescriptorParseException.class) + public void testDirSourceLineDuplicate() + throws DescriptorParseException { + VoteBuilder.createWithDirSourceLine("dir-source urras " + + "80550987E1D626E3EBA5E5E75A458DE0626D088C 208.83.223.34 " + + "208.83.223.34 443 80\ndir-source urras " + + "80550987E1D626E3EBA5E5E75A458DE0626D088C 208.83.223.34 " + + "208.83.223.34 443 80"); + } + + @Test() + public void testContactLineMissing() + throws DescriptorParseException { + VoteBuilder.createWithContactLine(null); + } + + @Test(expected = DescriptorParseException.class) + public void testContactLineDuplicate() + throws DescriptorParseException { + VoteBuilder.createWithContactLine("contact 4096R/E012B42D Jacob " + + "Appelbaum <jacob(a)appelbaum.net>\ncontact 4096R/E012B42D Jacob " + + "Appelbaum <jacob(a)appelbaum.net>"); + } + + @Test(expected = DescriptorParseException.class) + public void testDirKeyCertificateVersionLineMissing() + throws DescriptorParseException { + VoteBuilder.createWithDirKeyCertificateVersionLine(null); + } + + @Test(expected = DescriptorParseException.class) + public void testDirKeyCertificateVersionLineDuplicate() + throws DescriptorParseException { + VoteBuilder.createWithDirKeyCertificateVersionLine( + "dir-key-certificate-version 3\ndir-key-certificate-version 3"); + } + + @Test(expected = DescriptorParseException.class) + public void testFingerprintLineMissing() + throws DescriptorParseException { + VoteBuilder.createWithFingerprintLine(null); + } + + @Test(expected = DescriptorParseException.class) + public void testFingerprintLineDuplicate() + throws DescriptorParseException { + VoteBuilder.createWithFingerprintLine("fingerprint " + + "80550987E1D626E3EBA5E5E75A458DE0626D088C\nfingerprint " + + "80550987E1D626E3EBA5E5E75A458DE0626D088C"); + } + + @Test(expected = DescriptorParseException.class) + public void testFingerprintLineTooLong() + throws DescriptorParseException { + VoteBuilder.createWithFingerprintLine("fingerprint " + + "80550987E1D626E3EBA5E5E75A458DE0626D088C8055"); + } + + @Test(expected = DescriptorParseException.class) + public void testFingerprintLineTooShort() + throws DescriptorParseException { + VoteBuilder.createWithFingerprintLine("fingerprint " + + "80550987E1D626E3EBA5E5E75A458DE0626D"); + } + + @Test(expected = DescriptorParseException.class) + public void testDirKeyPublished3011() + throws DescriptorParseException { + VoteBuilder.createWithDirKeyPublishedLine("dir-key-published " + + "3011-04-27 05:34:37"); + } + + @Test(expected = DescriptorParseException.class) + public void testDirKeyPublishedRecentlyAtNoon() + throws DescriptorParseException { + VoteBuilder.createWithDirKeyPublishedLine("dir-key-published " + + "recently 12:00:00"); + } + + @Test(expected = DescriptorParseException.class) + public void testDirKeyPublishedRecentlyNoTime() + throws DescriptorParseException { + VoteBuilder.createWithDirKeyPublishedLine("dir-key-published " + + "recently"); + } + + @Test(expected = DescriptorParseException.class) + public void testDirKeyExpiresSoonAtNoon() + throws DescriptorParseException { + VoteBuilder.createWithDirKeyExpiresLine("dir-key-expires " + + "soon 12:00:00"); + } + + @Test(expected = DescriptorParseException.class) + public void testDirKeyExpiresLineMissing() + throws DescriptorParseException { + VoteBuilder.createWithDirKeyExpiresLine(null); + } + + @Test(expected = DescriptorParseException.class) + public void testDirKeyExpiresLineDuplicate() + throws DescriptorParseException { + VoteBuilder.createWithDirKeyExpiresLine("dir-key-expires 2012-04-27 " + + "05:34:37\ndir-key-expires 2012-04-27 05:34:37"); + } + + @Test(expected = DescriptorParseException.class) + public void testDirIdentityKeyLinesMissing() + throws DescriptorParseException { + VoteBuilder.createWithDirIdentityKeyLines(null); + } + + @Test(expected = DescriptorParseException.class) + public void testDirSigningKeyLinesMissing() + throws DescriptorParseException { + VoteBuilder.createWithDirSigningKeyLines(null); + } + + @Test() + public void testDirKeyCrosscertLinesMissing() + throws DescriptorParseException { + VoteBuilder.createWithDirKeyCrosscertLines(null); + } + + @Test(expected = DescriptorParseException.class) + public void testDirKeyCertificationLinesMissing() + throws DescriptorParseException { + VoteBuilder.createWithDirKeyCertificationLines(null); + } + + @Test(expected = DescriptorParseException.class) + public void testDirectoryFooterLineMissing() + throws DescriptorParseException { + VoteBuilder.createWithDirectoryFooterLine(null); + } + + @Test(expected = DescriptorParseException.class) + public void testDirectorySignaturesLinesMissing() + throws DescriptorParseException { + VoteBuilder.createWithDirectorySignatureLines(null); + } }

1 0

[metrics-lib/master] Implement a minimal relay descriptor reader.
by karsten＠torproject.org 16 Dec '11

16 Dec '11

commit f3e72d2f6581712c28cbd35541ffbf9bcb59dea6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Dec 16 12:57:45 2011 +0100 Implement a minimal relay descriptor reader. --- .../descriptor/impl/DescriptorFileImpl.java | 44 ++++++++ .../descriptor/impl/RelayDescriptorReaderImpl.java | 110 +++++++++++++++++++- 2 files changed, 150 insertions(+), 4 deletions(-) diff --git a/src/org/torproject/descriptor/impl/DescriptorFileImpl.java b/src/org/torproject/descriptor/impl/DescriptorFileImpl.java new file mode 100644 index 0000000..0dd984d --- /dev/null +++ b/src/org/torproject/descriptor/impl/DescriptorFileImpl.java @@ -0,0 +1,44 @@ +/* Copyright 2011 The Tor Project + * See LICENSE for licensing information */ +package org.torproject.descriptor.impl; + +import java.io.File; +import java.util.List; +import org.torproject.descriptor.Descriptor; +import org.torproject.descriptor.DescriptorFile; + +public class DescriptorFileImpl implements DescriptorFile { + + private File directory; + protected void setDirectory(File directory) { + this.directory = directory; + } + public File getDirectory() { + return this.file; + } + + private File file; + protected void setFile(File file) { + this.file = file; + } + public File getFile() { + return this.file; + } + + private long lastModified; + protected void setLastModified(long lastModified) { + this.lastModified = lastModified; + } + public long getLastModified() { + return this.lastModified; + } + + private List<Descriptor> descriptors; + protected void setDescriptors(List<Descriptor> descriptors) { + this.descriptors = descriptors; + } + public List<Descriptor> getDescriptors() { + return this.descriptors; + } +} + diff --git a/src/org/torproject/descriptor/impl/RelayDescriptorReaderImpl.java b/src/org/torproject/descriptor/impl/RelayDescriptorReaderImpl.java index 8421f80..064983e 100644 --- a/src/org/torproject/descriptor/impl/RelayDescriptorReaderImpl.java +++ b/src/org/torproject/descriptor/impl/RelayDescriptorReaderImpl.java @@ -2,38 +2,140 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; +import java.io.BufferedInputStream; +import java.io.ByteArrayOutputStream; import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; import java.util.Iterator; +import java.util.List; import java.util.Map; import java.util.Set; +import java.util.Stack; +import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorFile; import org.torproject.descriptor.RelayDescriptorReader; +import org.torproject.descriptor.RelayNetworkStatusConsensus; +import org.torproject.descriptor.RelayNetworkStatusVote; public class RelayDescriptorReaderImpl implements RelayDescriptorReader { + private List<File> directories = new ArrayList<File>(); public void addDirectory(File directory) { - /* TODO Implement me. */ + this.directories.add(directory); } public void setExcludeFile(File fileToExclude) { + throw new UnsupportedOperationException("Not implemented yet."); /* TODO Implement me. */ } public void setExcludeFiles(Set<File> filesToExclude) { + throw new UnsupportedOperationException("Not implemented yet."); /* TODO Implement me. */ } - public void setExcludeFile(File fileToExclude, long lastModifiedMillis) { + public void setExcludeFile(File fileToExclude, + long lastModifiedMillis) { + throw new UnsupportedOperationException("Not implemented yet."); /* TODO Implement me. */ } public void setExcludeFiles(Map<File, Long> filesToExclude) { + throw new UnsupportedOperationException("Not implemented yet."); /* TODO Implement me. */ } public Iterator<DescriptorFile> readDescriptors() { - /* TODO Implement me. */ - return new BlockingIteratorImpl<DescriptorFile>(); + BlockingIteratorImpl<DescriptorFile> descriptorQueue = + new BlockingIteratorImpl<DescriptorFile>(); + DescriptorReader reader = new DescriptorReader(this.directories, + descriptorQueue); + new Thread(reader).start(); + return descriptorQueue; + } + + private static class DescriptorReader implements Runnable { + private List<File> directories; + private BlockingIteratorImpl<DescriptorFile> descriptorQueue; + private DescriptorReader(List<File> directories, + BlockingIteratorImpl<DescriptorFile> descriptorQueue) { + this.directories = directories; + this.descriptorQueue = descriptorQueue; + } + public void run() { + for (File directory : this.directories) { + try { + Stack<File> files = new Stack<File>(); + files.add(directory); + while (!files.isEmpty()) { + File file = files.pop(); + if (file.isDirectory()) { + files.addAll(Arrays.asList(file.listFiles())); + } else { + try { + List<Descriptor> parsedDescriptors = this.readFile(file); + DescriptorFileImpl descriptorFile = + new DescriptorFileImpl(); + descriptorFile.setDirectory(directory); + descriptorFile.setFile(file); + descriptorFile.setLastModified(file.lastModified()); + descriptorFile.setDescriptors(parsedDescriptors); + this.descriptorQueue.add(descriptorFile); + } catch (DescriptorParseException e) { + /* TODO Handle me. */ + } + } + } + } catch (IOException e) { + System.err.println("Error while reading descriptors in '" + + directory.getAbsolutePath() + "'."); + /* TODO Handle this exception somehow. */ + } finally { + this.descriptorQueue.setOutOfDescriptors(); + } + } + } + private List<Descriptor> readFile(File file) throws IOException, + DescriptorParseException { + FileInputStream fis = new FileInputStream(file); + BufferedInputStream bis = new BufferedInputStream(fis); + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + int len; + byte[] data = new byte[1024]; + while ((len = bis.read(data, 0, 1024)) >= 0) { + baos.write(data, 0, len); + } + bis.close(); + byte[] rawDescriptorBytes = baos.toByteArray(); + /* TODO This consensus/vote detection is a hack. */ + boolean isConsensus = false; + if (file.getName().contains("consensus")) { + isConsensus = true; + } else if (file.getName().contains("vote")) { + } else { + throw new RuntimeException("Unknown descriptor type in '" + + file.getAbsolutePath() + "."); + } + return this.parseDescriptors(rawDescriptorBytes, isConsensus); + } + private List<Descriptor> parseDescriptors(byte[] rawDescriptorBytes, + boolean isConsensus) throws DescriptorParseException { + List<Descriptor> parsedDescriptors = new ArrayList<Descriptor>(); + if (isConsensus) { + List<RelayNetworkStatusConsensus> parsedConsensuses = + RelayNetworkStatusConsensusImpl.parseConsensuses( + rawDescriptorBytes); + parsedDescriptors.addAll(parsedConsensuses); + } else { + List<RelayNetworkStatusVote> parsedVotes = + RelayNetworkStatusVoteImpl.parseVotes(rawDescriptorBytes); + parsedDescriptors.addAll(parsedVotes); + } + return parsedDescriptors; + } } }

1 0

r25260: {website} Attempt to link to the correct ChangeLog. Thanks asn (website/trunk/download/en)
by Sebastian Hahn 16 Dec '11

16 Dec '11

Author: sebastian Date: 2011-12-16 08:52:00 +0000 (Fri, 16 Dec 2011) New Revision: 25260 Modified: website/trunk/download/en/download.wml Log: Attempt to link to the correct ChangeLog. Thanks asn Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2011-12-15 19:43:46 UTC (rev 25259) +++ website/trunk/download/en/download.wml 2011-12-16 08:52:00 UTC (rev 25260) @@ -269,7 +269,7 @@ <h2>Source Tarball</h2> <p> Configure with: <code style="color: #666666;">./configure && make && src/or/tor</code></p> <p>The current stable version of Tor is <version-stable>. Its <a href="https://gitweb.torproject.org/tor.git/blob/release-0.2.2:/ReleaseNotes">release notes</a> are available.</p> - <p>The current unstable/alpha version of Tor is <version-alpha>. Its <a href="https://gitweb.torproject.org/tor.git/blob/HEAD:/ChangeLog">Changelog</a> is available.</p> + <p>The current unstable/alpha version of Tor is <version-alpha>. Its <a href="https://gitweb.torproject.org/tor.git/blob/tor-<version-alpha>:/ChangeLog">Changelog</a> is available.</p> </div> </div> <div class="expander"><a href="javascript:void(0)" class="switch">Expand All</a></div>

1 0

[metrics-lib/master] Include the 682f6e0 bug in the unit tests.
by karsten＠torproject.org 16 Dec '11

16 Dec '11

commit c188815a260b65e02653763b9d38ef7ef2694119 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Dec 16 09:23:59 2011 +0100 Include the 682f6e0 bug in the unit tests. The bug was that we considered "\nr" as the beginning of a status entry. However, there are crypto lines starting with "r", so we need to look for "\nr ". Now there are crypto lines starting with "r" in the unit tests. Doesn't fix the problem, but helps discover it in the future. Fix comes next. --- .../impl/RelayNetworkStatusConsensusImplTest.java | 12 ++++-------- .../impl/RelayNetworkStatusVoteImplTest.java | 5 +++-- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/test/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java b/test/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java index db20638..deadf80 100644 --- a/test/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java +++ b/test/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java @@ -161,20 +161,16 @@ public class RelayNetworkStatusConsensusImplTest { + "3509BA5A624403A905C74DA5C8A0CEC9E0D3AF86\n" + "-----BEGIN SIGNATURE-----\n" + "NYRcTWAMRiYYiGW0hIbzeZKU6sefg98AwwXrQUCudO8wfA1cfgttTDoscB9I" - + "TbOY\n" - + "x+c30jV/qQCMamTAEDGgJTw8KghI32vytupKallI1EjCOF8UvL1UnALgpaR7" - + "sZ3W\n" - + "7WQZVVrWDtnYaULOEKfwnGnRC7WwE+YRSysbzwwCVs0=\n" + + "TbOY\nr+c30jV/qQCMamTAEDGgJTw8KghI32vytupKallI1EjCOF8UvL1UnA" + + "LgpaR7sZ3W\n7WQZVVrWDtnYaULOEKfwnGnRC7WwE+YRSysbzwwCVs0=\n" + "-----END SIGNATURE-----"); this.directorySignatures.add("directory-signature " + "27B6B5996C426270A5C95488AA5BCEB6BCC86956 " + "D5C30C15BB3F1DA27669C2D88439939E8F418FCF\n" + "-----BEGIN SIGNATURE-----\n" + "DzFPj3vyYrCv0W3r8qDPJPlmeLnadY+drjWkdOqO66Ih/hAWBb9KcBJAX1sX" - + "aDA7\n" - + "/iSaDhduBXuJdcu8lbmMP8d6uYBdRjHXqWDXySUZAkSfPB4JJPNGvfoQA/qe" - + "by7E\n" - + "5374pPPL6WwCLJHkKtk21S9oHDmFBdlZq7JWQelWlVM=\n" + + "aDA7\n/iSaDhduBXuJdcu8lbmMP8d6uYBdRjHXqWDXySUZAkSfPB4JJPNGvf" + + "oQA/qeby7E\n5374pPPL6WwCLJHkKtk21S9oHDmFBdlZq7JWQelWlVM=\n" + "-----END SIGNATURE-----"); } private byte[] buildConsensus() { diff --git a/test/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java b/test/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java index 8b62480..b34e143 100644 --- a/test/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java +++ b/test/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java @@ -209,13 +209,14 @@ public class RelayNetworkStatusVoteImplTest { + "4643,5050,5190,5222-5223,5228,5900,6660-6669,6679,6697,8000," + "8008,8074,8080,8087-8088,8443,8888,9418,9999-10000,19294," + "19638\n" - + "m 8,9,10,11 sha256=9ciEx9t0McXk9A06I7qwN7pxuNOdpCP64RV/6cx2Zkc"); + + "m 8,9,10,11 " + + "sha256=9ciEx9t0McXk9A06I7qwN7pxuNOdpCP64RV/6cx2Zkc"); this.directorySignatures.add("directory-signature " + "80550987E1D626E3EBA5E5E75A458DE0626D088C " + "EEB9299D295C1C815E289FBF2F2BBEA5F52FDD19\n" + "-----BEGIN SIGNATURE-----\n" + "iHEU3Iidya5RIrjyYgv8tlU0R+rF56/3/MmaaZi0a67e7ZkISfQ4dghScHxn" - + "F3Yh\nqXVaaoP07r6Ta+s0g1Zijm3lms50Nk/4tV2p8Y63c3F4Q3DAnK40Oi" + + "F3Yh\nrXVaaoP07r6Ta+s0g1Zijm3lms50Nk/4tV2p8Y63c3F4Q3DAnK40Oi" + "kfOIwEj+Ny\n+zBRQssP3hPhTPOj/A7o3mZZwtL6x1sxpeu/nME1l5E=\n" + "-----END SIGNATURE-----"); }

1 0

[metrics-lib/master] Add a real fix for the 682f6e0 bug.
by karsten＠torproject.org 16 Dec '11

16 Dec '11

commit 15ddbf715c5c8ff1451d76b9d46a4f60c16d0d1d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Dec 16 09:31:58 2011 +0100 Add a real fix for the 682f6e0 bug. --- .../descriptor/impl/NetworkStatusImpl.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/org/torproject/descriptor/impl/NetworkStatusImpl.java b/src/org/torproject/descriptor/impl/NetworkStatusImpl.java index 898d127..f478913 100644 --- a/src/org/torproject/descriptor/impl/NetworkStatusImpl.java +++ b/src/org/torproject/descriptor/impl/NetworkStatusImpl.java @@ -170,11 +170,11 @@ public abstract class NetworkStatusImpl { List<byte[]> splitParts = new ArrayList<byte[]>(); int from = start; while (from < end) { - int to = descriptorString.indexOf("\n" + keyword, from); - /* Searching for "\nkeyword" instead of "\nkeyword " or - * "\nkeyword\n" seems fragile. Workaround is to check for - * to > end, but that's really a hack. */ - if (to > end || to < 0) { + 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;

1 0

[metrics-lib/master] Throw out Java's BlockingQueue implementation.
by karsten＠torproject.org 16 Dec '11

16 Dec '11

commit 9acd48f52eac5f21831b27a8f94cbf59610ee7cc Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Dec 16 08:57:54 2011 +0100 Throw out Java's BlockingQueue implementation. The problem is that Java's BlockingQueue implementation doesn't support end-of-stream objects to signal that the producer won't add more objects to the queue. We need to implement that ourselves, and it turns out it's harder than expected to get it right. We can just implement our own thread handling. --- .../descriptor/impl/BlockingIteratorImpl.java | 65 +++++++++----------- 1 files changed, 30 insertions(+), 35 deletions(-) diff --git a/src/org/torproject/descriptor/impl/BlockingIteratorImpl.java b/src/org/torproject/descriptor/impl/BlockingIteratorImpl.java index 3dddf9e..ed79797 100644 --- a/src/org/torproject/descriptor/impl/BlockingIteratorImpl.java +++ b/src/org/torproject/descriptor/impl/BlockingIteratorImpl.java @@ -2,78 +2,73 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; +import java.util.LinkedList; import java.util.Iterator; import java.util.NoSuchElementException; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.LinkedBlockingQueue; +import java.util.Queue; /* Provide an iterator for a queue of objects and block when there are * currently no objects in the queue. Allow the producer to signal that * there won't be further objects and unblock any waiting consumers. */ public class BlockingIteratorImpl<T> implements Iterator<T> { - /* Define an internal class encapsulating queue elements as a workaround - * for adding an end-of-stream object (containing a null reference) to - * the queue when the producer runs out of objects. */ - private static class QueueElement<T> { - private T object; - } - - /* Blocking queue containing produced elemnts (or the end-of-stream - * object) waiting for consumers. */ - private BlockingQueue<QueueElement<T>> queue = - new LinkedBlockingQueue<QueueElement<T>>(); + /* Queue containing produced elemnts waiting for consumers. */ + private Queue<T> queue = new LinkedList<T>(); /* Restrict object construction to the impl package. */ protected BlockingIteratorImpl() { } /* Add an object to the queue. */ - protected void add(T object) { - /* TODO This check is invalid. But should we make sure that no - * objects get added after sending the end-of-stream object somehow? + protected synchronized void add(T object) { if (this.outOfDescriptors) { throw new IllegalStateException("Internal erorr: Adding results to " + "descriptor queue not allowed after sending end-of-stream " + "object."); - }*/ - QueueElement<T> element = new QueueElement<T>(); - element.object = object; - this.queue.add(element); + } + this.queue.offer(object); + notifyAll(); } /* Signalize that there won't be any further objects to be enqueued. */ private boolean outOfDescriptors = false; - protected void setOutOfDescriptors() { + protected synchronized void setOutOfDescriptors() { + if (this.outOfDescriptors) { + throw new IllegalStateException("Internal erorr: Sending " + + "end-of-stream object only permitted once."); + } this.outOfDescriptors = true; - this.add(null); + notifyAll(); } /* Return whether there are more objects. Block if there are currently * no objects, but the producer hasn't signalized that there won't be * further objects. */ - public boolean hasNext() { - QueueElement<T> nextElement = this.queue.peek(); - return ((nextElement != null && nextElement.object != null) || - (nextElement == null && !this.outOfDescriptors)); + public synchronized boolean hasNext() { + while (!this.outOfDescriptors && this.queue.isEmpty()) { + try { + wait(); + } catch (InterruptedException e) { + } + } + return this.queue.peek() != null; } /* Return the next object in the queue or throw an exception when there * are no further objects. Block if there are currently no objects, but * the producer hasn't signalized that there won't be further * objects. */ - public T next() { - QueueElement<T> nextElement = this.queue.peek(); - try { - nextElement = this.queue.take(); - } catch (InterruptedException e) { - /* TODO How should we handle this? */ + public synchronized T next() { + while (!this.outOfDescriptors && this.queue.isEmpty()) { + try { + wait(); + } catch (InterruptedException e) { + } } - if (nextElement == null || nextElement.object == null) { + if (this.queue.peek() == null) { throw new NoSuchElementException(); } - T result = nextElement.object; - return result; + return this.queue.remove(); } /* Don't support explicitly removing objects. They are removed

1 0

[torflow/master] Be more strict w/ circ failures and fast nodes.
by mikeperry＠torproject.org 15 Dec '11

15 Dec '11

commit 1e6a4219b57b8ea91418bd1c580a5b255e10a491 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Dec 15 11:50:42 2011 -0800 Be more strict w/ circ failures and fast nodes. We use unfiltered bandwidth because I suspect we're being too generous to fast nodes. To get more feedback, they should have to have spare capacity all the time, not just sometimes. However, gimpy nodes will still get to use filtered bandwidth if we've punished them too much already. Also, circuit failures now target a 0% rate (full success) instead of the network average, but the penalty only applies if you fall below the network average for your node class. --- NetworkScanners/BwAuthority/aggregate.py | 32 +++++++++++++++++++++-------- 1 files changed, 23 insertions(+), 9 deletions(-) diff --git a/NetworkScanners/BwAuthority/aggregate.py b/NetworkScanners/BwAuthority/aggregate.py index b8b01ea..46e4679 100755 --- a/NetworkScanners/BwAuthority/aggregate.py +++ b/NetworkScanners/BwAuthority/aggregate.py @@ -21,6 +21,7 @@ IGNORE_GUARDS = 0 # The guard measurement period is based on the client turnover # rate for guard nodes +# XXX: Make this a consensus param GUARD_SAMPLE_RATE = 2*7*24*60*60 # 2wks # PID constant defaults. May be overridden by consensus @@ -579,7 +580,17 @@ def main(argv): n.use_bw = n.ns_bw if cs_junk.use_pid_tgt: - n.pid_error = (n.filt_bw - pid_tgt_avg[n.node_class()]) \ + n.pid_error = (n.strm_bw - pid_tgt_avg[n.node_class()]) \ + / pid_tgt_avg[n.node_class()] + # use filt_bw for pid_error < 0 + if cs_junk.use_mercy: + if cs_junk.use_desc_bw: + if n.pid_error_sum < 0 and n.pid_error < 0: + n.pid_error = (n.filt_bw - pid_tgt_avg[n.node_class()]) \ + / pid_tgt_avg[n.node_class()] + else: + if n.desc_bw > n.ns_bw and n.pid_error < 0: + n.pid_error = (n.filt_bw - pid_tgt_avg[n.node_class()]) \ / pid_tgt_avg[n.node_class()] else: if cs_junk.use_best_ratio and n.sbw_ratio > n.fbw_ratio: @@ -593,14 +604,17 @@ def main(argv): # only in the event of update? # Penalize nodes for circ failure rate if cs_junk.use_circ_fails: - # FIXME: Should we compute this relative to 0? Why target anything - # less? - circ_error = ((1.0-n.circ_fail_rate) - true_circ_avg[n.node_class()]) \ - / true_circ_avg[n.node_class()] - # FIXME: Hrmm, should we only penalize for circ fails, or should - # we reward, too? - if circ_error < 0: - n.pid_error = min(circ_error,n.pid_error) + # Compute circ_error relative to 1.0 (full success), but only + # apply it if it is both below the network avg and worse than + # the pid_error + if (1.0-n.circ_fail_rate) < true_circ_avg[n.node_class()]: + circ_error = -n.circ_fail_rate # ((1.0-fail) - 1.0)/1.0 + if circ_error < 0 and circ_error < n.pid_error: + plog("INFO", + "CPU overload for %s node %s=%s desc=%d ns=%d pid_error=%f circ_error=%f circ_fail=%f" % + (n.node_class(), n.nick, n.idhex, n.desc_bw, n.ns_bw, + n.pid_error, circ_error, n.circ_fail_rate)) + n.pid_error = min(circ_error,n.pid_error) # Don't accumulate too much amplification for fast nodes if cs_junk.use_desc_bw:

1 0

[torflow/master] Make the guard sample rate a consensus param.
by mikeperry＠torproject.org 15 Dec '11

15 Dec '11

commit 3c0dd74bcc46050b4b7131b479a779bf26258926 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Dec 15 12:01:15 2011 -0800 Make the guard sample rate a consensus param. --- NetworkScanners/BwAuthority/README.spec.txt | 6 ++++++ NetworkScanners/BwAuthority/aggregate.py | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/NetworkScanners/BwAuthority/README.spec.txt b/NetworkScanners/BwAuthority/README.spec.txt index a1b732e..835b312 100644 --- a/NetworkScanners/BwAuthority/README.spec.txt +++ b/NetworkScanners/BwAuthority/README.spec.txt @@ -585,3 +585,9 @@ If absent, the default is 500.0, which translates to a 501X multiplier of descriptor bandwidth. + + "bwauthguardrate=N" + Restricts the rate at which we perform feedback on Guard nodes + to at most every N seconds. + + If absent, the default is 2*7*24*60*60, or two weeks. diff --git a/NetworkScanners/BwAuthority/aggregate.py b/NetworkScanners/BwAuthority/aggregate.py index 46e4679..77e3cdc 100755 --- a/NetworkScanners/BwAuthority/aggregate.py +++ b/NetworkScanners/BwAuthority/aggregate.py @@ -21,7 +21,6 @@ IGNORE_GUARDS = 0 # The guard measurement period is based on the client turnover # rate for guard nodes -# XXX: Make this a consensus param GUARD_SAMPLE_RATE = 2*7*24*60*60 # 2wks # PID constant defaults. May be overridden by consensus @@ -243,6 +242,7 @@ class ConsensusJunk: self.use_desc_bw = True self.use_mercy = False + self.guard_sample_rate = GUARD_SAMPLE_RATE self.pid_max = 500.0 self.K_p = K_p self.T_i = T_i @@ -288,6 +288,10 @@ class ConsensusJunk: elif p.startswith("bwauthpidmax="): self.pid_max = (int(p.split("=")[1])/10000.0) plog("INFO", "Got pid_max=%f from consensus." % self.pid_max) + elif p.startswith("bwauthguardrate="): + self.guard_sample_rate = int(p.split("=")[1]) + plog("INFO", "Got guard_sample_rate=%d from consensus." % + self.guard_sample_rate) except: plog("NOTICE", "Bw auth PID control disabled due to parse error.") traceback.print_exc() @@ -655,7 +659,8 @@ def main(argv): and "Exit" not in prev_consensus[n.idhex].flags): # Do full feedback if our previous vote > 2.5 weeks old if n.idhex not in prev_votes.vote_map or \ - n.measured_at - prev_votes.vote_map[n.idhex].measured_at > GUARD_SAMPLE_RATE: + n.measured_at - prev_votes.vote_map[n.idhex].measured_at \ + > cs_junk.guard_sample_rate: n.new_bw = n.get_pid_bw(prev_votes.vote_map[n.idhex], cs_junk.K_p, cs_junk.K_i,

1 0

[torflow/master] Log the network pid error averages.
by mikeperry＠torproject.org 15 Dec '11

15 Dec '11

commit b8adf0c86092950488d06c37e1b8f3a5cae451fd Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun Dec 11 21:39:59 2011 -0800 Log the network pid error averages. Also, log node class when we cap, and in some other cases. --- NetworkScanners/BwAuthority/aggregate.py | 42 ++++++++++++++++++++++-------- 1 files changed, 31 insertions(+), 11 deletions(-) diff --git a/NetworkScanners/BwAuthority/aggregate.py b/NetworkScanners/BwAuthority/aggregate.py index 15d8d82..b8b01ea 100755 --- a/NetworkScanners/BwAuthority/aggregate.py +++ b/NetworkScanners/BwAuthority/aggregate.py @@ -589,8 +589,12 @@ def main(argv): n.pid_error = (n.filt_bw - true_filt_avg[n.node_class()]) \ / true_filt_avg[n.node_class()] + # XXX: Refactor the following 3 clauses out into it's own function, so we can log + # only in the event of update? # Penalize nodes for circ failure rate if cs_junk.use_circ_fails: + # FIXME: Should we compute this relative to 0? Why target anything + # less? circ_error = ((1.0-n.circ_fail_rate) - true_circ_avg[n.node_class()]) \ / true_circ_avg[n.node_class()] # FIXME: Hrmm, should we only penalize for circ fails, or should @@ -601,13 +605,13 @@ def main(argv): # Don't accumulate too much amplification for fast nodes if cs_junk.use_desc_bw: if n.pid_error_sum > cs_junk.pid_max and n.pid_error > 0: - plog("INFO", "Capping feedback for node %s=%s desc=%d ns=%d pid_error_sum=%f" % - (n.nick, n.idhex, n.desc_bw, n.ns_bw, n.pid_error_sum)) + plog("INFO", "Capping feedback for %s node %s=%s desc=%d ns=%d pid_error_sum=%f" % + (n.node_class(), n.nick, n.idhex, n.desc_bw, n.ns_bw, n.pid_error_sum)) n.pid_error_sum = cs_junk.pid_max else: if float(n.ns_bw)/n.desc_bw > cs_junk.pid_max and n.pid_error > 0: - plog("INFO", "Capping feedback for node %s=%s desc=%d ns=%d pid_error=%f" % - (n.nick, n.idhex, n.desc_bw, n.ns_bw, n.pid_error)) + plog("INFO", "Capping feedback for %s node %s=%s desc=%d ns=%d pid_error=%f" % + (n.node_class(), n.nick, n.idhex, n.desc_bw, n.ns_bw, n.pid_error)) n.pid_error = 0 n.pid_error_sum = 0 @@ -617,12 +621,12 @@ def main(argv): # If node was demoted in the past and we plan to demote it again, # let's just not and say we did. if n.desc_bw > n.ns_bw and n.pid_error < 0: - plog("DEBUG", "Showing mercy for node %s=%s desc=%d ns=%d pid_error=%f" % - (n.nick, n.idhex, n.desc_bw, n.ns_bw, n.pid_error)) + plog("DEBUG", "Showing mercy for %s node %s=%s desc=%d ns=%d pid_error=%f" % + (n.node_class(), n.nick, n.idhex, n.desc_bw, n.ns_bw, n.pid_error)) n.use_bw = n.desc_bw if n.pid_error_sum < 0 and n.pid_error < 0: - plog("DEBUG", "Showing mercy for node %s=%s desc=%d ns=%d pid_error_sum=%f" % - (n.nick, n.idhex, n.desc_bw, n.ns_bw, n.pid_error_sum)) + plog("DEBUG", "Showing mercy for %s node %s=%s desc=%d ns=%d pid_error_sum=%f" % + (n.node_class(), n.nick, n.idhex, n.desc_bw, n.ns_bw, n.pid_error_sum)) n.pid_error_sum = 0 if n.idhex in prev_votes.vote_map: @@ -736,7 +740,7 @@ def main(argv): # Go through the list and cap them to NODE_CAP for n in nodes.itervalues(): if n.new_bw >= 0x7fffffff: - plog("WARN", "Bandwidth of node "+n.nick+"="+n.idhex+" exceeded maxint32: "+str(n.new_bw)) + plog("WARN", "Bandwidth of "+n.node_class()+" node "+n.nick+"="+n.idhex+" exceeded maxint32: "+str(n.new_bw)) n.new_bw = 0x7fffffff if cs_junk.T_i > 0 and cs_junk.T_i_decay > 0 \ and math.fabs(n.pid_error_sum) > \ @@ -744,7 +748,7 @@ def main(argv): plog("NOTICE", "Large pid_error_sum for node "+n.idhex+"="+n.nick+": "+ str(n.pid_error_sum)+" vs "+str(n.pid_error)) if n.new_bw > tot_net_bw*NODE_CAP: - plog("INFO", "Clipping extremely fast node "+n.idhex+"="+n.nick+ + plog("INFO", "Clipping extremely fast "+n.node_class()+" node "+n.idhex+"="+n.nick+ " at "+str(100*NODE_CAP)+"% of network capacity ("+ str(n.new_bw)+"->"+str(int(tot_net_bw*NODE_CAP))+") "+ " pid_error="+str(n.pid_error)+ @@ -753,7 +757,7 @@ def main(argv): n.pid_error_sum = 0 # Don't let unused error accumulate... if n.new_bw <= 0: if n.idhex in prev_consensus: - plog("INFO", str(prev_consensus[n.idhex].flags)+" node "+n.idhex+"="+n.nick+" has bandwidth <= 0: "+str(n.new_bw)) + plog("INFO", n.node_class()+" node "+n.idhex+"="+n.nick+" has bandwidth <= 0: "+str(n.new_bw)) else: plog("INFO", "New node "+n.idhex+"="+n.nick+" has bandwidth < 0: "+str(n.new_bw)) n.new_bw = 1 @@ -808,6 +812,22 @@ def main(argv): "Only measured %f of the previous consensus bandwidth despite measuring %f of the nodes" % (measured_bw_pct, measured_pct)) + for cl in ["Guard+Exit", "Guard", "Exit", "Middle"]: + c_nodes = filter(lambda n: n.node_class() == cl, nodes.itervalues()) + nc_nodes = filter(lambda n: n.pid_error < 0, c_nodes) + pc_nodes = filter(lambda n: n.pid_error > 0, c_nodes) + plog("INFO", "Avg "+cl+" pid_error="+str(sum(map(lambda n: n.pid_error, c_nodes))/len(c_nodes))) + plog("INFO", "Avg "+cl+" |pid_error|="+str(sum(map(lambda n: abs(n.pid_error), c_nodes))/len(c_nodes))) + plog("INFO", "Avg "+cl+" +pid_error=+"+str(sum(map(lambda n: n.pid_error, pc_nodes))/len(pc_nodes))) + plog("INFO", "Avg "+cl+" -pid_error="+str(sum(map(lambda n: n.pid_error, nc_nodes))/len(nc_nodes))) + + n_nodes = filter(lambda n: n.pid_error < 0, nodes.itervalues()) + p_nodes = filter(lambda n: n.pid_error > 0, nodes.itervalues()) + plog("INFO", "Avg network pid_error="+str(sum(map(lambda n: n.pid_error, nodes.itervalues()))/len(nodes))) + plog("INFO", "Avg network |pid_error|="+str(sum(map(lambda n: abs(n.pid_error), nodes.itervalues()))/len(nodes))) + plog("INFO", "Avg network +pid_error=+"+str(sum(map(lambda n: n.pid_error, p_nodes))/len(p_nodes))) + plog("INFO", "Avg network -pid_error="+str(sum(map(lambda n: n.pid_error, n_nodes))/len(n_nodes))) + plog("INFO", "Measured "+str(measured_pct) +"% of all tor nodes (" +str(measured_bw_pct)+"% of previous consensus bw).")

1 0