- tor-commits - lists.torproject.org

[pyonionoo/master] Merge remote-tracking branch 'gsathya/bug_6955'
by karsten＠torproject.org 25 Sep '12

25 Sep '12

commit f23b25c5e1bdfa9c45a55eaef61140f85ebff69d Merge: c4b4561 8fd564b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Sep 25 15:10:49 2012 -0400 Merge remote-tracking branch 'gsathya/bug_6955' pyonionoo/handlers/arguments.py | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-)

1 0

[pyonionoo/master] Fix typo in error message.
by karsten＠torproject.org 25 Sep '12

25 Sep '12

commit d645146326f327e84e2d2b6e665a595131b04e7e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Sep 25 15:11:52 2012 -0400 Fix typo in error message. --- pyonionoo/handlers/arguments.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pyonionoo/handlers/arguments.py b/pyonionoo/handlers/arguments.py index 976fd96..e954921 100644 --- a/pyonionoo/handlers/arguments.py +++ b/pyonionoo/handlers/arguments.py @@ -61,7 +61,7 @@ def parse(arguments): elif value == 'bridge': type_filter = 'b' else: - error_msg = 'Invalid argument to running parameter: %s' % value + error_msg = 'Invalid argument to type parameter: %s' % value raise cyclone.web.HTTPError(400, error_msg) if key == "lookup":

1 0

[pyonionoo/master] Raise proper exceptions, cleanup code
by karsten＠torproject.org 25 Sep '12

25 Sep '12

commit 8fd564bc0625b00bc4dfb894e77a18af7b9a33d3 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Tue Sep 25 18:56:16 2012 +0530 Raise proper exceptions, cleanup code --- pyonionoo/handlers/arguments.py | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pyonionoo/handlers/arguments.py b/pyonionoo/handlers/arguments.py index 4c18b84..976fd96 100644 --- a/pyonionoo/handlers/arguments.py +++ b/pyonionoo/handlers/arguments.py @@ -1,11 +1,13 @@ """ Handle URL request parameters. Provides the following functions: - parse: given a GET request parameter dictionary, return a keyword +parse: given a GET request parameter dictionary, return a keyword argument dictionary suitable for use by the database module functions. """ +import cyclone.web + # Request parameters. ARGUMENTS = ['type', 'running', 'search', 'lookup', 'country', 'order', 'offset', 'limit'] @@ -49,9 +51,9 @@ def parse(arguments): elif value.lower() == 'false': running_filter = False else: - raise ValueError( - 'Invalid argument to running parameter: {}.'.format( - value)) + error_msg = 'Invalid argument to running parameter: %s' % value + raise cyclone.web.HTTPError(400, error_msg) + if key == "type": value = values[0] if value == 'relay': @@ -59,20 +61,15 @@ def parse(arguments): elif value == 'bridge': type_filter = 'b' else: - raise ValueError( - 'Invalid argument to type parameter: {}.'.format( - value)) + error_msg = 'Invalid argument to running parameter: %s' % value + raise cyclone.web.HTTPError(400, error_msg) + if key == "lookup": hex_fingerprint_filter = values[0] + if key == "country": country_filter = values[0] - # XXX: The protocol allows a list of search terms. In a URL-based - # GET request, these would appear as search=term1&search=term2..., - # and then values would be [term1, term2,...]. But the protocol - # specifies that multiple terms appear as a single argument for - # the search parameter, which is then given to us as a single - # (space-separated) string. if key == "search": search_filter = values[0].split() @@ -85,24 +82,28 @@ def parse(arguments): if value == "consensus_weight": order_field = 'consensus_weight' else: - raise ValueError('Invalid order argument: {}'.format(value)) + error_msg = 'Invalid order argument: %s' % value + raise cyclone.web.HTTPError(400, error_msg) if key == 'offset': value = values[0] try: offset_value = int(value) except ValueError: - raise ValueError('Invalid offset argument: {}'.format(value)) + error_msg = 'Invalid offset argument: %s' % value + raise cyclone.web.HTTPError(400, error_msg) if key == 'limit': value = values[0] try: limit_value = int(value) except ValueError: - raise ValueError('Invalid limit argument: {}'.format(value)) + error_msg = 'Invalid limit argument: %s' % value + raise cyclone.web.HTTPError(400, error_msg) else: # key not in ARGUMENTS - raise NotImplementedError('Invalid request parameter: {}'.format(key)) + error_msg = 'Invalid request parameter: %s' % value + raise cyclone.web.HTTPError(400, error_msg) # There must be a better way to do this... return { @@ -116,4 +117,3 @@ def parse(arguments): 'offset_value' : offset_value, 'limit_value' : limit_value } -

1 0

[pyonionoo/master] Handle bridges without any flags in summary file.
by gsathya＠torproject.org 25 Sep '12

25 Sep '12

commit c4b4561f3d7184ee2a9a6e2efc048b32383f71c1 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Sep 24 15:43:48 2012 -0400 Handle bridges without any flags in summary file. Bridges without any flags have two subsequent spaces in the summary file. Pass a value for sep when calling split(), so that "consecutive delimiters are not grouped together and are deemed to delimit empty strings" (Python documentation). --- pyonionoo/parser.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pyonionoo/parser.py b/pyonionoo/parser.py index b917a92..4cfdd11 100644 --- a/pyonionoo/parser.py +++ b/pyonionoo/parser.py @@ -21,7 +21,7 @@ class Router: self.type = None def parse(self, raw_content): - values = raw_content.split() + values = raw_content.split(' ') if len(values) < 9: #raise Exception raise ValueError("Invalid router!")

1 0

[stem/master] Running apidoc when being built by read-the-docs
by atagar＠torproject.org 25 Sep '12

25 Sep '12

commit 705b61674e8cec9e5608a32c6a50a708fee8c5f7 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Sep 25 09:51:26 2012 -0700 Running apidoc when being built by read-the-docs The read-the-docs service runs sphinx-build, bypassing our custom Makefile. The only gotcha with this is that it means we don't call apidoc, causing our autogenerated documentation (which is... well, just about everything) to not exist. Making the apidoc in the conf.py file, using the READTHEDOCS environment variable to deterine if we're on that platform or not. Tested by first running a regular sphinx build to repro the apidoc not being called... sphinx-build -b html -d _build/doctrees . _build/html ... then did it again after setting READTHEDOCS to confirm that the autodocs now existed. --- docs/conf.py | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index ada61ec..0bdd83c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -13,6 +13,15 @@ import sys, os +# Our make file calls sphinx-apidoc, but read-the-docs uses our config instead +# (so it skips that step). Calling apidoc here instead if we're being built +# there. + +on_rtd = os.environ.get('READTHEDOCS', None) == 'True' + +if on_rtd: + os.system("sphinx-apidoc -f -o . ../stem") + # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here.

1 0

[tor/master] Fix comment typo
by nickm＠torproject.org 25 Sep '12

25 Sep '12

commit 38609f1354104f14bf7dde540b932450ab9a54cc Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Sep 18 15:20:10 2012 -0400 Fix comment typo --- src/or/dirvote.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index b1b885c..21ad836 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -1893,7 +1893,7 @@ networkstatus_compute_consensus(smartlist_t *votes, * listed that descriptor will have the same summary. If not then * something is fishy and we'll use the most common one (breaking * ties in favor of lexicographically larger one (only because it - * lets me reuse more existing code. + * lets me reuse more existing code)). * * The other case that can happen is that no authority that voted * for that descriptor has an exit policy summary. That's

1 0

[tor/master] Warn if HSes are configured on a client with UseEntryGuards disabled
by nickm＠torproject.org 25 Sep '12

25 Sep '12

commit 130e899fbb02d6005e3797dea2099e4033345ebe Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Sep 18 16:50:00 2012 -0400 Warn if HSes are configured on a client with UseEntryGuards disabled --- changes/warn-about-hses-without-guards | 8 ++++++++ src/or/config.c | 9 +++++++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/changes/warn-about-hses-without-guards b/changes/warn-about-hses-without-guards new file mode 100644 index 0000000..57b8b4d --- /dev/null +++ b/changes/warn-about-hses-without-guards @@ -0,0 +1,8 @@ + o Minor features: + + - Warn users who run hidden services on a Tor client with + UseEntryGuards disabled that their hidden services will be + vulnerable to http://freehaven.net/anonbib/#hs-attack06 (the + attack which motivated Tor to support entry guards in the first + place). Fixes bug 6889. + diff --git a/src/or/config.c b/src/or/config.c index affe238..11f63ef 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2536,6 +2536,15 @@ options_validate(or_options_t *old_options, or_options_t *options, options->UseEntryGuards = 0; } + if (!(options->UseEntryGuards) && + (options->RendConfigLines != NULL)) { + log_warn(LD_CONFIG, + "UseEntryGuards is disabled, but you have configured one or more " + "hidden services on this Tor instance. Your hidden services " + "will be very easy to locate using a well-known attack -- see " + "http://freehaven.net/anonbib/#hs-attack06 for details."); + } + if (!(options->LearnCircuitBuildTimeout) && options->CircuitBuildTimeout < RECOMMENDED_MIN_CIRCUIT_BUILD_TIMEOUT) { log_warn(LD_CONFIG,

1 0

[tor/master] Merge remote-tracking branch 'rransom/warn-about-hses-without-guards'
by nickm＠torproject.org 25 Sep '12

25 Sep '12

commit 95d9f7e9cce96d684a1f0279aa82c68d0b6182be Merge: dc014c9 38609f1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 25 12:39:00 2012 -0400 Merge remote-tracking branch 'rransom/warn-about-hses-without-guards' changes/warn-about-hses-without-guards | 8 ++++++++ src/or/config.c | 9 +++++++++ src/or/dirvote.c | 2 +- 3 files changed, 18 insertions(+), 1 deletions(-)

1 0

[tor-cloud/master] Wait 30s between reloading, stopping, and starting
by runa＠torproject.org 25 Sep '12

25 Sep '12

commit c5d5c227364a57b2fede8dcaea1e1f21f5c8633f Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Tue Sep 25 12:56:38 2012 +0100 Wait 30s between reloading, stopping, and starting --- ec2-prep.sh | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ec2-prep.sh b/ec2-prep.sh index 5c6e42d..4de2241 100644 --- a/ec2-prep.sh +++ b/ec2-prep.sh @@ -202,7 +202,9 @@ EOF # Edit /var/lib/tor/state and change the obfs port /etc/init.d/tor reload +sleep 30s /etc/init.d/tor stop +sleep 30s sed -i 's/TransportProxy.*/TransportProxy obfs2 0.0.0.0:52176/' /var/lib/tor/state /etc/init.d/tor start sleep 30s

1 0

[pyonionoo/master] Only search for beginning of nickname etc.
by gsathya＠torproject.org 25 Sep '12

25 Sep '12

commit ec043e2b66af7d149e27d36077022b42dc1777e2 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Sep 23 19:41:43 2012 +0200 Only search for beginning of nickname etc. --- pyonionoo/database.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pyonionoo/database.py b/pyonionoo/database.py index 128ccae..a7d909b 100644 --- a/pyonionoo/database.py +++ b/pyonionoo/database.py @@ -204,7 +204,7 @@ def query_summary_tbl(running_filter=None, type_filter=None, hex_fingerprint_fil clauses = [] if search_filter: for filter in search_filter: - clauses.append("search like '%%%s%%'" % filter) + clauses.append("search like '%% %s%%'" % filter) if running_filter: clauses.append("running = %s" % int(running_filter)) if type_filter:

1 0