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

[torbutton/master] get node data when a circuit's first stream is built
by mikeperry＠torproject.org 05 Nov '14

05 Nov '14

commit 60fde4eaa8c097f68143356736d08bc1c82cc4f4 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Nov 4 15:07:18 2014 -0800 get node data when a circuit's first stream is built --- src/chrome/content/tor-circuit-display.js | 53 +++++++++++++++++++++-------- src/modules/tor-control-port.js | 2 +- 2 files changed, 39 insertions(+), 16 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index c8d255e..49cd832 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -53,6 +53,8 @@ let localizedCountryNameFromCode = function (countryCode) { // A mutable map that stores the current nodes for each domain. let domainToNodeDataMap = {}; +let knownCircuitIDs = {}; + // __trimQuotes(s)__. // Removes quotation marks around a quoted string. let trimQuotes = s => s ? s.match(/^\"(.*)\"$/)[1] : undefined; @@ -133,22 +135,43 @@ let updateCircuitDisplay = function () { } }; -// __collectBuiltCircuitData(aController)__. -// Watches for CIRC BUILT events and records their data in the domainToNodeDataMap. -let collectBuiltCircuitData = function (aController) { +// __getCircuitStatusByID(aController, circuitID, onCircuitStatus)__ +// Returns the circuit status for the circuit with the given ID +// via onCircuitStatus(status). +let getCircuitStatusByID = function(aController, circuitID, onCircuitStatus) { + aController.getInfo("circuit-status", function (circuitStatuses) { + for (let circuitStatus of circuitStatuses) { + if (circuitStatus.id === circuitID) { + onCircuitStatus(circuitStatus); + } + } + }); +}; + +// __collectIsolationData(aController)__. +// Watches for STREAM SENTCONNECT events. When a SENTCONNECT event occurs, then +// the isolation settings (SOCKS username+password) become fixed for the +// corresponding circuit. Whenever the first stream on a new circuit is seen, +// looks up u+p and records the node data in the domainToNodeDataMap. +let collectIsolationData = function (aController) { aController.watchEvent( - "CIRC", - circuitEvent => circuitEvent.status === "EXTENDED" || - circuitEvent.status === "BUILT", - function (circuitEvent) { - let domain = trimQuotes(circuitEvent.SOCKS_USERNAME); - if (domain) { - nodeDataForCircuit(aController, circuitEvent, function (nodeData) { - domainToNodeDataMap[domain] = nodeData; - updateCircuitDisplay(); + "STREAM", + streamEvent => streamEvent.StreamStatus === "SENTCONNECT", + function (streamEvent) { + if (!knownCircuitIDs[streamEvent.CircuitID]) { + logger.eclog(4, "streamEvent.CircuitID: " + streamEvent.CircuitID); + knownCircuitIDs[streamEvent.CircuitID] = true; + getCircuitStatusByID(aController, streamEvent.CircuitID, function (circuitStatus) { + let domain = trimQuotes(circuitStatus.SOCKS_USERNAME); + if (domain) { + nodeDataForCircuit(aController, circuitStatus, function (nodeData) { + domainToNodeDataMap[domain] = nodeData; + updateCircuitDisplay(); + }); + } else { + updateCircuitDisplay(); + } }); - } else { - updateCircuitDisplay(); } }); }; @@ -181,7 +204,7 @@ let syncDisplayWithSelectedTab = function () { let display = function (host, port, password) { let myController = controller(host, port || 9151, password, function (x) { logger.eclog(5, x); }); syncDisplayWithSelectedTab(); - collectBuiltCircuitData(myController); + collectIsolationData(myController); }; return display; diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index c461aa6..ada80b5 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -259,7 +259,7 @@ io.controlSocket = function (host, port, password, onError) { // Log in to control port. sendCommand("authenticate " + (password || "")); // Activate needed events. - sendCommand("setevents circ"); + sendCommand("setevents stream"); return { close : socket.close, sendCommand : sendCommand, addNotificationCallback : notificationDispatcher.addCallback, removeNotificationCallback : notificationDispatcher.removeCallback };

1 0

[torbutton/master] Update changelog and version for 1.8.0.2
by mikeperry＠torproject.org 05 Nov '14

05 Nov '14

commit 0c5795bf21f6a036488473f52c1baee7d07d25e6 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Nov 4 18:37:03 2014 -0800 Update changelog and version for 1.8.0.2 --- src/CHANGELOG | 3 +++ src/install.rdf | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 98d3251..75b8fc2 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,6 @@ +1.8.0.2 + * Bug 13666: Various fixes for circuit status display + 1.8.0.1 * Bug 13651: Fix hangs associated with circuit status UI from #8641. diff --git a/src/install.rdf b/src/install.rdf index ae50323..40820f5 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.8.0.1</em:version> + <em:version>1.8.0.2</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/master] Various minor fixes for tor-control-port.js and tor-circuit-display.js
by mikeperry＠torproject.org 05 Nov '14

05 Nov '14

commit 5aca83a36d00b3624500ae2e07d559a915d333f1 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Nov 4 11:17:45 2014 -0800 Various minor fixes for tor-control-port.js and tor-circuit-display.js --- src/chrome/content/tor-circuit-display.js | 51 ++++++++++++++++------------- src/modules/tor-control-port.js | 4 +-- 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index 3a1fed8..c8d255e 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -55,7 +55,7 @@ let domainToNodeDataMap = {}; // __trimQuotes(s)__. // Removes quotation marks around a quoted string. -let trimQuotes = s => s.match(/^\"(.*)\"$/)[1]; +let trimQuotes = s => s ? s.match(/^\"(.*)\"$/)[1] : undefined; // nodeDataForID(controller, id, onResult)__. // Requests the IP, country code, and name of a node with given ID. @@ -94,7 +94,7 @@ let nodeLines = function (nodeData) { for (let {ip, country} of nodeData) { result.push(localizedCountryNameFromCode(country) + " (" + ip + ")"); } - result.push("Internet"); + result[4] = ("Internet"); return result; }; @@ -102,30 +102,35 @@ let nodeLines = function (nodeData) { // Updates the Tor circuit display SVG, showing the current domain // and the relay nodes for that domain. let updateCircuitDisplay = function () { - let URI = gBrowser.selectedBrowser.currentURI, - domain = null, - nodeData = null; - // Try to get a domain for this URI. Otherwise it remains null. - try { - domain = URI.host; - } catch (e) { } - if (domain) { - // Check if we have anything to show for this domain. - nodeData = domainToNodeDataMap[domain]; - if (nodeData) { - // Update the displayed domain. - document.querySelector("svg#tor-circuit text#domain").innerHTML = "(" + domain + "):"; - // Update the displayed information for the relay nodes. - let diagramNodes = document.querySelectorAll("svg#tor-circuit text.node-text"), - lines = nodeLines(nodeData); - for (let i = 0; i < diagramNodes.length; ++i) { - diagramNodes[i].innerHTML = lines[i]; + let selectedBrowser = gBrowser.selectedBrowser; + if (selectedBrowser) { + let URI = selectedBrowser.currentURI, + domain = null, + nodeData = null; + // Try to get a domain for this URI. Otherwise it remains null. + try { + domain = URI.host; + } catch (e) { } + if (domain) { + // Check if we have anything to show for this domain. + nodeData = domainToNodeDataMap[domain]; + if (nodeData) { + // Update the displayed domain. + document.querySelector("svg#tor-circuit text#domain").innerHTML = "(" + domain + "):"; + // Update the displayed information for the relay nodes. + let diagramNodes = document.querySelectorAll("svg#tor-circuit text.node-text"), + //diagramCircles = document.querySelectorAll("svg#tor-circuit .node-circule"), + lines = nodeLines(nodeData); + for (let i = 0; i < diagramNodes.length; ++i) { + let line = lines[i]; + diagramNodes[i].innerHTML = line ? line : ""; + } } } + // Only show the Tor circuit if we have a domain and node data. + document.querySelector("svg#tor-circuit").style.display = (domain && nodeData) ? + 'block' : 'none'; } - // Only show the Tor circuit if we have a domain and node data. - document.querySelector("svg#tor-circuit").style.display = (domain && nodeData) ? - 'block' : 'none'; }; // __collectBuiltCircuitData(aController)__. diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index 855b34b..c461aa6 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -107,7 +107,7 @@ io.asyncSocket = function (host, port, onInputData, onError) { let totalString = pendingWrites.join(""); try { outputStream.write(totalString, totalString.length); - log("wrote: " + aString + "\n"); + log("controlPort << " + aString + "\n"); } catch (err) { onError(err); } @@ -164,7 +164,7 @@ io.onLineFromOnMessage = function (onMessage) { pendingLines = []; // Pass multiline message to onMessage. onMessage(message); - //log(message); + log("controlPort >> " + message); } }; };

1 0

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 05 Nov '14

05 Nov '14

commit a4611999908bdb2e15b813d89a2ab2163526017f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 5 02:15:10 2014 +0000 Update translations for gettor_completed --- ms_MY/gettor.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ms_MY/gettor.po b/ms_MY/gettor.po index 196c546..00de1e1 100644 --- a/ms_MY/gettor.po +++ b/ms_MY/gettor.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Mohd Rukhairy Abdul Rahman <rukhairy(a)gmail.com>, 2014 # Mohd Shahril Bin Zainol Abidin <mohd_shahril_96(a)yahoo.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2014-10-15 17:11+0000\n" -"Last-Translator: Mohd Shahril Bin Zainol Abidin <mohd_shahril_96(a)yahoo.com>\n" +"PO-Revision-Date: 2014-11-05 02:13+0000\n" +"Last-Translator: Mohd Rukhairy Abdul Rahman <rukhairy(a)gmail.com>\n" "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/torproject/language/ms_MY/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,7 +21,7 @@ msgstr "" #: lib/gettor/i18n.py:27 msgid "Hello, This is the \"GetTor\" robot." -msgstr "Hello, Ini adalah robot \"GetTor\"." +msgstr "Helo, Ini adalah robot \"GetTor\"." #: lib/gettor/i18n.py:29 msgid "Thank you for your request."

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 05 Nov '14

05 Nov '14

commit 52e8c3ff8dc2b357c0ff2197a49c1650efb98ee7 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 5 02:15:05 2014 +0000 Update translations for gettor --- ms_MY/gettor.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ms_MY/gettor.po b/ms_MY/gettor.po index 196c546..00de1e1 100644 --- a/ms_MY/gettor.po +++ b/ms_MY/gettor.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Mohd Rukhairy Abdul Rahman <rukhairy(a)gmail.com>, 2014 # Mohd Shahril Bin Zainol Abidin <mohd_shahril_96(a)yahoo.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2014-10-15 17:11+0000\n" -"Last-Translator: Mohd Shahril Bin Zainol Abidin <mohd_shahril_96(a)yahoo.com>\n" +"PO-Revision-Date: 2014-11-05 02:13+0000\n" +"Last-Translator: Mohd Rukhairy Abdul Rahman <rukhairy(a)gmail.com>\n" "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/torproject/language/ms_MY/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,7 +21,7 @@ msgstr "" #: lib/gettor/i18n.py:27 msgid "Hello, This is the \"GetTor\" robot." -msgstr "Hello, Ini adalah robot \"GetTor\"." +msgstr "Helo, Ini adalah robot \"GetTor\"." #: lib/gettor/i18n.py:29 msgid "Thank you for your request."

1 0

[tor-messenger-build/master] Remove formatting for URLs in chat window (closes #13618)
by sukhbir＠torproject.org 04 Nov '14

04 Nov '14

commit 995cd3a1698368dd1ac1ca2b6b1f2817b2a6f4ad Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Nov 5 00:06:06 2014 +0530 Remove formatting for URLs in chat window (closes #13618) --- projects/instantbird/config | 1 + projects/instantbird/links.patch | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/projects/instantbird/config b/projects/instantbird/config index d9f25dc..35b476c 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -46,6 +46,7 @@ input_files: - filename: xmpp.patch - filename: facebook.patch - filename: accountcreation.patch + - filename: links.patch - filename: prepare-messages-for-displaying.patch - filename: 'mozconfig-[% c("var/osname") %]' name: mozconfig diff --git a/projects/instantbird/links.patch b/projects/instantbird/links.patch new file mode 100644 index 0000000..d90b0a7 --- /dev/null +++ b/projects/instantbird/links.patch @@ -0,0 +1,22 @@ +# HG changeset patch +# User Sukhbir Singh <sukhbir(a)torproject.org> +# Date 1415125946 -19800 +# Wed Nov 05 00:02:26 2014 +0530 +# Node ID fe384d60035532dd4b81248a345525359ea2f98f +# Parent 947732f86131ec2882340344ba0c29cc9943de48 +Remove formatting for URLs in chat window + +diff --git a/chat/modules/imContentSink.jsm b/chat/modules/imContentSink.jsm +--- a/chat/modules/imContentSink.jsm ++++ b/chat/modules/imContentSink.jsm +@@ -58,10 +58,6 @@ + attrs: { }, + + tags: { +- 'a': { +- 'title': true, +- 'href': kAllowedURLs +- }, + 'br': true, + 'p': true + },

1 0

[atlas/master] Explain how to perform advanced searches.
by phw＠torproject.org 04 Nov '14

04 Nov '14

commit 038deddef5249676f61e020ca83986886916b6b1 Author: Philipp Winter <phw(a)torproject.org> Date: Tue Nov 4 18:15:20 2014 +0100 Explain how to perform advanced searches. Onionoo was recently extended and now understands several advanced search expressions. This commit explains to users how to use these expressions. This fixes <https://bugs.torproject.org/13599>. --- templates/about.html | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/templates/about.html b/templates/about.html index 365b157..75c2e40 100644 --- a/templates/about.html +++ b/templates/about.html @@ -12,7 +12,15 @@ Atlas is a web application to discover Tor relays. It provides useful informatio <div class="span4"> <h2>Search and Filter</h2> <p> -You are able to search for existing Tor relays by keywords. The results are displayed inside of tables that can be further refined with filters. +You can search for Tor relays and bridges by using keywords. In particular, +Atlas enables you to search for (partial) nicknames (e.g., +“moria”), IP addresses (e.g., “128.31.”), and +fingerprints (e.g., “9695DFC3”). It is also possible to combine +searches, e.g., “moria 128.31.”. Finally, you can use qualifiers +to search for relays in specific countries (e.g., “moria +country:us”), with specific contact information (e.g., +“contact:arma”), or with specific flags (e.g., +“flag:Authority”). </p> </div>

1 0

[tor/master] Changes file for Andrea's work on 6456
by nickm＠torproject.org 04 Nov '14

04 Nov '14

commit 3d8cb107323fa5d9cc375087e69a9940b947d0e3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 4 09:59:25 2014 -0500 Changes file for Andrea's work on 6456 --- changes/tickets6456 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/changes/tickets6456 b/changes/tickets6456 new file mode 100644 index 0000000..68ce2c7 --- /dev/null +++ b/changes/tickets6456 @@ -0,0 +1,6 @@ + o Code simplification and refactoring: + - Combine the functions used to parse ClientTransportPlugin and + ServerTransportPlugin into a single function. Closes ticket 6456. + + o Testing: + - New tests for parse_transport_line(). Part of ticket 6456.

1 0

[tor/master] Expose parse_client_transport_line() and parse_server_transport_line() for the test suite
by nickm＠torproject.org 04 Nov '14

04 Nov '14

commit 18c97ad8bc85b9c0a0b3cac088f719f7e261c60b Author: Andrea Shepard <andrea(a)torproject.org> Date: Fri Jul 25 17:49:47 2014 -0700 Expose parse_client_transport_line() and parse_server_transport_line() for the test suite --- src/or/config.c | 10 ++-------- src/or/config.h | 4 ++++ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 310cef8..b50834b 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -536,12 +536,6 @@ static int options_transition_affects_workers( static int options_transition_affects_descriptor( const or_options_t *old_options, const or_options_t *new_options); static int check_nickname_list(char **lst, const char *name, char **msg); - -static int parse_client_transport_line(const or_options_t *options, - const char *line, int validate_only); - -static int parse_server_transport_line(const or_options_t *options, - const char *line, int validate_only); static char *get_bindaddr_from_transport_listen_line(const char *line, const char *transport); static int parse_dir_authority_line(const char *line, @@ -4763,7 +4757,7 @@ parse_bridge_line(const char *line) * - If it's an external proxy line, add the transport described in the line to * our internal transport list. * - If it's a managed proxy line, launch the managed proxy. */ -static int +STATIC int parse_client_transport_line(const or_options_t *options, const char *line, int validate_only) { @@ -5063,7 +5057,7 @@ get_options_for_server_transport(const char *transport) * isn't. * If <b>validate_only</b> is 0, the line is well-formed, and it's a * managed proxy line, launch the managed proxy. */ -static int +STATIC int parse_server_transport_line(const or_options_t *options, const char *line, int validate_only) { diff --git a/src/or/config.h b/src/or/config.h index bf38613..31496c2 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -140,6 +140,10 @@ STATIC int options_validate(or_options_t *old_options, or_options_t *options, or_options_t *default_options, int from_setconf, char **msg); +STATIC int parse_client_transport_line(const or_options_t *options, + const char *line, int validate_only); +STATIC int parse_server_transport_line(const or_options_t *options, + const char *line, int validate_only); #endif #endif

1 0

[tor/master] Merge and refactor redundant parse_client_transport_line() and parse_server_transport_line() functions
by nickm＠torproject.org 04 Nov '14

04 Nov '14

commit 2d4241d58482c919984f163323efb96c6f365a2d Author: Andrea Shepard <andrea(a)torproject.org> Date: Thu Jul 31 12:50:34 2014 -0700 Merge and refactor redundant parse_client_transport_line() and parse_server_transport_line() functions --- src/or/config.c | 267 +++++++++++++++---------------------------------------- 1 file changed, 74 insertions(+), 193 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 7911b5c..10b118c 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -538,10 +538,6 @@ static int options_transition_affects_descriptor( static int check_nickname_list(char **lst, const char *name, char **msg); static char *get_bindaddr_from_transport_listen_line(const char *line, const char *transport); -static int parse_client_transport_line(const or_options_t *options, - const char *line, int validate_only); -static int parse_server_transport_line(const or_options_t *options, - const char *line, int validate_only); static int parse_dir_authority_line(const char *line, dirinfo_type_t required_type, int validate_only); @@ -4768,53 +4764,36 @@ parse_transport_line(const or_options_t *options, const char *line, int validate_only, int server) { - if (server) { - return parse_server_transport_line(options, line, validate_only); - } else { - return parse_client_transport_line(options, line, validate_only); - } -} -/** Read the contents of a ClientTransportPlugin line from - * <b>line</b>. Return 0 if the line is well-formed, and -1 if it - * isn't. - * - * If <b>validate_only</b> is 0, the line is well-formed, and the - * transport is needed by some bridge: - * - If it's an external proxy line, add the transport described in the line to - * our internal transport list. - * - If it's a managed proxy line, launch the managed proxy. */ -static int -parse_client_transport_line(const or_options_t *options, - const char *line, int validate_only) -{ smartlist_t *items = NULL; int r; - char *field2=NULL; - - const char *transports=NULL; - smartlist_t *transport_list=NULL; - char *addrport=NULL; + const char *transports = NULL; + smartlist_t *transport_list = NULL; + char *type = NULL; + char *addrport = NULL; tor_addr_t addr; uint16_t port = 0; - int socks_ver=PROXY_NONE; + int socks_ver = PROXY_NONE; /* managed proxy options */ - int is_managed=0; - char **proxy_argv=NULL; - char **tmp=NULL; + int is_managed = 0; + char **proxy_argv = NULL; + char **tmp = NULL; int proxy_argc, i; - int is_useless_proxy=1; + int is_useless_proxy = 1; int line_length; + /* Split the line into space-separated tokens */ items = smartlist_new(); smartlist_split_string(items, line, NULL, SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, -1); + line_length = smartlist_len(items); - line_length = smartlist_len(items); if (line_length < 3) { - log_warn(LD_CONFIG, "Too few arguments on ClientTransportPlugin line."); + log_warn(LD_CONFIG, + "Too few arguments on %sTransportPlugin line.", + server ? "Server" : "Client"); goto err; } @@ -4838,194 +4817,89 @@ parse_client_transport_line(const or_options_t *options, is_useless_proxy = 0; } SMARTLIST_FOREACH_END(transport_name); - /* field2 is either a SOCKS version or "exec" */ - field2 = smartlist_get(items, 1); - - if (!strcmp(field2,"socks4")) { + type = smartlist_get(items, 1); + if (!strcmp(type, "exec")) { + is_managed = 1; + } else if (server && !strcmp(type, "proxy")) { + /* 'proxy' syntax only with ServerTransportPlugin */ + is_managed = 0; + } else if (!server && !strcmp(type, "socks4")) { + /* 'socks4' syntax only with ClientTransportPlugin */ + is_managed = 0; socks_ver = PROXY_SOCKS4; - } else if (!strcmp(field2,"socks5")) { + } else if (!server && !strcmp(type, "socks5")) { + /* 'socks5' syntax only with ClientTransportPlugin */ + is_managed = 0; socks_ver = PROXY_SOCKS5; - } else if (!strcmp(field2,"exec")) { - is_managed=1; } else { - log_warn(LD_CONFIG, "Strange ClientTransportPlugin field '%s'.", - field2); + log_warn(LD_CONFIG, + "Strange %sTransportPlugin type '%s'", + server ? "Server" : "Client", type); goto err; } if (is_managed && options->Sandbox) { - log_warn(LD_CONFIG, "Managed proxies are not compatible with Sandbox mode." - "(ClientTransportPlugin line was %s)", escaped(line)); + log_warn(LD_CONFIG, + "Managed proxies are not compatible with Sandbox mode." + "(%sTransportPlugin line was %s)", + server ? "Server" : "Client", escaped(line)); goto err; } - if (is_managed) { /* managed */ - if (!validate_only && is_useless_proxy) { - log_notice(LD_GENERAL, "Pluggable transport proxy (%s) does not provide " - "any needed transports and will not be launched.", line); - } - - /* If we are not just validating, use the rest of the line as the - argv of the proxy to be launched. Also, make sure that we are - only launching proxies that contribute useful transports. */ - if (!validate_only && !is_useless_proxy) { - proxy_argc = line_length-2; - tor_assert(proxy_argc > 0); - proxy_argv = tor_malloc_zero(sizeof(char*)*(proxy_argc+1)); - tmp = proxy_argv; - for (i=0;i<proxy_argc;i++) { /* store arguments */ - *tmp++ = smartlist_get(items, 2); - smartlist_del_keeporder(items, 2); - } - *tmp = NULL; /*terminated with NULL, just like execve() likes it*/ - - /* kickstart the thing */ - pt_kickstart_client_proxy(transport_list, proxy_argv); - } - } else { /* external */ - if (smartlist_len(transport_list) != 1) { - log_warn(LD_CONFIG, "You can't have an external proxy with " - "more than one transports."); - goto err; - } - - addrport = smartlist_get(items, 2); + if (is_managed) { + /* managed */ - if (tor_addr_port_lookup(addrport, &addr, &port)<0) { - log_warn(LD_CONFIG, "Error parsing transport " - "address '%s'", addrport); - goto err; - } - if (!port) { - log_warn(LD_CONFIG, - "Transport address '%s' has no port.", addrport); - goto err; + if (!server && !validate_only && is_useless_proxy) { + log_notice(LD_GENERAL, + "Pluggable transport proxy (%s) does not provide " + "any needed transports and will not be launched.", + line); } - if (!validate_only) { - transport_add_from_config(&addr, port, smartlist_get(transport_list, 0), - socks_ver); - - log_info(LD_DIR, "Transport '%s' found at %s", - transports, fmt_addrport(&addr, port)); - } - } - - r = 0; - goto done; - - err: - r = -1; - - done: - SMARTLIST_FOREACH(items, char*, s, tor_free(s)); - smartlist_free(items); - if (transport_list) { - SMARTLIST_FOREACH(transport_list, char*, s, tor_free(s)); - smartlist_free(transport_list); - } - - return r; -} - -/** Read the contents of a ServerTransportPlugin line from - * <b>line</b>. Return 0 if the line is well-formed, and -1 if it - * isn't. - * If <b>validate_only</b> is 0, the line is well-formed, and it's a - * managed proxy line, launch the managed proxy. */ -static int -parse_server_transport_line(const or_options_t *options, - const char *line, int validate_only) -{ - smartlist_t *items = NULL; - int r; - const char *transports=NULL; - smartlist_t *transport_list=NULL; - char *type=NULL; - char *addrport=NULL; - tor_addr_t addr; - uint16_t port = 0; - - /* managed proxy options */ - int is_managed=0; - char **proxy_argv=NULL; - char **tmp=NULL; - int proxy_argc,i; - - int line_length; - - items = smartlist_new(); - smartlist_split_string(items, line, NULL, - SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, -1); - - line_length = smartlist_len(items); - if (line_length < 3) { - log_warn(LD_CONFIG, "Too few arguments on ServerTransportPlugin line."); - goto err; - } - - /* Get the first line element, split it to commas into - transport_list (in case it's multiple transports) and validate - the transport names. */ - transports = smartlist_get(items, 0); - transport_list = smartlist_new(); - smartlist_split_string(transport_list, transports, ",", - SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0); - SMARTLIST_FOREACH_BEGIN(transport_list, const char *, transport_name) { - if (!string_is_C_identifier(transport_name)) { - log_warn(LD_CONFIG, "Transport name is not a C identifier (%s).", - transport_name); - goto err; - } - } SMARTLIST_FOREACH_END(transport_name); - - type = smartlist_get(items, 1); - - if (!strcmp(type, "exec")) { - is_managed=1; - } else if (!strcmp(type, "proxy")) { - is_managed=0; - } else { - log_warn(LD_CONFIG, "Strange ServerTransportPlugin type '%s'", type); - goto err; - } - - if (is_managed && options->Sandbox) { - log_warn(LD_CONFIG, "Managed proxies are not compatible with Sandbox mode." - "(ServerTransportPlugin line was %s)", escaped(line)); - goto err; - } + /* + * If we are not just validating, use the rest of the line as the + * argv of the proxy to be launched. Also, make sure that we are + * only launching proxies that contribute useful transports. + */ - if (is_managed) { /* managed */ - if (!validate_only) { - proxy_argc = line_length-2; + if (!validate_only && (server || !is_useless_proxy)) { + proxy_argc = line_length - 2; tor_assert(proxy_argc > 0); - proxy_argv = tor_malloc_zero(sizeof(char*)*(proxy_argc+1)); + proxy_argv = tor_malloc_zero(sizeof(char *) * (proxy_argc + 1)); tmp = proxy_argv; - for (i=0;i<proxy_argc;i++) { /* store arguments */ + for (i = 0; i < proxy_argc; i++) { + /* store arguments */ *tmp++ = smartlist_get(items, 2); smartlist_del_keeporder(items, 2); } - *tmp = NULL; /*terminated with NULL, just like execve() likes it*/ + *tmp = NULL; /* terminated with NULL, just like execve() likes it */ /* kickstart the thing */ - pt_kickstart_server_proxy(transport_list, proxy_argv); + if (server) { + pt_kickstart_server_proxy(transport_list, proxy_argv); + } else { + pt_kickstart_client_proxy(transport_list, proxy_argv); + } } - } else { /* external */ + } else { + /* external */ + if (smartlist_len(transport_list) != 1) { - log_warn(LD_CONFIG, "You can't have an external proxy with " - "more than one transports."); + log_warn(LD_CONFIG, + "You can't have an external proxy with more than " + "one transport."); goto err; } addrport = smartlist_get(items, 2); - if (tor_addr_port_lookup(addrport, &addr, &port)<0) { - log_warn(LD_CONFIG, "Error parsing transport " - "address '%s'", addrport); + if (tor_addr_port_lookup(addrport, &addr, &port) < 0) { + log_warn(LD_CONFIG, + "Error parsing transport address '%s'", addrport); goto err; } + if (!port) { log_warn(LD_CONFIG, "Transport address '%s' has no port.", addrport); @@ -5033,8 +4907,15 @@ parse_server_transport_line(const or_options_t *options, } if (!validate_only) { - log_info(LD_DIR, "Server transport '%s' at %s.", + log_info(LD_DIR, "%s '%s' at %s.", + server ? "Server transport" : "Transport", transports, fmt_addrport(&addr, port)); + + if (!server) { + transport_add_from_config(&addr, port, + smartlist_get(transport_list, 0), + socks_ver); + } } }

1 0