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

[bridgedb/develop] Commit for #31528 (Get rid of BridgeDB's "chatspeak")
by phw＠torproject.org 15 May '20

15 May '20

commit 320ddd1747cd584dd6cf9d7a2ff3f571827d1089 Author: agix <columbeff(a)gmail.com> Date: Thu Apr 30 10:18:46 2020 +0200 Commit for #31528 (Get rid of BridgeDB's "chatspeak") Known chatspeak references have been removed or replaced Malicious requests are now redirected with the status code 400 --- README.rst | 12 ++++----- bridgedb/distributors/https/server.py | 11 ++++---- .../https/templates/assets/css/main.css | 4 +-- bridgedb/distributors/https/templates/bridges.html | 13 ++-------- .../distributors/https/templates/error-400.html | 30 ++++++++++++++++++++++ .../distributors/https/templates/error-500.html | 4 +-- bridgedb/test/test_https_server.py | 18 ++++++------- 7 files changed, 56 insertions(+), 36 deletions(-) diff --git a/README.rst b/README.rst index 858562e..1b0a840 100644 --- a/README.rst +++ b/README.rst @@ -78,8 +78,8 @@ Dependencies and installation BridgeDB requires the following OS-level dependencies: -- python>=2.7 -- python-dev +- python>=3 +- python3-dev - `python3-dkim <https://pypi.org/project/dkimpy/>`__ (it contains the ``dkimverify`` binary) - build-essential - OpenSSL>=1.0.1g @@ -106,11 +106,11 @@ Deploying BridgeDB BridgeDB should work with or without a Python virtualenv. -- Install Python 2.7, and other OS-level dependencies. On Debian, you +- Install Python 3, and other OS-level dependencies. On Debian, you can do:: - sudo apt-get install build-essential openssl python python-dev \ - python-setuptools sqlite3 libgeoip-dev geoip-database + sudo apt-get install build-essential openssl python3 python3-dev \ + python3-setuptools sqlite3 gnupg2 libgeoip-dev geoip-database - Install Pip 1.3.1 or later. Debian has this version, but if for some @@ -146,7 +146,7 @@ BridgeDB should work with or without a Python virtualenv. - **(virtualenv installs only)** To install, set PYTHONPATH to include the root directory of the virtualenv:: - export PYTHONPATH=$PYTHONPATH:${VIRTUAL_ENV}/lib/python2.7/site-packages + export PYTHONPATH=$PYTHONPATH:${VIRTUAL_ENV}/lib/python3.7/site-packages - Then, proceed as usual:: diff --git a/bridgedb/distributors/https/server.py b/bridgedb/distributors/https/server.py index b2de4b1..91757e7 100644 --- a/bridgedb/distributors/https/server.py +++ b/bridgedb/distributors/https/server.py @@ -166,11 +166,9 @@ def replaceErrorPage(request, error, template_name=None, html=True): def redirectMaliciousRequest(request): - '''Redirect the client to a "daring work of art" which "in true - post-modern form, […] tends to raise more questions than answers." - ''' - logging.debug("Redirecting %s to a daring work of art..." % getClientIP(request)) - request.write(redirectTo(base64.b64decode("aHR0cDovLzJnaXJsczFjdXAuY2Ev"), request)) + '''Setting the reponse code to 400 (Bad Request)''' + logging.debug("Setting response code to 400 for %s" % getClientIP(request)) + request.setResponseCode(400) request.finish() return request @@ -367,7 +365,7 @@ class ErrorResource(CSPResource): render_POST = render_GET - +resource400 = ErrorResource('error-400.html', code=400) resource404 = ErrorResource('error-404.html', code=404) resource500 = ErrorResource('error-500.html', code=500) maintenance = ErrorResource('error-503.html', code=503) @@ -1157,6 +1155,7 @@ def addWebServer(config, distributor): root.putChild(b'info', info) root.putChild(b'maintenance', maintenance) root.putChild(b'error', resource500) + root.putChild(b'malicious', resource400) root.putChild(CSPResource.reportURI, csp) if config.RECAPTCHA_ENABLED: diff --git a/bridgedb/distributors/https/templates/assets/css/main.css b/bridgedb/distributors/https/templates/assets/css/main.css index 72a3205..8ff1f07 100644 --- a/bridgedb/distributors/https/templates/assets/css/main.css +++ b/bridgedb/distributors/https/templates/assets/css/main.css @@ -373,11 +373,11 @@ div.bridge-lines.-webkit-scrollbar-thumb.horizontal{ align-content: left; } -#uh-oh-spaghettios { +#error { width: 80%; margin: auto; } -.uh-oh-spaghettios~p { +.error~p { text-align: center; font-size: 115%; } diff --git a/bridgedb/distributors/https/templates/bridges.html b/bridgedb/distributors/https/templates/bridges.html index 55a9e79..1d672eb 100644 --- a/bridgedb/distributors/https/templates/bridges.html +++ b/bridgedb/distributors/https/templates/bridges.html @@ -60,11 +60,6 @@ ${bridgeline | h,trim}<br /> </p> % else: <p class="text-danger"> -## TRANSLATORS: Please translate this into some silly way to say -## "There was a problem!" in your language. For example, -## for Italian, you might translate this into "Mama mia!", -## or for French: "Sacrebleu!". :) -${_("""Uh oh, spaghettios!""")} ${_("""It seems there was an error getting your QRCode.""")} <i class="icon icon-frown"></i> </p> @@ -106,17 +101,13 @@ ${_("""This QRCode contains your bridge lines. Scan it with a QRCode """ \ </div> % else: -<div class="bs-component" id="uh-oh-spaghettios"> +<div class="bs-component" id="error"> <div class="alert alert-dismissable alert-danger"> <p> <br /> <strong> <em class="primary"> -## TRANSLATORS: Please translate this into some silly way to say -## "There was a problem!" in your language. For example, -## for Italian, you might translate this into "Mama mia!", -## or for French: "Sacrebleu!". :) -${_("""Uh oh, spaghettios!""")} +${_("""BridgeDB encountered an error.""")} </em> </strong> <br /> diff --git a/bridgedb/distributors/https/templates/error-400.html b/bridgedb/distributors/https/templates/error-400.html new file mode 100644 index 0000000..5f12dda --- /dev/null +++ b/bridgedb/distributors/https/templates/error-400.html @@ -0,0 +1,30 @@ +## -*- coding: utf-8 -*- + +<html> + <head> + <meta charset="utf-8"> + <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <title>BridgeDB - 400</title> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <meta name="description" content="Bridge IP database"> + <meta name="author" content="The Tor Project"> + +  + <link rel="stylesheet" href="/assets/css/main.css"> +  + <link rel="stylesheet" href="/assets/css/error.css"> + </head> + <body> + <div class="application error error400"> + <main class="main main--error" role="main"> + <div class="road full-size"></div> + <div class="error-text"> + <h1>Bad Request</h1> + <p>Your request was not understood by the server.<a href="/">BridgeDB</a></p> + </div> + </main> + </div> + </body> +</html> diff --git a/bridgedb/distributors/https/templates/error-500.html b/bridgedb/distributors/https/templates/error-500.html index 5c56c39..e17b2f4 100644 --- a/bridgedb/distributors/https/templates/error-500.html +++ b/bridgedb/distributors/https/templates/error-500.html @@ -27,8 +27,8 @@ </div> <div class="road full-size"></div> <div class="error-text"> - <h1>Bad News Bears</h1> - <p>Something wicked totally just borked <a href="/">BridgeDB</a>… :'(</p> + <h1>Internal Error</h1> + <p>BridgeDB encountered an internal error<a href="/">BridgeDB</a></p> </div> </main> </div> diff --git a/bridgedb/test/test_https_server.py b/bridgedb/test/test_https_server.py index 54bda2e..3b159ce 100644 --- a/bridgedb/test/test_https_server.py +++ b/bridgedb/test/test_https_server.py @@ -68,15 +68,15 @@ class ReplaceErrorPageTests(unittest.TestCase): def test_replaceErrorPage(self): """``replaceErrorPage`` should return the error-500.html page.""" request = DummyRequest(['']) - exc = Exception("vegan gümmibären") + exc = Exception("Under Maintenance") errorPage = server.replaceErrorPage(request, exc) - self.assertSubstring(b"Bad News Bears", errorPage) - self.assertNotSubstring("vegan gümmibären".encode("utf-8"), errorPage) + self.assertSubstring(b"Internal Error", errorPage) + self.assertNotSubstring("Under Maintenance".encode("utf-8"), errorPage) def test_replaceErrorPage_matches_resource500(self): """``replaceErrorPage`` should return the error-500.html page.""" request = DummyRequest(['']) - exc = Exception("vegan gümmibären") + exc = Exception("Under Maintenance") errorPage = server.replaceErrorPage(request, exc) error500Page = server.resource500.render(request) self.assertEqual(errorPage, error500Page) @@ -89,8 +89,8 @@ class ReplaceErrorPageTests(unittest.TestCase): exc = Exception("vegan gümmibären") server.resource500 = None errorPage = server.replaceErrorPage(request, exc) - self.assertNotSubstring(b"Bad News Bears", errorPage) - self.assertNotSubstring("vegan gümmibären".encode("utf-8"), errorPage) + self.assertNotSubstring(b"Bad Request", errorPage) + self.assertNotSubstring("Under Maintenance".encode("utf-8"), errorPage) self.assertSubstring(b"Sorry! Something went wrong with your request.", errorPage) @@ -108,7 +108,7 @@ class ErrorResourceTests(unittest.TestCase): def test_resource500(self): """``server.resource500`` should display the error-500.html page.""" page = server.resource500.render(self.request) - self.assertSubstring(b'Bad News Bears', page) + self.assertSubstring(b'Internal Error', page) def test_maintenance(self): """``server.maintenance`` should display the error-503.html page.""" @@ -549,7 +549,7 @@ class ReCaptchaProtectedResourceTests(unittest.TestCase): """Check the ``Request`` returned from ``_renderDeferred``.""" self.assertIsInstance(request, DummyRequest) html = b''.join(request.written) - self.assertSubstring(b'Uh oh, spaghettios!', html) + self.assertSubstring(b'BridgeDB encountered an error.', html) d = task.deferLater(reactor, 0, lambda x: x, (True, self.request)) d.addCallback(self.captchaResource._renderDeferred) @@ -913,7 +913,7 @@ class BridgesResourceTests(unittest.TestCase): page = self.bridgesResource.renderAnswer(request, bridgeLines=None) # We don't want the fancy version: - self.assertNotSubstring(b"Bad News Bears", page) + self.assertNotSubstring(b"Bad Request", page) self.assertSubstring(b"Sorry! Something went wrong with your request.", page)

1 0

[bridgedb/develop] Update our strings to get them translated.
by phw＠torproject.org 15 May '20

15 May '20

commit aba3c3465b63b1d2116132f00cb865b7f7b35c45 Author: Philipp Winter <phw(a)nymity.ch> Date: Thu May 14 14:21:59 2020 -0700 Update our strings to get them translated. --- bridgedb/i18n/templates/bridgedb.pot | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/bridgedb/i18n/templates/bridgedb.pot b/bridgedb/i18n/templates/bridgedb.pot index bb78824..273e1e4 100644 --- a/bridgedb/i18n/templates/bridgedb.pot +++ b/bridgedb/i18n/templates/bridgedb.pot @@ -5,18 +5,18 @@ # msgid "" msgstr "" -"Project-Id-Version: bridgedb 0.10.0+10.g96de503\n" +"Project-Id-Version: bridgedb 0.10.0+25.g77870a9\n" "Report-Msgid-Bugs-To: " "'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…" "=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" -"POT-Creation-Date: 2020-04-09 14:45-0700\n" +"POT-Creation-Date: 2020-05-14 14:21-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.7.0\n" +"Generated-By: Babel 2.8.0\n" #. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*- #. This file is part of BridgeDB, a Tor bridge distribution system. @@ -78,31 +78,26 @@ msgstr "" msgid "QRCode for your bridge lines" msgstr "" -#. TRANSLATORS: Please translate this into some silly way to say -#. "There was a problem!" in your language. For example, -#. for Italian, you might translate this into "Mama mia!", -#. or for French: "Sacrebleu!". :) -#: bridgedb/distributors/https/templates/bridges.html:67 -#: bridgedb/distributors/https/templates/bridges.html:119 -msgid "Uh oh, spaghettios!" -msgstr "" - -#: bridgedb/distributors/https/templates/bridges.html:68 +#: bridgedb/distributors/https/templates/bridges.html:63 msgid "It seems there was an error getting your QRCode." msgstr "" -#: bridgedb/distributors/https/templates/bridges.html:73 +#: bridgedb/distributors/https/templates/bridges.html:68 msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy " "your bridge lines onto mobile and other devices." msgstr "" -#: bridgedb/distributors/https/templates/bridges.html:125 +#: bridgedb/distributors/https/templates/bridges.html:110 +msgid "BridgeDB encountered an error." +msgstr "" + +#: bridgedb/distributors/https/templates/bridges.html:116 msgid "There currently aren't any bridges available..." msgstr "" -#: bridgedb/distributors/https/templates/bridges.html:127 -#: bridgedb/distributors/https/templates/bridges.html:131 +#: bridgedb/distributors/https/templates/bridges.html:118 +#: bridgedb/distributors/https/templates/bridges.html:122 #, python-format msgid " Perhaps you should try %s going back %s and choosing a different bridge type!" msgstr ""

1 0

[onionperf/master] Removes tpf mentions from the documentation
by karsten＠torproject.org 14 May '20

14 May '20

commit fd9420426f02001cd1524ee68895b14102d4dbd5 Author: Ana Custura <ana(a)netstat.org.uk> Date: Thu May 14 17:06:12 2020 +0100 Removes tpf mentions from the documentation --- README.md | 9 +-------- onionperf/onionperf | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index d7ff81b..9f7e872 100644 --- a/README.md +++ b/README.md @@ -226,14 +226,7 @@ subcommand (which is described in more detail below). The analysis produces a contextual information collected during the measurement process. The `README_JSON.md` file in this repo describes the format and elements contained in the `json` file. -The analysis also produces a `.tpf` file in the standard Torperf format -(`type torperf 1.0`) which contains a subset of the measurement data available in -the `json` file. This file is produced to increase interoperability with existing -tools written to process Torperf measurement results. More information regarding -how to read Torperf's measurements results can be found at: -https://metrics.torproject.org/collector.html#torperf. - -The daily generated `json` and `tpf` files are placed in the web docroot and are +The daily generated `json` files are placed in the web docroot and are available through the local filesystem in the `onionperf-data/htdocs` directory. These files can be shared via a web server such as Apache or nginx. diff --git a/onionperf/onionperf b/onionperf/onionperf index 69ac399..ee28344 100755 --- a/onionperf/onionperf +++ b/onionperf/onionperf @@ -200,7 +200,7 @@ def main(): default=True) measure_parser.add_argument('-n', '--nickname', - help="""the 'SOURCE' STRING to use in .tpf torperf stats files produced by OnionPerf""", + help="""the 'SOURCE' STRING to use in measurement result files produced by OnionPerf""", metavar="STRING", type=str, action="store", dest="nickname", default=hostname)

1 0

[onionperf/master] Removes torperf export function in analysis.py
by karsten＠torproject.org 14 May '20

14 May '20

commit b411bd32760a12de25d406f870d903f223c1e763 Author: Ana Custura <ana(a)netstat.org.uk> Date: Thu May 14 14:50:15 2020 +0100 Removes torperf export function in analysis.py --- onionperf/analysis.py | 143 -------------------------------------------------- 1 file changed, 143 deletions(-) diff --git a/onionperf/analysis.py b/onionperf/analysis.py index dfdf2a6..83f993d 100644 --- a/onionperf/analysis.py +++ b/onionperf/analysis.py @@ -150,149 +150,6 @@ class Analysis(object): analysis_instance.json_db = db return analysis_instance - def export_torperf_version_1_1(self, output_prefix=os.getcwd(), do_compress=False): - # export file in `@type torperf 1.0` format: https://collector.torproject.org/#type-torperf - if not os.path.exists(output_prefix): - os.makedirs(output_prefix) - - for nickname in self.json_db['data']: - if 'tgen' not in self.json_db['data'][nickname] or 'transfers' not in self.json_db['data'][nickname]['tgen']: - continue - - xfers_by_filesize = {} - for xfer_db in list(self.json_db['data'][nickname]['tgen']['transfers'].values()): - xfers_by_filesize.setdefault(xfer_db['filesize_bytes'], []).append(xfer_db) - - streams_by_srcport, circuits = {}, [] - if 'tor' in self.json_db['data'][nickname]: - if 'streams' in self.json_db['data'][nickname]['tor']: - for streams_db in list(self.json_db['data'][nickname]['tor']['streams'].values()): - if 'source' in streams_db: - srcport = int(streams_db['source'].split(':')[1]) - streams_by_srcport[srcport] = streams_db - if 'circuits' in self.json_db['data'][nickname]['tor']: - circuits = self.json_db['data'][nickname]['tor']['circuits'] - - for filesize in xfers_by_filesize: - # build the filename - filename_prefix = "{}-{}".format(nickname, filesize) - filename_middle = "-{}".format(util.date_to_string(self.date_filter)) if self.date_filter is not None else "" - filename_suffix = ".tpf.xz" if do_compress else ".tpf" - filename = "{}{}{}".format(filename_prefix, filename_middle, filename_suffix) - - filepath = "{}/{}".format(output_prefix, filename) - - logging.info("saving analysis results to {0}".format(filepath)) - - # always append instead of truncating file - output = util.FileWritable(filepath, do_compress=do_compress, do_truncate=False) - output.open() - - for xfer_db in xfers_by_filesize[filesize]: - # if any keys are missing, log a warning - try: - d = {} - - d['SOURCE'] = nickname - d['SOURCEADDRESS'] = self.json_db['data'][nickname]['measurement_ip'] - d['ENDPOINTLOCAL'] = xfer_db['endpoint_local'] - d['ENDPOINTPROXY'] = xfer_db['endpoint_proxy'] - d['ENDPOINTREMOTE'] = xfer_db['endpoint_remote'] - d['HOSTNAMELOCAL'] = xfer_db['hostname_local'] - d['HOSTNAMEREMOTE'] = xfer_db['hostname_remote'] - - d['FILESIZE'] = xfer_db['filesize_bytes'] - d['READBYTES'] = xfer_db['total_bytes_read'] - d['WRITEBYTES'] = xfer_db['total_bytes_write'] - d['DIDTIMEOUT'] = 0 - - def ts_to_str(ts): return"{0:.02f}".format(ts) - - # initialize times to 0.0 - time_keys = ['START', 'SOCKET', 'CONNECT', 'NEGOTIATE', 'REQUEST', 'RESPONSE', 'DATAREQUEST', 'DATARESPONSE', 'DATACOMPLETE', 'LAUNCH'] - for i in range(1, 10): - time_keys.append('DATAPERC{}0'.format(i)) - for key in time_keys: - d[key] = 0.0 - - # since these are initialized to 0, it's OK if we are missing some times, e.g. due to read error - if 'unix_ts_start' in xfer_db: - - # if we need to filter by date and the download did not start on that date, skip it - if self.date_filter is not None: - start_datetime = datetime.datetime.utcfromtimestamp(xfer_db['unix_ts_start']) - if start_datetime is not None: - if not util.do_dates_match(self.date_filter, start_datetime.date()): - logging.info("skipping download because start date {} does not match filter date {}".format(util.date_to_string(start_datetime.date()), util.date_to_string(self.date_filter))) - continue - - d['START'] = ts_to_str(xfer_db['unix_ts_start']) - if 'elapsed_seconds' in xfer_db: - if 'socket_create' in xfer_db['elapsed_seconds']: - d['SOCKET'] = ts_to_str(xfer_db['unix_ts_start'] + xfer_db['elapsed_seconds']['socket_create']) - if 'socket_connect' in xfer_db['elapsed_seconds']: - d['CONNECT'] = ts_to_str(xfer_db['unix_ts_start'] + xfer_db['elapsed_seconds']['socket_connect']) - if 'proxy_choice' in xfer_db['elapsed_seconds']: - d['NEGOTIATE'] = ts_to_str(xfer_db['unix_ts_start'] + xfer_db['elapsed_seconds']['proxy_choice']) - if 'proxy_request' in xfer_db['elapsed_seconds']: - d['REQUEST'] = ts_to_str(xfer_db['unix_ts_start'] + xfer_db['elapsed_seconds']['proxy_request']) - if 'proxy_response' in xfer_db['elapsed_seconds']: - d['RESPONSE'] = ts_to_str(xfer_db['unix_ts_start'] + xfer_db['elapsed_seconds']['proxy_response']) - if 'command' in xfer_db['elapsed_seconds']: - d['DATAREQUEST'] = ts_to_str(xfer_db['unix_ts_start'] + xfer_db['elapsed_seconds']['command']) - if 'response' in xfer_db['elapsed_seconds']: - d['DATARESPONSE'] = ts_to_str(xfer_db['unix_ts_start'] + xfer_db['elapsed_seconds']['response']) - - if 'payload_progress' in xfer_db['elapsed_seconds']: - # set DATAPERC[10,20,...,90] - for decile in sorted(xfer_db['elapsed_seconds']['payload_progress'].keys()): - if decile in xfer_db['elapsed_seconds']['payload_progress'] and xfer_db['elapsed_seconds']['payload_progress'][decile] is not None: - decile_as_int = int(float(decile) * 100) - d['DATAPERC{0}'.format(decile_as_int)] = ts_to_str(xfer_db['unix_ts_start'] + xfer_db['elapsed_seconds']['payload_progress'][decile]) - else: - for i in range(1, 10): - d.pop('DATAPERC{}0'.format(i)) - - if 'last_byte' in xfer_db['elapsed_seconds']: - d['DATACOMPLETE'] = ts_to_str(xfer_db['unix_ts_start'] + xfer_db['elapsed_seconds']['last_byte']) - - if xfer_db['is_error']: - d['DIDTIMEOUT'] = 1 # could be ioerror or timeout or etc, torperf did not distinguish - d['ERRORCODE'] = xfer_db['error_code'] # this field is onionperf specific - - # now get the tor parts - srcport = int(xfer_db['endpoint_local'].split(':')[2]) - if srcport in streams_by_srcport: - stream_db = streams_by_srcport[srcport] - if 'failure_reason_local' in list(stream_db.keys()): - d['ERRORCODE'] += '_' + stream_db['failure_reason_local'] - if 'failure_reason_remote' in list(stream_db.keys()): - d['ERRORCODE'] += '_' + stream_db['failure_reason_remote'] - circid = int(stream_db['circuit_id'] or 0) - if circid in circuits: - circuit_db = circuits[circid] - - d['LAUNCH'] = circuit_db['unix_ts_start'] - d['PATH'] = ','.join([item[0].split('~')[0] for item in circuit_db['path']]) - d['BUILDTIMES'] = ','.join([str(item[1]) for item in circuit_db['path']]) - d['TIMEOUT'] = circuit_db['build_timeout'] if 'build_timeout' in circuit_db else None - d['QUANTILE'] = circuit_db['build_quantile'] if 'build_quantile' in circuit_db else None - d['CIRC_ID'] = circid - d['USED_AT'] = stream_db['unix_ts_end'] - d['USED_BY'] = int(stream_db['stream_id']) - if 'ERRORCODE' in list(d.keys()): - d['ERRORCODE'] = ERRORS[d['ERRORCODE']] - - output.write("@type torperf 1.1\r\n") - output_str = ' '.join("{0}={1}".format(k, d[k]) for k in sorted(d.keys()) if d[k] is not None).strip() - output.write("{0}\r\n".format(output_str)) - except KeyError as e: - logging.warning("KeyError while exporting torperf file, missing key '{0}', skipping transfer '{1}'".format(str(e), xfer_db['transfer_id'])) - continue - - output.close() - logging.info("done!") - def subproc_analyze_func(analysis_args): signal(SIGINT, SIG_IGN) # ignore interrupts a = analysis_args[0]

1 0

[onionperf/master] Removes torperf argument from the cli interface
by karsten＠torproject.org 14 May '20

14 May '20

commit febd00b454e60b556edd5c1f286b376207e31cb1 Author: Ana Custura <ana(a)netstat.org.uk> Date: Thu May 14 14:02:48 2020 +0100 Removes torperf argument from the cli interface --- onionperf/onionperf | 5 ----- 1 file changed, 5 deletions(-) diff --git a/onionperf/onionperf b/onionperf/onionperf index 1e0aa66..69ac399 100755 --- a/onionperf/onionperf +++ b/onionperf/onionperf @@ -272,11 +272,6 @@ files generated by this script will be written""", action="store_true", dest="do_simple", default=False) - analyze_parser.add_argument('-t', '--torperf', - help="""export transfer data in Torperf format in addition to OnionPerf format""", - action="store_true", dest="save_torperf", - default=False) - # analyze_parser = sub_parser.add_parser('analyze', description=DESC_ANALYZE, help=HELP_ANALYZE) # analyze_parser.set_defaults(func=analyze, formatter_class=argparse.RawDescriptionHelpFormatter) #

1 0

[onionperf/master] Removes code to export tpf files at midnight
by karsten＠torproject.org 14 May '20

14 May '20

commit cffd1d2b1405dda1e0b2374ba922957bf8819417 Author: Ana Custura <ana(a)netstat.org.uk> Date: Thu May 14 14:53:30 2020 +0100 Removes code to export tpf files at midnight --- onionperf/measurement.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/onionperf/measurement.py b/onionperf/measurement.py index 91952a5..79c96ff 100644 --- a/onionperf/measurement.py +++ b/onionperf/measurement.py @@ -148,9 +148,8 @@ def logrotate_thread_task(writables, tgen_writable, torctl_writable, docroot, ni # run the analysis, i.e. parse the files anal.analyze(do_simple=False, date_filter=next_midnight.date()) - # save the results in onionperf and torperf format in the www docroot + # save the results in onionperf json format in the www docroot anal.save(output_prefix=docroot, do_compress=True) - anal.export_torperf_version_1_1(output_prefix=docroot, do_compress=False) # update the xml index in docroot generate_docroot_index(docroot) @@ -306,7 +305,7 @@ class Measurement(object): logging.info("Exiting") def __start_log_processors(self, general_writables, tgen_writable, torctl_writable): - # rotate the log files, and then parse out the torperf measurement data + # rotate the log files, and then parse out the measurement data logrotate_args = (general_writables, tgen_writable, torctl_writable, self.www_docroot, self.nickname, self.done_event) logrotate = threading.Thread(target=logrotate_thread_task, name="logrotate", args=logrotate_args) logrotate.start()

1 0

[onionperf/master] Removes torperf arguments from analysis and reprocessing functions
by karsten＠torproject.org 14 May '20

14 May '20

commit 0535edd8931c7821f7deff8d148648ed976790b6 Author: Ana Custura <ana(a)netstat.org.uk> Date: Thu May 14 14:02:07 2020 +0100 Removes torperf arguments from analysis and reprocessing functions --- onionperf/onionperf | 4 +--- onionperf/reprocessing.py | 9 +++------ onionperf/tests/test_reprocessing.py | 15 +++------------ 3 files changed, 7 insertions(+), 21 deletions(-) diff --git a/onionperf/onionperf b/onionperf/onionperf index a61fd73..1e0aa66 100755 --- a/onionperf/onionperf +++ b/onionperf/onionperf @@ -421,8 +421,6 @@ def analyze(args): analysis.add_torctl_file(args.torctl_logpath) analysis.analyze(args.do_simple, date_filter=args.date_filter) analysis.save(output_prefix=args.prefix) - if args.save_torperf: - analysis.export_torperf_version_1_1(output_prefix=args.prefix, do_compress=False) 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 @@ -430,7 +428,7 @@ def analyze(args): torctl_logs = reprocessing.collect_logs(args.torctl_logpath, '*torctl.log*') log_pairs = reprocessing.match(tgen_logs, torctl_logs, args.date_filter) logging.info("Found {0} matching log pairs to be reprocessed".format(len(log_pairs))) - reprocessing.multiprocess_logs(log_pairs, args.prefix, args.nickname, args.save_torperf, args.do_simple) + reprocessing.multiprocess_logs(log_pairs, args.prefix, args.nickname, args.do_simple) else: logging.error("Given paths were an unrecognized mix of file and directory paths, nothing will be analyzed") diff --git a/onionperf/reprocessing.py b/onionperf/reprocessing.py index 48f67bb..f88f311 100644 --- a/onionperf/reprocessing.py +++ b/onionperf/reprocessing.py @@ -46,24 +46,21 @@ def match(tgen_logs, tor_logs, date_filter): return log_pairs -def analyze_func(prefix, nick, save_torperf, do_simple, pair): +def analyze_func(prefix, nick, do_simple, pair): analysis = Analysis(nickname=nick) logging.info('Analysing pair for date {0}'.format(pair[2])) analysis.add_tgen_file(pair[0]) analysis.add_torctl_file(pair[1]) analysis.analyze(do_simple=do_simple, date_filter=pair[2]) analysis.save(output_prefix=prefix) - if save_torperf: - analysis.export_torperf_version_1_1( - output_prefix=prefix, do_compress=False) return 1 -def multiprocess_logs(log_pairs, prefix, nick=None, save_torperf=False, do_simple=False): +def multiprocess_logs(log_pairs, prefix, nick=None, do_simple=False): pool = Pool(cpu_count()) analyses = None try: - func = partial(analyze_func, prefix, nick, save_torperf, do_simple) + func = partial(analyze_func, prefix, nick, do_simple) mr = pool.map_async(func, log_pairs) pool.close() while not mr.ready(): diff --git a/onionperf/tests/test_reprocessing.py b/onionperf/tests/test_reprocessing.py index a120587..5e758d2 100644 --- a/onionperf/tests/test_reprocessing.py +++ b/onionperf/tests/test_reprocessing.py @@ -61,23 +61,17 @@ def test_log_match_with_wrong_filter_date(): def test_analyze_func_json(): pair = (DATA_DIR + 'logs/onionperf_2019-01-10_23:59:59.tgen.log', DATA_DIR + 'logs/onionperf_2019-01-10_23:59:59.torctl.log', datetime.datetime(2019, 1, 10, 0, 0)) work_dir = tempfile.mkdtemp() - reprocessing.analyze_func(work_dir, None, True, False, pair) + reprocessing.analyze_func(work_dir, None, False, pair) json_file = os.path.join(work_dir, "2019-01-10.onionperf.analysis.json.xz") assert(os.path.exists(json_file)) - for i in ['51200', '5242880', '1048576']: - torperf_file = os.path.join(work_dir, "op-ab-{0}-2019-01-10.tpf".format(i)) - assert(os.path.exists(torperf_file)) shutil.rmtree(work_dir) def test_multiprocess_logs(): pairs = [(DATA_DIR + 'logs/onionperf_2019-01-10_23:59:59.tgen.log', DATA_DIR + 'logs/onionperf_2019-01-10_23:59:59.torctl.log', datetime.datetime(2019, 1, 10, 0, 0))] work_dir = tempfile.mkdtemp() - reprocessing.multiprocess_logs(pairs, work_dir, save_torperf=True) + reprocessing.multiprocess_logs(pairs, work_dir) json_file = os.path.join(work_dir, "2019-01-10.onionperf.analysis.json.xz") assert(os.path.exists(json_file)) - for i in ['51200', '5242880', '1048576']: - torperf_file = os.path.join(work_dir, "op-ab-{0}-2019-01-10.tpf".format(i)) - assert(os.path.exists(torperf_file)) shutil.rmtree(work_dir) def test_end_to_end(): @@ -85,10 +79,7 @@ def test_end_to_end(): torctl_logs = reprocessing.collect_logs(DATA_DIR, '*torctl.log') log_pairs = reprocessing.match(tgen_logs, torctl_logs, None) work_dir = tempfile.mkdtemp() - reprocessing.multiprocess_logs(log_pairs, work_dir, save_torperf=True) + reprocessing.multiprocess_logs(log_pairs, work_dir) json_file = os.path.join(work_dir, "2019-01-10.onionperf.analysis.json.xz") assert(os.path.exists(json_file)) - for i in ['51200', '5242880', '1048576']: - torperf_file = os.path.join(work_dir, "op-ab-{0}-2019-01-10.tpf".format(i)) - assert(os.path.exists(torperf_file)) shutil.rmtree(work_dir)

1 0

[translation/whisperback_release] add transifex config
by emmapeel＠torproject.org 14 May '20

14 May '20

commit 75a869d3fa9519133eacd69e7402f7e0bd3130f7 Author: emma peel <emma.peel(a)riseup.net> Date: Thu May 14 18:31:21 2020 +0000 add transifex config --- .gitignore | 1 - .tx/config | 7 +++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 53867e967d..0000000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.tx diff --git a/.tx/config b/.tx/config new file mode 100644 index 0000000000..845453c829 --- /dev/null +++ b/.tx/config @@ -0,0 +1,7 @@ +[torproject.3-whisperback-whisperback-pot] +file_filter = <lang>.po +source_file = whisperback.pot +source_lang = en + +[main] +host = https://www.transifex.net

1 0

[community/master] Updates sub-header to Community
by antonela＠torproject.org 14 May '20

14 May '20

commit b76431eb1d9de6053c634dbd21166e8c421fcadf Author: Antonela <hola(a)antonela.me> Date: Thu May 14 15:22:49 2020 -0300 Updates sub-header to Community --- content/localization/contents.lr | 2 +- content/onion-services/contents.lr | 2 +- content/outreach/contents.lr | 2 +- content/relay-operations/contents.lr | 2 +- content/training/contents.lr | 2 +- content/user-research/contents.lr | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/content/localization/contents.lr b/content/localization/contents.lr index 00b6229..a1d81c7 100644 --- a/content/localization/contents.lr +++ b/content/localization/contents.lr @@ -1,4 +1,4 @@ -section: localization +section: Community --- section_id: localization --- diff --git a/content/onion-services/contents.lr b/content/onion-services/contents.lr index d9af6b7..a9b8ea4 100644 --- a/content/onion-services/contents.lr +++ b/content/onion-services/contents.lr @@ -1,4 +1,4 @@ -section: onion services +section: Community --- section_id: onion-services --- diff --git a/content/outreach/contents.lr b/content/outreach/contents.lr index 8e7206a..cd2b5fe 100644 --- a/content/outreach/contents.lr +++ b/content/outreach/contents.lr @@ -1,4 +1,4 @@ -section: outreach +section: Community --- section_id: outreach --- diff --git a/content/relay-operations/contents.lr b/content/relay-operations/contents.lr index 6cc4932..1d13163 100644 --- a/content/relay-operations/contents.lr +++ b/content/relay-operations/contents.lr @@ -1,4 +1,4 @@ -section: relay operations +section: Community --- section_id: relay-operations --- diff --git a/content/training/contents.lr b/content/training/contents.lr index 2d7693c..0a87ede 100644 --- a/content/training/contents.lr +++ b/content/training/contents.lr @@ -1,4 +1,4 @@ -section: training +section: Community --- section_id: training --- diff --git a/content/user-research/contents.lr b/content/user-research/contents.lr index 444df2a..e3ee4ae 100644 --- a/content/user-research/contents.lr +++ b/content/user-research/contents.lr @@ -1,4 +1,4 @@ -section: community +section: Community --- section_id: user-research ---

1 0

[community/master] Update contents.lr
by antonela＠torproject.org 14 May '20

14 May '20

commit e5f6ce51aace67645600f0cd9800cc1fc46b1942 Author: Antonela <hola(a)antonela.me> Date: Thu May 14 15:18:39 2020 -0300 Update contents.lr --- content/user-research/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/user-research/contents.lr b/content/user-research/contents.lr index 31b93ef..444df2a 100644 --- a/content/user-research/contents.lr +++ b/content/user-research/contents.lr @@ -1,4 +1,4 @@ -section: user research +section: community --- section_id: user-research ---

1 0