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

[bridgedb/master] Fix alignment of topic headers in XXX-bdb-soc-dist.
by isis＠torproject.org 04 Feb '14

04 Feb '14

commit 58eb425869b34cc76ae2f76e751e160aa6ad229e Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Oct 23 11:55:28 2013 +0000 Fix alignment of topic headers in XXX-bdb-soc-dist. --- doc/proposals/XXX-bridgedb-social-distribution.txt | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/doc/proposals/XXX-bridgedb-social-distribution.txt b/doc/proposals/XXX-bridgedb-social-distribution.txt index 5f44fcf..7274132 100644 --- a/doc/proposals/XXX-bridgedb-social-distribution.txt +++ b/doc/proposals/XXX-bridgedb-social-distribution.txt @@ -8,7 +8,7 @@ Related Proposals: 199-bridgefinder-integration.txt XXX-bridgedb-database-improvements.txt Status: Draft -* I. Overview +* I. Overview This proposal specifies a system for social distribution of the centrally-stored bridges within BridgeDB. It is primarily based upon Part @@ -18,7 +18,7 @@ Status: Draft such malicious users and/or censoring entities from joining the pool of Tor clients who are able to receive distributed bridges. -* II. Motivation & Problem Scope +* II. Motivation & Problem Scope As it currently stands, Tor bridges which are stored within BridgeDB may be freely requested by any entity at nearly any time. While the openness, that @@ -35,7 +35,7 @@ Status: Draft can be even more in need of the identity protections and free speech enablement which Tor can provide, given their political contexts. -** II.A. Current Tor bridge distribution mechanisms and known pitfalls: +** II.A. Current Tor bridge distribution mechanisms and known pitfalls: *** 1. HTTP(S) Distributor @@ -71,7 +71,7 @@ Status: Draft roughly 1000 bridges in the Email Distributor's pool, distributing 3 bridges per email response, -* III. Terminology & Notations +* III. Terminology & Notations ** III.A. Terminology Definitions User := A client connecting to BridgeDB in order to obtain bridges. @@ -103,9 +103,7 @@ Status: Draft | ω | The last time that U requested and Invite Ticket from D | |--------------------+---------------------------------------------------------------------------------------------| -** III.C. Unicode characters - -* III. Threat Model +* IV. Threat Model In the original rBridge scheme, there are two separate proposals: the first does not make any attempt to hide information such as the user's (U) @@ -294,7 +292,7 @@ Status: Draft Considerations: -**** a. It doesn't need to modify the user's application-level traffic +**** 1a. It doesn't need to modify the user's application-level traffic The clientside will eventually need to be able to build a circuit to the BridgeDB backend, but it is not necessary that the clientside handle @@ -311,7 +309,7 @@ Status: Draft must be present before tor is started; tor will not reload these settings via SIGHUP. -**** c. TorLaucher is not the correct place for this functionality. +**** 1c. TorLaucher is not the correct place for this functionality. I am *not* adding this to TorLauncher. The clientside of rBridge will eventually need to handle a lot of complicated new cryptographic @@ -329,7 +327,7 @@ Status: Draft and then either launches tor (if the user wants to use an installed tor binary) or launches TorLauncher if we're running TBB. -**** d. Little-t tor is not the correct place for this either. +**** 1d. Little-t tor is not the correct place for this either. It might be possible, instead of (b) or (c), to add this to little-t tor. However, I feel like the bridge distribution problem is a

1 0

[bridgedb/master] Fix Accept-Lang: header log message to actually log the top five LC codes.
by isis＠torproject.org 04 Feb '14

04 Feb '14

commit 6b585fcbac636c035424f77c8a5f1f41a64bb474 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jan 28 17:25:45 2014 +0000 Fix Accept-Lang: header log message to actually log the top five LC codes. --- 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 ddac918..65702ba 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -527,7 +527,7 @@ def setLocaleFromRequestHeader(request): localedir = os.path.join(os.path.dirname(__file__), 'i18n/') langs = headers.parseAcceptLanguage(header) ## XXX the 'Accept-Language' header is potentially identifying - logging.debug("Client Accept-Language (top 5): %s" % langs[:4]) + logging.debug("Client Accept-Language (top 5): %s" % langs[:5]) try: language = gettext.translation("bridgedb", localedir=localedir,

1 0

[bridgedb/master] Change Mako template lookups to ignore atime checks.
by isis＠torproject.org 04 Feb '14

04 Feb '14

commit 3c2100f4be0952b1e1e9fcfc0bfab7b90acf1549 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jan 28 16:16:53 2014 +0000 Change Mako template lookups to ignore atime checks. * CHANGE Mako template lookups to ignore atime filesystem checks, using only compiled template and not reloading from file. --- lib/bridgedb/HTTPServer.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 65702ba..2668e31 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -40,10 +40,18 @@ from mako.lookup import TemplateLookup from zope.interface import Interface, Attribute, implements template_root = os.path.join(os.path.dirname(__file__),'templates') -lookup = TemplateLookup(directories=[template_root], - output_encoding='utf-8') rtl_langs = ('ar', 'he', 'fa', 'gu_IN', 'ku') +# Setting `filesystem_checks` to False is recommended for production servers, +# due to potential speed increases. This means that the atimes of the Mako +# template files aren't rechecked every time the template is requested +# (otherwise, if they are checked, and the atime is newer, the template is +# recompiled). See: +# http://docs.makotemplates.org/en/latest/usage.html#setting-filesystem-checks +lookup = TemplateLookup(directories=[template_root], + output_encoding='utf-8', + filesystem_checks=False) + logging.debug("Set template root to %s" % template_root) try:

1 0

[bridgedb/master] Set Mako template collection cache limit.
by isis＠torproject.org 04 Feb '14

04 Feb '14

commit 3f861122ba82cf0d60cc879f90a2fa1833ab25c4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jan 28 16:36:22 2014 +0000 Set Mako template collection cache limit. --- lib/bridgedb/HTTPServer.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 2668e31..dca2800 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -46,11 +46,13 @@ rtl_langs = ('ar', 'he', 'fa', 'gu_IN', 'ku') # due to potential speed increases. This means that the atimes of the Mako # template files aren't rechecked every time the template is requested # (otherwise, if they are checked, and the atime is newer, the template is -# recompiled). See: -# http://docs.makotemplates.org/en/latest/usage.html#setting-filesystem-checks +# recompiled). `collection_size` sets the number of compiled templates which +# are cached before the least recently used ones are removed. See: +# http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup lookup = TemplateLookup(directories=[template_root], output_encoding='utf-8', - filesystem_checks=False) + filesystem_checks=False, + collection_size=500) logging.debug("Set template root to %s" % template_root)

1 0

[bridgedb/master] Adjust margin width on bootstap step containers.
by isis＠torproject.org 04 Feb '14

04 Feb '14

commit c65bec2be5879fb3e114a108b5235053661610fb Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jan 28 17:49:08 2014 +0000 Adjust margin width on bootstap step containers. --- lib/bridgedb/templates/assets/custom.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/templates/assets/custom.css b/lib/bridgedb/templates/assets/custom.css index bc0e2d1..9449fc5 100644 --- a/lib/bridgedb/templates/assets/custom.css +++ b/lib/bridgedb/templates/assets/custom.css @@ -97,7 +97,7 @@ margin-top: 2px; } [class*="bdb_span"] { min-height: 1px; - margin: 0 20px 22px 20px; + margin: 0 20px 16px 20px; } .bdb_span7 { width: 560px

1 0

[bridgedb/master] Log template directory setting after assignment.
by isis＠torproject.org 04 Feb '14

04 Feb '14

commit b6be171230a2ca6916830d05c41184f29cab466e Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jan 28 16:57:36 2014 +0000 Log template directory setting after assignment. --- lib/bridgedb/HTTPServer.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index dca2800..ad69e1b 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -40,6 +40,8 @@ from mako.lookup import TemplateLookup from zope.interface import Interface, Attribute, implements template_root = os.path.join(os.path.dirname(__file__),'templates') +logging.debug("Set template root to %s" % template_root) + rtl_langs = ('ar', 'he', 'fa', 'gu_IN', 'ku') # Setting `filesystem_checks` to False is recommended for production servers, @@ -54,7 +56,6 @@ lookup = TemplateLookup(directories=[template_root], filesystem_checks=False, collection_size=500) -logging.debug("Set template root to %s" % template_root) try: # Make sure we have the database before trying to import the module:

1 0

[bridgedb/master] Add links to source code and ticket creation to bridges.tpo footers.
by isis＠torproject.org 04 Feb '14

04 Feb '14

commit a90e586fbbac021d8c807a70c0afef5b6dac6086 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jan 28 17:54:53 2014 +0000 Add links to source code and ticket creation to bridges.tpo footers. --- lib/bridgedb/templates/base.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/bridgedb/templates/base.html b/lib/bridgedb/templates/base.html index 629680e..4a80040 100644 --- a/lib/bridgedb/templates/base.html +++ b/lib/bridgedb/templates/base.html @@ -73,6 +73,13 @@ ${self.body()} <div class="footer"> <p>© The Tor Project</p> + <p> + <a href="https://gitweb.torproject.org/bridgedb.git">${_("Source Code")}</a> + &middot + <a href="https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…">${_("Report a Bug")}</a> + &middot + <a href="mailto:isis@torproject.org">${_("Contact")}</a> + </p> </div> </div>

1 0

[bridgedb/master] Add buttons for IPv4/6 bridge requests to base.html template.
by isis＠torproject.org 04 Feb '14

04 Feb '14

commit b57f054c43618f2b708e2fb7aa3569a124222cb8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jan 28 18:03:11 2014 +0000 Add buttons for IPv4/6 bridge requests to base.html template. * FIXES #9127. --- lib/bridgedb/templates/base.html | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/lib/bridgedb/templates/base.html b/lib/bridgedb/templates/base.html index 4a80040..9f8a70a 100644 --- a/lib/bridgedb/templates/base.html +++ b/lib/bridgedb/templates/base.html @@ -51,6 +51,31 @@ ${self.body()} ("""<a href="https://www.torproject.org/docs/bridges">""", "</a>")} </p> + <h4>${_("I need a different type of bridge!")}</h4> + <p> + ${_("BridgeDB can provide bridges with either IPv4 or IPv6 addresses.")} + </p> + +  + <p> + <div class="pt-container" style="margin: 20px 20px 20px"> + <div class="btn-toolbar" style="text-align: center; margin: 0;"> + <div class="btn-group"> + <a href="./bridges"> + <button class="btn btn-default" type="button"> + ${_("Get IPv4 bridges")} + </button> + </a> + <a href="./bridges?ipv6=true"> + <button class="btn btn-default" type="button"> + ${_("Get IPv6 bridges")} + </button> + </a> + </div> + </div> + </div> + </p> + <h4>${_("I need an alternative way of getting bridges!")}</h4> <p>${_("Another way to find public bridge addresses is to send an email " "(from a %s or a %s address) to %s with the line 'get bridges' by "

1 0

[bridgedb/master] Merge branch 'fix/9127-https-interface-ipv6' into develop
by isis＠torproject.org 04 Feb '14

04 Feb '14

commit 95dd010dd9ef9faf69e6034f952a7a95b6743c3b Merge: a90e586 b57f054 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jan 28 19:30:20 2014 +0000 Merge branch 'fix/9127-https-interface-ipv6' into develop lib/bridgedb/templates/base.html | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)

1 0

[bridgedb/master] Merge branch 'fix/mako-template-caching' into develop
by isis＠torproject.org 04 Feb '14

04 Feb '14

commit dd681babf7505b6cbcab7d3e76b6feebcc2accc3 Merge: 6b585fc b6be171 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jan 28 17:46:51 2014 +0000 Merge branch 'fix/mako-template-caching' into develop lib/bridgedb/HTTPServer.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)

1 0