September 2019 - tor-commits - lists.torproject.org

[bridgedb/master] Don't interpret quoted text as commands.
by phw＠torproject.org 11 Sep '19

11 Sep '19

commit 4a0586767f08a3b4ee83b7805fd3cfcf531c245d Author: Philipp Winter <phw(a)nymity.ch> Date: Mon Aug 19 17:05:52 2019 -0700 Don't interpret quoted text as commands. BridgeDB gets confused when users reply to a "get help" email. The issue is that BridgeDB interprets commands anywhere in the email body, even if it's in quoted text. To fix this issue, we are ignoring commands whose email body line starts with a '>' character, which is typically used for email quotes. This fixes <https://bugs.torproject.org/17626>. --- CHANGELOG | 9 +++++++++ bridgedb/distributors/email/request.py | 21 +++++++++++++++------ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index aba6d19..c3073ef 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,12 @@ +Changes in version 0.8.1 - + + * FIXES https://bugs.torproject.org/17626 + BridgeDB gets confused when users reply to a "get help" email. The + issue is that BridgeDB interprets commands anywhere in the email body, + even if it's in quoted text. To fix this issue, we are ignoring + commands whose email body line starts with a '>' character, which is + typically used for email quotes. + Changes in version 0.8.0 - 2019-08-20 * FIXES https://bugs.torproject.org/9316 diff --git a/bridgedb/distributors/email/request.py b/bridgedb/distributors/email/request.py index a490e56..83c203d 100644 --- a/bridgedb/distributors/email/request.py +++ b/bridgedb/distributors/email/request.py @@ -58,6 +58,15 @@ TRANSPORT_PATTERN = re.compile(TRANSPORT_REGEXP) UNBLOCKED_REGEXP = ".*unblocked ([a-z]{2,4})" UNBLOCKED_PATTERN = re.compile(UNBLOCKED_REGEXP) +#: Regular expressions that we use to match for email commands. Any command is +#: valid as long as it wasn't quoted, i.e., the line didn't start with a '>' +#: character. +HELP_LINE = re.compile("([^>].*)?h[ae]lp") +GET_LINE = re.compile("([^>].*)?get") +KEY_LINE = re.compile("([^>].*)?key") +IPV6_LINE = re.compile("([^>].*)?ipv6") +TRANSPORT_LINE = re.compile("([^>].*)?transport") +UNBLOCKED_LINE = re.compile("([^>].*)?unblocked") def determineBridgeRequestOptions(lines): """Figure out which :mod:`~bridgedb.filters` to apply, or offer help. @@ -83,20 +92,20 @@ def determineBridgeRequestOptions(lines): if not line: skippedHeaders = True if not skippedHeaders: continue - if ("help" in line) or ("halp" in line): + if HELP_LINE.match(line) is not None: raise EmailRequestedHelp("Client requested help.") - if "get" in line: + if GET_LINE.match(line) is not None: request.isValid(True) logging.debug("Email request was valid.") - if "key" in line: + if KEY_LINE.match(line) is not None: request.wantsKey(True) raise EmailRequestedKey("Email requested a copy of our GnuPG key.") - if "ipv6" in line: + if IPV6_LINE.match(line) is not None: request.withIPv6() - if "transport" in line: + if TRANSPORT_LINE.match(line) is not None: request.withPluggableTransportType(line) - if "unblocked" in line: + if UNBLOCKED_LINE.match(line) is not None: request.withoutBlockInCountry(line) logging.debug("Generating hashring filters for request.")

1 0

[bridgedb/master] Merge branch 'fix/17626' into develop
by phw＠torproject.org 11 Sep '19

11 Sep '19

commit a65b843dd18d812996035b84952d46ac3dc388de Merge: d67abc7 4a05867 Author: Philipp Winter <phw(a)nymity.ch> Date: Mon Aug 26 14:46:38 2019 -0700 Merge branch 'fix/17626' into develop CHANGELOG | 9 +++++++++ bridgedb/distributors/email/request.py | 21 +++++++++++++++------ 2 files changed, 24 insertions(+), 6 deletions(-)

1 0

[bridgedb/master] Merge branch 'release-0.8.1'
by phw＠torproject.org 11 Sep '19

11 Sep '19

commit 5ab8ca22678cd65bb99399e7f55fa3ed577f4c10 Merge: bbf1bdc b55c8ca Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Sep 11 14:06:16 2019 -0700 Merge branch 'release-0.8.1' CHANGELOG | 14 ++++++++++++++ bridgedb/distributors/email/request.py | 21 +++++++++++++++------ bridgedb/distributors/https/templates/base.html | 7 ++----- bridgedb/strings.py | 9 +-------- 4 files changed, 32 insertions(+), 19 deletions(-)

1 0

[bridgedb/master] Bump version number to 0.8.1.
by phw＠torproject.org 11 Sep '19

11 Sep '19

commit b55c8ca6b265b4b27bf3ebca88ee6f7e3bdfe14e Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Sep 11 14:05:55 2019 -0700 Bump version number to 0.8.1. --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index a8413eb..db92cb3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -Changes in version 0.8.1 - +Changes in version 0.8.1 - 2019-09-11 * FIXES https://bugs.torproject.org/17626 BridgeDB gets confused when users reply to a "get help" email. The

1 0

[tor-browser-build/master] Add missing Changelog item for 9.0a6
by gk＠torproject.org 11 Sep '19

11 Sep '19

commit e82857e90d8bbbf963d5060b6ea4922625162136 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 11 17:33:22 2019 +0000 Add missing Changelog item for 9.0a6 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index f97cb65..2ecd3d1 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -51,6 +51,7 @@ Tor Browser 9.0a6 -- September 4 2019 * Backport fix for bug 1572844 to fix broken build * OS X * Bug 29818: Adapt #13379 patch for 68esr + * Bug 31464: meek and moat are broken on macOS 10.9 with Go 1.12 * Bug 31403: Bump snowflake commit to cd650fa009 * Linux * Bug 31403: Bump snowflake commit to cd650fa009

1 0

[metrics-lib/master] Bump version to 2.7.0-dev.
by karsten＠torproject.org 11 Sep '19

11 Sep '19

commit 7e396f01ef6de4cb3cd7e2b7fc977b4af7b97e7f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Sep 11 16:08:16 2019 +0200 Bump version to 2.7.0-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 04f79fd..02ccf52 100644 --- a/build.xml +++ b/build.xml @@ -7,7 +7,7 @@ <project default="usage" name="metrics-lib" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant"> - <property name="release.version" value="2.7.0" /> + <property name="release.version" value="2.7.0-dev" /> <property name="javadoc-title" value="Tor Metrics Library API Documentation"/> <property name="javadoc-excludes" value="**/impl/** **/index/** **/internal/** **/log/**" /> <property name="implementation-title" value="Tor Metrics Library" />

1 0

[metrics-lib/release] Upgrade to latest metrics-base.
by karsten＠torproject.org 11 Sep '19

11 Sep '19

commit aa686c4b492badec430abdc0b674c283e0ed6d39 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 24 19:25:19 2019 +0200 Upgrade to latest metrics-base. Also include change log entries. --- CHANGELOG.md | 16 ++++++++++++++++ src/build | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18d250e..66a626a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,19 @@ +# Changes in version 2.7.0 - 2019-0?-?? + + * Medium changes + * Update build-time and run-time dependencies to versions found in + Debian buster, including: commons-codec-1.11.jar, + commons-compress-1.18.jar, jackson-annotations-2.9.8.jar, + jackson-core-2.9.8.jar, jackson-databind-2.9.8.jar, + logback-core-1.2.3.jar, logback-classic-1.2.3.jar, + slf4j-api-1.7.25.jar, and xz-1.8.jar. + * Update Checkstyle dependencies to versions found in Debian + buster, including: antlr-2.7.7.jar, antlr4-runtime-4.7.2.jar, + checkstyle-8.15.jar, commons-beanutils-1.9.3.jar, + commons-collections3-3.2.2.jar, commons-logging-1.2.jar, + guava-19.0.jar, java-atk-wrapper.jar, and picocli-3.9.2.jar. + + # Changes in version 2.6.2 - 2019-05-29 * Medium changes diff --git a/src/build b/src/build index e12ba96..42ee1fc 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit e12ba96aa0708b20375cf7cf5d20dfa19940d18a +Subproject commit 42ee1fc086b0e86cddf56475124a547465484321

1 0

[metrics-lib/release] Update to Debian buster libraries.
by karsten＠torproject.org 11 Sep '19

11 Sep '19

commit 453a6f5acb9b9935a88de8c6e39e05e29b5423e7 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jul 18 07:53:39 2019 +0200 Update to Debian buster libraries. Also upgrade to latest metrics-base. Note that Checkstyle is excluded from this update, because there's a yet unresolved issue with the new version: ("Unable to create Root Module") that we'll have to address in a separate patch. But given that Checkstyle is not required for the build it's okay to keep the old version for now. It'll be in the release tarball. --- build.xml | 14 +++++++------- src/build | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.xml b/build.xml index 3066e90..a163dc9 100644 --- a/build.xml +++ b/build.xml @@ -14,13 +14,13 @@ <property name="jarpatternprop" value="empty" /> <patternset id="runtime" > - <include name="commons-codec-1.10.jar"/> - <include name="commons-compress-1.13.jar"/> - <include name="jackson-annotations-2.8.6.jar"/> - <include name="jackson-core-2.8.6.jar"/> - <include name="jackson-databind-2.8.6.jar"/> - <include name="slf4j-api-1.7.22.jar" /> - <include name="xz-1.6.jar"/> + <include name="commons-codec-1.11.jar"/> + <include name="commons-compress-1.18.jar"/> + <include name="jackson-annotations-2.9.8.jar"/> + <include name="jackson-core-2.9.8.jar"/> + <include name="jackson-databind-2.9.8.jar"/> + <include name="slf4j-api-1.7.25.jar" /> + <include name="xz-1.8.jar"/> </patternset> <target name="coverage-check"> diff --git a/src/build b/src/build index e639c69..e12ba96 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit e639c697e9e94c6dbb26e946e5247c20a62c0661 +Subproject commit e12ba96aa0708b20375cf7cf5d20dfa19940d18a

1 0

[metrics-lib/release] Bump version to 2.6.2-dev.
by karsten＠torproject.org 11 Sep '19

11 Sep '19

commit e723c065b764ecfbb3bb96d4c491e67398b7f21b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu May 30 15:21:41 2019 +0200 Bump version to 2.6.2-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index e6a1dbe..3066e90 100644 --- a/build.xml +++ b/build.xml @@ -6,7 +6,7 @@ <project default="usage" name="metrics-lib" basedir="."> - <property name="release.version" value="2.6.2" /> + <property name="release.version" value="2.6.2-dev" /> <property name="javadoc-title" value="Tor Metrics Library API Documentation"/> <property name="javadoc-excludes" value="**/impl/** **/index/** **/internal/** **/log/**" /> <property name="implementation-title" value="Tor Metrics Library" />

1 0

[metrics-lib/release] Add change log entry for Cobertura deps.
by karsten＠torproject.org 11 Sep '19

11 Sep '19

commit 4ffa637c56d676dc2c0ceeec48556110aee2050a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 24 19:56:39 2019 +0200 Add change log entry for Cobertura deps. --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 66a626a..e3622e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ checkstyle-8.15.jar, commons-beanutils-1.9.3.jar, commons-collections3-3.2.2.jar, commons-logging-1.2.jar, guava-19.0.jar, java-atk-wrapper.jar, and picocli-3.9.2.jar. + * Update Cobertura dependencies to versions found in Debian buster, + including: asm4-5.0.4.jar, asm4-util-5.0.4.jar, + asm4-tree-5.0.4.jar, asm4-commons-5.0.4.jar, + asm4-analysis-5.0.4.jar, and commons-lang3-3.8.jar # Changes in version 2.6.2 - 2019-05-29

1 0