- tor-commits - lists.torproject.org

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 25 Feb '12

25 Feb '12

commit 9af8d7d45a24c77409e1f17fdf762e13297a14b7 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Feb 25 17:15:27 2012 +0000 Update translations for torcheck_completed --- de/torcheck.po | 51 ++++++++++++++++++++------------------------------- 1 files changed, 20 insertions(+), 31 deletions(-) diff --git a/de/torcheck.po b/de/torcheck.po index 1e6627b..8aa4c21 100644 --- a/de/torcheck.po +++ b/de/torcheck.po @@ -1,5 +1,5 @@ # TorCheck gettext template -# Copyright (C) 2008 Jacob Appelbaum +# Copyright (C) 2008-2012 The Tor Project, Inc # # Translators: # LaKoon <X2oler(a)freenet.de>, 2011. @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2008-04-24 20:28+PDT\n" -"PO-Revision-Date: 2010-11-30 04:59+0000\n" -"Last-Translator: Jacob Appelbaum <jacob(a)appelbaum.net>\n" +"POT-Creation-Date: 2012-02-16 20:28+PDT\n" +"PO-Revision-Date: 2012-02-25 16:53+0000\n" +"Last-Translator: Sacro <Scion(a)T-Online.de>\n" "Language-Team: Tor Translation <tor-translation(a)torproject.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,8 +23,17 @@ msgstr "Gratulation. Ihr Browser ist eingerichtet für die Benutzung von Tor." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " -"for further information about using Tor safely." -msgstr "Bitte besuchen Sie die <a href=\"https://www.torproject.org/\">Webseiten des Tor-Projektes</a>, um weitere Informationen über die sichere Benutzung von Tor zu erhalten." +"for further information about using Tor safely. You are now free to browse " +"the Internet anonymously." +msgstr "Bitte schaue auf der <a href=\"https://www.torproject.org/\">Tor-Website</a> nach, wenn du weitere Informationen benötigst, wie man Tor sicher benutzt. Du kannst das Internet jetzt anonym benutzen." + +msgid "There is a security update available for the Tor Browser Bundle." +msgstr "Ein Sicherheitsupdate ist für das Tor Browser Bundle verfügbar." + +msgid "" +"<a href=\"https://www.torproject.org/download/download-easy.html\">Click " +"here to go to the download page</a>" +msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Klicke hier, um zu der download Seite zu gelangen</a>" msgid "Sorry. You are not using Tor." msgstr "Leider scheint Tor bei Ihnen nicht aktiviert zu sein." @@ -32,37 +41,17 @@ msgstr "Leider scheint Tor bei Ihnen nicht aktiviert zu sein." msgid "" "If you are attempting to use a Tor client, please refer to the <a " "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" -" " -"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">instructions" -" for configuring your Tor client</a>." -msgstr "Falls Sie Tor nutzen möchten, informieren Sie sich bitte auf der <a href=\"https://www.torproject.org/\">Tor Webseite</a>, insbesondere bei den <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">Anweisungen zur Konfiguration von Tor</a>." +" href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " +"configuring your Tor client</a>." +msgstr "Solltest du versuchen einen Tor-Client zu benutzen, schaue bitte auf der <a href=\"https://www.torproject.org/\">Tor-Website</a> nach, und speziell die <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">instruktionen zum konfigurieren eines Tor-Clients</a>." msgid "Sorry, your query failed or an unexpected response was received." msgstr "Ihre Anfrage ist leider fehlgeschlagen oder der Server erhielt eine unerwartete Antwort." msgid "" "A temporary service outage prevents us from determining if your source IP " -"address is a <a href=\"https://www.torproject.org/\">Tor</a> node. For " -"other ways to test whether you are using Tor, please visit <a " -"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPri…">this" -" FAQ entry</a>." -msgstr "Wegen eines vorübergehenden Dienstausfalls können wir derzeit nicht prüfen, ob Ihre Quell-IP-Adresse ein <a href=\"https://www.torproject.org/\">Tor</a>-Knoten ist. Für weitere Testmöglichkeiten, lesen Sie bitte <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPri…">diesen FAQ-Eintrag</a>." - -msgid "Additional information: " -msgstr "Weitere Informationen: " +"address is a <a href=\"https://www.torproject.org/\">Tor</a> node." +msgstr "Eine temporäre störung des Systems hindert uns daran zu erkennen ob deine IP-Adresse ein <a href=\"https://www.torproject.org/\">Tor</a> Knoten ist." msgid "Your IP address appears to be: " msgstr "Ihre IP-Adresse scheint folgende zu sein: " - -msgid "" -"This small script is powered by <a " -"href=\"http://exitlist.torproject.org/\">tordnsel</a>" -msgstr "Dieses kleine Skript wird von <a href=\"http://exitlist.torproject.org/\">tordnsel</a> betrieben." - -msgid "" -"You may also be interested in the <a href=\"/cgi-" -"bin/TorBulkExitList.py\">Tor Bulk Exit List Exporter</a>" -msgstr "Vielleicht ist auch der<a href=\"/cgi-bin/TorBulkExitList.py\">Tor Bulk Exit List Exporter</a> interessant für Sie." - -msgid "This server does not log <i>any</i> information about visitors." -msgstr "Dieser Server speichert <i>keinerlei</i> Daten über seine Besucher."

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 25 Feb '12

25 Feb '12

commit b01ab666fe8c2c19f242bcb20d845d40bfd5f539 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Feb 25 17:15:25 2012 +0000 Update translations for torcheck --- de/torcheck.po | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/de/torcheck.po b/de/torcheck.po index 44559e0..8aa4c21 100644 --- a/de/torcheck.po +++ b/de/torcheck.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2010-11-30 04:59+0000\n" -"Last-Translator: Appelbaum <jacob(a)appelbaum.net>\n" +"PO-Revision-Date: 2012-02-25 16:53+0000\n" +"Last-Translator: Sacro <Scion(a)T-Online.de>\n" "Language-Team: Tor Translation <tor-translation(a)torproject.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,15 +25,15 @@ msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "" +msgstr "Bitte schaue auf der <a href=\"https://www.torproject.org/\">Tor-Website</a> nach, wenn du weitere Informationen benötigst, wie man Tor sicher benutzt. Du kannst das Internet jetzt anonym benutzen." msgid "There is a security update available for the Tor Browser Bundle." -msgstr "" +msgstr "Ein Sicherheitsupdate ist für das Tor Browser Bundle verfügbar." msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " "here to go to the download page</a>" -msgstr "" +msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Klicke hier, um zu der download Seite zu gelangen</a>" msgid "Sorry. You are not using Tor." msgstr "Leider scheint Tor bei Ihnen nicht aktiviert zu sein." @@ -43,7 +43,7 @@ msgid "" "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" " href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " "configuring your Tor client</a>." -msgstr "" +msgstr "Solltest du versuchen einen Tor-Client zu benutzen, schaue bitte auf der <a href=\"https://www.torproject.org/\">Tor-Website</a> nach, und speziell die <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">instruktionen zum konfigurieren eines Tor-Clients</a>." msgid "Sorry, your query failed or an unexpected response was received." msgstr "Ihre Anfrage ist leider fehlgeschlagen oder der Server erhielt eine unerwartete Antwort." @@ -51,7 +51,7 @@ msgstr "Ihre Anfrage ist leider fehlgeschlagen oder der Server erhielt eine uner msgid "" "A temporary service outage prevents us from determining if your source IP " "address is a <a href=\"https://www.torproject.org/\">Tor</a> node." -msgstr "" +msgstr "Eine temporäre störung des Systems hindert uns daran zu erkennen ob deine IP-Adresse ein <a href=\"https://www.torproject.org/\">Tor</a> Knoten ist." msgid "Your IP address appears to be: " msgstr "Ihre IP-Adresse scheint folgende zu sein: "

1 0

[tor-cloud/master] No need to set gpg homedir to /root
by runa＠torproject.org 25 Feb '12

25 Feb '12

commit 93b789552e7559fde394de5166a3e0db8d309682 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Sat Feb 25 14:49:44 2012 +0000 No need to set gpg homedir to /root --- build.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build.sh b/build.sh index 0e0449a..1b24681 100755 --- a/build.sh +++ b/build.sh @@ -87,7 +87,7 @@ ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ub # Verify the signature echo "Get the GPG key" -ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "sudo gpg --homedir /root/.gnupg --keyserver keys.gnupg.net --recv-key 7DB87C81" +ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "sudo gpg --keyserver keys.gnupg.net --recv-key 7DB87C81" echo "Try to verify the file" ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "sudo bash -c 'gpg --verify /mnt/SHA256SUMS.gpg /mnt/SHA256SUMS &> /mnt/verify.txt'"

1 0

[tor-cloud/master] Tell me where the signature-verification-process failed
by runa＠torproject.org 25 Feb '12

25 Feb '12

commit e23557acee8ae904d3f6c88f278651305b0e2ba3 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Sat Feb 25 14:20:29 2012 +0000 Tell me where the signature-verification-process failed --- build.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build.sh b/build.sh index 7fc5f34..0e0449a 100755 --- a/build.sh +++ b/build.sh @@ -96,7 +96,7 @@ echo "Check the return code" ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "sudo bash -c 'sudo grep Good /mnt/verify.txt'" echo "See if the hashes match. If all else fails, lock ourselves out of the instance" -ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "if [ `echo $?` -eq "0" ]; then hashone=`grep ubuntu-10.04-server-cloudimg-i386.tar.gz /mnt/SHA256SUMS | awk '{print $1}'` && hashtwo=`sha256sum /mnt/ubuntu-10.04-server-cloudimg-i386.tar.gz | awk '{print $1}'` && if [ $hashone != $hashtwo ]; then echo 'Could not verify signature, will lock you out of the instance' && sudo rm /home/ubuntu/.ssh/authorized_keys ; fi ; else echo 'Could not verify signature, will lock you out of the instance' && sudo rm /home/ubuntu/.ssh/authorized_keys ; fi" +ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "if [ `echo $?` -eq "0" ]; then hashone=`grep ubuntu-10.04-server-cloudimg-i386.tar.gz /mnt/SHA256SUMS | awk '{print $1}'` && hashtwo=`sha256sum /mnt/ubuntu-10.04-server-cloudimg-i386.tar.gz | awk '{print $1}'` && if [ $hashone != $hashtwo ]; then echo 'Hash in SHA256SUMS file does not match sha256sum of .tar.gz, will lock you out of the instance' && sudo rm /home/ubuntu/.ssh/authorized_keys ; fi ; else echo 'No good signature in verify.txt, will lock you out of the instance' && sudo rm /home/ubuntu/.ssh/authorized_keys ; fi" # Set the correct permission for /mnt echo "Verified the signature, continue with the build process"

1 0

[tor-cloud/master] Print a line after successfully verifying the signature
by runa＠torproject.org 25 Feb '12

25 Feb '12

commit a697b5630dedf2a1f98a2f2838694985a8ea4c40 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Sat Feb 25 14:02:59 2012 +0000 Print a line after successfully verifying the signature --- build.sh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/build.sh b/build.sh index 50b2290..7fc5f34 100755 --- a/build.sh +++ b/build.sh @@ -99,6 +99,7 @@ echo "See if the hashes match. If all else fails, lock ourselves out of the inst ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "if [ `echo $?` -eq "0" ]; then hashone=`grep ubuntu-10.04-server-cloudimg-i386.tar.gz /mnt/SHA256SUMS | awk '{print $1}'` && hashtwo=`sha256sum /mnt/ubuntu-10.04-server-cloudimg-i386.tar.gz | awk '{print $1}'` && if [ $hashone != $hashtwo ]; then echo 'Could not verify signature, will lock you out of the instance' && sudo rm /home/ubuntu/.ssh/authorized_keys ; fi ; else echo 'Could not verify signature, will lock you out of the instance' && sudo rm /home/ubuntu/.ssh/authorized_keys ; fi" # Set the correct permission for /mnt +echo "Verified the signature, continue with the build process" ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "sudo chown ubuntu:ubuntu /mnt" # If everything is ok, extract image and continue the build process

1 0

[metrics-lib/master] Fix legacy-dir-key line parsing in votes.
by karsten＠torproject.org 25 Feb '12

25 Feb '12

commit 8664260c1f63381d81ebdd5fddeedb300afe29d5 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Feb 17 07:48:53 2012 +0100 Fix legacy-dir-key line parsing in votes. --- .../descriptor/RelayNetworkStatusVote.java | 6 ++-- .../impl/RelayNetworkStatusVoteImpl.java | 14 +++++----- .../impl/RelayNetworkStatusVoteImplTest.java | 24 ++++++++++++++++++++ 3 files changed, 34 insertions(+), 10 deletions(-) diff --git a/src/org/torproject/descriptor/RelayNetworkStatusVote.java b/src/org/torproject/descriptor/RelayNetworkStatusVote.java index 3dd82bc..f9635e2 100644 --- a/src/org/torproject/descriptor/RelayNetworkStatusVote.java +++ b/src/org/torproject/descriptor/RelayNetworkStatusVote.java @@ -68,9 +68,9 @@ public interface RelayNetworkStatusVote extends Descriptor { /* Return the directory key certificate version. */ public int getDirKeyCertificateVersion(); - /* Return the legacy key or null if the directory authority does not use - * a legacy key. */ - public String getLegacyKey(); + /* Return the legacy dir key or null if the directory authority does not + * use a legacy dir key. */ + public String getLegacyDirKey(); /* Return the directory key publication timestamp. */ public long getDirKeyPublishedMillis(); diff --git a/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java b/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java index 3729f75..a00cd75 100644 --- a/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java +++ b/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java @@ -255,8 +255,8 @@ public class RelayNetworkStatusVoteImpl extends NetworkStatusImpl this.parseDirAddressLine(line, parts); } else if (keyword.equals("fingerprint")) { this.parseFingerprintLine(line, parts); - } else if (keyword.equals("legacy-key")) { - this.parseLegacyKeyLine(line, parts); + } else if (keyword.equals("legacy-dir-key")) { + this.parseLegacyDirKeyLine(line, parts); } else if (keyword.equals("dir-key-published")) { this.parseDirKeyPublished(line, parts); } else if (keyword.equals("dir-key-expires")) { @@ -349,12 +349,12 @@ public class RelayNetworkStatusVoteImpl extends NetworkStatusImpl ParseHelper.parseTwentyByteHexString(line, parts[1]); } - private void parseLegacyKeyLine(String line, String[] parts) + private void parseLegacyDirKeyLine(String line, String[] parts) throws DescriptorParseException { if (parts.length != 2) { throw new DescriptorParseException("Illegal line '" + line + "'."); } - this.legacyKey = ParseHelper.parseTwentyByteHexString(line, parts[2]); + this.legacyDirKey = ParseHelper.parseTwentyByteHexString(line, parts[1]); } private void parseDirKeyPublished(String line, String[] parts) @@ -430,9 +430,9 @@ public class RelayNetworkStatusVoteImpl extends NetworkStatusImpl return this.dirKeyCertificateVersion; } - private String legacyKey; - public String getLegacyKey() { - return this.legacyKey; + private String legacyDirKey; + public String getLegacyDirKey() { + return this.legacyDirKey; } private long dirKeyPublishedMillis; diff --git a/test/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java b/test/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java index e907086..8a60eec 100644 --- a/test/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java +++ b/test/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java @@ -146,6 +146,14 @@ public class RelayNetworkStatusVoteImplTest { vb.contactLine = line; return new RelayNetworkStatusVoteImpl(vb.buildVote(), true); } + private String legacyDirKeyLine = null; + private static RelayNetworkStatusVote + createWithLegacyDirKeyLine(String line) + throws DescriptorParseException { + VoteBuilder vb = new VoteBuilder(); + vb.legacyDirKeyLine = line; + return new RelayNetworkStatusVoteImpl(vb.buildVote(), true); + } private String dirKeyCertificateVersionLine = "dir-key-certificate-version 3"; private static RelayNetworkStatusVote @@ -394,6 +402,9 @@ public class RelayNetworkStatusVoteImplTest { if (this.contactLine != null) { sb.append(this.contactLine + "\n"); } + if (this.legacyDirKeyLine != null) { + sb.append(this.legacyDirKeyLine + "\n"); + } if (this.dirKeyCertificateVersionLine != null) { sb.append(this.dirKeyCertificateVersionLine + "\n"); } @@ -902,6 +913,19 @@ public class RelayNetworkStatusVoteImplTest { + "Appelbaum <jacob(a)appelbaum.net>"); } + @Test() + public void testLegacyDirKeyLine() throws DescriptorParseException { + RelayNetworkStatusVote vote = VoteBuilder.createWithLegacyDirKeyLine( + "legacy-dir-key 81349FC1F2DBA2C2C11B45CB9706637D480AB913"); + assertEquals("81349FC1F2DBA2C2C11B45CB9706637D480AB913", + vote.getLegacyDirKey()); + } + + @Test(expected = DescriptorParseException.class) + public void testLegacyDirKeyLineNoId() throws DescriptorParseException { + VoteBuilder.createWithLegacyDirKeyLine("legacy-dir-key "); + } + @Test(expected = DescriptorParseException.class) public void testDirKeyCertificateVersionLineMissing() throws DescriptorParseException {

1 0

[metrics-lib/master] eventdns lines have 1 and 0 for true and false.
by karsten＠torproject.org 25 Feb '12

25 Feb '12

commit e8ed8fb812f7aa101a1492c456544fdb0660372b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Feb 17 09:02:56 2012 +0100 eventdns lines have 1 and 0 for true and false. --- .../descriptor/impl/ServerDescriptorImpl.java | 4 ++-- .../descriptor/impl/ServerDescriptorImplTest.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java b/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java index 76873dc..67b4d09 100644 --- a/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java @@ -340,9 +340,9 @@ public class ServerDescriptorImpl extends DescriptorImpl if (partsNoOpt.length != 2) { throw new DescriptorParseException("Illegal line '" + line + "'."); } - if (partsNoOpt[1].equals("true")) { + if (partsNoOpt[1].equals("1")) { this.usesEnhancedDnsLogic = true; - } else if (partsNoOpt[1].equals("false")) { + } else if (partsNoOpt[1].equals("0")) { this.usesEnhancedDnsLogic = false; } else { throw new DescriptorParseException("Illegal line '" + line + "'."); diff --git a/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java b/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java index 889fce4..85db9df 100644 --- a/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java +++ b/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java @@ -1021,27 +1021,27 @@ public class ServerDescriptorImplTest { @Test() public void testEventdnsOpt() throws DescriptorParseException { ServerDescriptor descriptor = DescriptorBuilder. - createWithEventdnsLine("opt eventdns true"); + createWithEventdnsLine("opt eventdns 1"); assertTrue(descriptor.getUsesEnhancedDnsLogic()); } @Test() public void testEventdnsTrue() throws DescriptorParseException { ServerDescriptor descriptor = DescriptorBuilder. - createWithEventdnsLine("eventdns true"); + createWithEventdnsLine("eventdns 1"); assertTrue(descriptor.getUsesEnhancedDnsLogic()); } @Test() public void testEventdnsFalse() throws DescriptorParseException { ServerDescriptor descriptor = DescriptorBuilder. - createWithEventdnsLine("eventdns false"); + createWithEventdnsLine("eventdns 0"); assertFalse(descriptor.getUsesEnhancedDnsLogic()); } @Test(expected = DescriptorParseException.class) public void testEventdns1() throws DescriptorParseException { - DescriptorBuilder.createWithEventdnsLine("eventdns 1"); + DescriptorBuilder.createWithEventdnsLine("eventdns true"); } @Test(expected = DescriptorParseException.class)

1 0

[metrics-lib/master] directory-footer lines were optional before consensus method 9.
by karsten＠torproject.org 25 Feb '12

25 Feb '12

commit b57644ef288f7441fc07ce4833a0c1407e052a5e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Feb 17 08:06:56 2012 +0100 directory-footer lines were optional before consensus method 9. --- .../impl/RelayNetworkStatusConsensusImpl.java | 5 ++--- .../impl/RelayNetworkStatusVoteImpl.java | 5 ++--- .../descriptor/impl/ConsensusBuilder.java | 6 ++++++ .../impl/RelayNetworkStatusConsensusImplTest.java | 15 +++++++++++++++ .../impl/RelayNetworkStatusVoteImplTest.java | 2 +- 5 files changed, 26 insertions(+), 7 deletions(-) diff --git a/src/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java b/src/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java index 10f97c0..734ee4c 100644 --- a/src/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java +++ b/src/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java @@ -44,11 +44,10 @@ public class RelayNetworkStatusConsensusImpl extends NetworkStatusImpl super(consensusBytes, failUnrecognizedDescriptorLines); Set<String> exactlyOnceKeywords = new HashSet<String>(Arrays.asList(( "vote-status,consensus-method,valid-after,fresh-until," - + "valid-until,voting-delay,known-flags," - + "directory-footer").split(","))); + + "valid-until,voting-delay,known-flags").split(","))); this.checkExactlyOnceKeywords(exactlyOnceKeywords); Set<String> atMostOnceKeywords = new HashSet<String>(Arrays.asList(( - "client-versions,server-versions,params," + "client-versions,server-versions,params,directory-footer," + "bandwidth-weights").split(","))); this.checkAtMostOnceKeywords(atMostOnceKeywords); this.checkFirstKeyword("network-status-version"); diff --git a/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java b/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java index a00cd75..28850a7 100644 --- a/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java +++ b/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java @@ -47,12 +47,11 @@ public class RelayNetworkStatusVoteImpl extends NetworkStatusImpl + "valid-until,voting-delay,known-flags,dir-source," + "dir-key-certificate-version,fingerprint,dir-key-published," + "dir-key-expires,dir-identity-key,dir-signing-key," - + "dir-key-certification,directory-footer,directory-signature"). - split(","))); + + "dir-key-certification,directory-signature").split(","))); this.checkExactlyOnceKeywords(exactlyOnceKeywords); Set<String> atMostOnceKeywords = new HashSet<String>(Arrays.asList(( "client-versions,server-versions,params,contact,legacy-key," - + "dir-key-crosscert,dir-address").split(","))); + + "dir-key-crosscert,dir-address,directory-footer").split(","))); this.checkAtMostOnceKeywords(atMostOnceKeywords); this.checkFirstKeyword("network-status-version"); } diff --git a/test/org/torproject/descriptor/impl/ConsensusBuilder.java b/test/org/torproject/descriptor/impl/ConsensusBuilder.java index 2d0291d..f35864b 100644 --- a/test/org/torproject/descriptor/impl/ConsensusBuilder.java +++ b/test/org/torproject/descriptor/impl/ConsensusBuilder.java @@ -108,6 +108,9 @@ public class ConsensusBuilder { List<String> dirSources = new ArrayList<String>(); List<String> statusEntries = new ArrayList<String>(); private String directoryFooterLine = "directory-footer"; + protected void setDirectoryFooterLine(String line) { + this.directoryFooterLine = line; + } protected static RelayNetworkStatusConsensus createWithDirectoryFooterLine(String line) throws DescriptorParseException { @@ -119,6 +122,9 @@ public class ConsensusBuilder { + "Wbe=0 Wbg=0 Wbm=10000 Wdb=10000 Web=10000 Wed=1021 Wee=10000 " + "Weg=1021 Wem=10000 Wgb=10000 Wgd=8694 Wgg=10000 Wgm=10000 " + "Wmb=10000 Wmd=285 Wme=0 Wmg=0 Wmm=10000"; + protected void setBandwidthWeightsLine(String line) { + this.bandwidthWeightsLine = line; + } protected static RelayNetworkStatusConsensus createWithBandwidthWeightsLine(String line) throws DescriptorParseException { diff --git a/test/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java b/test/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java index b37b72a..65c9658 100644 --- a/test/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java +++ b/test/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java @@ -981,10 +981,25 @@ public class RelayNetworkStatusConsensusImplTest { @Test(expected = DescriptorParseException.class) public void testDirectoryFooterNoLine() throws DescriptorParseException { + /* This breaks, because a bandwidth-weights line without a preceding + * directory-footer line is not allowed. */ ConsensusBuilder.createWithDirectoryFooterLine(null); } @Test() + public void testDirectoryFooterMissing() + throws DescriptorParseException { + ConsensusBuilder cb = new ConsensusBuilder(); + cb.setDirectoryFooterLine(null); + cb.setBandwidthWeightsLine(null); + /* This does not break, because directory footers were optional before + * consensus method 9. */ + RelayNetworkStatusConsensus consensus = + new RelayNetworkStatusConsensusImpl(cb.buildConsensus(), true); + assertNull(consensus.getBandwidthWeights()); + } + + @Test() public void testDirectoryFooterLineSpace() throws DescriptorParseException { ConsensusBuilder.createWithDirectoryFooterLine("directory-footer "); diff --git a/test/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java b/test/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java index 8a60eec..7569d7a 100644 --- a/test/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java +++ b/test/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java @@ -1032,7 +1032,7 @@ public class RelayNetworkStatusVoteImplTest { VoteBuilder.createWithDirKeyCertificationLines(null); } - @Test(expected = DescriptorParseException.class) + @Test() public void testDirectoryFooterLineMissing() throws DescriptorParseException { VoteBuilder.createWithDirectoryFooterLine(null);

1 0

[metrics-lib/master] Parse old server descriptors with "opt read-history " lines.
by karsten＠torproject.org 25 Feb '12

25 Feb '12

commit 39021ee925004d57d3d952867e03b543eb207254 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Feb 17 09:19:26 2012 +0100 Parse old server descriptors with "opt read-history " lines. --- .../descriptor/impl/BandwidthHistoryImpl.java | 5 +++++ .../descriptor/impl/ServerDescriptorImplTest.java | 14 ++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/org/torproject/descriptor/impl/BandwidthHistoryImpl.java b/src/org/torproject/descriptor/impl/BandwidthHistoryImpl.java index 3e094ad..c696624 100644 --- a/src/org/torproject/descriptor/impl/BandwidthHistoryImpl.java +++ b/src/org/torproject/descriptor/impl/BandwidthHistoryImpl.java @@ -15,6 +15,11 @@ public class BandwidthHistoryImpl implements BandwidthHistory { if (partsNoOpt.length >= 5) { 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("(") && diff --git a/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java b/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java index 85db9df..598c3ab 100644 --- a/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java +++ b/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java @@ -1007,14 +1007,12 @@ public class ServerDescriptorImplTest { assertTrue(bandwidthValues.isEmpty()); } - /* TODO There are some old server descriptors with "read-history " - * lines. Find out if these were spec-compliant and if other lines may - * start with leading spaces, too. */ - @Test(expected = DescriptorParseException.class) - public void testReadHistoryLeadingSpace() - throws DescriptorParseException { - String readHistoryLine = "read-history 2012-01-01 03:51:44 (900 s) " - + "4268032,139264,7797760,1415168"; + @Test() + public void testReadHistoryTwoSpaces() throws DescriptorParseException { + /* There are some server descriptors from older Tor versions that + * contain "opt read-history " lines. */ + String readHistoryLine = "opt read-history 2012-01-01 03:51:44 " + + "(900 s) 4268032,139264,7797760,1415168"; DescriptorBuilder.createWithReadHistoryLine(readHistoryLine); }

1 0

[metrics-lib/master] Accept exit policy lines with IPv4 masks in dotted-quad format.
by karsten＠torproject.org 25 Feb '12

25 Feb '12

commit e952d082b036138d6e5a9319e5ee70acdd1545eb Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Feb 17 12:39:39 2012 +0100 Accept exit policy lines with IPv4 masks in dotted-quad format. --- .../torproject/descriptor/impl/ParseHelper.java | 24 +++++++++++++------ .../descriptor/impl/ServerDescriptorImplTest.java | 10 ++++++++ 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/src/org/torproject/descriptor/impl/ParseHelper.java b/src/org/torproject/descriptor/impl/ParseHelper.java index 2779d5a..8db09e2 100644 --- a/src/org/torproject/descriptor/impl/ParseHelper.java +++ b/src/org/torproject/descriptor/impl/ParseHelper.java @@ -87,18 +87,26 @@ public class ParseHelper { } else if (addressPart.contains("/")) { String[] addressParts = addressPart.split("/"); String address = addressParts[0]; + String mask = addressParts[1]; ParseHelper.parseIpv4Address(line, address); - int maskValue = -1; - try { - maskValue = Integer.parseInt(addressPart.substring( - addressPart.indexOf("/") + 1)); - } catch (NumberFormatException e) { - /* Handle below. */ - } - if (addressParts.length != 2 || maskValue < 0 || maskValue > 32) { + if (addressParts.length != 2) { throw new DescriptorParseException("'" + addressPart + "' in " + "line '" + line + "' is not a valid address part."); } + if (mask.contains(".")) { + ParseHelper.parseIpv4Address(line, mask); + } else { + int maskValue = -1; + try { + maskValue = Integer.parseInt(mask); + } catch (NumberFormatException e) { + /* Handle below. */ + } + if (maskValue < 0 || maskValue > 32) { + throw new DescriptorParseException("'" + mask + "' in line '" + + line + "' is not a valid IPv4 mask."); + } + } } else { ParseHelper.parseIpv4Address(line, addressPart); } diff --git a/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java b/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java index 598c3ab..72bec62 100644 --- a/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java +++ b/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java @@ -763,6 +763,16 @@ public class ServerDescriptorImplTest { } @Test() + public void testExitPolicyMaskTypes() throws DescriptorParseException { + ServerDescriptor descriptor = DescriptorBuilder. + createWithExitPolicyLines("reject 192.168.0.0/16:*\n" + + "reject 94.134.192.243/255.255.255.0:*"); + assertEquals(Arrays.asList(new String[] { "reject 192.168.0.0/16:*", + "reject 94.134.192.243/255.255.255.0:*"}), + descriptor.getExitPolicyLines()); + } + + @Test() public void testRouterSignatureOpt() throws DescriptorParseException { DescriptorBuilder.createWithRouterSignatureLines("opt "

1 0