January 2014 - tor-commits - lists.torproject.org

[ooni-probe/master] Update README.md
by art＠torproject.org 13 Jan '14

13 Jan '14

commit 51c92f2d32a205624a80259d647fed311d62090f Author: Arturo Filastò <hellais(a)users.noreply.github.com> Date: Mon Jan 13 13:26:55 2014 +0100 Update README.md --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index deb1b6f..f3551f8 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,15 @@ probe is a liability for you, please be aware of this risk. ## Installation +### Debian based systems + +``` +echo "deb http://deb.ooni.nu/ooni wheezy main" >> /etc/apt/sources.list +gpg --recv-key 0x49B8CDF4 +gpg --export 89AB86D4788F3785FE9EDA31F9E2D9B049B8CDF4 | sudo apt-key add - +apt-get update && apt-get install ooniprobe +``` + ### Linux We believe that ooniprobe runs reasonably well on Debian GNU/Linux wheezy as

1 0

[ooni-probe/master] Bump to version 1.0.0-rc6
by art＠torproject.org 13 Jan '14

13 Jan '14

commit 359aea8ddb7365dc1b5083228c4783c9db85ff50 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Jan 13 14:44:20 2014 +0100 Bump to version 1.0.0-rc6 --- debian/changelog | 6 +++--- ooni/__init__.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 93abf71..c05ec94 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -ooniprobe (1.0.0-rc5-1) UNRELEASED; urgency=low +ooniprobe (1.0.0-rc6-1); urgency=low - * Initial release. (Closes: #XXXXXX) + * ooniprobe 1.0.0-rc6 - -- OONI Developers (signing key) <ooni-dev(a)lists.torproject.org> Fri, 3 Jan 2014 11:14:46 +0200 + -- OONI Developers (signing key) <ooni-dev(a)lists.torproject.org> Mon, 13 Jan 2014 14:14:46 +0200 diff --git a/ooni/__init__.py b/ooni/__init__.py index f4337c5..dbf546e 100644 --- a/ooni/__init__.py +++ b/ooni/__init__.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- __author__ = "Arturo Filastò" -__version__ = "1.0.0-rc5" +__version__ = "1.0.0-rc6" __all__ = ['config', 'inputunit', 'kit', 'lib', 'nettest', 'oonicli', 'reporter',

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 13 Jan '14

13 Jan '14

commit e6a796f83075399b7ecb3c58ffa4dba954522a7b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 13 11:16:17 2014 +0000 Update translations for tails-misc_completed --- de.po | 97 ++++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 51 insertions(+), 46 deletions(-) diff --git a/de.po b/de.po index 314da61..de1c452 100644 --- a/de.po +++ b/de.po @@ -6,13 +6,15 @@ # ivl1705 <listmember(a)rinnberger.de>, 2013 # skps <lmaerz(a)emailn.de>, 2013 # MarioBaier26 <mario.baier26(a)gmx.de>, 2013 +# malexmave <max(a)velcommuta.de>, 2014 +# to_ba, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-26 23:41+0200\n" -"PO-Revision-Date: 2013-11-06 21:50+0000\n" -"Last-Translator: ivl1705 <listmember(a)rinnberger.de>\n" +"POT-Creation-Date: 2014-01-10 12:23+0100\n" +"PO-Revision-Date: 2014-01-13 10:49+0000\n" +"Last-Translator: malexmave <max(a)velcommuta.de>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,6 +22,14 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:31 +msgid "Tor is ready" +msgstr "Tor ist bereit" + +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:32 +msgid "You can now access the Internet." +msgstr "Sie haben nun Zugriff auf das Internet." + #: config/chroot_local-includes/etc/whisperback/config.py:64 #, python-format msgid "" @@ -191,6 +201,22 @@ msgstr "Ausgabe von GnuPG:" msgid "Other messages provided by GnuPG:" msgstr "Andere Nachrichten von GnuPG:" +#: config/chroot_local-includes/usr/local/bin/iceweasel:12 +msgid "Tor is not ready" +msgstr "Tor ist nicht bereit" + +#: config/chroot_local-includes/usr/local/bin/iceweasel:13 +msgid "Tor is not ready. Start Tor Browser anyway?" +msgstr "Tor ist nicht bereit. Möchten Sie den Tor Browser trotzdem starten?" + +#: config/chroot_local-includes/usr/local/bin/iceweasel:14 +msgid "Start Tor Browser" +msgstr "Tor Browser starten" + +#: config/chroot_local-includes/usr/local/bin/iceweasel:15 +msgid "Cancel" +msgstr "Abbruch" + #: config/chroot_local-includes/usr/local/bin/shutdown_helper_applet:34 msgid "Shutdown Immediately" msgstr "Sofort Herunterfahren" @@ -227,21 +253,21 @@ msgstr "Baue Informationen:\n%s" msgid "About Tails" msgstr "Über Tails" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:114 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:120 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:124 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:115 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:121 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125 msgid "Your additional software" msgstr "Ihre zusätzliche Software" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:115 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:116 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:126 msgid "" "The upgrade failed. This might be due to a network problem. Please check " "your network connection, try to restart Tails, or read the system log to " "understand better the problem." msgstr "Das Upgrade ist fehlgeschlagen. Es könnte an einem Netzwerk-Problem liegen. Bitte überprüfen Sie ihre Netzwerkverbindung, starten Sie Tails neu oder lesen Sie die System-Logdateien um das Problem zu finden." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:121 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:122 msgid "The upgrade was successful." msgstr "Das Upgrade war erfolgreich." @@ -259,20 +285,7 @@ msgstr "Tor braucht eine exakt Systemuhr um genau zu arbeiten, besonders für ve msgid "Failed to synchronize the clock!" msgstr "Systemuhr Synchronisierungsfehler!" -#: config/chroot_local-includes/usr/local/bin/tails-security-check:86 -#, perl-format -msgid "Unparseable line in %s" -msgstr "Unparseable line in %s" - -#: config/chroot_local-includes/usr/local/bin/tails-security-check:113 -msgid "atom_str was passed an undefined argument" -msgstr "atom_str wurde als undefiniertes Argument übergeben" - -#: config/chroot_local-includes/usr/local/bin/tails-security-check:177 -msgid "Empty fetched feed." -msgstr "Leerer Feed." - -#: config/chroot_local-includes/usr/local/bin/tails-security-check:194 +#: config/chroot_local-includes/usr/local/bin/tails-security-check:145 msgid "This version of Tails has known security issues:" msgstr "Diese Tails Version weist Sicherheitslücken auf:" @@ -318,79 +331,71 @@ msgid "" " more...</a>" msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html'>Mehr erfahren...</a>" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:59 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57 msgid "error:" msgstr "Fehler:" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:60 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 msgid "Error" msgstr "Fehler" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:69 -msgid "warning:" -msgstr "Warnung:" - -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70 -msgid "Warning" -msgstr "Warnung" - -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:79 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:68 msgid "Do you really want to launch the Unsafe Browser?" msgstr "Möchten Sie wirklich den unsicheren Browser starten?" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70 msgid "" "Network activity within the Unsafe Browser is <b>not anonymous</b>. Only use" " the Unsafe Browser if necessary, for example if you have to login or " "register to activate your Internet connection." msgstr "Die Netzwerkaktivität im unsicheren Browser ist <b>nicht anonym</b>. Benutzen Sie den unsicheren Browser nur falls es nötig ist, wie zb. wenn Sie ihre Internetverbindung aktivieren müssen." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:82 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:71 msgid "_Launch" msgstr "_Start" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:83 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:72 msgid "_Exit" msgstr "_Exit" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:93 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:82 msgid "Starting the Unsafe Browser..." msgstr "Unsicherer Browser wird gestartet..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:94 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:83 msgid "This may take a while, so please be patient." msgstr "Dies könnte eine weile dauern, bitte haben Sie etwas geduld." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:112 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:101 msgid "Failed to setup chroot." msgstr "Konnte chroot nicht einrichten." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:181 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:175 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 msgid "Unsafe Browser" msgstr "Unsicherer Browser" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:221 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:215 msgid "Shutting down the Unsafe Browser..." msgstr "Unsicherer Browser wird beendet..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:222 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:216 msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." msgstr "Dies könnte eine weile dauen, und bevor der Unsichere Browser geschlossen ist, können Sie ihn nicht noch einmal starten." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:234 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:228 msgid "Failed to restart Tor." msgstr "Tor konnte nicht neugestartet werden." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:242 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:236 msgid "" "Another Unsafe Browser is currently running, or being cleaned up. Please " "retry in a while." msgstr "Ein anderer Unsicherer Browser ist derzeit offen oder wird gerade beendet. Bitte probieren Sie es später noch einmal." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:255 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:249 msgid "" "No DNS server was obtained through DHCP or manually configured in " "NetworkManager."

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 13 Jan '14

13 Jan '14

commit 983916e2b96bdeb3637f76c27205b4b17f721d3a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 13 11:16:14 2014 +0000 Update translations for tails-misc --- de.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/de.po b/de.po index 67c99cb..de1c452 100644 --- a/de.po +++ b/de.po @@ -6,14 +6,15 @@ # ivl1705 <listmember(a)rinnberger.de>, 2013 # skps <lmaerz(a)emailn.de>, 2013 # MarioBaier26 <mario.baier26(a)gmx.de>, 2013 +# malexmave <max(a)velcommuta.de>, 2014 # to_ba, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-10 12:23+0100\n" -"PO-Revision-Date: 2014-01-11 16:01+0000\n" -"Last-Translator: to_ba\n" +"PO-Revision-Date: 2014-01-13 10:49+0000\n" +"Last-Translator: malexmave <max(a)velcommuta.de>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -27,7 +28,7 @@ msgstr "Tor ist bereit" #: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:32 msgid "You can now access the Internet." -msgstr "" +msgstr "Sie haben nun Zugriff auf das Internet." #: config/chroot_local-includes/etc/whisperback/config.py:64 #, python-format @@ -206,11 +207,11 @@ msgstr "Tor ist nicht bereit" #: config/chroot_local-includes/usr/local/bin/iceweasel:13 msgid "Tor is not ready. Start Tor Browser anyway?" -msgstr "" +msgstr "Tor ist nicht bereit. Möchten Sie den Tor Browser trotzdem starten?" #: config/chroot_local-includes/usr/local/bin/iceweasel:14 msgid "Start Tor Browser" -msgstr "" +msgstr "Tor Browser starten" #: config/chroot_local-includes/usr/local/bin/iceweasel:15 msgid "Cancel"

1 0

[onionoo/master] Add recommended_version field to details documents.
by karsten＠torproject.org 13 Jan '14

13 Jan '14

commit 786db5dae3641bf9d13896b9e84f59a54643c143 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jan 13 10:30:48 2014 +0100 Add recommended_version field to details documents. Implements #10619. --- src/org/torproject/onionoo/NodeDataWriter.java | 20 ++++++++++++++++++-- src/org/torproject/onionoo/NodeStatus.java | 19 +++++++++++++++++-- web/index.html | 15 ++++++++++++++- 3 files changed, 49 insertions(+), 5 deletions(-) diff --git a/src/org/torproject/onionoo/NodeDataWriter.java b/src/org/torproject/onionoo/NodeDataWriter.java index 290802c..7623e16 100644 --- a/src/org/torproject/onionoo/NodeDataWriter.java +++ b/src/org/torproject/onionoo/NodeDataWriter.java @@ -136,6 +136,14 @@ public class NodeDataWriter implements DataWriter, DescriptorListener { if (validAfterMillis > this.relaysLastValidAfterMillis) { this.relaysLastValidAfterMillis = validAfterMillis; } + Set<String> recommendedVersions = null; + if (consensus.getRecommendedServerVersions() != null) { + recommendedVersions = new HashSet<String>(); + for (String recommendedVersion : + consensus.getRecommendedServerVersions()) { + recommendedVersions.add("Tor " + recommendedVersion); + } + } for (NetworkStatusEntry entry : consensus.getStatusEntries().values()) { String nickname = entry.getNickname(); @@ -149,11 +157,14 @@ public class NodeDataWriter implements DataWriter, DescriptorListener { long consensusWeight = entry.getBandwidth(); String defaultPolicy = entry.getDefaultPolicy(); String portList = entry.getPortList(); + Boolean recommendedVersion = (recommendedVersions == null || + entry.getVersion() == null) ? null : + recommendedVersions.contains(entry.getVersion()); NodeStatus newNodeStatus = new NodeStatus(true, nickname, fingerprint, address, orAddressesAndPorts, null, validAfterMillis, orPort, dirPort, relayFlags, consensusWeight, null, null, -1L, defaultPolicy, portList, validAfterMillis, - validAfterMillis, null, null); + validAfterMillis, null, null, recommendedVersion); if (this.knownNodes.containsKey(fingerprint)) { this.knownNodes.get(fingerprint).update(newNodeStatus); } else { @@ -183,7 +194,7 @@ public class NodeDataWriter implements DataWriter, DescriptorListener { NodeStatus newNodeStatus = new NodeStatus(false, nickname, fingerprint, address, orAddressesAndPorts, null, publishedMillis, orPort, dirPort, relayFlags, -1L, "??", null, - -1L, null, null, publishedMillis, -1L, null, null); + -1L, null, null, publishedMillis, -1L, null, null, null); if (this.knownNodes.containsKey(fingerprint)) { this.knownNodes.get(fingerprint).update(newNodeStatus); } else { @@ -697,6 +708,7 @@ public class NodeDataWriter implements DataWriter, DescriptorListener { double exitProbability = entry.getExitProbability(); String defaultPolicy = entry.getDefaultPolicy(); String portList = entry.getPortList(); + Boolean recommendedVersion = entry.getRecommendedVersion(); StringBuilder sb = new StringBuilder(); sb.append("{\"version\":1,\n" + "\"nickname\":\"" + nickname + "\",\n" @@ -790,6 +802,10 @@ public class NodeDataWriter implements DataWriter, DescriptorListener { } sb.append("]}"); } + if (recommendedVersion != null) { + sb.append(",\n\"recommended_version\":" + (recommendedVersion ? + "true" : "false")); + } /* Add exit addresses if at least one of them is distinct from the * onion-routing addresses. */ diff --git a/src/org/torproject/onionoo/NodeStatus.java b/src/org/torproject/onionoo/NodeStatus.java index e549336..30e1ed4 100644 --- a/src/org/torproject/onionoo/NodeStatus.java +++ b/src/org/torproject/onionoo/NodeStatus.java @@ -56,13 +56,15 @@ public class NodeStatus extends Document { private String portList; private SortedMap<Long, Set<String>> lastAddresses; private String contact; + private Boolean recommendedVersion; public NodeStatus(boolean isRelay, String nickname, String fingerprint, String address, SortedSet<String> orAddressesAndPorts, SortedSet<String> exitAddresses, long lastSeenMillis, int orPort, int dirPort, SortedSet<String> relayFlags, long consensusWeight, String countryCode, String hostName, long lastRdnsLookup, String defaultPolicy, String portList, long firstSeenMillis, - long lastChangedAddresses, String aSNumber, String contact) { + long lastChangedAddresses, String aSNumber, String contact, + Boolean recommendedVersion) { this.isRelay = isRelay; this.nickname = nickname; this.fingerprint = fingerprint; @@ -108,6 +110,7 @@ public class NodeStatus extends Document { this.lastAddresses.put(lastChangedAddresses, addresses); this.aSNumber = aSNumber; this.contact = contact; + this.recommendedVersion = recommendedVersion; } public static NodeStatus fromString(String documentString) { @@ -121,6 +124,7 @@ public class NodeStatus extends Document { lastRdnsLookup = -1L, firstSeenMillis = -1L, lastChangedAddresses = -1L; int orPort = -1, dirPort = -1; + Boolean recommendedVersion = null; try { SimpleDateFormat dateTimeFormat = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss"); @@ -199,6 +203,10 @@ public class NodeStatus extends Document { if (parts.length > 20) { contact = parts[20]; } + if (parts.length > 21) { + recommendedVersion = parts[21].equals("null") ? null : + parts[21].equals("true"); + } } catch (NumberFormatException e) { System.err.println("Number format exception while parsing node " + "status line '" + documentString + "': " + e.getMessage() @@ -221,7 +229,8 @@ public class NodeStatus extends Document { fingerprint, address, orAddressesAndPorts, exitAddresses, lastSeenMillis, orPort, dirPort, relayFlags, consensusWeight, countryCode, hostName, lastRdnsLookup, defaultPolicy, portList, - firstSeenMillis, lastChangedAddresses, aSNumber, contact); + firstSeenMillis, lastChangedAddresses, aSNumber, contact, + recommendedVersion); return newNodeStatus; } @@ -241,6 +250,7 @@ public class NodeStatus extends Document { this.portList = newNodeStatus.portList; this.aSNumber = newNodeStatus.aSNumber; this.contact = newNodeStatus.contact; + this.recommendedVersion = newNodeStatus.recommendedVersion; } if (this.isRelay && newNodeStatus.isRelay) { this.lastAddresses.putAll(newNodeStatus.lastAddresses); @@ -298,6 +308,8 @@ public class NodeStatus extends Document { sb.append("\tnull\tnull\tnull"); } sb.append("\t" + (this.contact != null ? this.contact : "")); + sb.append("\t" + (this.recommendedVersion == null ? "null" : + this.recommendedVersion ? "true" : "false")); return sb.toString(); } @@ -508,5 +520,8 @@ public class NodeStatus extends Document { public String getContact() { return this.contact; } + public Boolean getRecommendedVersion() { + return this.recommendedVersion; + } } diff --git a/web/index.html b/web/index.html index f59a433..d270c60 100644 --- a/web/index.html +++ b/web/index.html @@ -945,7 +945,7 @@ If there is an "accept" ("reject") element, the relay accepts (rejects) all TCP ports or port ranges in the given list for most IP addresses and rejects (accepts) all other ports. Missing if the relay rejects all connections to IPv6 addresses. -<font color="blue">Added on January 6, 2013.</font> +<font color="blue">Added on January 6, 2014.</font> </p> </li> @@ -973,6 +973,19 @@ found. </li> <li> +<font color="blue"><b>recommended_version</b></font> +<code class="typeof">boolean</code> +<span class="required-false">optional</span> +<p> +Boolean field saying whether the Tor software version of this relay is +recommended by the directory authorities or not. +Omitted if either the directory authorities did not recommend versions, or +the relay did not report which version it runs. +<font color="blue">Added on January 13, 2014.</font> +</p> +</li> + +<li> <b>family</b> <code class="typeof">array of strings</code> <span class="required-false">optional</span>

1 0

r26533: {} Created a Tor Browser FAQ page (nothing links to it yet) (website/trunk/docs/en)
by Matt Pagan 13 Jan '14

13 Jan '14

Author: mttp Date: 2014-01-13 09:06:39 +0000 (Mon, 13 Jan 2014) New Revision: 26533 Added: website/trunk/docs/en/faq-torbrowser.wml Log: Created a Tor Browser FAQ page (nothing links to it yet) Added: website/trunk/docs/en/faq-torbrowser.wml =================================================================== --- website/trunk/docs/en/faq-torbrowser.wml (rev 0) +++ website/trunk/docs/en/faq-torbrowser.wml 2014-01-13 09:06:39 UTC (rev 26533) @@ -0,0 +1,317 @@ +## translation metadata +# Revision: $Revision: 25929 $ +# Translation-Priority: 2-medium + +#include "head.wmi" TITLE="Tor Project: Tor Browser FAQ" CHARSET="UTF-8" +<div id="content" class="clearfix"> + <div id="breadcrumbs"> + <a href="<page index>">Home » </a> + <a href="<page docs/documentation>">Documentation » </a> + <a href="<page docs/faq-torbrowser>">Tor Browser FAQ</a> + </div> + <div id="maincol"> +  + <h1>Tor Browser FAQ</h1> + <hr> + <h3>Questions</h3> + <ul> + <li><a href="#WhereDidVidaliaGo">Where did the world map (Vidalia) + go?</a></li> + <li><a href="#DisableJS">How do I disable JavaScript?</a></li> + <li><a href="#VerifyDownload">How do I verify the download + (sha256sums.txt)?</a></li> + <li><a href="#NewIdentityClosingTabs">Why does "New Identity" close + all my open tabs?</a></li> + <li><a href="#ConfigureRelayOrBridge">How do I configure Tor as a relay + or bridge?</a></li> + <li><a href="#Timestamps">Why are the file timestamps from 2000?</a></li> + <li><a href="#SourceCode">Where is the source code for the bundle? How do + I verify a build?</a></li> + </ul> + <hr> + + <a id="WhereDidVidaliaGo"></a> + <h3><a class="anchor" href="#WhereDidVidaliaGo">Where did the world map + (Vidalia) go?</a></h3> + + <p>Vidalia has been replaced with Tor Launcher, which is a Firefox + extension that provides similar functionality. Unfortunately, circuit + status reporting is still missing, but we are <a + href="https://trac.torproject.org/projects/tor/ticket/8641">working + on providing it</a>. </p> + + <p>In the meantime, we are providing standalone Vidalia packages for + people who still want the map. Windows and Linux versions are <a + href="https://people.torproject.org/~erinn/vidalia-standalone-bundles/"> + available here</a>. + + <p>To use these packages, extract them, then run the startup script. + On Windows, this is "Start Vidalia.exe". On Linux, it is start-vidalia. + They can be placed in a different directory from TBB (and likely should + be). </p> + + <p>This Vidalia package will only run properly if Tor Browser has already + been launched. You cannot start it before launching Tor Browser. </p> + + <p>MacOS is still under development, but in the mean time you can modify + your TBB 2.x to be a standalone Vidalia (and then use it after starting + TBB 3.x) by opening your TBB 2.x vidalia.conf file in an editor and + replacing its contents with just these lines:</p> + + <pre> + [General] + LanguageCode=en + + [Tor] + ControlPort=9151 + TorExecutable=. + Torrc=. + DataDirectory=. + AuthenticationMethod=cookie + </pre> + + <hr> + + <a id="DisableJS"></a> + <h3><a class="anchor" href="#DisableJS">How do I disable JavaScript?</a> + </h3> + + <p>Alas, Mozilla decided to get rid of the config checkbox for JavaScript + from earlier Firefox versions. And since TBB 3.5 is based on Firefox 24 + (FF17 is unmaintained), that means TBB 3.5 doesn't have the config + checkbox anymore either, which is unfortunate.</p> + + <p>The simplest way to disable JavaScript in TBB 3.5 is to click on the + Noscript "S" (between the green onion and the address bar), and select + "Forbid scripts globally". Note that vanilla NoScript actually whitelists + several domains even when you try to disable scripts globally, whereas + Tor Browser's NoScript configuration disables all of them. </p> + + <p>The more klunky way to disable JavaScript is to go to about:config, + find javascript.enabled, and set it to false.</p> + + <p>There is also a very simple addon available at addons.mozilla.org + called QuickJS, which provides a toolbar toggle for the javascript.enabled + about:config control. There are no configuration options for the addon, + it just switches the javascript.enabled entry between true and false and + provides a button for it. </p> + + <p>If you want to be extra safe, use both the about:config setting and + NoScript. </p> + + <p>As for whether you should disable it or leave it enabled, that's <a + href="https://www.torproject.org/docs/faq#TBBJavaScriptEnabled">a + tradeoff we leave to you</a>.</p> + + <hr> + + <a id="VerifyDownload"></a> + <h3><a class="anchor" href="#VerifyDownload">How do I verify the download + (sha256sums.txt)?</a></h3> + + <p>You can still verify your Tor Browser download by downloading the + signature file (.asc) along with your package and <a + href="https://www.torproject.org/docs/verifying-signatures.html.en"> + checking the GPG signature</a> as before. We now have an additional + verification method that allows you to verify the build as well as + the download.</p> + + <ul> + <li>Download the Tor Browser package, the sha256sums.txt file, and the + sha256sums signature files. They can all be found in the same directory + under <a href="https://www.torproject.org/dist/torbrowser/"> + https://www.torproject.org/dist/torbrowser/</a>, for example in 3.5 + for TBB 3.5.</li> + <li>Retrieve the signers' GPG keys. This can be done from the command + line by entering something like + <pre>gpg --keyserver keys.mozilla.org --recv-keys 0x29846B3C683686CC</pre> + (This will bring you developer Mike Perry's public key. Other + developers' key IDs can be found on + <a href="https://www.torproject.org/docs/signing-keys.html.en">this + page</a>.)</li> + <li>Verify the sha256sums.txt file by executing this command: + <pre>gpg --verify <NAME OF THE SIGNATURE FILE>.asc sha256sums.txt</pre></li> + <li>You should see a message like "Good signature from <DEVELOPER + NAME>". If you don't, there is a problem. Try these steps again.</li> + <li>Now you can take the sha256sum of the Tor Browser package. On + Windows you can use the <a href="http://md5deep.sourceforge.net/"> + hashdeep utility</a> and run + <pre>C:\location\where\you\saved\hashdeep -c sha256sum <TOR BROWSER FILE NAME>.exe</pre> + On Mac or Linux you can run <pre>sha256sum <TOR BROWSER FILE NAME>.zip</pre> or <pre>sha256sum <TOR BROWSER FILE NAME>.tar.gz</pre> without having to download a utility.</li> + <li>You will see a string of letters and numbers.</li> + <li>Open sha256sums.txt in a text editor.</li> + <li>Locate the name of the Tor Browser file you downloaded.</li> + <li>Compare the string of letters and numbers to the left of your + filename with the string of letters and numbers that appeared + on your command line. If they match, you've successfully verified the + build.</li> + </ul> + + <p><a href="https://github.com/isislovecruft/scripts/blob/master/verify-gitian-builder-…"> + Scripts</a> to <a + href="http://tor.stackexchange.com/questions/648/how-to-verify-tor-browser-bundle…">automate + </a> these steps have been written, but to use them you will need to + modify them yourself with the latest Tor Browser Bundle filename.</p> + + <hr> + + <a id="PluggableTransports"></a> + <h3><a class="anchor" href="#PluggableTransports">How do I use pluggable transports?</a></h3> + + <p> + For now, the Pluggable Transports-capable TBB is still a separate + unofficial package. Download them <a + href="https://people.torproject.org/~dcf/pt-bundle/3.5-pt20131217/"> + here</a>. We hope to have combined packages available in a beta soon. + </p> + + <p> + The separate Pluggable Transports-capable TBB is different from the + Pluggable Transports bundles that have been released in the past. + They include the programs necessary to use obfsproxy and flash proxy, + but the pluggable transports are not enabled by default. You must + enable them manually by adding Bridge lines to the torrc file. + (Please see ticket <a + href="https://trac.torproject.org/projects/tor/ticket/10418">#10418</a> + for how we hope to make it easier to do in the future.) + </p> + + <p> + To enable <b>obfsproxy</b>, edit the file called Data/Tor/torrc inside the + bundle and add the lines: + </p> + + <pre> +Bridge obfs3 83.212.101.2:42782 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D +Bridge obfs3 83.212.101.2:443 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D +Bridge obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9 +Bridge obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9 +Bridge obfs3 209.141.36.236:45496 +Bridge obfs3 208.79.90.242:35658 +Bridge obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD +Bridge obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E +Bridge obfs2 83.212.100.216:47870 1F01A7BB60F49FC96E0850A6BAD6D076DFEFAF80 +Bridge obfs2 83.212.96.182:46602 6F058CBEF888EB20D1DEB9886909F1E812245D41 +Bridge obfs2 70.182.182.109:54542 94C9E691688FAFDEC701A0788BD15BE8AD34ED35 +Bridge obfs2 128.31.0.34:1051 CA7434F14A898C7D3427B8295A7F83446BC7F496 +Bridge obfs2 83.212.101.2:45235 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D + </pre> + <p> + To enable <b>flash proxy</b>, edit the file called Data/Tor/torrc inside the + bundle and add the lines: + </p> + <pre> +LearnCircuitBuildTimeout 0 +CircuitBuildTimeout 60 +Bridge flashproxy 0.0.1.0:1 + </pre> + + <hr> + + <a id="NewIdentityClosingTabs"></a> + <h3><a class="anchor" href="#NewIdentityClosingTabs">Why does "New + Identity" close all my open tabs?</a></h3> + + <p> + That's actually a feature, since it's discarding your application-level + browser data too. But it sure is a surprising feature, for people who + are used to Vidalia's "new identity" behavior. + </p> + + <p> + We're working on ways to make the behavior less surprising, e.g. a popup + warning or auto restoring tabs. See ticket <a + href="https://trac.torproject.org/projects/tor/ticket/9906">#9906</a> and + ticket <a href="https://trac.torproject.org/projects/tor/ticket/10400"> + #10400</a> to follow progress there. + </p> + + <p> + In the mean time, you can get Vidalia's old "newnym" functionality by + attaching a Vidalia to your TBB3.x. See the instructions above. + </p> + + <hr> + + <a id="ConfigureRelayOrBridge"></a> + <h3><a class="anchor" href="#ConfigureRelayOrBridge">How do I configure Tor as a relay or bridge?</a></h3> + + <p> + You've got three options. + </p> + + <p> + First (best option), if you're on Linux, you can install the system + Tor package (e.g. apt-get install tor) and then set it up to be a relay + (<a href="https://www.torproject.org/docs/tor-relay-debian">instructions</a>). + You can then use TBB independent of that. + </p> + + <p> + Second (simpler option), if you're on Windows, you can fetch the separate + "Vidalia relay bundle" or "Vidalia bridge bundle" from the download page + and then use that (again you can use TBB independent of it). + </p> + + <p> + Third (complex option), you can either hook your Vidalia up to TBB (as + described in the FAQ above) or edit your torrc file (in Data/Tor/torrc) + directly to add the following lines: + </p> + <pre> + ORPort 443 + Exitpolicy reject *:* + BridgeRelay 1 # only add this line if you want to be a bridge + </pre> + <p> + If you've installed <a + href="https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en#i…">Obfsproxy</a>, + you'll need to add one more line: + </p> + <pre> + ServerTransportPlugin obfs3 exec /usr/bin/obfsproxy managed + </pre> + <p> + This third option is pretty klunky right now; see e.g. <a + href="https://trac.torproject.org/projects/tor/ticket/10449">this bug</a>; + but we're hoping it will become an easy option in the future. + </p> + + <hr> + + <a id="Timestamps"></a> + <h3><a class="anchor" href="#Timestamps">Why are the file timestamps + from 2000?</a></h3> + + <p>One of the huge new features in TBB 3.x is the "deterministic build" + process, which allows many people to build the Tor Browser Bundle and + verify that they all make exactly the same package. See Mike's <a + href="https://blog.torproject.org/blog/deterministic-builds-part-one-cyberwar-and…">first + blog</a> post for the motivation, and his <a + href="https://blog.torproject.org/blog/deterministic-builds-part-two-technical-de…">second + blog post</a> for the technical details of how we do it. + </p> + + <p>Part of creating identical builds is having everybody use the same + timestamp. Mike picked the beginning of 2000 for that time. The reason + you might see 7pm in 1999 is because of time zones. </p> + + <hr> + + <a id="SourceCode"></a> + <h3><a class="anchor" href="#SourceCode">Where is the source code for the bundle? How do I verify a build?</a></h3> + + <p> + Start with <a href="https://gitweb.torproject.org/builders/tor-browser-bundle.git">https://gitweb.torproject.org/builders/tor-browser-bundle.git</a> and <a href="https://gitweb.torproject.org/builders/tor-browser-bundle.git/blob/HEAD:/gi…">https://gitweb.torproject.org/builders/tor-browser-bundle.git/blob/HEAD:/gi…</a>. + </p> + + </div> +  + <div id = "sidecol"> +#include "side.wmi" +#include "info.wmi" + </div> +  +</div> + +#include <foot.wmi>

1 0

[goptlib/master] Update setup loop examples.
by dcf＠torproject.org 13 Jan '14

13 Jan '14

commit 5a089f3f33bab6b066baad3911dc6e0d8231ce1c Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jan 12 23:29:00 2014 -0800 Update setup loop examples. --- pt.go | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/pt.go b/pt.go index 024eec9..181097e 100644 --- a/pt.go +++ b/pt.go @@ -40,13 +40,18 @@ // os.Exit(1) // } // for _, methodName := range ptInfo.MethodNames { -// ln, err := pt.ListenSocks("tcp", "127.0.0.1:0") -// if err != nil { -// pt.CmethodError(methodName, err.Error()) -// continue +// switch methodName { +// case "foo": +// ln, err := pt.ListenSocks("tcp", "127.0.0.1:0") +// if err != nil { +// pt.CmethodError(methodName, err.Error()) +// break +// } +// go acceptLoop(ln) +// pt.Cmethod(methodName, ln.Version(), ln.Addr()) +// default: +// pt.CmethodError(methodName, "no such method") // } -// go acceptLoop(ln) -// pt.Cmethod(methodName, ln.Version(), ln.Addr()) // } // pt.CmethodsDone() // } @@ -86,13 +91,18 @@ // os.Exit(1) // } // for _, bindaddr := range ptInfo.Bindaddrs { -// ln, err := net.ListenTCP("tcp", bindaddr.Addr) -// if err != nil { -// pt.SmethodError(bindaddr.MethodName, err.Error()) -// continue +// switch bindaddr.MethodName { +// case "foo": +// ln, err := net.ListenTCP("tcp", bindaddr.Addr) +// if err != nil { +// pt.SmethodError(bindaddr.MethodName, err.Error()) +// break +// } +// go acceptLoop(ln) +// pt.Smethod(bindaddr.MethodName, ln.Addr()) +// default: +// pt.SmethodError(bindaddr.MethodName, "no such method") // } -// go acceptLoop(ln) -// pt.Smethod(bindaddr.MethodName, ln.Addr()) // } // pt.SmethodsDone() // }

1 0

[websocket/master] Use new goptlib ServerSetup and ClientSetup.
by dcf＠torproject.org 13 Jan '14

13 Jan '14

commit 0ea3a5f82ea4dd846d75b17860633504ba110c04 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jan 12 23:01:47 2014 -0800 Use new goptlib ServerSetup and ClientSetup. --- websocket-client/websocket-client.go | 30 +++++++++++++++--------------- websocket-server/websocket-server.go | 19 ++++++++++++------- 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/websocket-client/websocket-client.go b/websocket-client/websocket-client.go index 228cb1c..fe38c9d 100644 --- a/websocket-client/websocket-client.go +++ b/websocket-client/websocket-client.go @@ -187,13 +187,12 @@ func startListener(addrStr string) (*pt.SocksListener, error) { func main() { var logFilename string - var socksAddrStrs = []string{"127.0.0.1:0"} - var socksArg string + var socksAddrStr string var err error flag.Usage = usage flag.StringVar(&logFilename, "log", "", "log file to write to") - flag.StringVar(&socksArg, "socks", "", "address on which to listen for SOCKS connections") + flag.StringVar(&socksAddrStr, "socks", "127.0.0.1:0", "address on which to listen for SOCKS connections") flag.Parse() if logFilename != "" { @@ -205,10 +204,6 @@ func main() { logFile = f } - if socksArg != "" { - socksAddrStrs = []string{socksArg} - } - log("starting") ptInfo, err = pt.ClientSetup([]string{ptMethodName}) if err != nil { @@ -217,15 +212,20 @@ func main() { } listeners := make([]net.Listener, 0) - for _, socksAddrStr := range socksAddrStrs { - ln, err := startListener(socksAddrStr) - if err != nil { - pt.CmethodError(ptMethodName, err.Error()) - continue + for _, methodName := range ptInfo.MethodNames { + switch methodName { + case ptMethodName: + ln, err := startListener(socksAddrStr) + if err != nil { + pt.CmethodError(ptMethodName, err.Error()) + break + } + pt.Cmethod(ptMethodName, ln.Version(), ln.Addr()) + log("listening on %s", ln.Addr().String()) + listeners = append(listeners, ln) + default: + pt.CmethodError(methodName, "no such method") } - pt.Cmethod(ptMethodName, ln.Version(), ln.Addr()) - log("listening on %s", ln.Addr().String()) - listeners = append(listeners, ln) } pt.CmethodsDone() diff --git a/websocket-server/websocket-server.go b/websocket-server/websocket-server.go index 64ae7b4..4120df8 100644 --- a/websocket-server/websocket-server.go +++ b/websocket-server/websocket-server.go @@ -243,14 +243,19 @@ func main() { bindaddr.Addr.Port = port } - ln, err := startListener(bindaddr.Addr) - if err != nil { - pt.SmethodError(bindaddr.MethodName, err.Error()) - continue + switch bindaddr.MethodName { + case ptMethodName: + ln, err := startListener(bindaddr.Addr) + if err != nil { + pt.SmethodError(bindaddr.MethodName, err.Error()) + break + } + pt.Smethod(bindaddr.MethodName, ln.Addr()) + log("listening on %s", ln.Addr().String()) + listeners = append(listeners, ln) + default: + pt.SmethodError(bindaddr.MethodName, "no such method") } - pt.Smethod(bindaddr.MethodName, ln.Addr()) - log("listening on %s", ln.Addr().String()) - listeners = append(listeners, ln) } pt.SmethodsDone()

1 0

[goptlib/master] Use the argument to ClientSetup only when the "*" list is requested.
by dcf＠torproject.org 13 Jan '14

13 Jan '14

commit 5db12aacc1d56a713a1701a192f987dfccec7363 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jan 12 22:38:21 2014 -0800 Use the argument to ClientSetup only when the "*" list is requested. Formerly the list always served as an additional filter of methods that we support. Now, ClientSetup always returns all the method names requested by Tor, unless "*" is requested, in which case the given method name list is returned. This change is to enable the case where for "*" you want to return something other than the full list of transports you support. https://lists.torproject.org/pipermail/tor-dev/2013-December/005966.html --- examples/dummy-client/dummy-client.go | 19 ++++++++++++------- pt.go | 25 +++++++++---------------- pt_test.go | 22 ++++++++++++++++------ 3 files changed, 37 insertions(+), 29 deletions(-) diff --git a/examples/dummy-client/dummy-client.go b/examples/dummy-client/dummy-client.go index a0fa488..64f1ec1 100644 --- a/examples/dummy-client/dummy-client.go +++ b/examples/dummy-client/dummy-client.go @@ -90,14 +90,19 @@ func main() { listeners := make([]net.Listener, 0) for _, methodName := range ptInfo.MethodNames { - ln, err := pt.ListenSocks("tcp", "127.0.0.1:0") - if err != nil { - pt.CmethodError(methodName, err.Error()) - continue + switch methodName { + case "dummy": + ln, err := pt.ListenSocks("tcp", "127.0.0.1:0") + if err != nil { + pt.CmethodError(methodName, err.Error()) + break + } + go acceptLoop(ln) + pt.Cmethod(methodName, ln.Version(), ln.Addr()) + listeners = append(listeners, ln) + default: + pt.CmethodError(methodName, "no such method") } - go acceptLoop(ln) - pt.Cmethod(methodName, ln.Version(), ln.Addr()) - listeners = append(listeners, ln) } pt.CmethodsDone() diff --git a/pt.go b/pt.go index c77687f..024eec9 100644 --- a/pt.go +++ b/pt.go @@ -315,24 +315,16 @@ func getManagedTransportVer() (string, error) { // Get the intersection of the method names offered by Tor and those in // methodNames. This function reads the environment variable // TOR_PT_CLIENT_TRANSPORTS. -func getClientTransports(methodNames []string) ([]string, error) { +func getClientTransports(star []string) ([]string, error) { clientTransports, err := getenvRequired("TOR_PT_CLIENT_TRANSPORTS") if err != nil { return nil, err } if clientTransports == "*" { - return methodNames, nil - } - result := make([]string, 0) - for _, requested := range strings.Split(clientTransports, ",") { - for _, methodName := range methodNames { - if requested == methodName { - result = append(result, methodName) - break - } - } + return star, nil + } else { + return strings.Split(clientTransports, ","), nil } - return result, nil } // This structure is returned by ClientSetup. It consists of a list of method @@ -342,16 +334,17 @@ type ClientInfo struct { } // Check the client pluggable transports environment, emitting an error message -// and returning a non-nil error if any error is encountered. Returns a -// ClientInfo struct. -func ClientSetup(methodNames []string) (info ClientInfo, err error) { +// and returning a non-nil error if any error is encountered. star is the list +// of method names to use in case "*" is requested by Tor. Resolves the various +// Returns a ClientInfo struct. +func ClientSetup(star []string) (info ClientInfo, err error) { ver, err := getManagedTransportVer() if err != nil { return } line("VERSION", ver) - info.MethodNames, err = getClientTransports(methodNames) + info.MethodNames, err = getClientTransports(star) if err != nil { return } diff --git a/pt_test.go b/pt_test.go index a2abc1f..7e74f2b 100644 --- a/pt_test.go +++ b/pt_test.go @@ -118,7 +118,7 @@ func tcpAddrsEqual(a, b *net.TCPAddr) bool { func TestGetClientTransports(t *testing.T) { tests := [...]struct { ptServerClientTransports string - methodNames []string + star []string expected []string }{ { @@ -147,21 +147,31 @@ func TestGetClientTransports(t *testing.T) { []string{"alpha"}, }, { + "alpha,beta,gamma", + []string{}, + []string{"alpha", "beta", "gamma"}, + }, + { "alpha,beta", - []string{"alpha", "beta", "alpha"}, + []string{}, []string{"alpha", "beta"}, }, + { + "alpha", + []string{}, + []string{"alpha"}, + }, // my reading of pt-spec.txt says that "*" has special meaning // only when it is the entirety of the environment variable. { "alpha,*,gamma", []string{"alpha", "beta", "gamma"}, - []string{"alpha", "gamma"}, + []string{"alpha", "*", "gamma"}, }, { "alpha", []string{"beta"}, - []string{}, + []string{"alpha"}, }, } @@ -175,14 +185,14 @@ func TestGetClientTransports(t *testing.T) { for _, test := range tests { os.Setenv("TOR_PT_CLIENT_TRANSPORTS", test.ptServerClientTransports) - output, err := getClientTransports(test.methodNames) + output, err := getClientTransports(test.star) if err != nil { t.Errorf("TOR_PT_CLIENT_TRANSPORTS=%q unexpectedly returned an error: %s", test.ptServerClientTransports, err) } if !stringSetsEqual(output, test.expected) { t.Errorf("TOR_PT_CLIENT_TRANSPORTS=%q %q → %q (expected %q)", - test.ptServerClientTransports, test.methodNames, output, test.expected) + test.ptServerClientTransports, test.star, output, test.expected) } } }

1 0

[goptlib/master] Use the argument to ServerSetup only when the "*" list is requested.
by dcf＠torproject.org 13 Jan '14

13 Jan '14

commit f9316c52f21767bb5b0cd534d01fdf4efb4716f7 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jan 12 21:58:35 2014 -0800 Use the argument to ServerSetup only when the "*" list is requested. Formerly the list always served as an additional filter of methods that we support. Now, ServerSetup always returns all the method names requested by Tor, unless "*" is requested, in which case the given method name list is returned. This change is to enable the case where the list of method names is not known in advance. https://lists.torproject.org/pipermail/tor-dev/2013-December/005966.html --- examples/dummy-server/dummy-server.go | 19 ++++++++++++------- pt.go | 29 +++++++++++++++-------------- pt_test.go | 27 +++++++++++++++++++-------- 3 files changed, 46 insertions(+), 29 deletions(-) diff --git a/examples/dummy-server/dummy-server.go b/examples/dummy-server/dummy-server.go index 7e8ad96..ea91be9 100644 --- a/examples/dummy-server/dummy-server.go +++ b/examples/dummy-server/dummy-server.go @@ -87,14 +87,19 @@ func main() { listeners := make([]net.Listener, 0) for _, bindaddr := range ptInfo.Bindaddrs { - ln, err := net.ListenTCP("tcp", bindaddr.Addr) - if err != nil { - pt.SmethodError(bindaddr.MethodName, err.Error()) - continue + switch bindaddr.MethodName { + case "dummy": + ln, err := net.ListenTCP("tcp", bindaddr.Addr) + if err != nil { + pt.SmethodError(bindaddr.MethodName, err.Error()) + break + } + go acceptLoop(ln) + pt.Smethod(bindaddr.MethodName, ln.Addr()) + listeners = append(listeners, ln) + default: + pt.SmethodError(bindaddr.MethodName, "no such method") } - go acceptLoop(ln) - pt.Smethod(bindaddr.MethodName, ln.Addr()) - listeners = append(listeners, ln) } pt.SmethodsDone() diff --git a/pt.go b/pt.go index 391b1f5..c77687f 100644 --- a/pt.go +++ b/pt.go @@ -427,11 +427,12 @@ func filterBindaddrs(addrs []Bindaddr, methodNames []string) []Bindaddr { return result } -// Return an array of Bindaddrs, those being the contents of -// TOR_PT_SERVER_BINDADDR, with keys filtered by TOR_PT_SERVER_TRANSPORTS, and -// further filtered by the methods in methodNames. Transport-specific options -// from TOR_PT_SERVER_TRANSPORT_OPTIONS are assigned to the Options member. -func getServerBindaddrs(methodNames []string) ([]Bindaddr, error) { +// Return an array of Bindaddrs, being the contents of TOR_PT_SERVER_BINDADDR +// with keys filtered by TOR_PT_SERVER_TRANSPORTS. If TOR_PT_SERVER_TRANSPORTS +// is "*", then keys are filtered by the entries in star instead. +// Transport-specific options from TOR_PT_SERVER_TRANSPORT_OPTIONS are assigned +// to the Options member. +func getServerBindaddrs(star []string) ([]Bindaddr, error) { var result []Bindaddr // Parse the list of server transport options. @@ -468,13 +469,12 @@ func getServerBindaddrs(methodNames []string) ([]Bindaddr, error) { if err != nil { return nil, err } - if serverTransports != "*" { + if serverTransports == "*" { + result = filterBindaddrs(result, star) + } else { result = filterBindaddrs(result, strings.Split(serverTransports, ",")) } - // Finally filter by what we understand. - result = filterBindaddrs(result, methodNames) - return result, nil } @@ -525,17 +525,18 @@ type ServerInfo struct { } // Check the server pluggable transports environment, emitting an error message -// and returning a non-nil error if any error is encountered. Resolves the -// various requested bind addresses, the server ORPort and extended ORPort, and -// reads the auth cookie file. Returns a ServerInfo struct. -func ServerSetup(methodNames []string) (info ServerInfo, err error) { +// and returning a non-nil error if any error is encountered. star is the list +// of method names to use in case "*" is requested by Tor. Resolves the various +// requested bind addresses, the server ORPort and extended ORPort, and reads +// the auth cookie file. Returns a ServerInfo struct. +func ServerSetup(star []string) (info ServerInfo, err error) { ver, err := getManagedTransportVer() if err != nil { return } line("VERSION", ver) - info.Bindaddrs, err = getServerBindaddrs(methodNames) + info.Bindaddrs, err = getServerBindaddrs(star) if err != nil { return } diff --git a/pt_test.go b/pt_test.go index f7e9156..a2abc1f 100644 --- a/pt_test.go +++ b/pt_test.go @@ -265,7 +265,7 @@ func TestGetServerBindaddrs(t *testing.T) { ptServerBindaddr string ptServerTransports string ptServerTransportOptions string - methodNames []string + star []string }{ { "xxx", @@ -290,7 +290,7 @@ func TestGetServerBindaddrs(t *testing.T) { ptServerBindaddr string ptServerTransports string ptServerTransportOptions string - methodNames []string + star []string expected []Bindaddr }{ { @@ -315,7 +315,9 @@ func TestGetServerBindaddrs(t *testing.T) { "alpha,beta,gamma", "", []string{}, - []Bindaddr{}, + []Bindaddr{ + {"alpha", &net.TCPAddr{IP: net.ParseIP("1.2.3.4"), Port: 1111}, Args{}}, + }, }, { "alpha-1.2.3.4:1111,beta-[1:2::3:4]:2222", @@ -328,6 +330,15 @@ func TestGetServerBindaddrs(t *testing.T) { }, }, { + "alpha-1.2.3.4:1111,beta-[1:2::3:4]:2222", + "*", + "", + []string{"alpha", "gamma"}, + []Bindaddr{ + {"alpha", &net.TCPAddr{IP: net.ParseIP("1.2.3.4"), Port: 1111}, Args{}}, + }, + }, + { "trebuchet-127.0.0.1:1984,ballista-127.0.0.1:4891", "trebuchet,ballista", "trebuchet:secret=nou;trebuchet:cache=/tmp/cache;ballista:secret=yes", @@ -351,10 +362,10 @@ func TestGetServerBindaddrs(t *testing.T) { os.Setenv("TOR_PT_SERVER_BINDADDR", test.ptServerBindaddr) os.Setenv("TOR_PT_SERVER_TRANSPORTS", test.ptServerTransports) os.Setenv("TOR_PT_SERVER_TRANSPORT_OPTIONS", test.ptServerTransportOptions) - _, err := getServerBindaddrs(test.methodNames) + _, err := getServerBindaddrs(test.star) if err == nil { t.Errorf("TOR_PT_SERVER_BINDADDR=%q TOR_PT_SERVER_TRANSPORTS=%q TOR_PT_SERVER_TRANSPORT_OPTIONS=%q %q unexpectedly succeeded", - test.ptServerBindaddr, test.ptServerTransports, test.ptServerTransportOptions, test.methodNames) + test.ptServerBindaddr, test.ptServerTransports, test.ptServerTransportOptions, test.star) } } @@ -362,14 +373,14 @@ func TestGetServerBindaddrs(t *testing.T) { os.Setenv("TOR_PT_SERVER_BINDADDR", test.ptServerBindaddr) os.Setenv("TOR_PT_SERVER_TRANSPORTS", test.ptServerTransports) os.Setenv("TOR_PT_SERVER_TRANSPORT_OPTIONS", test.ptServerTransportOptions) - output, err := getServerBindaddrs(test.methodNames) + output, err := getServerBindaddrs(test.star) if err != nil { t.Errorf("TOR_PT_SERVER_BINDADDR=%q TOR_PT_SERVER_TRANSPORTS=%q TOR_PT_SERVER_TRANSPORT_OPTIONS=%q %q unexpectedly returned an error: %s", - test.ptServerBindaddr, test.ptServerTransports, test.ptServerTransportOptions, test.methodNames, err) + test.ptServerBindaddr, test.ptServerTransports, test.ptServerTransportOptions, test.star, err) } if !bindaddrSetsEqual(output, test.expected) { t.Errorf("TOR_PT_SERVER_BINDADDR=%q TOR_PT_SERVER_TRANSPORTS=%q TOR_PT_SERVER_TRANSPORT_OPTIONS=%q %q → %q (expected %q)", - test.ptServerBindaddr, test.ptServerTransports, test.ptServerTransportOptions, test.methodNames, output, test.expected) + test.ptServerBindaddr, test.ptServerTransports, test.ptServerTransportOptions, test.star, output, test.expected) } } }

1 0