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

[tor/master] practracker: Improvements based on last Nick's review.
by nickm＠torproject.org 13 Mar '19

13 Mar '19

commit ec8c5b3fea78b2596d3b68571fd47b8e41d4a3ea Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Mar 12 14:35:26 2019 +0200 practracker: Improvements based on last Nick's review. --- scripts/maint/practracker/metrics.py | 6 +++--- scripts/maint/practracker/problem.py | 3 ++- scripts/maint/practracker/util.py | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/maint/practracker/metrics.py b/scripts/maint/practracker/metrics.py index c7d2091d0..56b9e8383 100644 --- a/scripts/maint/practracker/metrics.py +++ b/scripts/maint/practracker/metrics.py @@ -26,8 +26,8 @@ def get_function_lines(f): """ # Skip lines with these terms since they confuse our regexp - REGEXP_CONFUSE_TERMS = ["MOCK_IMPL", "ENABLE_GCC_WARNINGS", "ENABLE_GCC_WARNING", "DUMMY_TYPECHECK_INSTANCE", - "DISABLE_GCC_WARNING", "DISABLE_GCC_WARNINGS"] + REGEXP_CONFUSE_TERMS = {"MOCK_IMPL", "ENABLE_GCC_WARNINGS", "ENABLE_GCC_WARNING", "DUMMY_TYPECHECK_INSTANCE", + "DISABLE_GCC_WARNING", "DISABLE_GCC_WARNINGS"} in_function = False for lineno, line in enumerate(f): @@ -43,7 +43,7 @@ def get_function_lines(f): in_function = True else: - # Fund the end of a function + # Find the end of a function if line.startswith("}"): n_lines = lineno - func_start in_function = False diff --git a/scripts/maint/practracker/problem.py b/scripts/maint/practracker/problem.py index 00e029d1c..60ee3eb24 100644 --- a/scripts/maint/practracker/problem.py +++ b/scripts/maint/practracker/problem.py @@ -8,6 +8,7 @@ get worse. """ import os.path +import sys class ProblemVault(object): """ @@ -23,7 +24,7 @@ class ProblemVault(object): with open(exception_fname, 'r') as exception_f: self.register_exceptions(exception_f) except IOError: - print("No exception file provided") + print("No exception file provided", file=sys.stderr) def register_exceptions(self, exception_file): # Register exceptions diff --git a/scripts/maint/practracker/util.py b/scripts/maint/practracker/util.py index 966c62515..63de72d5a 100644 --- a/scripts/maint/practracker/util.py +++ b/scripts/maint/practracker/util.py @@ -2,7 +2,7 @@ import os # We don't want to run metrics for unittests, automatically-generated C files, # external libraries or git leftovers. -EXCLUDE_SOURCE_DIRS = ["/src/test/", "/src/trunnel/", "/src/ext/", "/.git/"] +EXCLUDE_SOURCE_DIRS = {"/src/test/", "/src/trunnel/", "/src/ext/", "/.git/"} def get_tor_c_files(tor_topdir): """

1 0

[tor/master] Improve failure message from check-best-practices
by nickm＠torproject.org 13 Mar '19

13 Mar '19

commit e2512950b69d5f9f030673a15e8cf72b930538c7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 12 09:32:22 2019 -0400 Improve failure message from check-best-practices --- doc/HACKING/HelpfulTools.md | 15 +++++++++++++++ scripts/maint/practracker/practracker.py | 9 ++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/doc/HACKING/HelpfulTools.md b/doc/HACKING/HelpfulTools.md index d49923852..cba57e875 100644 --- a/doc/HACKING/HelpfulTools.md +++ b/doc/HACKING/HelpfulTools.md @@ -371,3 +371,18 @@ source code. Here's how to use it: 6. See the Doxygen manual for more information; this summary just scratches the surface. + +Style and best-pratices checking +-------------------------------- + +We use scripts to check for various problems in the formatting and style +of our source code. The "check-spaces" test detects a bunch of violations +of our coding style on the local level. The "check-best-practices" test +looks for violations of some of our complexity guidelines. + +You can tell the tool about exceptions to the complexity guidelines via its +exceptions file (scripts/maint/practracker/exceptions.txt). But before you +do this, consider whether you shouldn't fix the underlying problem. Maybe +that file really _is_ too big. Maybe that function really _is_ doing too +much. (On the other hand, for stable release series, it is sometimes better +to leave things unrefactored.) diff --git a/scripts/maint/practracker/practracker.py b/scripts/maint/practracker/practracker.py index 541c5cbfb..08b74c264 100755 --- a/scripts/maint/practracker/practracker.py +++ b/scripts/maint/practracker/practracker.py @@ -133,7 +133,14 @@ def main(): # If new issues were found, try to give out some advice to the developer on how to resolve it. if (found_new_issues): - new_issues_str = "practracker FAILED as indicated by the problem lines above. Please use the exceptions file ({}) to find any previous state of these problems. If you are unable to fix the underlying best-practices issue right now then you need to either update the relevant exception line or add a new one.".format(exceptions_file) + new_issues_str = """\ +FAILURE: practracker found new problems in the code: see warnings above. + +Please fix the problems if you can, and update the exceptions file +({}) if you can't. + +See doc/HACKING/HelpfulTools.md for more information on using practracker.\ +""".format(exceptions_file) print(new_issues_str) sys.exit(found_new_issues)

1 0

[tor/master] grandfather in two more functions
by nickm＠torproject.org 13 Mar '19

13 Mar '19

commit 21c6e295ca74e2ab50a759123bca1fae36af36b3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 12 20:37:25 2019 -0400 grandfather in two more functions --- scripts/maint/practracker/exceptions.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index da354d8f8..3fa68aff4 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -166,7 +166,9 @@ problem function-size /src/feature/dirauth/bwauth.c:dirserv_read_measured_bandwi problem function-size /src/feature/dirauth/dsigs_parse.c:networkstatus_parse_detached_signatures() 196 problem function-size /src/feature/dirauth/voteflags.c:dirserv_compute_performance_thresholds() 172 problem file-size /src/feature/hs/hs_service.c 4171 +problem function-size /src/feature/hs/hs_cell.c:hs_cell_parse_introduce2() 154 problem function-size /src/feature/hs/hs_common.c:hs_get_responsible_hsdirs() 104 +problem function-size /src/feature/hs/hs_common.c:hs_get_extend_info_from_lspecs() 101 problem function-size /src/feature/hs/hs_client.c:send_introduce1() 104 problem function-size /src/feature/hs/hs_client.c:hs_config_client_authorization() 108 problem function-size /src/feature/hs/hs_config.c:config_generic_service() 149

1 0

[tor/master] Changes file for practracker (29221)
by nickm＠torproject.org 13 Mar '19

13 Mar '19

commit 504aef6228d3a8460f43b9c9cf2cd4175ce4e1f7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 13 09:29:10 2019 -0400 Changes file for practracker (29221) --- changes/bug29221 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug29221 b/changes/bug29221 new file mode 100644 index 000000000..fbe08aa9a --- /dev/null +++ b/changes/bug29221 @@ -0,0 +1,5 @@ + o Minor features (development tools): + - Tor's test scripts now check for files and functions that seem + too long and complicated. Existing overlong functions and files are + accepted for now, but should eventually be refactored. Closes + ticket 29221.

1 0

[tor/master] practracker: Fix duplicate exceptions and handle them more "gracefully".
by nickm＠torproject.org 13 Mar '19

13 Mar '19

commit 3e38efdf165098062972300687975c3372cec70e Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Mar 13 12:59:44 2019 +0200 practracker: Fix duplicate exceptions and handle them more "gracefully". --- scripts/maint/practracker/exceptions.txt | 1 - scripts/maint/practracker/problem.py | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index 3fa68aff4..abe615f04 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -173,7 +173,6 @@ problem function-size /src/feature/hs/hs_client.c:send_introduce1() 104 problem function-size /src/feature/hs/hs_client.c:hs_config_client_authorization() 108 problem function-size /src/feature/hs/hs_config.c:config_generic_service() 149 problem function-size /src/feature/hs/hs_cell.c:hs_cell_build_establish_intro() 115 -problem function-size /src/feature/hs/hs_cell.c:hs_cell_parse_introduce2() 147 problem file-size /src/feature/hs/hs_descriptor.c 3108 problem function-size /src/feature/hs/hs_descriptor.c:desc_encode_v3() 108 problem function-size /src/feature/hs/hs_descriptor.c:decrypt_desc_layer() 110 diff --git a/scripts/maint/practracker/problem.py b/scripts/maint/practracker/problem.py index 60ee3eb24..61420fb78 100644 --- a/scripts/maint/practracker/problem.py +++ b/scripts/maint/practracker/problem.py @@ -33,6 +33,12 @@ class ProblemVault(object): if problem is None: continue + # Fail if we see dup exceptions. There is really no reason to have dup exceptions. + if problem.key() in self.exceptions: + print("Duplicate exceptions lines found in exception file:\n\t{}\n\t{}\nAborting...".format(problem, self.exceptions[problem.key()]), + file=sys.stderr) + sys.exit(1) + self.exceptions[problem.key()] = problem #print "Registering exception: %s" % problem

1 0

[tor/master] Merge branch 'bug29221_more_squashed'
by nickm＠torproject.org 13 Mar '19

13 Mar '19

commit 17ff69a268f761d0d68bb1201a578555fe460fb8 Merge: 2b5cc8a05 504aef622 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 13 09:30:02 2019 -0400 Merge branch 'bug29221_more_squashed' Makefile.am | 11 +- changes/bug29221 | 5 + doc/HACKING/HelpfulTools.md | 15 ++ scripts/maint/practracker/exceptions.txt | 261 +++++++++++++++++++++++++ scripts/maint/practracker/metrics.py | 50 +++++ scripts/maint/practracker/practracker.py | 149 ++++++++++++++ scripts/maint/practracker/practracker_tests.py | 50 +++++ scripts/maint/practracker/problem.py | 138 +++++++++++++ scripts/maint/practracker/util.py | 27 +++ 9 files changed, 704 insertions(+), 2 deletions(-)

1 0

[translation/tpo-web] Update translations for tpo-web
by translation＠torproject.org 13 Mar '19

13 Mar '19

commit 04b09f232bc5a32b490752acb81ab35dad2aada6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 13 12:49:56 2019 +0000 Update translations for tpo-web --- contents+es.po | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/contents+es.po b/contents+es.po index d80905604..32bbc0b13 100644 --- a/contents+es.po +++ b/contents+es.po @@ -1031,6 +1031,8 @@ msgid "" "From 2000 to 2015 she served as EFF’s Legal Director as well as its General " "Counsel." msgstr "" +"Entre el 2000 y el 2015 ejerció como Directora Jurídica de la EFF, así como " +"como su Consejera General." #: https//lektor-staging.torproject.org/about/people/cindy/ #: (content/about/people/cindy/contents+en.lrperson.description) @@ -1039,6 +1041,10 @@ msgid "" " the outside lead attorney in Bernstein v. Dept. of Justice, the successful " "First Amendment challenge to the U.S. export restrictions on cryptography." msgstr "" +"Cindy se involucró con la EFF por primera vez en 1993, cuando la EFF le " +"pidió que se ocupara como abogada principal del caso Bernstein v. Dept. of " +"Justice, el afortunado desafío de la Primera Enmienda a las restricciones de" +" exportación en criptografía de los EE. UU." #: https//lektor-staging.torproject.org/about/people/cindy/ #: (content/about/people/cindy/contents+en.lrperson.description) @@ -1050,27 +1056,40 @@ msgid "" " to develop the Necessary and Proportionate Principles applying " "international human rights standards to digital communications surveillance." msgstr "" +"La Sra. Cohn trabaja para garantizar que las personas de todo el mundo " +"tengan el derecho de acceder a la información y comunicarse de forma privada" +" y anónima, lo que incluye las crecientes demandas contra el espionaje de la" +" NSA, brindar asesoría legal a los programadores de ordenadores que " +"desarrollan y construyen herramientas de privacidad y anonimato, y ayuda a " +"desarrollar los Principios Necesario. y Proporcional que aplican las normas " +"internacionales de derechos humanos a la vigilancia de las comunicaciones " +"digitales." #: https//lektor-staging.torproject.org/about/people/phoul/ #: (content/about/people/phoul/contents+en.lrperson.description) msgid "Relay advocate, Outreachy mentor, and a member of the community team." msgstr "" +"Defensor de relevo, mentor de divulgación y un miembro del equipo de la " +"comunidad." #: https//lektor-staging.torproject.org/about/people/phoul/ #: (content/about/people/phoul/contents+en.lrperson.description) msgid "He is also a director of the Canadian Torservers.net partner Coldhak." -msgstr "" +msgstr "También es director del Torservers.net canadiense socio de Coldhak." #: https//lektor-staging.torproject.org/about/people/atagar/ #: (content/about/people/atagar/contents+en.lrperson.description) msgid "Author of the Stem python controller library and Nyx relay monitor." msgstr "" +"Autor de la librería de controladores de Python Stem y monitor de relé Nyx." #: https//lektor-staging.torproject.org/about/people/dgoulet/ #: (content/about/people/dgoulet/contents+en.lrperson.description) msgid "" "Tor development team focusing on onion services and our torsocks maintainer." msgstr "" +"El equipo de desarrollo de Tor se centra en los servicios de onion y en " +"nuestro mantenedor de torsocks." #: https//lektor-staging.torproject.org/about/people/dawuud/ #: (content/about/people/dawuud/contents+en.lrperson.description)

1 0

[tor-browser-build/maint-8.0] Prepare -build2 for 8.0.7
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit 8487e3a1e498dcb5604d884d422ab999957877f8 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 13 12:47:08 2019 +0000 Prepare -build2 for 8.0.7 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++++ projects/torbutton/config | 2 +- rbm.conf | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 6a941a1..4d533ce 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -3,6 +3,10 @@ Tor Browser 8.0.7 -- March 19 2019 * Update Firefox to 60.6.0esr * Update Tor to 0.3.5.8 * Bug 29660: XMPP can not connect to SOCKS5 anymore + * Update Torbutton to 2.0.11 + * Bug 29021: Tell NoScript it is running within Tor Browser + * Windows + * Bug 29081: Harden libwinpthread * Linux * Bug 27531: Add separate LD_LIBRARY_PATH for fteproxy diff --git a/projects/torbutton/config b/projects/torbutton/config index c262950..0d66ae0 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.0.10 +version: 2.0.11 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 49166f2..3de1879 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.0.7' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 8.0.6 project_name: tor-browser

1 0

[tor-browser-build/maint-8.0] Bug 29081: Harden libwinpthread
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit 2da5df458e3aa88a578210a1dc22a46387e39fba Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 14 08:22:40 2019 +0000 Bug 29081: Harden libwinpthread --- projects/mingw-w64/build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build index 1e25290..b2117c5 100644 --- a/projects/mingw-w64/build +++ b/projects/mingw-w64/build @@ -43,8 +43,8 @@ make install mkdir -p /var/tmp/build/builddir/mingw-w64/mingw-w64-pthread cd /var/tmp/build/builddir/mingw-w64/mingw-w64-pthread /var/tmp/build/[% project %]-[% c("version") %]/mingw-w64-libraries/winpthreads/configure \ - LDFLAGS="-Wl,--no-insert-timestamp" \ - --host=[% c("arch") %]-w64-mingw32 --prefix=$distdir/[% c("arch") %]-w64-mingw32 + LDFLAGS="-Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp" \ + --host=[% c("arch") %]-w64-mingw32 --prefix=$distdir/[% c("arch") %]-w64-mingw32 make -j[% c("buildconf/num_procs") %] make install

1 0

[torbutton/maint-2.0] Release preparations for 2.0.11
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit 70d44df529402368ec599955a7eef033ecb9b0e0 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 13 12:42:24 2019 +0000 Release preparations for 2.0.11 Version bump and CHANGELOG update --- src/CHANGELOG | 3 +++ src/install.rdf | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 2b0d2db0..b8d462ac 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,6 @@ +2.0.11 + * Bug 29021: Tell NoScript it is running within Tor Browser + 2.0.10 * Bug 29035: Clean up our donation campaign and add newsletter sign-up link * Bug 27175: Add pref to allow users to persist custom noscript settings diff --git a/src/install.rdf b/src/install.rdf index c39fbfb8..1aa768b4 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>2.0.10</em:version> + <em:version>2.0.11</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0