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

[bridgedb/develop] Merge branch 'fix/6127-render_GET-traceback' into develop
by isis＠torproject.org 01 Feb '14

01 Feb '14

commit 336eb6250df6bf53f0390e95b2fde9a30ac1b1cf Merge: 99cbe98 aa2885b Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jan 24 20:20:39 2014 +0000 Merge branch 'fix/6127-render_GET-traceback' into develop lib/bridgedb/HTTPServer.py | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-)

1 0

[bridgedb/develop] Fix Sphinx directives in HTTPServer.usingRTLLang().
by isis＠torproject.org 01 Feb '14

01 Feb '14

commit f964f7e8c95258b8ec572374dce772221886ecbf Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jan 24 03:39:30 2014 +0000 Fix Sphinx directives in HTTPServer.usingRTLLang(). --- lib/bridgedb/HTTPServer.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 153918b..ea10e0b 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -371,8 +371,7 @@ def addWebServer(cfg, dist, sched): return site def usingRTLLang(request): - """ - Check if we should translate the text into a RTL language + """Check if we should translate the text into a RTL language Retrieve the headers from the request. Obtain the Accept-Language header and decide if we need to translate the text. Install the requisite @@ -380,8 +379,11 @@ def usingRTLLang(request): support. Choose the first language from the header that we support and return True if it is a RTL language, else return False. - :param request twisted.web.server.Request: Incoming request - :returns bool: Language is right-to-left + :type request: :api:`twisted.web.server.Request` + :param request: An incoming request. + :rtype: bool + :returns: ``True`` if the preferred language is right-to-left; ``False`` + otherwise. """ langs = setLocaleFromRequestHeader(request)

1 0

[bridgedb/develop] Add COLLECT_TIMESTAMPS option for configuring addOrUpdateBridgeHistory().
by isis＠torproject.org 01 Feb '14

01 Feb '14

commit 11b83c612090d673d4f23ccaf85be66ec5588e8a Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jan 24 20:49:39 2014 +0000 Add COLLECT_TIMESTAMPS option for configuring addOrUpdateBridgeHistory(). * ADD a new option, `COLLECT_TIMESTAMPS` to the config file to configure whether or not to run the timestamp collection code, including `Stability.addOrUpdateBridgeHistory()`, in `Main.load()`. * FIXES #10724 --- bridgedb.conf | 18 ++++++++++++++++++ lib/bridgedb/Main.py | 21 +++++++++++---------- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/bridgedb.conf b/bridgedb.conf index bf97077..bcde0cf 100644 --- a/bridgedb.conf +++ b/bridgedb.conf @@ -20,6 +20,11 @@ # # CHANGELOG: # ~~~~~~~~~~ +# Changes in version 0.0.4 - 2014-01-24 +# * ADD COLLECT_TIMESTAMPS option (see #10724). Set it to False for the +# staging instance (etc/test-bridgedb.conf), and True for the production +# server (etc/bridgedb.conf). +# # Changes in version 0.0.3 - 2014-01-17 # * UPDATE config from bridgedb.git/bridgedb.conf, without changing any of the # settings. @@ -146,6 +151,19 @@ FORCE_PORTS = [(443, 1)] # Only "Stable" is now supported. This is a list of (flag,minimum) tuples. FORCE_FLAGS = [("Stable", 1)] +#--------------------------- +# Database/Parsing Options \ +#------------------------------------------------------------------------------ +# +# These options change various database transaction and descriptor parsing +# behaviours. +#------------------------------------------------------------------------------ + +# (boolean) If True, then collect, sort, and store all timestamps seen for all +# bridges. This operation is extremely expensive, and should be disabled when +# it is not necessary. +COLLECT_TIMESTAMPS = True + #------------------------------- # HTTP(S) Distribution Options \ #------------------------------------------------------------------------------ diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 24ec825..a46f22f 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -140,16 +140,17 @@ def load(state, splitter, clear=False): # ns, then we skip it there, too. splitter.insert(bridge) - if bridge.getID() in timestamps.keys(): - ts = timestamps[bridge.getID()][:] - ts.sort() - for timestamp in ts: - logging.debug( - "Adding/updating timestamps in BridgeHistory for "\ - "'%s' in database: %s" - % (bridge.fingerprint, timestamp)) - bridgedb.Stability.addOrUpdateBridgeHistory( - bridge, timestamp) + if state.COLLECT_TIMESTAMPS: + if bridge.getID() in timestamps.keys(): + ts = timestamps[bridge.getID()][:] + ts.sort() + for timestamp in ts: + logging.debug( + "Updating BridgeHistory timestamps for %s: %s" + % (bridge.fingerprint, timestamp)) + bridgedb.Stability.addOrUpdateBridgeHistory( + bridge, timestamp) + logging.debug("Closing bridge-server-descriptor file: '%s'" % fname) f.close()

1 0

[bridgedb/develop] Fix a misnamed logger call in HTTPServer; change severity level.
by isis＠torproject.org 01 Feb '14

01 Feb '14

commit 4d26c43515a4ed2d4f8cf2e066ecb764cd98e813 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jan 26 02:44:58 2014 +0000 Fix a misnamed logger call in HTTPServer; change severity level. --- lib/bridgedb/HTTPServer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index da72f3e..26bc5ad 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -94,7 +94,7 @@ class CaptchaProtectedResource(twisted.web.resource.Resource): try: c.get() except Exception as error: - log.error("Connection to Recaptcha server failed.") + logging.fatal("Connection to Recaptcha server failed: %s" % error) # TODO: this does not work for versions of IE < 8.0 imgstr = 'data:image/jpeg;base64,%s' % base64.b64encode(c.image)

1 0

[bridgedb/develop] Make log message for strange X-Forward-For headers clearer.
by isis＠torproject.org 01 Feb '14

01 Feb '14

commit 3f9a5344ec553a14db1e66ac9a95208bee1d3fa5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jan 25 18:18:10 2014 +0000 Make log message for strange X-Forward-For headers clearer. --- lib/bridgedb/HTTPServer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index eac1fb9..6892f12 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -82,7 +82,7 @@ class CaptchaProtectedResource(twisted.web.resource.Resource): if h: ip = h.split(",")[-1].strip() if not bridgedb.Bridges.is_valid_ip(ip): - logging.warn("Got weird forwarded-for value %r",h) + logging.warn("Got weird X-Forwarded-For value %r" % h) ip = None else: ip = request.getClientIP()

1 0

[bridgedb/develop] Merge branch 'feature/10724-collect-timestamps-option' into develop
by isis＠torproject.org 01 Feb '14

01 Feb '14

commit b52786f8abef76423e89e3ef74e1714490bf0b97 Merge: 336eb62 11b83c6 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jan 24 21:00:35 2014 +0000 Merge branch 'feature/10724-collect-timestamps-option' into develop bridgedb.conf | 18 ++++++++++++++++++ lib/bridgedb/Main.py | 21 +++++++++++---------- 2 files changed, 29 insertions(+), 10 deletions(-)

1 0

[bridgedb/develop] Split a long string of chained method calls into separate calls.
by isis＠torproject.org 01 Feb '14

01 Feb '14

commit 847905a78373aa101406439ccaa68f2f3e9a6c9a Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jan 25 18:19:31 2014 +0000 Split a long string of chained method calls into separate calls. * CHANGE a line in HTTPServer.CaptchaProtectedResource which chained several method calls together inside a return statement, into a separate lines for each call. --- lib/bridgedb/HTTPServer.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 6892f12..da72f3e 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -98,7 +98,9 @@ class CaptchaProtectedResource(twisted.web.resource.Resource): # TODO: this does not work for versions of IE < 8.0 imgstr = 'data:image/jpeg;base64,%s' % base64.b64encode(c.image) - return lookup.get_template('captcha.html').render(imgstr=imgstr, challenge_field=c.challenge) + template = lookup.get_template('captcha.html') + rendered = template.render(imgstr=imgstr, challenge_field=c.challenge) + return rendered def render_POST(self, request): try:

1 0

[bridgedb/develop] Add Sphinx docstring to CaptchaProtectedResource.render_POST().
by isis＠torproject.org 01 Feb '14

01 Feb '14

commit dc9757df396b9d8cf5fda0e8bdb838ab9af33a53 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jan 26 02:49:00 2014 +0000 Add Sphinx docstring to CaptchaProtectedResource.render_POST(). --- lib/bridgedb/HTTPServer.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 9b4c515..5ce8b72 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -112,6 +112,18 @@ class CaptchaProtectedResource(twisted.web.resource.Resource): return rendered def render_POST(self, request): + """Process a client CAPTCHA by sending it to the ReCaptcha server. + + The client's IP address is not sent to the ReCaptcha server; instead, + a completely random IP is generated and sent instead. + + :type request: :api:`twisted.web.http.Request` + :param request: A ``Request`` object containing the POST arguments + should include two key/value pairs: one key being + ``'recaptcha_challange_field'``, and the other, + ``'recaptcha_response_field'``. These POST arguments + should be obtained from :meth:`render_GET`. + """ try: challenge = request.args['recaptcha_challenge_field'][0] response = request.args['recaptcha_response_field'][0]

1 0

[bridgedb/develop] Fix typos in two docstrings in HTTPServer.
by isis＠torproject.org 01 Feb '14

01 Feb '14

commit ca1544c38005262df7ada31806f7ca6e0f0ccbb0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jan 26 05:45:17 2014 +0000 Fix typos in two docstrings in HTTPServer. --- lib/bridgedb/HTTPServer.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 3bffe81..104e924 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -432,11 +432,11 @@ def usingRTLLang(request): return False def getAssumedChosenLang(langs): - """ - Return the first language in ``langs`` and we supprt + """Return the first language in **langs** that we support. - :param langs list: All requested languages - :returns string: Chosen language + :param list langs: All requested languages + :rtype: str + :returns: A country code for the client's preferred language. """ i18npath = os.path.join(os.path.dirname(__file__), 'i18n') path = filepath.FilePath(i18npath) @@ -456,9 +456,8 @@ def setLocaleFromRequestHeader(request): Parse the languages in the header, and attempt to install the first one in the list. If that fails, we receive a :class:`gettext.NullTranslation` object, if it worked then we have a :class:`gettext.GNUTranslation` - object. Whichever one we end up with, add the other get the other - languages and add them as fallbacks to the first. Lastly, install this - chain of translations. + object. Whichever one we end up with, get the other languages and add them + as fallbacks to the first. Lastly, install this chain of translations. :type request: :api:`twisted.web.server.Request` :param request: An incoming request from a client.

1 0

[bridgedb/develop] Don't safelog randomly generated IPs.
by isis＠torproject.org 01 Feb '14

01 Feb '14

commit bf852f9e95162f42c02f50554853e3075bedbd9f Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jan 25 17:38:31 2014 +0000 Don't safelog randomly generated IPs. * REMOVE calls to `Util.safelog` which masked the IP addresses which are randomly generated in `HTTPServer.CaptchaProtectedResource.render_POST()`. These random IPs are sent to the ReCaptcha server in order to not reveal the client's real IP, and they are no more revealing/identifying of a particular client than the `twisted.web.http.Request.args` which are logged. --- lib/bridgedb/HTTPServer.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 32399b3..eac1fb9 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -114,13 +114,14 @@ class CaptchaProtectedResource(twisted.web.resource.Resource): recaptcha_response = captcha.submit(challenge, response, self.recaptchaPrivKey, remote_ip) if recaptcha_response.is_valid: - logging.info("Valid recaptcha from %s. Parameters were %r", - Util.logSafely(remote_ip), request.args) + logging.info("Valid recaptcha from %s. Parameters were %r" + % (remote_ip, request.args)) return self.resource.render(request) else: - logging.info("Invalid recaptcha from %s. Parameters were %r", - Util.logSafely(remote_ip), request.args) - logging.info("Recaptcha error code: %s", recaptcha_response.error_code) + logging.info("Invalid recaptcha from %s. Parameters were %r" + % (remote_ip, request.args)) + logging.info("Recaptcha error code: %r" + % recaptcha_response.error_code) return redirectTo(request.URLPath(), request) class WebResource(twisted.web.resource.Resource):

1 0