- tor-commits - lists.torproject.org

[flashproxy/master] Be more tolerant of whitespace in HTTP reg messages.
by dcf＠torproject.org 20 Sep '12

20 Sep '12

commit cb88fe655ffdff5a21130a7b65eab2bf0cafc76a Author: David Fifield <david(a)bamsoftware.com> Date: Wed Sep 19 15:49:27 2012 -0700 Be more tolerant of whitespace in HTTP reg messages. --- facilitator/facilitator.cgi | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/facilitator/facilitator.cgi b/facilitator/facilitator.cgi index 6ccb479..8975aa7 100755 --- a/facilitator/facilitator.cgi +++ b/facilitator/facilitator.cgi @@ -101,7 +101,7 @@ def do_post(): client_specs = fs.getlist("client") if len(client_specs) != 1: exit_error(400) - client_spec = client_specs[0] + client_spec = client_specs[0].strip() try: client_addr = fac.parse_addr_spec(client_spec, defhost=proxy_addr[0]) except ValueError:

1 0

[flashproxy/master] Use $NAME once more in init.d/facilitator.
by dcf＠torproject.org 20 Sep '12

20 Sep '12

commit 0ac67a1686a2f7a8d5b387eda0c1037b8881dc8f Author: David Fifield <david(a)bamsoftware.com> Date: Wed Sep 19 16:53:15 2012 -0700 Use $NAME once more in init.d/facilitator. --- facilitator/init.d/facilitator | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/facilitator/init.d/facilitator b/facilitator/init.d/facilitator index fbb30c5..5228d1d 100755 --- a/facilitator/init.d/facilitator +++ b/facilitator/init.d/facilitator @@ -21,7 +21,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin DESC="Flash proxy facilitator" NAME=facilitator PIDFILE=/var/run/$NAME.pid -LOGFILE=/var/log/facilitator.log +LOGFILE=/var/log/$NAME.log DAEMON=/usr/local/bin/$NAME DAEMON_ARGS="-r $RELAY --log $LOGFILE --pidfile $PIDFILE" SCRIPTNAME=/etc/init.d/$NAME

1 0

[metrics-db/master] Correctly parse IPv6 addresses with :: in the middle.
by karsten＠torproject.org 19 Sep '12

19 Sep '12

commit f0b4f989a175ac8a2771f7a157e74e0c67b124ee Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Sep 19 17:47:55 2012 -0400 Correctly parse IPv6 addresses with :: in the middle. --- .../ernie/db/SanitizedBridgesWriter.java | 70 +++++++++++-------- 1 files changed, 40 insertions(+), 30 deletions(-) diff --git a/src/org/torproject/ernie/db/SanitizedBridgesWriter.java b/src/org/torproject/ernie/db/SanitizedBridgesWriter.java index 4f72c6a..afafe11 100644 --- a/src/org/torproject/ernie/db/SanitizedBridgesWriter.java +++ b/src/org/torproject/ernie/db/SanitizedBridgesWriter.java @@ -201,43 +201,53 @@ public class SanitizedBridgesWriter { return null; } byte[] hashInput = new byte[16 + 20 + 19]; - StringBuilder hex = new StringBuilder(); - String[] parts = address.substring(1, address.length() - 1). - split(":", -1); - if (parts.length < 1 || parts.length > 8) { + String[] doubleColonSeparatedParts = address.substring(1, + address.length() - 1).split("::", -1); + if (doubleColonSeparatedParts.length > 2) { /* Invalid IPv6 address. */ return null; } - for (int i = 0; i < parts.length; i++) { - String part = parts[i]; - if (part.contains(".")) { - String[] ipParts = part.split("\\."); - byte[] ipv4Bytes = new byte[4]; - if (ipParts.length != 4) { - /* Invalid IPv4 part in IPv6 address. */ - return null; - } - for (int m = 0; m < 4; m++) { - ipv4Bytes[m] = (byte) Integer.parseInt(ipParts[m]); - } - hex.append(Hex.encodeHexString(ipv4Bytes)); - } else if (part.length() > 4) { + List<String> hexParts = new ArrayList<String>(); + for (String doubleColonSeparatedPart : doubleColonSeparatedParts) { + StringBuilder hexPart = new StringBuilder(); + String[] parts = doubleColonSeparatedPart.split(":", -1); + if (parts.length < 1 || parts.length > 8) { /* Invalid IPv6 address. */ return null; - } else if (part.length() < 1) { - int j = parts.length - 1; - if (address.contains(".")) { - j++; - } - for (; j < 8; j++) { - hex.append("0000"); - } - } else { - for (int k = part.length(); k < 4; k++) { - hex.append("0"); + } + for (int i = 0; i < parts.length; i++) { + String part = parts[i]; + if (part.contains(".")) { + String[] ipParts = part.split("\\."); + byte[] ipv4Bytes = new byte[4]; + if (ipParts.length != 4) { + /* Invalid IPv4 part in IPv6 address. */ + return null; + } + for (int m = 0; m < 4; m++) { + ipv4Bytes[m] = (byte) Integer.parseInt(ipParts[m]); + } + hexPart.append(Hex.encodeHexString(ipv4Bytes)); + } else if (part.length() > 4) { + /* Invalid IPv6 address. */ + return null; + } else { + for (int k = part.length(); k < 4; k++) { + hexPart.append("0"); + } + hexPart.append(part); } - hex.append(part); } + hexParts.add(hexPart.toString()); + } + StringBuilder hex = new StringBuilder(); + hex.append(hexParts.get(0)); + if (hexParts.size() == 2) { + for (int i = 32 - hexParts.get(0).length() + - hexParts.get(1).length(); i > 0; i--) { + hex.append("0"); + } + hex.append(hexParts.get(1)); } byte[] ipBytes = null; try {

1 0

[tor/master] Make ./configure -q really silent
by nickm＠torproject.org 19 Sep '12

19 Sep '12

commit cff3b8c93cf312956e629b4caab8f5e48d1e10dd Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 19 11:47:59 2012 -0400 Make ./configure -q really silent Our updateVersions script was being verbose, which might have made sense back when I wrote it, but doesn't any more. Final fix for bug 6599 --- contrib/updateVersions.pl | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/contrib/updateVersions.pl b/contrib/updateVersions.pl index 710d7d9..9dae1ff 100755 --- a/contrib/updateVersions.pl +++ b/contrib/updateVersions.pl @@ -4,6 +4,8 @@ $CONFIGURE_IN = './configure.ac'; $ORCONFIG_H = './src/win32/orconfig.h'; $TOR_NSI = './contrib/tor-mingw.nsi.in'; +$quiet = 1; + sub demand { my $fn = shift; die "Missing file $fn" unless (-f $fn); @@ -24,7 +26,7 @@ while (<F>) { } } die "No version found" unless $version; -print "Tor version is $version\n"; +print "Tor version is $version\n" unless $quiet; close F; sub correctversion { @@ -36,7 +38,7 @@ sub correctversion { if ($s =~ /^$defchar(?:)define\s+VERSION\s+\"([^\"]+)\"/m) { $oldver = $1; if ($oldver ne $version) { - print "Version mismatch in $fn: It thinks that the version is $oldver. Fixing.\n"; + print "Version mismatch in $fn: It thinks that the version is $oldver. I think it's $version. Fixing.\n"; $line = $defchar . "define VERSION \"$version\""; open(F, ">$fn.bak"); print F $s; @@ -44,9 +46,9 @@ sub correctversion { $s =~ s/^$defchar(?:)define\s+VERSION.*?$/$line/m; open(F, ">$fn"); print F $s; - close F; + close F; } else { - print "$fn has the correct version. Good.\n"; + print "$fn has the correct version. Good.\n" unless $quiet; } } else { print "Didn't find a version line in $fn -- uh oh.\n";

1 0

r25797: {website} add some recent press. (website/trunk/press/en)
by Andrew Lewman 19 Sep '12

19 Sep '12

Author: phobos Date: 2012-09-19 15:11:19 +0000 (Wed, 19 Sep 2012) New Revision: 25797 Modified: website/trunk/press/en/inthemedia.wml Log: add some recent press. Modified: website/trunk/press/en/inthemedia.wml =================================================================== --- website/trunk/press/en/inthemedia.wml 2012-09-18 14:20:57 UTC (rev 25796) +++ website/trunk/press/en/inthemedia.wml 2012-09-19 15:11:19 UTC (rev 25797) @@ -33,6 +33,14 @@ </tr> </thead> <tr style="background-color: #e5e5e5;"> +<td>2012 Sep 19</td> +<td><a href="http://www.infobae.com/notas/667840-Proyecto-Tor-comunicaciones-en-la-web-1…">Proyecto Tor: comunicaciones en la web 100% anónimas y seguras</a></td> +</td> +<tr> +<td>2012 Aug 24</td> +<td><a href="https://secure.security.nl/artikel/42807/1/Tor_gaat_naar_Facebook_ondanks_p…">Tor gaat naar Facebook ondanks privacyrisico</a></td> +</tr> +<tr style="background-color: #e5e5e5;"> <td>2012 Jul 19</td> <td>Philadelphia Inquirer</td> <td><a href="http://www.philly.com/philly/business/20120719_Tech_Life__Fostering_anonymi…">Tech Life: Fostering anonymity online</a></td>

1 0

[tor/master] Merge branch 'bug6843'
by nickm＠torproject.org 19 Sep '12

19 Sep '12

commit 0e0a16774261cf2f9f98ffe42ccd8aefe3a36a95 Merge: f612a9e a78eeb4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 19 09:01:15 2012 -0400 Merge branch 'bug6843' changes/bug6843 | 5 +++++ doc/include.am | 30 ++++++++++++++++++++++++++---- 2 files changed, 31 insertions(+), 4 deletions(-)

1 0

[tor/master] Fix dependency checking on manpage builds
by nickm＠torproject.org 19 Sep '12

19 Sep '12

commit a78eeb4cbc99e7c92cad57c30e0d1957881951fb Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 14 10:36:42 2012 -0400 Fix dependency checking on manpage builds Fixes bug 6843; bugfix on 0.2.4.1-alpha. --- changes/bug6843 | 5 +++++ doc/include.am | 30 ++++++++++++++++++++++++++---- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/changes/bug6843 b/changes/bug6843 new file mode 100644 index 0000000..1acfdbd --- /dev/null +++ b/changes/bug6843 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Our new buildsystem was overzealous about rebuilding manpages: it + would rebuild them all whenever any one of them changed. Now our + dependency checking should be correct. Fixes bug 6843; bugfix on + 0.2.4.1-alpha. diff --git a/doc/include.am b/doc/include.am index bb01038..9eb919b 100644 --- a/doc/include.am +++ b/doc/include.am @@ -46,24 +46,46 @@ asciidoc_product = $(nodist_man1_MANS) $(doc_DATA) # Generate the html documentation from asciidoc, but don't do # machine-specific replacements yet -$(html_in) : $(txt_in) +$(html_in) : $(AM_V_GEN)$(top_srcdir)/doc/asciidoc-helper.sh html @ASCIIDOC@ $(top_srcdir)/$@ # Generate the manpage from asciidoc, but don't do # machine-specific replacements yet -$(man_in) : $(txt_in) +$(man_in) : $(AM_V_GEN)$(top_srcdir)/doc/asciidoc-helper.sh man @A2X@ $(top_srcdir)/$@ +doc/tor.1.in: doc/tor.1.txt +doc/tor-gencert.1.in: doc/tor-gencert.1.txt +doc/tor-resolve.1.in: doc/tor-resolve.1.txt +doc/torify.1.in: doc/torify.1.txt +doc/tor-fw-helper.1.in: doc/tor-fw-helper.1.txt + +doc/tor.html.in: doc/tor.1.txt +doc/tor-gencert.html.in: doc/tor-gencert.1.txt +doc/tor-resolve.html.in: doc/tor-resolve.1.txt +doc/torify.html.in: doc/torify.1.txt +doc/tor-fw-helper.html.in: doc/tor-fw-helper.1.txt + # use ../config.status to swap all machine-specific magic strings # in the asciidoc with their replacements. -$(asciidoc_product) : $(txt_in) $(man_in) +$(asciidoc_product) : $(AM_V_GEN)$(MKDIR_P) $(@D) $(AM_V_at)if test -e $(top_srcdir)/$@.in && ! test -e $@.in ; then \ cp $(top_srcdir)/$@.in $@; \ fi $(AM_V_at)./config.status -q --file=$@; -$(doc_DATA) : $(html_in) +doc/tor.html: doc/tor.html.in +doc/tor-gencert.html: doc/tor-gencert.html.in +doc/tor-resolve.html: doc/tor-resolve.html.in +doc/torify.html: doc/torify.html.in +doc/tor-fw-helper.html: doc/tor-fw-helper.html.in + +doc/tor.1: doc/tor.1.in +doc/tor-gencert.1: doc/tor-gencert.1.in +doc/tor-resolve.1: doc/tor-resolve.1.in +doc/torify.1: doc/torify.1.in +doc/tor-fw-helper.1: doc/tor-fw-helper.1.in CLEANFILES+= $(asciidoc_product) config.log DISTCLEANFILES+= $(html_in) $(man_in)

1 0

[tor/master] Clarify that hidden services are TCP only
by nickm＠torproject.org 19 Sep '12

19 Sep '12

commit b9c86948e4f4f0af15e88f74a7297f424ed37f6b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 19 08:18:19 2012 -0400 Clarify that hidden services are TCP only Also remove some trailing whitespace. Patch from maker; fixes bug 6024. --- changes/bug6024 | 2 ++ doc/tor.1.txt | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/changes/bug6024 b/changes/bug6024 new file mode 100644 index 0000000..743e6ef --- /dev/null +++ b/changes/bug6024 @@ -0,0 +1,2 @@ + o Documentation fixes: + - Clarify that hidden services are TCP only. Fixes bug 6024. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 5aac054..773fccf 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -237,7 +237,7 @@ GENERAL OPTIONS recommend that you leave this alone unless you know what you're doing, since giving attackers access to your control listener is really dangerous. This directive can be specified multiple - times to bind to multiple addresses/ports. (Default: 127.0.0.1) + times to bind to multiple addresses/ports. (Default: 127.0.0.1) **ControlSocket** __Path__:: Like ControlPort, but listens on a Unix domain socket, rather than a TCP @@ -762,7 +762,7 @@ The following options are useful only for clients (that is, if purposes, e.g., for Tor controllers. This option may be used multiple times for different hidden services. If a hidden service uses authorization and this option is not set, the hidden service is not accessible. Hidden - services can be configured to require authorization using the + services can be configured to require authorization using the **HiddenServiceAuthorizeClient** option. **CloseHSClientCircuitsImmediatelyOnTimeout** **0**|**1**:: @@ -1017,7 +1017,7 @@ The following options are useful only for clients (that is, if Open this port to listen for transparent proxy connections. Set this to 0 if you don't want to allow transparent proxy connections. Set the port to "auto" to have Tor pick a port for you. This directive can be - specified multiple times to bind to multiple addresses/ports. See + specified multiple times to bind to multiple addresses/ports. See SOCKSPort for an explanation of isolation flags. + + TransPort requires OS support for transparent proxies, such as BSDs' pf or @@ -1055,7 +1055,7 @@ The following options are useful only for clients (that is, if **AutomapHostsOnResolve** **0**|**1**:: When this option is enabled, and we get a request to resolve an address that ends with one of the suffixes in **AutomapHostsSuffixes**, we map an - unused virtual address to that address, and return the new virtual address. + unused virtual address to that address, and return the new virtual address. This is handy for making ".onion" addresses work with applications that resolve an address and then connect to it. (Default: 0) @@ -1747,10 +1747,11 @@ The following options are used to configure a hidden service. Configure a virtual port VIRTPORT for a hidden service. You may use this option multiple times; each time applies to the service using the most recent hiddenservicedir. By default, this option maps the virtual port to - the same port on 127.0.0.1. You may override the target port, address, or - both by specifying a target of addr, port, or addr:port. You may also have - multiple lines with the same VIRTPORT: when a user connects to that - VIRTPORT, one of the TARGETs from those lines will be chosen at random. + the same port on 127.0.0.1 over TCP. You may override the target port, + address, or both by specifying a target of addr, port, or addr:port. + You may also have multiple lines with the same VIRTPORT: when a user + connects to that VIRTPORT, one of the TARGETs from those lines will be + chosen at random. **PublishHidServDescriptors** **0**|**1**:: If set to 0, Tor will run any hidden services you configure, but it won't @@ -1775,7 +1776,7 @@ The following options are used to configure a hidden service. their configuration file using **HidServAuth**. **RendPostPeriod** __N__ **seconds**|**minutes**|**hours**|**days**|**weeks**:: - Every time the specified period elapses, Tor uploads any rendezvous + Every time the specified period elapses, Tor uploads any rendezvous service descriptors to the directory servers. This information is also uploaded whenever it changes. (Default: 1 hour)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 19 Sep '12

19 Sep '12

commit f612a9eb1bfc32849f649d2071b9d4d9c9b51053 Merge: d1c4cf2 b9c8694 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 19 08:26:07 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug6024 | 2 ++ doc/tor.1.txt | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-)

1 0

[tor/maint-0.2.3] Clarify that hidden services are TCP only
by nickm＠torproject.org 19 Sep '12

19 Sep '12

commit b9c86948e4f4f0af15e88f74a7297f424ed37f6b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 19 08:18:19 2012 -0400 Clarify that hidden services are TCP only Also remove some trailing whitespace. Patch from maker; fixes bug 6024. --- changes/bug6024 | 2 ++ doc/tor.1.txt | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/changes/bug6024 b/changes/bug6024 new file mode 100644 index 0000000..743e6ef --- /dev/null +++ b/changes/bug6024 @@ -0,0 +1,2 @@ + o Documentation fixes: + - Clarify that hidden services are TCP only. Fixes bug 6024. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 5aac054..773fccf 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -237,7 +237,7 @@ GENERAL OPTIONS recommend that you leave this alone unless you know what you're doing, since giving attackers access to your control listener is really dangerous. This directive can be specified multiple - times to bind to multiple addresses/ports. (Default: 127.0.0.1) + times to bind to multiple addresses/ports. (Default: 127.0.0.1) **ControlSocket** __Path__:: Like ControlPort, but listens on a Unix domain socket, rather than a TCP @@ -762,7 +762,7 @@ The following options are useful only for clients (that is, if purposes, e.g., for Tor controllers. This option may be used multiple times for different hidden services. If a hidden service uses authorization and this option is not set, the hidden service is not accessible. Hidden - services can be configured to require authorization using the + services can be configured to require authorization using the **HiddenServiceAuthorizeClient** option. **CloseHSClientCircuitsImmediatelyOnTimeout** **0**|**1**:: @@ -1017,7 +1017,7 @@ The following options are useful only for clients (that is, if Open this port to listen for transparent proxy connections. Set this to 0 if you don't want to allow transparent proxy connections. Set the port to "auto" to have Tor pick a port for you. This directive can be - specified multiple times to bind to multiple addresses/ports. See + specified multiple times to bind to multiple addresses/ports. See SOCKSPort for an explanation of isolation flags. + + TransPort requires OS support for transparent proxies, such as BSDs' pf or @@ -1055,7 +1055,7 @@ The following options are useful only for clients (that is, if **AutomapHostsOnResolve** **0**|**1**:: When this option is enabled, and we get a request to resolve an address that ends with one of the suffixes in **AutomapHostsSuffixes**, we map an - unused virtual address to that address, and return the new virtual address. + unused virtual address to that address, and return the new virtual address. This is handy for making ".onion" addresses work with applications that resolve an address and then connect to it. (Default: 0) @@ -1747,10 +1747,11 @@ The following options are used to configure a hidden service. Configure a virtual port VIRTPORT for a hidden service. You may use this option multiple times; each time applies to the service using the most recent hiddenservicedir. By default, this option maps the virtual port to - the same port on 127.0.0.1. You may override the target port, address, or - both by specifying a target of addr, port, or addr:port. You may also have - multiple lines with the same VIRTPORT: when a user connects to that - VIRTPORT, one of the TARGETs from those lines will be chosen at random. + the same port on 127.0.0.1 over TCP. You may override the target port, + address, or both by specifying a target of addr, port, or addr:port. + You may also have multiple lines with the same VIRTPORT: when a user + connects to that VIRTPORT, one of the TARGETs from those lines will be + chosen at random. **PublishHidServDescriptors** **0**|**1**:: If set to 0, Tor will run any hidden services you configure, but it won't @@ -1775,7 +1776,7 @@ The following options are used to configure a hidden service. their configuration file using **HidServAuth**. **RendPostPeriod** __N__ **seconds**|**minutes**|**hours**|**days**|**weeks**:: - Every time the specified period elapses, Tor uploads any rendezvous + Every time the specified period elapses, Tor uploads any rendezvous service descriptors to the directory servers. This information is also uploaded whenever it changes. (Default: 1 hour)

1 0