- tor-commits - lists.torproject.org

[flashproxy/master] Add a faster numpy-based apply_mask.
by dcf＠torproject.org 19 Apr '12

19 Apr '12

commit aadad3991d586cb1e6ee0edaebb8054fa49f4031 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Apr 8 17:58:51 2012 -0700 Add a faster numpy-based apply_mask. --- connector.py | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/connector.py b/connector.py index dad0071..d101a30 100755 --- a/connector.py +++ b/connector.py @@ -24,6 +24,11 @@ except ImportError: # Python 2.4 uses this name. from sha import sha as sha1 +try: + import numpy +except ImportError: + numpy = None + DEFAULT_REMOTE_ADDRESS = "0.0.0.0" DEFAULT_REMOTE_PORT = 9000 DEFAULT_LOCAL_ADDRESS = "127.0.0.1" @@ -130,7 +135,22 @@ def format_addr(addr): -def apply_mask(payload, mask_key): +def apply_mask_numpy(payload, mask_key): + if len(payload) == 0: + return "" + payload_a = numpy.frombuffer(payload, dtype="|u4", count=len(payload)//4) + m, = numpy.frombuffer(mask_key, dtype="|u4", count=1) + result = numpy.bitwise_xor(payload_a, m).tostring() + i = len(payload) // 4 * 4 + if i < len(payload): + remainder = [] + while i < len(payload): + remainder.append(chr(ord(payload[i]) ^ ord(mask_key[i % 4]))) + i += 1 + result = result + "".join(remainder) + return result + +def apply_mask_py(payload, mask_key): result = array.array("B", payload) m = array.array("B", mask_key) i = 0 @@ -149,6 +169,11 @@ def apply_mask(payload, mask_key): i += 1 return result.tostring() +if numpy is not None: + apply_mask = apply_mask_numpy +else: + apply_mask = apply_mask_py + class WebSocketFrame(object): def __init__(self): self.fin = False

1 0

[flashproxy/master] Add a websockify patch to assume binary frames in the absence of "base64".
by dcf＠torproject.org 19 Apr '12

19 Apr '12

commit 4ca2f2e70974fff095f01964d80ef271c1d55543 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Apr 19 14:31:14 2012 -0700 Add a websockify patch to assume binary frames in the absence of "base64". Otherwise websockify just terminates the connection unless the subprotocol is "base64" or "binary". --- README | 2 ++ patches/websockify-binary-default.patch | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/README b/README index e9917e4..5aa054f 100644 --- a/README +++ b/README @@ -118,6 +118,7 @@ re-register: The relay runs with a WebSocket proxy in external proxy mode. git clone git://github.com/kanaka/websockify.git + git apply ~/flashproxy/patches/websockify-binary-default.patch This command proxies WebSocket on port 9901 to a local ORPort on 9001. ./websockify :9901 127.0.0.1:9001 The init.d script described under "Installing so as to restart at boot" @@ -160,6 +161,7 @@ CentOS. "make install" copies files to /usr/local/bin. # service facilitator start # cd websockify + # git apply ~/flashproxy/patches/websockify-binary-default.patch # cp websockify websocket.py /usr/local/bin # useradd -d /dev/null -s /bin/false websockify # mkdir /var/websockify diff --git a/patches/websockify-binary-default.patch b/patches/websockify-binary-default.patch new file mode 100644 index 0000000..9ba7f06 --- /dev/null +++ b/patches/websockify-binary-default.patch @@ -0,0 +1,26 @@ +From 066c665c2e437a399e2fd0b55394b0ec82c7aeab Mon Sep 17 00:00:00 2001 +From: David Fifield <david(a)bamsoftware.com> +Date: Thu, 19 Apr 2012 14:16:16 -0700 +Subject: [PATCH] Assume binary transfer when no subprotocol is given. + +--- + websocket.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/websocket.py b/websocket.py +index 646160c..d6cea57 100644 +--- a/websocket.py ++++ b/websocket.py +@@ -660,7 +660,8 @@ Sec-WebSocket-Accept: %s\r + elif 'base64' in protocols: + self.base64 = True + else: +- raise self.EClose("Client must support 'binary' or 'base64' protocol") ++ self.base64 = False ++ # raise self.EClose("Client must support 'binary' or 'base64' protocol") + + # Generate the hash value for the accept header + accept = b64encode(sha1(s2b(key + self.GUID)).digest()) +-- +1.7.9.5 +

1 0

[tor/master] Improve the message of validate_pluggable_transports_config().
by nickm＠torproject.org 19 Apr '12

19 Apr '12

commit 9d9b5ed0c65e2c6669a047706122b650f16870cb Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Apr 12 01:27:58 2012 +0200 Improve the message of validate_pluggable_transports_config(). --- src/or/circuitbuild.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 1c7367a..359771e 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4802,10 +4802,11 @@ validate_pluggable_transports_config(void) pluggable transports. We should warn the user in such case, since it's probably misconfiguration. */ if (!transport_get_by_name(b->transport_name)) - log_warn(LD_CONFIG, "You have a Bridge line using the %s " - "pluggable transport, but there doesn't seem to be a " - "corresponding ClientTransportPlugin line.", - b->transport_name); + log_warn(LD_CONFIG, "We can't find a pluggable transport proxy " + "that supports '%s' for bridge '%s:%u'. This can happen " + "if you haven't provided a ClientTransportPlugin line, or " + "if your pluggable transport proxy stopped working.", + b->transport_name, fmt_addr(&b->addr), b->port); } SMARTLIST_FOREACH_END(b); return 0;

1 0

[tor/master] Trivially refactor validate_pluggable_transports_config().
by nickm＠torproject.org 19 Apr '12

19 Apr '12

commit 32267809b529a636e556be4b42630bfc56a61fb5 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Apr 12 01:35:46 2012 +0200 Trivially refactor validate_pluggable_transports_config(). * Remove the ugly if statement. * constify 'bridge_info_t' in SMARTLIST_FOREACH_BEGIN. --- src/or/circuitbuild.c | 37 ++++++++++++++++++------------------- 1 files changed, 18 insertions(+), 19 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 359771e..5481838 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4793,26 +4793,25 @@ int validate_pluggable_transports_config(void) { /* Don't validate if managed proxies are not yet fully configured. */ - if (bridge_list && !pt_proxies_configuration_pending()) { - SMARTLIST_FOREACH_BEGIN(bridge_list, bridge_info_t *, b) { - /* Skip bridges without transports. */ - if (!b->transport_name) - continue; - /* See if the user has Bridges that specify nonexistent - pluggable transports. We should warn the user in such case, - since it's probably misconfiguration. */ - if (!transport_get_by_name(b->transport_name)) - log_warn(LD_CONFIG, "We can't find a pluggable transport proxy " - "that supports '%s' for bridge '%s:%u'. This can happen " - "if you haven't provided a ClientTransportPlugin line, or " - "if your pluggable transport proxy stopped working.", - b->transport_name, fmt_addr(&b->addr), b->port); - } SMARTLIST_FOREACH_END(b); - - return 0; - } else { + if (!bridge_list || pt_proxies_configuration_pending()) return -1; - } + + SMARTLIST_FOREACH_BEGIN(bridge_list, const bridge_info_t *, b) { + /* Skip bridges without transports. */ + if (!b->transport_name) + continue; + /* See if the user has Bridges that specify nonexistent + pluggable transports. We should warn the user in such case, + since it's probably misconfiguration. */ + if (!transport_get_by_name(b->transport_name)) + log_warn(LD_CONFIG, "We can't find a pluggable transport proxy " + "that supports '%s' for bridge '%s:%u'. This can happen " + "if you haven't provided a ClientTransportPlugin line, or " + "if your pluggable transport proxy stopped working.", + b->transport_name, fmt_addr(&b->addr), b->port); + } SMARTLIST_FOREACH_END(b); + + return 0; } /** Return a bridge pointer if <b>ri</b> is one of our known bridges

1 0

[tor/master] Merge remote-tracking branch 'asn-mytor/bug5601'
by nickm＠torproject.org 19 Apr '12

19 Apr '12

commit 2d24994d166f6d89a685b83a9021c360cd828905 Merge: bd7724a 3226780 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 19 17:53:19 2012 -0400 Merge remote-tracking branch 'asn-mytor/bug5601' src/or/circuitbuild.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-)

1 0

[tor/master] Fix a log-uninitialized-buffer bug.
by nickm＠torproject.org 19 Apr '12

19 Apr '12

commit f6afd4efa6c24fab8ace710fc0eac4c8811b93dd Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 18 23:02:09 2012 -0400 Fix a log-uninitialized-buffer bug. Fix for 5647; bugfix on 0.2.1.5-alpha. --- changes/bug5647 | 4 ++++ src/or/routerparse.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/bug5647 b/changes/bug5647 new file mode 100644 index 0000000..92f41c8 --- /dev/null +++ b/changes/bug5647 @@ -0,0 +1,4 @@ + o Major bugfixes: + - Avoid logging uninitialized data when unable to decode a hidden + service descriptor cookie. Fixes bug 5647; bugfix on 0.2.1.5-alpha. + diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 322a2b5..8c4f582 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -5056,7 +5056,6 @@ rend_parse_client_keys(strmap_t *parsed_clients, const char *ckstr) while (!strcmpstart(current_entry, "client-name ")) { rend_authorized_client_t *parsed_entry; size_t len; - char descriptor_cookie_base64[REND_DESC_COOKIE_LEN_BASE64+2+1]; char descriptor_cookie_tmp[REND_DESC_COOKIE_LEN+2]; /* Determine end of string. */ const char *eos = strstr(current_entry, "\nclient-name "); @@ -5125,7 +5124,7 @@ rend_parse_client_keys(strmap_t *parsed_clients, const char *ckstr) tok->args[0], REND_DESC_COOKIE_LEN_BASE64+2+1) != REND_DESC_COOKIE_LEN)) { log_warn(LD_REND, "Descriptor cookie contains illegal characters: " - "%s", descriptor_cookie_base64); + "%s", escaped(tok->args[0])); goto err; } memcpy(parsed_entry->descriptor_cookie, descriptor_cookie_tmp,

1 0

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

19 Apr '12

commit bd7724a57eeb756232f5be222c643ccb8b364966 Merge: a0d1e80 f6afd4e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 19 17:08:09 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug5647 | 4 ++++ src/or/routerparse.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.2] Fix a log-uninitialized-buffer bug.
by nickm＠torproject.org 19 Apr '12

19 Apr '12

commit f6afd4efa6c24fab8ace710fc0eac4c8811b93dd Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 18 23:02:09 2012 -0400 Fix a log-uninitialized-buffer bug. Fix for 5647; bugfix on 0.2.1.5-alpha. --- changes/bug5647 | 4 ++++ src/or/routerparse.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/bug5647 b/changes/bug5647 new file mode 100644 index 0000000..92f41c8 --- /dev/null +++ b/changes/bug5647 @@ -0,0 +1,4 @@ + o Major bugfixes: + - Avoid logging uninitialized data when unable to decode a hidden + service descriptor cookie. Fixes bug 5647; bugfix on 0.2.1.5-alpha. + diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 322a2b5..8c4f582 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -5056,7 +5056,6 @@ rend_parse_client_keys(strmap_t *parsed_clients, const char *ckstr) while (!strcmpstart(current_entry, "client-name ")) { rend_authorized_client_t *parsed_entry; size_t len; - char descriptor_cookie_base64[REND_DESC_COOKIE_LEN_BASE64+2+1]; char descriptor_cookie_tmp[REND_DESC_COOKIE_LEN+2]; /* Determine end of string. */ const char *eos = strstr(current_entry, "\nclient-name "); @@ -5125,7 +5124,7 @@ rend_parse_client_keys(strmap_t *parsed_clients, const char *ckstr) tok->args[0], REND_DESC_COOKIE_LEN_BASE64+2+1) != REND_DESC_COOKIE_LEN)) { log_warn(LD_REND, "Descriptor cookie contains illegal characters: " - "%s", descriptor_cookie_base64); + "%s", escaped(tok->args[0])); goto err; } memcpy(parsed_entry->descriptor_cookie, descriptor_cookie_tmp,

1 0

[tor/master] initial round of changelog stanza cleanup
by arma＠torproject.org 19 Apr '12

19 Apr '12

commit a0d1e806e036969e02eeb4966e0d618f32643ce0 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Apr 19 15:10:33 2012 -0400 initial round of changelog stanza cleanup --- changes/bug3942 | 2 +- changes/bug4011 | 1 - changes/bug4875 | 4 ++-- changes/bug5053 | 8 ++++---- changes/bug5151 | 2 +- changes/bug5180 | 3 +-- changes/bug5508 | 2 +- changes/bug5558 | 4 ++-- changes/bug5644 | 2 +- changes/ides-becomes-turtles | 4 ++-- 10 files changed, 15 insertions(+), 17 deletions(-) diff --git a/changes/bug3942 b/changes/bug3942 index f69c7bc..5731aad 100644 --- a/changes/bug3942 +++ b/changes/bug3942 @@ -1,4 +1,4 @@ o Minor bugfixes: - Don't log that we have "decided to publish new relay descriptor" unless - we are actually publishing a descriptor. Fix for bug 3942; bugfix on + we are actually publishing a descriptor. Fixes bug 3942; bugfix on 0.2.3.2-alpha. diff --git a/changes/bug4011 b/changes/bug4011 index 23afd13..fb82d6e 100644 --- a/changes/bug4011 +++ b/changes/bug4011 @@ -1,5 +1,4 @@ o Major bugfixes: - - Do not allow the presence of one consensus flavor to keep us from downloading another. Previously, we had one "time to download a consensus" timer, which didn't understand the idea of having one diff --git a/changes/bug4875 b/changes/bug4875 index 7d19ca3..c8c9ba5 100644 --- a/changes/bug4875 +++ b/changes/bug4875 @@ -1,3 +1,3 @@ - o Minor bugfixes + o Minor features: - Relays now understand an IPv6 address when they get one from a - directory server. Fixes bug 4875. + directory server. Resolves ticket 4875. diff --git a/changes/bug5053 b/changes/bug5053 index 88d82cd..fe43f54 100644 --- a/changes/bug5053 +++ b/changes/bug5053 @@ -1,5 +1,5 @@ - o Minor bugfixes: - - Resolve IPv6 addresses in bridge and entry statistics to country code - "??" which means we at least count them. Fixes bug 5053; bugfix on - 0.2.3.9-alpha. + o Minor features: + - Resolve IPv6 addresses in bridge and entry statistics to country + code "??" which means we at least count them. Resolves ticket 5053; + improves on 0.2.3.9-alpha. diff --git a/changes/bug5151 b/changes/bug5151 index 4ea1219..1a56cf6 100644 --- a/changes/bug5151 +++ b/changes/bug5151 @@ -1,4 +1,4 @@ o Minor bugfixes: - Fix bug stomping on ORPort option NoListen and ignoring option NoAdvertise. Fixes bug 5151; bugfix on 0.2.3.9-alpha. - - Move a debug printout from notice to debug level. + diff --git a/changes/bug5180 b/changes/bug5180 index 86698b4..2cb545e 100644 --- a/changes/bug5180 +++ b/changes/bug5180 @@ -1,7 +1,6 @@ o Removed features: - - The "torify" script no longer supports the "tsocks" sockifier tool, since it doesn't support DNS and UDP right for Tor. - Everyone should be using torsocks instead. Fixes bug 3530 and bug + Everyone should be using torsocks instead. Fixes bugs 3530 and 5180. Based on a patch by "ugh". diff --git a/changes/bug5508 b/changes/bug5508 index 6606f82..cebc31d 100644 --- a/changes/bug5508 +++ b/changes/bug5508 @@ -1,4 +1,4 @@ o Minor bugfixes: - Fix a bug where a bridge authority crashes (on a failed assert) if it has seen no directory requests when it's time to write - statistics to disk. + statistics to disk. Fixes bug 5508. Bugfix on 0.2.3.6-alpha. diff --git a/changes/bug5558 b/changes/bug5558 index 90ab3a6..43b832c 100644 --- a/changes/bug5558 +++ b/changes/bug5558 @@ -1,3 +1,3 @@ - o Minor bugfixes + o Minor bugfixes: - Enforce correct return behavior of tor_vsscanf(), when the '%%' - pattern is used. Fixes bug 5558. + pattern is used. Fixes bug 5558. Bugfix on 0.2.1.13. diff --git a/changes/bug5644 b/changes/bug5644 index a390eba..4eb2d01 100644 --- a/changes/bug5644 +++ b/changes/bug5644 @@ -1,4 +1,4 @@ - o Major bugfixes + o Major bugfixes: - Prevent a client-side assertion failure when receiving an INTRODUCE2 cell by an exit relay, in a general purpose circuit. Fixes bug 5644; bugfix on tor-0.2.1.6-alpha diff --git a/changes/ides-becomes-turtles b/changes/ides-becomes-turtles index 09d964f..6451221 100644 --- a/changes/ides-becomes-turtles +++ b/changes/ides-becomes-turtles @@ -1,4 +1,4 @@ o Directory authority changes: - - Change IP address for ides (v3 directory authority), and rename it to - turtles. + - Change IP address for ides (v3 directory authority), and rename + it to turtles.

1 0

[metrics-lib/master] Add an upper limit of 100 descriptors in the queue.
by karsten＠torproject.org 19 Apr '12

19 Apr '12

commit f154c86a316cff0180ed551041927273691e5bee Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Apr 19 20:01:54 2012 +0200 Add an upper limit of 100 descriptors in the queue. --- .../descriptor/impl/BlockingIteratorImpl.java | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/descriptor/impl/BlockingIteratorImpl.java b/src/org/torproject/descriptor/impl/BlockingIteratorImpl.java index c023aec..e23034a 100644 --- a/src/org/torproject/descriptor/impl/BlockingIteratorImpl.java +++ b/src/org/torproject/descriptor/impl/BlockingIteratorImpl.java @@ -19,13 +19,20 @@ public class BlockingIteratorImpl<T> implements Iterator<T> { protected BlockingIteratorImpl() { } - /* Add an object to the queue. */ + /* Add an object to the queue if there's still room. */ + final int MAX_DESCRIPTORS = 100; protected synchronized void add(T object) { if (this.outOfDescriptors) { throw new IllegalStateException("Internal error: Adding results to " + "descriptor queue not allowed after sending end-of-stream " + "object."); } + while (this.queue.size() >= this.MAX_DESCRIPTORS) { + try { + wait(); + } catch (InterruptedException e) { + } + } this.queue.offer(object); notifyAll(); } @@ -68,6 +75,7 @@ public class BlockingIteratorImpl<T> implements Iterator<T> { if (this.queue.peek() == null) { throw new NoSuchElementException(); } + notifyAll(); return this.queue.remove(); }

1 0