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

[meek/extension] Listen on an ephemeral port and write the port number to stderr.
by dcf＠torproject.org 06 Apr '14

06 Apr '14

commit 71bced9eb3381f47af03c93a8ef58f8c40292f6b Author: David Fifield <david(a)bamsoftware.com> Date: Mon Mar 24 20:00:24 2014 -0700 Listen on an ephemeral port and write the port number to stderr. --- firefox/components/main.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/firefox/components/main.js b/firefox/components/main.js index 7b962ac..74df52f 100644 --- a/firefox/components/main.js +++ b/firefox/components/main.js @@ -59,9 +59,13 @@ MeekHTTPHelper.prototype = { // https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIServe… var serverSocket = Components.classes["@mozilla.org/network/server-socket;1"] .createInstance(Components.interfaces.nsIServerSocket); - // Listen on loopback only, with default backlog. - serverSocket.init(MeekHTTPHelper.LOCAL_PORT, true, -1); + // Listen on an ephemeral port, loopback only, with default backlog. + serverSocket.init(-1, true, -1); serverSocket.asyncListen(this); + // This output line is used by a controller program to find out what + // address the helper is listening on. For the dump call to have any + // effect, the pref browser.dom.window.dump.enabled must be true. + dump("meek-http-helper: listen 127.0.0.1:" + serverSocket.port + "\n"); // Block forever. var prompts = Components.classes["@mozilla.org/embedcomp/prompt-service;1"] @@ -88,7 +92,6 @@ MeekHTTPHelper.prototype = { // Global variables and functions. -MeekHTTPHelper.LOCAL_PORT = 7000; MeekHTTPHelper.LOCAL_READ_TIMEOUT = 2.0; MeekHTTPHelper.LOCAL_WRITE_TIMEOUT = 2.0;

1 0

[meek/extension] Use an ordinary channel, not a proxied channel.
by dcf＠torproject.org 06 Apr '14

06 Apr '14

commit cf81b598defd537ed65c015cbf79c322dad26b89 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Mar 24 19:58:11 2014 -0700 Use an ordinary channel, not a proxied channel. How we're going to handle the proxy issue is by setting a pref in a separate profile. --- firefox/components/main.js | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/firefox/components/main.js b/firefox/components/main.js index 8ed3fd1..7b962ac 100644 --- a/firefox/components/main.js +++ b/firefox/components/main.js @@ -92,19 +92,6 @@ MeekHTTPHelper.LOCAL_PORT = 7000; MeekHTTPHelper.LOCAL_READ_TIMEOUT = 2.0; MeekHTTPHelper.LOCAL_WRITE_TIMEOUT = 2.0; -// A "direct" nsIProxyInfo that bypasses the default proxy. -// https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIProto… -// https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIProxy… -MeekHTTPHelper.directProxyInfo = Components.classes["@mozilla.org/network/protocol-proxy-service;1"] - .getService(Components.interfaces.nsIProtocolProxyService) - .newProxyInfo("direct", "", 0, 0, 0xffffffff, null); - -// https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIIOSer… -MeekHTTPHelper.ioService = Components.classes["@mozilla.org/network/io-service;1"] - .getService(Components.interfaces.nsIIOService); -MeekHTTPHelper.httpProtocolHandler = MeekHTTPHelper.ioService.getProtocolHandler("http") - .QueryInterface(Components.interfaces.nsIHttpProtocolHandler); - // Set the transport to time out at the given absolute deadline. MeekHTTPHelper.refreshDeadline = function(transport, deadline) { var timeout; @@ -146,10 +133,10 @@ MeekHTTPHelper.LocalConnectionHandler.prototype = { this.transport.close(0); return; } - var uri = MeekHTTPHelper.ioService.newURI(req.url, null, null); - // Construct an HTTP channel with the proxy bypass. - // https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIHttpC… - this.channel = MeekHTTPHelper.httpProtocolHandler.newProxiedChannel(uri, MeekHTTPHelper.directProxyInfo, 0, null) + // https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIIOSer… + var ioService = Components.classes["@mozilla.org/network/io-service;1"] + .getService(Components.interfaces.nsIIOService); + this.channel = ioService.newChannel(req.url, null, null) .QueryInterface(Components.interfaces.nsIHttpChannel); if (req.header !== undefined) { for (var key in req.header) {

1 0

r26693: {website} Some updates to the PT page. (website/trunk/docs/en)
by George Kadianakis 06 Apr '14

06 Apr '14

Author: asn Date: 2014-04-06 01:20:21 +0000 (Sun, 06 Apr 2014) New Revision: 26693 Modified: website/trunk/docs/en/pluggable-transports.wml Log: Some updates to the PT page. Modified: website/trunk/docs/en/pluggable-transports.wml =================================================================== --- website/trunk/docs/en/pluggable-transports.wml 2014-04-05 08:08:20 UTC (rev 26692) +++ website/trunk/docs/en/pluggable-transports.wml 2014-04-06 01:20:21 UTC (rev 26693) @@ -44,32 +44,44 @@ and <a href="https://gitweb.torproject.org/pluggable-transports/obfsproxy.git/blob/HEAD:…">obfs3</a> pluggable transports. Maintained by asn. - - Status: <a href="<page projects/obfsproxy>#download">Deployed</a> + Status: <a href="#download">Deployed</a> </li> - <li>Flashproxy turns ordinary web browsers into bridges using + <li><a href="https://crypto.stanford.edu/flashproxy/">Flashproxy</a> turns ordinary web browsers into bridges using websockets, and has a little python stub to hook Tor clients to the websocket connection. See its - <a href="https://crypto.stanford.edu/flashproxy/">web page</a>, <a href="https://gitweb.torproject.org/flashproxy.git">git repository</a>, and <a href="https://crypto.stanford.edu/flashproxy/flashproxy.pdf">design paper</a>. Maintained by David Fifield. # <iframe src="//crypto.stanford.edu/flashproxy/embed.html" width="80" height="15" frameborder="0" scrolling="no"></iframe> - Status: <a href="https://crypto.stanford.edu/flashproxy/#how-to">Deployed</a> + Status: <a href="#download">Deployed</a> </li> - <li>ScrambleSuit is a pluggable transport that protects + <li><a href="https://fteproxy.org/">Format-Transforming + Encryption</a> (FTE) transforms Tor traffic to arbitrary + formats using their language descriptions. See the <a + href="https://kpdyer.com/publications/ccs2013-fte.pdf">research + paper</a>. Status: <a href="#download">Deployed</a> </li> + + <li><a href="http://www.cs.kau.se/philwint/scramblesuit/">ScrambleSuit</a> + is a pluggable transport that protects against follow-up probing attacks and is also capable of changing its network fingerprint (packet length distribution, - inter-arrival times, etc.). It's part of the Obfsproxy framework. See its - <a href="http://www.cs.kau.se/philwint/scramblesuit/">official page</a>. + inter-arrival times, etc.). It's part of the Obfsproxy framework. Maintained by Philipp Winter. - Status: In testing + Status: To be deployed </li> + <li>Meek is a transport that uses HTTP for carrying bytes + and TLS for obfuscation. Traffic is relayed through a third-party + server (Google App Engine). It uses a trick to talk to the third + party so that it looks like it is talking to an unblocked server. + Maintained by David Fifield. + Status: <e>Coming soon + </li> + <li>StegoTorus is an Obfsproxy fork that extends it to a) split Tor streams across multiple connections to avoid packet size signatures, and b) embed the traffic flows in traces that look like @@ -95,13 +107,6 @@ Status: Undeployed </li> - <li>Format-Transforming Encryption (FTE) transforms Tor traffic - to arbitrary formats using their language descriptions. See - the <a href="https://kpdyer.com/publications/ccs2013-fte.pdf">research - paper</a> and <a href="https://fteproxy.org/">web page</a>. - Status: In testing - </li> - </ul> Also see the <emph>unofficial</emph> pluggable transports <a

1 0

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

05 Apr '14

commit 3291e9d24daf307b8d0a560c7786301617f5cc3e Author: Translation commit bot <translation(a)torproject.org> Date: Sat Apr 5 20:15:11 2014 +0000 Update translations for gettor_completed --- nl/gettor.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/nl/gettor.po b/nl/gettor.po index 17bbf03..f74f670 100644 --- a/nl/gettor.po +++ b/nl/gettor.po @@ -4,6 +4,7 @@ # # Translators: # erwindelaat <erwin.de.laat(a)cleveridge.org>, 2014 +# Yer00n, 2014 # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009 # Shondoit Walker <shondoit(a)gmail.com>, 2013 # Shondoit Walker <shondoit(a)gmail.com>, 2011 @@ -13,8 +14,8 @@ 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-02-24 11:20+0000\n" -"Last-Translator: erwindelaat <erwin.de.laat(a)cleveridge.org>\n" +"PO-Revision-Date: 2014-04-05 20:00+0000\n" +"Last-Translator: Yer00n\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/torproject/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -444,7 +445,7 @@ msgstr "Wat is Tor?" #: lib/gettor/i18n.py:274 msgid "The name \"Tor\" can refer to several different components." -msgstr "De naam \"Tor\" kan slaan op veschillende onderdelen." +msgstr "De naam \"Tor\" kan slaan op verschillende onderdelen." #: lib/gettor/i18n.py:276 msgid "" @@ -457,7 +458,7 @@ msgid "" "Tor network. You can read more about how Tor works here:\n" "\n" " https://www.torproject.org/about/overview.html.en" -msgstr "De Tor software is een programma dat je op je computer kunt draaien dat je helpt om veilig te zijn op het internet. Tor beschermt je door je communicatie te verspreiden over een verdeeld netwerk van relays, beheerd door vrijwilligers van over de hele wereld: het voorkomt dat iemand die je internetverbinding afluistert kan achterhalen welke sites je bezoekt. En het voorkomt dat de sites die je bezoekt je fysieke locatie kunnen achterhalen. Deze verzameling van vrijwilligersrelays wordt het Tor netwerk genoemd. Je kunt hier meer lezen over hoe Tor werkt:\n\n\thttps://www.torproject.org/about/overview.html.en" +msgstr "De Tor software is een programma dat je op je computer kunt uitvoeren. Het houdt je veilig op het internet. Tor beschermt je door je communicatie te verspreiden over een verdeeld netwerk van schakelpunten, beheerd door vrijwilligers over de hele wereld: het voorkomt dat iemand die je internetverbinding afluistert kan achterhalen welke sites je bezoekt. Het voorkomt bovendien dat de sites die je bezoekt je fysieke locatie kunnen achterhalen. Deze verzameling van schakelpunten van vrijwilligers wordt het Tor netwerk genoemd. Je kunt hier meer lezen over hoe Tor werkt:\n\n\thttps://www.torproject.org/about/overview.html.en" #: lib/gettor/i18n.py:286 msgid "What is the Tor Browser Bundle?" @@ -468,7 +469,7 @@ msgid "" "The Browser Bundle (TBB) is the package we recommend to most users. \n" "The bundle comes with everything you need to safely browse the Internet.\n" "Just extract it and run." -msgstr "De Tor Browser Bundle (TBB) is een pakket dat we aanraden aan de meeste gebruikers. De bundel komt met alles wat je nodig hebt om veilig het internet te gebruiken. Simpelweg uitpakken en opstarten." +msgstr "De Tor Browser Bundle (TBB) is een pakket dat we aanraden aan de meeste gebruikers. De bundel bevat alles wat je nodig hebt om veilig het internet te gebruiken. Gewoon uitpakken en opstarten." #: lib/gettor/i18n.py:292 msgid "What package should I request?"

1 0

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

05 Apr '14

commit 9a6641d79aa92a3fea75094d97c43067ef7f1e57 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Apr 5 20:15:06 2014 +0000 Update translations for gettor --- nl/gettor.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/nl/gettor.po b/nl/gettor.po index 17bbf03..f74f670 100644 --- a/nl/gettor.po +++ b/nl/gettor.po @@ -4,6 +4,7 @@ # # Translators: # erwindelaat <erwin.de.laat(a)cleveridge.org>, 2014 +# Yer00n, 2014 # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009 # Shondoit Walker <shondoit(a)gmail.com>, 2013 # Shondoit Walker <shondoit(a)gmail.com>, 2011 @@ -13,8 +14,8 @@ 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-02-24 11:20+0000\n" -"Last-Translator: erwindelaat <erwin.de.laat(a)cleveridge.org>\n" +"PO-Revision-Date: 2014-04-05 20:00+0000\n" +"Last-Translator: Yer00n\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/torproject/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -444,7 +445,7 @@ msgstr "Wat is Tor?" #: lib/gettor/i18n.py:274 msgid "The name \"Tor\" can refer to several different components." -msgstr "De naam \"Tor\" kan slaan op veschillende onderdelen." +msgstr "De naam \"Tor\" kan slaan op verschillende onderdelen." #: lib/gettor/i18n.py:276 msgid "" @@ -457,7 +458,7 @@ msgid "" "Tor network. You can read more about how Tor works here:\n" "\n" " https://www.torproject.org/about/overview.html.en" -msgstr "De Tor software is een programma dat je op je computer kunt draaien dat je helpt om veilig te zijn op het internet. Tor beschermt je door je communicatie te verspreiden over een verdeeld netwerk van relays, beheerd door vrijwilligers van over de hele wereld: het voorkomt dat iemand die je internetverbinding afluistert kan achterhalen welke sites je bezoekt. En het voorkomt dat de sites die je bezoekt je fysieke locatie kunnen achterhalen. Deze verzameling van vrijwilligersrelays wordt het Tor netwerk genoemd. Je kunt hier meer lezen over hoe Tor werkt:\n\n\thttps://www.torproject.org/about/overview.html.en" +msgstr "De Tor software is een programma dat je op je computer kunt uitvoeren. Het houdt je veilig op het internet. Tor beschermt je door je communicatie te verspreiden over een verdeeld netwerk van schakelpunten, beheerd door vrijwilligers over de hele wereld: het voorkomt dat iemand die je internetverbinding afluistert kan achterhalen welke sites je bezoekt. Het voorkomt bovendien dat de sites die je bezoekt je fysieke locatie kunnen achterhalen. Deze verzameling van schakelpunten van vrijwilligers wordt het Tor netwerk genoemd. Je kunt hier meer lezen over hoe Tor werkt:\n\n\thttps://www.torproject.org/about/overview.html.en" #: lib/gettor/i18n.py:286 msgid "What is the Tor Browser Bundle?" @@ -468,7 +469,7 @@ msgid "" "The Browser Bundle (TBB) is the package we recommend to most users. \n" "The bundle comes with everything you need to safely browse the Internet.\n" "Just extract it and run." -msgstr "De Tor Browser Bundle (TBB) is een pakket dat we aanraden aan de meeste gebruikers. De bundel komt met alles wat je nodig hebt om veilig het internet te gebruiken. Simpelweg uitpakken en opstarten." +msgstr "De Tor Browser Bundle (TBB) is een pakket dat we aanraden aan de meeste gebruikers. De bundel bevat alles wat je nodig hebt om veilig het internet te gebruiken. Gewoon uitpakken en opstarten." #: lib/gettor/i18n.py:292 msgid "What package should I request?"

1 0

[tor/master] check outputs from get_first_listener_addrport_string
by nickm＠torproject.org 05 Apr '14

05 Apr '14

commit 753a246a14a021dc3e4bc26c40d6fe7c2d60bb1b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 27 17:11:53 2014 -0400 check outputs from get_first_listener_addrport_string Fix for 9650; bugfix for 0.2.3.16-alpha. --- changes/bug9650 | 4 ++++ src/or/transports.c | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/changes/bug9650 b/changes/bug9650 new file mode 100644 index 0000000..c49cc24 --- /dev/null +++ b/changes/bug9650 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Avoid potential crashes or bad behavior when launching a + server-side managed proxy with ORPort or ExtORPort temporarily + disabled. Fixes bug 9650; bugfix on 0.2.3.16-alpha. diff --git a/src/or/transports.c b/src/or/transports.c index 8b4a118..7e496fe 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -1243,8 +1243,10 @@ create_managed_proxy_environment(const managed_proxy_t *mp) { char *orport_tmp = get_first_listener_addrport_string(CONN_TYPE_OR_LISTENER); - smartlist_add_asprintf(envs, "TOR_PT_ORPORT=%s", orport_tmp); - tor_free(orport_tmp); + if (orport_tmp) { + smartlist_add_asprintf(envs, "TOR_PT_ORPORT=%s", orport_tmp); + tor_free(orport_tmp); + } } { @@ -1275,8 +1277,10 @@ create_managed_proxy_environment(const managed_proxy_t *mp) get_first_listener_addrport_string(CONN_TYPE_EXT_OR_LISTENER); char *cookie_file_loc = get_ext_or_auth_cookie_file_name(); - smartlist_add_asprintf(envs, "TOR_PT_EXTENDED_SERVER_PORT=%s", - ext_or_addrport_tmp); + if (ext_or_addrport_tmp) { + smartlist_add_asprintf(envs, "TOR_PT_EXTENDED_SERVER_PORT=%s", + ext_or_addrport_tmp); + } smartlist_add_asprintf(envs, "TOR_PT_AUTH_COOKIE_FILE=%s", cookie_file_loc);

1 0

[tor/master] Merge remote-tracking branch 'public/bug9650'
by nickm＠torproject.org 05 Apr '14

05 Apr '14

commit bc0882c868c0cb61ade0f8b500c4392c889d6d0e Merge: 2ff664e 753a246 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Apr 5 14:53:48 2014 -0400 Merge remote-tracking branch 'public/bug9650' changes/bug9650 | 4 ++++ src/or/transports.c | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-)

1 0

[tor/master] Make tor_addr_port_parse handle portless IPv6 addresses correctly.
by nickm＠torproject.org 05 Apr '14

05 Apr '14

commit b3469e4207d12821993f1d2d381c5d27918a4c01 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Apr 5 14:41:37 2014 -0400 Make tor_addr_port_parse handle portless IPv6 addresses correctly. (Not a bugfix on any Tor release; before 10801_024, it didn't handle portless addresses at all.) --- src/common/address.c | 9 +++++++++ src/test/test_addr.c | 25 +++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/src/common/address.c b/src/common/address.c index 3e89861..8456558 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1488,9 +1488,18 @@ int tor_addr_port_split(int severity, const char *addrport, char **address_out, uint16_t *port_out) { + tor_addr_t a_tmp; tor_assert(addrport); tor_assert(address_out); tor_assert(port_out); + /* We need to check for IPv6 manually because addr_port_lookup() doesn't + * do a good job on IPv6 addresses that lack a port. */ + if (tor_addr_parse(&a_tmp, addrport) == AF_INET6) { + *port_out = 0; + *address_out = tor_strdup(addrport); + return 0; + } + return addr_port_lookup(severity, addrport, address_out, NULL, port_out); } diff --git a/src/test/test_addr.c b/src/test/test_addr.c index 6228fab..c75f8e6 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -741,6 +741,14 @@ test_addr_parse(void) test_streq(buf, "192.0.2.1"); test_eq(port, 1234); + r= tor_addr_port_parse(LOG_DEBUG, + "[::1]:1234", + &addr, &port, -1); + test_assert(r == 0); + tor_addr_to_str(buf, &addr, sizeof(buf), 0); + test_streq(buf, "::1"); + test_eq(port, 1234); + /* Domain name. */ r= tor_addr_port_parse(LOG_DEBUG, "torproject.org:1234", @@ -759,6 +767,17 @@ test_addr_parse(void) test_assert(r == 0); tt_int_op(port,==,200); + r= tor_addr_port_parse(LOG_DEBUG, + "[::1]", + &addr, &port, -1); + test_assert(r == -1); + + r= tor_addr_port_parse(LOG_DEBUG, + "[::1]", + &addr, &port, 400); + test_assert(r == 0); + tt_int_op(port,==,400); + /* Bad port. */ r= tor_addr_port_parse(LOG_DEBUG, "192.0.2.2:66666", @@ -793,6 +812,12 @@ test_addr_parse(void) test_assert(r == 0); tt_int_op(port,==,1337); + r= tor_addr_port_parse(LOG_DEBUG, + "[::1]:1369", + &addr, &port, 200); + test_assert(r == 0); + tt_int_op(port,==,1369); + done: ; }

1 0

[tor/master] Add a test for default/port conflicts in tor_addr_port_parse
by nickm＠torproject.org 05 Apr '14

05 Apr '14

commit eefa3ebc786fdfd3a642698822f8a0ade583996e Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Apr 5 14:18:39 2014 -0400 Add a test for default/port conflicts in tor_addr_port_parse --- src/test/test_addr.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/test/test_addr.c b/src/test/test_addr.c index 5452ee9..6228fab 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -785,6 +785,14 @@ test_addr_parse(void) &addr, &port, -1); test_assert(r == -1); + /* Make sure that the default port has lower priority than the real + one */ + r= tor_addr_port_parse(LOG_DEBUG, + "192.0.2.2:1337", + &addr, &port, 200); + test_assert(r == 0); + tt_int_op(port,==,1337); + done: ; }

1 0

[tor/master] Merge remote-tracking branch 'public/bug10801_024'
by nickm＠torproject.org 05 Apr '14

05 Apr '14

commit 2ff664ee20836ecd7b9e3e9a368766b4125f21a8 Merge: d290e36 b3469e4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Apr 5 14:50:57 2014 -0400 Merge remote-tracking branch 'public/bug10801_024' Conflicts: src/common/address.c src/or/config.c changes/bug10801 | 4 ++++ src/common/address.c | 25 +++++++++++++++++---- src/common/address.h | 3 ++- src/or/config.c | 13 +++-------- src/test/test_addr.c | 59 +++++++++++++++++++++++++++++++++++++++++++++----- 5 files changed, 83 insertions(+), 21 deletions(-) diff --cc src/common/address.c index cc3e31f,8456558..e5930de --- a/src/common/address.c +++ b/src/common/address.c @@@ -1450,8 -1438,11 +1450,11 @@@ get_interface_address6(int severity, sa * allocated string holding the address portion and *port_out * to the port. * - * Don't do DNS lookups and don't allow domain names in the <ip> field. + * Don't do DNS lookups and don't allow domain names in the "ip" field. - * Don't accept addrport of the form "ip" or "ip:0". + * + * If default_port is less than 0, don't accept addrport of the - * form "<ip>" or "<ip>:0". Otherwise, accept those forms, and set ++ * form "ip" or "ip:0". Otherwise, accept those forms, and set + * *port_out to default_port. * * Return 0 on success, -1 on failure. */ int diff --cc src/or/config.c index 4a6b301,fc959f7..dbf643c --- a/src/or/config.c +++ b/src/or/config.c @@@ -4529,49 -4163,19 +4529,42 @@@ parse_bridge_line(const char *line log_warn(LD_CONFIG, "Too few items to Bridge line."); goto err; } - addrport = smartlist_get(items, 0); + addrport = smartlist_get(items, 0); /* Next field is addrport then. */ smartlist_del_keeporder(items, 0); } else { - addrport = field1; + addrport = field; } - /* Parse addrport. */ - if (tor_addr_port_lookup(addrport, - &bridge_line->addr, &bridge_line->port)<0) { - if (tor_addr_port_parse(LOG_INFO, addrport, &addr, &port, 443)<0) { ++ if (tor_addr_port_parse(LOG_INFO, addrport, ++ &bridge_line->addr, &bridge_line->port, 443)<0) { log_warn(LD_CONFIG, "Error parsing Bridge address '%s'", addrport); goto err; } - if (!bridge_line->port) { - log_info(LD_CONFIG, - "Bridge address '%s' has no port; using default port 443.", - addrport); - bridge_line->port = 443; - } + /* If transports are enabled, next field could be a fingerprint or a + socks argument. If transports are disabled, next field must be + a fingerprint. */ if (smartlist_len(items)) { - fingerprint = smartlist_join_strings(items, "", 0, NULL); + if (bridge_line->transport_name) { /* transports enabled: */ + field = smartlist_get(items, 0); + smartlist_del_keeporder(items, 0); + + /* If it's a key=value pair, then it's a SOCKS argument for the + transport proxy... */ + if (string_is_key_value(LOG_DEBUG, field)) { + bridge_line->socks_args = smartlist_new(); + smartlist_add(bridge_line->socks_args, field); + } else { /* ...otherwise, it's the bridge fingerprint. */ + fingerprint = field; + } + + } else { /* transports disabled: */ + fingerprint = smartlist_join_strings(items, "", 0, NULL); + } + } + + /* Handle fingerprint, if it was provided. */ + if (fingerprint) { if (strlen(fingerprint) != HEX_DIGEST_LEN) { log_warn(LD_CONFIG, "Key digest for Bridge is wrong length."); goto err;

1 0