- tor-commits - lists.torproject.org

[tpo/master] Update Isa's photo
by gus＠torproject.org 09 Jun '20

09 Jun '20

commit ffd349f34c9a0d7c07a2128d6994ec5ca1b1539e Author: gus <gus(a)torproject.org> Date: Mon Jun 8 18:21:01 2020 -0400 Update Isa's photo --- assets/static/images/people/isabela.png | Bin 46938 -> 834334 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/assets/static/images/people/isabela.png b/assets/static/images/people/isabela.png index 924f6b41..732cdb61 100644 Binary files a/assets/static/images/people/isabela.png and b/assets/static/images/people/isabela.png differ

1 0

[tor-browser-build/master] Add #27903 to alpha Changelog, too
by gk＠torproject.org 08 Jun '20

08 Jun '20

commit b76fb9960da268cc6ad676241ea0d25706936175 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 8 17:35:56 2020 +0000 Add #27903 to alpha Changelog, too --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index aa55f4f..c045d53 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -296,6 +296,8 @@ Tor Browser 9.5a5 -- February 12 2020 * Bug 32870: Update version of pion-webrtc * Bug 32767: Remove Disconnect search * Bug 30237: Add v3 onion services client authentication prompt + * Linux + * Bug 27903: Tor Browser 8 does not respect gtk3 settings * Android * Bug 30767: Custom obfs4 bridge does not work on Tor Browser for Android * Build System

1 0

[tpo/master] Add missing comma in versions list
by sysrqb＠torproject.org 08 Jun '20

08 Jun '20

commit b063dde5138f26faa1896f3b7f19d20329b8e10b Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Jun 8 16:12:48 2020 +0000 Add missing comma in versions list --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index 99bfd39a..36ba2b9d 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -20,7 +20,7 @@ body: "9.5a13", "9.5a13-MacOS", "9.5a13-Linux", -"9.5a13-Windows" +"9.5a13-Windows", "10.0a1", "10.0a1-MacOS", "10.0a1-Linux",

1 0

[tpo/master] Deprecate old Tor Browser version (9.0.10, 9.5a12, 9.5a13)
by sysrqb＠torproject.org 08 Jun '20

08 Jun '20

commit 65a2553b92327f64c8413d0ede5760a04ce13ee9 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Jun 8 16:15:40 2020 +0000 Deprecate old Tor Browser version (9.0.10, 9.5a12, 9.5a13) --- .../projects/torbrowser/RecommendedTBBVersions/contents.lr | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index 36ba2b9d..70c945b9 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -5,22 +5,10 @@ _template: empty.html body: [ -"9.0.10", -"9.0.10-MacOS", -"9.0.10-Linux", -"9.0.10-Windows", "9.5", "9.5-MacOS", "9.5-Linux", "9.5-Windows", -"9.5a12", -"9.5a12-MacOS", -"9.5a12-Linux", -"9.5a12-Windows", -"9.5a13", -"9.5a13-MacOS", -"9.5a13-Linux", -"9.5a13-Windows", "10.0a1", "10.0a1-MacOS", "10.0a1-Linux",

1 0

[tor/master] scripts/maint: Remove obsolete generated tor.sh
by nickm＠torproject.org 08 Jun '20

08 Jun '20

commit 76d07940fd54b06965a4fc241bba2949107d0e3d Author: c <c(a)chroniko.jp> Date: Mon Jun 8 01:41:36 2020 +0000 scripts/maint: Remove obsolete generated tor.sh Per <https://trac.torproject.org/projects/tor/ticket/34381>, these contrib scripts were generated by older versions of Tor and shellcheck will throw warnings if they still exist. --- scripts/maint/checkShellScripts.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/maint/checkShellScripts.sh b/scripts/maint/checkShellScripts.sh index 4c872c7ee..0a423be29 100755 --- a/scripts/maint/checkShellScripts.sh +++ b/scripts/maint/checkShellScripts.sh @@ -34,6 +34,9 @@ if [ ! -d "$TOPLEVEL/src" ]; then exit 1 fi +# Remove obsolete scripts generated from older versions of Tor +rm -f "$TOPLEVEL/contrib/dist/suse/tor.sh" "$TOPLEVEL/contrib/dist/tor.sh" + # Check *.sh scripts, but ignore the ones that we can't fix find "$TOPLEVEL/contrib" "$TOPLEVEL/doc" "$TOPLEVEL/scripts" "$TOPLEVEL/src" \ -name "*.sh" \

1 0

[onionperf/master] Add --date-prefix command line switch.
by karsten＠torproject.org 08 Jun '20

08 Jun '20

commit 0025fef345803ad8ea0695181622e66530b2278d Author: Philipp Winter <phw(a)nymity.ch> Date: Fri May 29 16:00:24 2020 -0700 Add --date-prefix command line switch. The switch tells OnionPerf to prepend yesterday's date to the analysis output file. This new switch is mutually exclusive with --date-filter. This fixes <https://bugs.torproject.org/29369>. --- onionperf/analysis.py | 11 +++++++---- onionperf/measurement.py | 4 ++-- onionperf/onionperf | 11 +++++++++-- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/onionperf/analysis.py b/onionperf/analysis.py index 59d8217..20ca354 100644 --- a/onionperf/analysis.py +++ b/onionperf/analysis.py @@ -96,12 +96,15 @@ class Analysis(object): else: self.json_db['data'][nickname] = analysis.json_db['data'][nickname] - def save(self, filename=None, output_prefix=os.getcwd(), do_compress=True): + def save(self, filename=None, output_prefix=os.getcwd(), do_compress=True, date_prefix=None): if filename is None: - if self.date_filter is None: - filename = "onionperf.analysis.json.xz" + base_filename = "onionperf.analysis.json.xz" + if date_prefix is not None: + filename = "{0}.{1}".format(util.date_to_string(date_prefix), base_filename) + elif self.date_filter is not None: + filename = "{0}.{1}".format(util.date_to_string(self.date_filter), base_filename) else: - filename = "{}.onionperf.analysis.json.xz".format(util.date_to_string(self.date_filter)) + filename = base_filename filepath = os.path.abspath(os.path.expanduser("{0}/{1}".format(output_prefix, filename))) if not os.path.exists(output_prefix): diff --git a/onionperf/measurement.py b/onionperf/measurement.py index 308305c..4a58bc4 100644 --- a/onionperf/measurement.py +++ b/onionperf/measurement.py @@ -157,10 +157,10 @@ def logrotate_thread_task(writables, tgen_writable, torctl_writable, docroot, ni anal.add_torctl_file(torctl_writable.rotate_file(filename_datetime=next_midnight)) # run the analysis, i.e. parse the files - anal.analyze(do_simple=False, date_filter=next_midnight.date()) + anal.analyze(do_simple=False) # save the results in onionperf json format in the www docroot - anal.save(output_prefix=docroot, do_compress=True) + anal.save(output_prefix=docroot, do_compress=True, date_prefix=next_midnight.date()) # update the xml index in docroot generate_docroot_index(docroot) diff --git a/onionperf/onionperf b/onionperf/onionperf index d811e7b..a7d32f6 100755 --- a/onionperf/onionperf +++ b/onionperf/onionperf @@ -266,12 +266,19 @@ files generated by this script will be written""", action="store", dest="nickname", default=None) - analyze_parser.add_argument('-d', '--date-filter', + date_group = analyze_parser.add_mutually_exclusive_group() + date_group.add_argument('-d', '--date-filter', help="""a DATE string in the form YYYY-MM-DD, all log messages that did not occur on this date will be filtered out of the analysis""", metavar="DATE", type=type_str_date_in, action="store", dest="date_filter", default=None) + date_group.add_argument('-x', '--date-prefix', + help="""a DATE string in the form YYYY-MM-DD to add as prefix to the output file""", + metavar="DATE", type=type_str_date_in, + action="store", dest="date_prefix", + default=None) + analyze_parser.add_argument('-s', '--do-simple-parse', help="""parse and export only summary statistics rather than full transfer/circuit/stream data""", action="store_true", dest="do_simple", @@ -381,7 +388,7 @@ def analyze(args): if args.torctl_logpath is not None: analysis.add_torctl_file(args.torctl_logpath) analysis.analyze(args.do_simple, date_filter=args.date_filter) - analysis.save(output_prefix=args.prefix) + analysis.save(output_prefix=args.prefix, date_prefix=args.date_prefix) elif args.tgen_logpath is not None and os.path.isdir(args.tgen_logpath) and args.torctl_logpath is not None and os.path.isdir(args.torctl_logpath): from onionperf import reprocessing

1 0

[onionperf/master] Add size and last_modified fields to index.xml.
by karsten＠torproject.org 08 Jun '20

08 Jun '20

commit d38807c62b5cbb324a70179cebfb4d4cccc7668c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jun 1 21:51:07 2020 +0200 Add size and last_modified fields to index.xml. While touching this code: - make sure that the index.xml file itself is not contained and - fix the encoding issue introduced by the Python 3 upgrade. Fixes #29365. --- onionperf/measurement.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/onionperf/measurement.py b/onionperf/measurement.py index e947ede..676ccfc 100644 --- a/onionperf/measurement.py +++ b/onionperf/measurement.py @@ -18,11 +18,18 @@ from . import analysis, monitor, model, util def generate_docroot_index(docroot_path): root = etree.Element("files") - filepaths = [f for f in os.listdir(docroot_path) if os.path.isfile(os.path.abspath('/'.join([docroot_path, f])))] - for filename in filepaths: - e = etree.SubElement(root, "file") - e.set("name", filename) - with open("{0}/index.xml".format(docroot_path), 'wt') as f: print(etree.tostring(root, pretty_print=True, xml_declaration=True), file=f) + with os.scandir(docroot_path) as files: + for entry in files: + if not entry.name == 'index.xml' and entry.is_file(): + e = etree.SubElement(root, "file") + e.set("name", entry.name) + stat_result = entry.stat() + e.set("size", str(stat_result.st_size)) + mtime = datetime.datetime.fromtimestamp(stat_result.st_mtime) + e.set("last_modified", mtime.replace(microsecond=0).isoformat(sep=' ')) + with open("{0}/index.xml".format(docroot_path), 'wb') as f: + et = etree.ElementTree(root) + et.write(f, pretty_print=True, xml_declaration=True) def readline_thread_task(instream, q): # wait for lines from stdout until the EOF

1 0

[onionperf/master] Modify SHA-256 digest field in index.xml.
by karsten＠torproject.org 08 Jun '20

08 Jun '20

commit 7b5e65dc0160314dd76000d5f98ce64278fd1543 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jun 8 11:50:30 2020 +0200 Modify SHA-256 digest field in index.xml. --- onionperf/measurement.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/onionperf/measurement.py b/onionperf/measurement.py index d4435f0..308305c 100644 --- a/onionperf/measurement.py +++ b/onionperf/measurement.py @@ -3,7 +3,8 @@ Authored by Rob Jansen, 2015 See LICENSE for licensing information ''' -import hashlib + +import binascii, hashlib import os, traceback, subprocess, threading, queue, logging, time, datetime, re, shlex from lxml import etree @@ -29,7 +30,7 @@ def generate_docroot_index(docroot_path): e.set("last_modified", mtime.replace(microsecond=0).isoformat(sep=' ')) with open(entry, 'rb') as f: fbytes = f.read() - e.set("sha256sum", hashlib.sha256(fbytes).hexdigest()) + e.set("sha256", binascii.b2a_base64(hashlib.sha256(fbytes).digest(), newline=False)) with open("{0}/index.xml".format(docroot_path), 'wb') as f: et = etree.ElementTree(root) et.write(f, pretty_print=True, xml_declaration=True)

1 0

[onionperf/master] Fix recently broken unit tests.
by karsten＠torproject.org 08 Jun '20

08 Jun '20

commit 5d7662d831361cc822b2c783238be4bd34614cfc Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jun 8 09:44:47 2020 +0200 Fix recently broken unit tests. --- onionperf/tests/test_measurement.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/onionperf/tests/test_measurement.py b/onionperf/tests/test_measurement.py index f577c61..e5010fa 100644 --- a/onionperf/tests/test_measurement.py +++ b/onionperf/tests/test_measurement.py @@ -55,7 +55,7 @@ def test_create_tor_config_client_lines(): WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nDataDirectoryGroupReadable 1\nLog INFO stdout\nUseBridges 1\n" known_config_server = "RunAsDaemon 0\nORPort 0\nDirPort 0\nControlPort 9001\nSocksPort 9050\nSocksListenAddress 127.0.0.1\nClientOnly 1\n\ -WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nDataDirectoryGroupReadable 1\nLog INFO stdout\nUseEntryGuards 0" +WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nDataDirectoryGroupReadable 1\nLog INFO stdout\nUseEntryGuards 0\n" meas = measurement.Measurement(None, None, None, None, None, None, "UseBridges 1\n", None, None) @@ -75,7 +75,7 @@ def test_create_tor_config_client_file(): """ known_config_server = "RunAsDaemon 0\nORPort 0\nDirPort 0\nControlPort 9001\nSocksPort 9050\nSocksListenAddress 127.0.0.1\nClientOnly 1\n\ -WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nDataDirectoryGroupReadable 1\nLog INFO stdout\nUseEntryGuards 0" +WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nDataDirectoryGroupReadable 1\nLog INFO stdout\nUseEntryGuards 0\n" known_config = "RunAsDaemon 0\nORPort 0\nDirPort 0\nControlPort 9001\nSocksPort 9050\nSocksListenAddress 127.0.0.1\nClientOnly 1\n\ WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nDataDirectoryGroupReadable 1\nLog INFO stdout\nUseBridges 1\n" @@ -101,7 +101,7 @@ def test_create_tor_config_server_file(): WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nDataDirectoryGroupReadable 1\nLog INFO stdout\nUseBridges 1\n" known_config = "RunAsDaemon 0\nORPort 0\nDirPort 0\nControlPort 9001\nSocksPort 9050\nSocksListenAddress 127.0.0.1\nClientOnly 1\n\ -WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nDataDirectoryGroupReadable 1\nLog INFO stdout\nUseEntryGuards 0" +WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nDataDirectoryGroupReadable 1\nLog INFO stdout\nUseEntryGuards 0\n" meas = measurement.Measurement(None, None, None, None, None, None, None, None, absolute_data_path("config"))

1 0

[onionperf/master] Adds file SHA-256 digests to index.xml
by karsten＠torproject.org 08 Jun '20

08 Jun '20

commit 686c4f1acf02f5df96aff83af0add861a3e763d9 Author: Ana Custura <ana(a)netstat.org.uk> Date: Fri Jun 5 15:54:23 2020 +0100 Adds file SHA-256 digests to index.xml --- onionperf/measurement.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/onionperf/measurement.py b/onionperf/measurement.py index 676ccfc..d4435f0 100644 --- a/onionperf/measurement.py +++ b/onionperf/measurement.py @@ -3,7 +3,7 @@ Authored by Rob Jansen, 2015 See LICENSE for licensing information ''' - +import hashlib import os, traceback, subprocess, threading, queue, logging, time, datetime, re, shlex from lxml import etree @@ -27,6 +27,9 @@ def generate_docroot_index(docroot_path): e.set("size", str(stat_result.st_size)) mtime = datetime.datetime.fromtimestamp(stat_result.st_mtime) e.set("last_modified", mtime.replace(microsecond=0).isoformat(sep=' ')) + with open(entry, 'rb') as f: + fbytes = f.read() + e.set("sha256sum", hashlib.sha256(fbytes).hexdigest()) with open("{0}/index.xml".format(docroot_path), 'wb') as f: et = etree.ElementTree(root) et.write(f, pretty_print=True, xml_declaration=True)

1 0