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

[bridgedb/develop] Merge branch 'master' into develop
by isis＠torproject.org 21 Feb '14

21 Feb '14

commit befe5d49c53c2c3eff3c1a46535cbc834b6db329 Merge: e5bc105 e2f859c Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Feb 21 23:28:27 2014 +0000 Merge branch 'master' into develop

1 0

[bridgedb/develop] Merge branch 'release-0.1.4'
by isis＠torproject.org 21 Feb '14

21 Feb '14

commit e2f859cde0bc96b1d3f525b7b8f1608d09adfbde Merge: 564f4b9 e5bc105 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Feb 21 23:28:06 2014 +0000 Merge branch 'release-0.1.4' CHANGELOG | 6 ++++++ lib/bridgedb/templates/index.html | 14 +++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-)

1 0

[bridgedb/master] Merge branch 'master' into develop
by isis＠torproject.org 21 Feb '14

21 Feb '14

commit fa67d20ba88a5673c55bc6049f75181ebf119c99 Merge: 26ba67b 564f4b9 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Feb 21 21:55:20 2014 +0000 Merge branch 'master' into develop

1 0

[bridgedb/master] Merge branch 'hotfix/9264_2_rtl-2step' into develop
by isis＠torproject.org 21 Feb '14

21 Feb '14

commit c836fa07a5eb60af171200554ec43021f5a7310b Merge: fa67d20 31956f6 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Feb 21 23:25:17 2014 +0000 Merge branch 'hotfix/9264_2_rtl-2step' into develop lib/bridgedb/templates/index.html | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)

1 0

[bridgedb/master] Update CHANGELOG entry for 0.1.4.
by isis＠torproject.org 21 Feb '14

21 Feb '14

commit e5bc105a4428a7934096d675931c6bfdbe3b6307 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Feb 21 23:26:55 2014 +0000 Update CHANGELOG entry for 0.1.4. --- CHANGELOG | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index bd2a28e..9f44093 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,9 @@ +Changes in version 0.1.4 - 2014-02-21 +BridgeDB 0.1.4 includes fixes for the following bugs: + * FIXES an RTL encoding issue in the "Step 2" text on index.html + of the HTTPS distributor. + + Changes in version 0.1.3 - 2014-02-21 BridgeDB 0.1.3 includes fixes for the following bugs: * FIXES #9264 Problem with transport lines in BridgeDB's bridge

1 0

[bridgedb/master] Fix RTL rendering for "Step 2" on index.html.
by isis＠torproject.org 21 Feb '14

21 Feb '14

commit 31956f6b91baa751ef76e32531e451a6a6bca3be Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Feb 21 23:10:55 2014 +0000 Fix RTL rendering for "Step 2" on index.html. * FIXES an RTL rendering issue from the #9264 fixes, seems introduced in commit 59e8b4684a "Provide an Advanced Options page for easier bridge selection". --- lib/bridgedb/templates/index.html | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/bridgedb/templates/index.html b/lib/bridgedb/templates/index.html index a97e21d..4245337 100644 --- a/lib/bridgedb/templates/index.html +++ b/lib/bridgedb/templates/index.html @@ -1,4 +1,4 @@ -## -*- coding: utf-8 -*- +## -*- coding: utf-8 -*- <%inherit file="base.html"/> <div class="main-steps"> @@ -14,10 +14,14 @@ </div> <div class="step row"> - <div class="span1"> - <p class="lead"><span class="step-title"> ${_("Step 2")} </span></p></div> - <div class="span5 step-text"> - ${_("Get %s bridges %s") % ("""<a href="/options">""", "</a>")}</div> + <div class="bdb_span7 step-text"> + <span class="lead"> + <span class="step-title"> + ${_("Step 2")}</span> + <span style="margin-left: 20px;"> + ${_("Get %s bridges %s") % ("""<a href="/options">""", "</a>")}</span> + </span> + </div> </div> <div class="step row">

1 0

[bridgedb/master] Merge branch 'release-0.1.4'
by isis＠torproject.org 21 Feb '14

21 Feb '14

commit e2f859cde0bc96b1d3f525b7b8f1608d09adfbde Merge: 564f4b9 e5bc105 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Feb 21 23:28:06 2014 +0000 Merge branch 'release-0.1.4' CHANGELOG | 6 ++++++ lib/bridgedb/templates/index.html | 14 +++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-)

1 0

[bridgedb/master] We need to remember the digests of the documents the bridge published
by isis＠torproject.org 21 Feb '14

21 Feb '14

commit 1bf55b5aa58e89b8654d6bb7d9458bbdcd37b261 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Sun Feb 2 02:55:04 2014 +0000 We need to remember the digests of the documents the bridge published --- lib/bridgedb/Bridges.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 2c1b34e..9e07ad8 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -131,6 +131,9 @@ class Bridge: self.transports = transports self.running = self.stable = None self.blockingCountries = {} + self.desc_digest = None + self.ei_digest = None + self.verified = False if id_digest is not None: assert fingerprint is None @@ -145,6 +148,22 @@ class Bridge: else: raise TypeError("Bridge with no ID") + def setDescriptorDigest(self, digest): + """Set the descriptor digest, specified in the NS.""" + self.desc_digest = digest + + def setExtraInfoDigest(self, digest): + """Set the extra-info digest, specified in the descriptor.""" + self.ei_digest = digest + + def setVerified(self): + """Call when the bridge's descriptor is parsed""" + self.verified = True + + def isVerified(self): + """Returns the truthiness of ``verified``""" + return self.verified + def getID(self): """Return the bridge's identity digest.""" return fromHex(self.fingerprint)

1 0

[bridgedb/master] We need the ORPort to be an int, convert it from the get-go
by isis＠torproject.org 21 Feb '14

21 Feb '14

commit 36af115dd5aef145c1fdd4d4db75eca86ad7f635 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Sat Feb 1 22:46:19 2014 +0000 We need the ORPort to be an int, convert it from the get-go --- lib/bridgedb/parse/networkstatus.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/parse/networkstatus.py b/lib/bridgedb/parse/networkstatus.py index 0b73569..9304009 100644 --- a/lib/bridgedb/parse/networkstatus.py +++ b/lib/bridgedb/parse/networkstatus.py @@ -132,7 +132,7 @@ def parseRLine(line): timestamp = time.mktime(time.strptime(" ".join(fields[3:5]), "%Y-%m-%d %H:%M:%S")) ORaddr = fields[5] - ORport = fields[6] + ORport = int(fields[6]) dirport = fields[7] except InvalidBase64 as error: logging.error(error)

1 0

[bridgedb/master] Update the Bridge class docstring
by isis＠torproject.org 21 Feb '14

21 Feb '14

commit 499b32c0d409c7a1bddf9a2f74fd3993ddd68888 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Sun Feb 2 03:00:33 2014 +0000 Update the Bridge class docstring --- lib/bridgedb/Bridges.py | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 9e07ad8..1a2bdd6 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -109,15 +109,31 @@ def chopString(s, size): yield s[pos:pos+size] class Bridge: - """Holds information for a single bridge""" - ## Fields: - ## nickname -- The bridge's nickname. Not currently used. - ## ip -- The bridge's IP address, as a dotted quad. - ## orport -- The bridge's OR port. - ## fingerprint -- The bridge's identity digest, in lowercase hex, with - ## no spaces. - ## running,stable -- DOCDOC - ## blockingCountries -- list of country codes blocking this bridge + """Holds information for a single bridge + + :attr str nickname: The bridge's nickname. Not currently used. + :attr str ip: The bridge's IPv4 address, as a dotted quad. + :attr int orport: The bridge's OR port. + :attr dict or_addresses: The bridges alternate IP addresses, keys + the address, values are the port(s) on + which it listens. + :attr list transports: List of PluggableTransport instances for + each PT the bridge supports. + :attr str fingerprint: The bridge's identity digest, in lowercase + hex, with no spaces. + :attr bool running: Is this bridge running? + :attr bool stable: Is this bridge stable? + :attr dict blockingCountries: list of country codes blocking this + bridge + :attr str desc_digest: SHA-1 hexdigest of the bridge's descriptor + as defined in the networkstatus document + :attr str ei_digest: SHA-1 hexdigest of the bridge's extra-info + document as defined in the bridge's + descriptor, corresponding to desc_digest + :attr bool verified: Did we receive the descriptor for this + bridge that was specified in the + networkstatus? + """ def __init__(self, nickname, ip, orport, fingerprint=None, id_digest=None, or_addresses=None, transports=None): """Create a new Bridge. One of fingerprint and id_digest must be

1 0