June 2020 - tor-commits - lists.torproject.org

[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

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 08 Jun '20

08 Jun '20

commit d32d157d1f49ac6d6555fbfd7d95dd6fc1c7cd0d Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 8 08:53:37 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ka.po | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/contents+ka.po b/contents+ka.po index 463847c1ce..589de26689 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -2512,11 +2512,14 @@ msgid "" "plugins](/tbb/tbb-14) into Tor Browser, as these may bypass Tor or otherwise" " harm your anonymity and privacy." msgstr "" +"ამასთან, არ გირჩევთ [დააყენოთ დამატებები ან მოდულები](/tbb/tbb-14) Tor-" +"ბრაუზერში, შედეგად Tor-ის გვერდით ავლით ან რამე სხვა გზით დააზიანოს თქვენი " +"ვინაობის გაუმხელობა ან პირადულობა." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "### Use HTTPS versions of websites" -msgstr "" +msgstr "### გამოიყენეთ HTTPS-ვერსიები ან საიტები" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -2525,6 +2528,8 @@ msgid "" "encryption of your traffic to the final destination website depends upon on " "that website." msgstr "" +"Tor დაშიფრავს თქვენს კავშირს Tor-ქსელში, მაგრამ დაშიფვრა უშუალოდ საიტამდე " +"დამოკიდებული თავად ვებსაიტზე." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 08 Jun '20

08 Jun '20

commit 82375952e3b13dbe9fc0dcdd0c94b1ef88503c2d Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 8 08:23:53 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ka.po | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/contents+ka.po b/contents+ka.po index 6b36bcab50..463847c1ce 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -2441,6 +2441,9 @@ msgid "" "Further, if you provide: name, email, address, phone number, or any other " "personal information, you are no longer anonymous to that website." msgstr "" +"გარდა ამისა, თუ მიაწვდით: სახელს, ელფოსტას, მისამართს, ტელეფონის ნომერს ან " +"ნებისმიერ სხვა პირად ინფორმაციასაც, ასეთი საიტისთვის თქვენი ვინაობა აღარ " +"იქნება დაფარული." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -2448,6 +2451,7 @@ msgid "" "The best defense is to be vigilant and extremely cautious when filling out " "web forms." msgstr "" +"საუკეთესო დაცვა გულისხმობს სიფხიზლეს და მეტ ყურადღებას, ველების შევსებისას." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -2460,6 +2464,9 @@ msgid "" "Torrent file-sharing applications have been observed to ignore proxy " "settings and make direct connections even when they are told to use Tor." msgstr "" +"Torrent ფაილთა გასაზიარებელი აპლიკაციები შემჩნეულია პროქსი-პარამეტრების " +"უგულებელყოფასა და პირდაპირი კავშირების დამყარებაში, იმ შემთხვევაშიც კი თუ " +"მითითებული ექნება რომ Tor გამოიყენოს." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -2468,6 +2475,9 @@ msgid "" "send out your real IP address in the tracker GET request, because that's how" " torrents work." msgstr "" +"მაშინაც კი თუ torrent-აპლიკაცია მხოლოდ Tor-ის გავლით უკავშირდება ქსელს, " +"დროდადრო იგზავნება თქვენი ნამდვილი IP-მისამართი აღმრიცხავის GET-მოთხოვნაში, " +"ვინაიდან სწორედ ასე მუშაობს torrent." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -2477,11 +2487,14 @@ msgid "" "over-tor-isnt-good-idea) this way, you also slow down the entire Tor network" " for everyone else." msgstr "" +"არა მხოლოდ [torrent-ით მიმოცვლილ და იმავდროულად Tor-ის ვებმონაცემებს " +"ამჟღავნებთ](https://blog.torproject.org/blog/bittorrent-over-tor-isnt-good-" +"idea) ამით, აგრეთვე მთლიანად Tor-ქსელსაც ანელებთ ყველა სხვა დანარჩენისთვის." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "### Don't enable or install browser plugins" -msgstr "" +msgstr "### არ ჩართოთ ან ჩადგათ ბრაუზერის მოდულები" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 08 Jun '20

08 Jun '20

commit 2901b00a6c84f562ad44a5f3a2a13822db7e5055 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 8 07:53:38 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ka.po | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/contents+ka.po b/contents+ka.po index 7e8bab47a3..6b36bcab50 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -2407,7 +2407,7 @@ msgstr "- სახიფათო: [BitTorret Tor-ის გავლით](/m #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "### Control what information you provide through web forms." -msgstr "" +msgstr "### გაითვალისწინეთ, რა მონაცემები შეგყავთ საიტის ველებში." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -2415,6 +2415,8 @@ msgid "" "If you visit a website using Tor Browser, they don't know who you are or " "your true location." msgstr "" +"თუ საიტს ეწვევით Tor-ბრაუზერით, მათ არ ეცოდინებათ თქვენი ვინაობა და ნამდვილი" +" მდებარეობა." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -2422,6 +2424,7 @@ msgid "" "Unfortunately many sites ask for more personal information than they need " "through web forms." msgstr "" +"სამწუხაროდ, ბევრი საიტი ითხოვს მეტი პირადი მონაცემის ველებში შეყვანას." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -2429,6 +2432,8 @@ msgid "" "If you sign in to that website, they still don't know your location but they" " know who you are." msgstr "" +"თუ ასეთი საიტის ანგარიშზე შეხვალთ, მათ მაინც არ ეცოდინებათ თქვენი ნამდვილი " +"მდებარეობა, მაგრამ გაიგებენ ვინ ხართ." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description)

1 0

[onionperf/master] Fix config issue in single onion service mode.
by karsten＠torproject.org 08 Jun '20

08 Jun '20

commit 2fcb8f3a0afbcb9a7d4a9c07a0036c89b9865e15 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jun 8 09:30:09 2020 +0200 Fix config issue in single onion service mode. --- onionperf/measurement.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onionperf/measurement.py b/onionperf/measurement.py index a2fca69..e947ede 100644 --- a/onionperf/measurement.py +++ b/onionperf/measurement.py @@ -378,7 +378,7 @@ WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory if name == "client" and self.additional_client_conf: tor_config += self.additional_client_conf if not 'UseEntryGuards' in tor_config and not 'UseBridges' in tor_config: - tor_config += "UseEntryGuards 0" + tor_config += "UseEntryGuards 0\n" if name == "server" and self.single_onion: tor_config += "HiddenServiceSingleHopMode 1\nHiddenServiceNonAnonymousMode 1\n" return tor_config

1 0