July 2018 - tor-commits - lists.torproject.org

[sbws/master] Create args, confs and other fixtures
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit 4f5fd8f5729ef8f734efb8a96b7adbcb585c1252 Author: juga0 <juga(a)riseup.net> Date: Thu Jul 5 14:58:32 2018 +0000 Create args, confs and other fixtures --- tests/integration/conftest.py | 115 +++++++++++++++++++++++++++++++++--------- 1 file changed, 91 insertions(+), 24 deletions(-) diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index cfd0e28..1294624 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -1,37 +1,72 @@ +"""pytest configuration for integration tests.""" +import argparse import pytest -from tempfile import TemporaryDirectory -from sbws.util.parser import create_parser -from sbws.util.config import get_config -from sbws.util.stem import launch_tor -import sbws.core.init import os +from sbws.core import init +from sbws.lib.circuitbuilder import GapsCircuitBuilder as CB +from sbws.lib.destination import DestinationList +from sbws.lib.relaylist import RelayList +from sbws.util.config import _get_default_config +from sbws.util.stem import launch_tor + + +class _PseudoArguments(argparse.Namespace): + + """Just enough of the argparse.Namespace (what you get when you do + args = parser.parse_args()) to make get_config() happy + + >>> args = _PseudoArguments(directory='/home/matt/.sbws') + >>> args.directory + '/home/matt/.sbws' + + """ + + def __init__(self, **kw): + for key in kw: + setattr(self, key, kw[key]) + + +(a)pytest.fixture(scope='session') +def tmpdir(tmpdir_factory, request): + """Create a tmp dir for the tests""" + base = str(hash(request.node.nodeid))[:3] + bn = tmpdir_factory.mktemp(base) + return bn + @pytest.fixture(scope='session') -def parser(): - return create_parser() +def sbwshome_empty(tmpdir): + """Create sbws home inside of the tests tmp dir without initializing.""" + home = tmpdir.join('.sbws') + os.makedirs(home.strpath, exist_ok=True) + return home.strpath @pytest.fixture(scope='session') -def persistent_empty_dotsbws(parser): - ''' - Creates a ~/.sbws with nothing in it but a config.ini and a datadir/ - ''' - d = TemporaryDirectory() - args = parser.parse_args( - '-d {} --log-level debug init'.format(d.name).split()) - conf = get_config(args) - sbws.core.init.main(args, conf) - os.makedirs(os.path.join(d.name, 'datadir')) - return d +def sbwshome_dir(sbwshome_empty): + """Create sbws home inside of the tests tmp dir without initializing.""" + os.makedirs(os.path.join(sbwshome_empty, 'datadir'), exist_ok=True) + return sbwshome_empty @pytest.fixture(scope='session') -def persistent_launch_tor(parser, persistent_empty_dotsbws): - d = persistent_empty_dotsbws - args = parser.parse_args('-d {}'.format(d.name).split()) - conf = get_config(args) - conf['tor']['extra_lines'] = ''' # noqa: E501 +def args(sbwshome_dir, parser): + """Args with sbws home in the tests tmp dir.""" + args = _PseudoArguments(directory=sbwshome_dir, output=sbwshome_dir, + scale=False, log_level='debug') + return args + + +(a)pytest.fixture(scope='session') +def conf(sbwshome_dir): + """Default configuration with sbws home in the tmp test dir.""" + conf = _get_default_config() + conf['paths']['sbws_home'] = sbwshome_dir + conf['destinations']['foo'] = 'on' + conf['destinations.foo'] = {} + conf['destinations.foo']['url'] = 'http://127.0.0.1:28888/sbws.bin' + conf['tor']['extra_lines'] = """ # noqa: E501 DirAuthority auth1 orport=2002 no-v2 v3ident=D7DBC517EFD2BA1A5012CF1BD0BB38F17C8160BD 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=4EE103A081F400E6622F5461D51782B876BB5C24 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=8B85069C7FC0593801E6491A34100264FCE28980 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C @@ -39,6 +74,38 @@ TestingTorNetwork 1 NumCPUs 1 LogTimeGranularity 1 SafeLogging 0 -''' +""" + return conf + + +(a)pytest.fixture(scope='session') +def sbwshome(sbwshome_dir, args, conf): + init.main(args, conf) + return sbwshome_dir + + +(a)pytest.fixture(scope='session') +def persistent_launch_tor(conf): cont = launch_tor(conf) return cont + + +(a)pytest.fixture(scope='session') +def rl(args, conf, persistent_launch_tor): + return RelayList(args, conf, persistent_launch_tor) + + +(a)pytest.fixture(scope='session') +def cb(args, conf, persistent_launch_tor, rl): + return CB(args, conf, persistent_launch_tor, rl) + + +(a)pytest.fixture(scope='session') +def dests(args, conf, persistent_launch_tor, cb, rl): + dests, error_msg = DestinationList.from_config(conf, cb, rl, + persistent_launch_tor) + assert dests, error_msg + return dests + + +# @pytest.fixture(scope='session')

1 0

[sbws/master] Use args, conf fixtures
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit 72acff552b2316e0bb97c231381b7f47b0bb1bf9 Author: juga0 <juga(a)riseup.net> Date: Thu Jul 5 15:09:23 2018 +0000 Use args, conf fixtures --- tests/integration/core/test_scanner.py | 51 ++++++---------------------------- 1 file changed, 8 insertions(+), 43 deletions(-) diff --git a/tests/integration/core/test_scanner.py b/tests/integration/core/test_scanner.py index e7e0d86..fc9a6c5 100644 --- a/tests/integration/core/test_scanner.py +++ b/tests/integration/core/test_scanner.py @@ -1,8 +1,4 @@ from sbws.core.scanner import measure_relay -from sbws.lib.circuitbuilder import GapsCircuitBuilder as CB -from sbws.util.config import get_config -from sbws.lib.relaylist import RelayList -from sbws.lib.destination import DestinationList from sbws.lib.resultdump import ResultSuccess import logging @@ -20,40 +16,18 @@ def assert_within(value, target, radius): '{} of {}'.format(value, radius, target) -def get_everything_to_measure(dotsbws, cont, parser): - args = parser.parse_args( - '-d {} --log-level debug scanner'.format(dotsbws).split()) - conf = get_config(args) - conf['destinations']['foo'] = 'on' - conf['destinations.foo'] = {} - conf['destinations.foo']['url'] = 'http://127.0.0.1:28888/sbws.bin' - rl = RelayList(args, conf, cont) - cb = CB(args, conf, cont, rl) - dests, error_msg = DestinationList.from_config(conf, cb, rl, cont) - assert dests, error_msg - return { - 'args': args, - 'conf': conf, - 'rl': rl, - 'cb': cb, - 'dests': dests - } - - def test_measure_relay_with_maxadvertisedbandwidth( - persistent_launch_tor, parser, persistent_empty_dotsbws, caplog): + persistent_launch_tor, sbwshome, args, conf, + dests, cb, rl, caplog): caplog.set_level(logging.DEBUG) - cont = persistent_launch_tor - dotsbws = persistent_empty_dotsbws.name - d = get_everything_to_measure(dotsbws, cont, parser) - args = d['args'] - conf = d['conf'] - rl = d['rl'] - dests = d['dests'] - cb = d['cb'] + # d = get_everything_to_measure(sbwshome, cont, args, conf) + # rl = d['rl'] + # dests = d['dests'] + # cb = d['cb'] # 117A456C911114076BEB4E757AC48B16CC0CCC5F is relay1mbyteMAB relay = [r for r in rl.relays if r.nickname == 'relay1mbyteMAB'][0] + # d['relay'] = relay result = measure_relay(args, conf, dests, cb, rl, relay) assert len(result) == 1 result = result[0] @@ -69,16 +43,7 @@ def test_measure_relay_with_maxadvertisedbandwidth( def test_measure_relay_with_relaybandwidthrate( - persistent_launch_tor, parser, persistent_empty_dotsbws): - cont = persistent_launch_tor - dotsbws = persistent_empty_dotsbws.name - d = get_everything_to_measure(dotsbws, cont, parser) - args = d['args'] - conf = d['conf'] - rl = d['rl'] - dests = d['dests'] - cb = d['cb'] - # relay1mbyteRBR 934E06F38A391CB71DF83ECDE05DFF5CDE3AC49D + persistent_launch_tor, args, conf, dests, cb, rl): relay = [r for r in rl.relays if r.nickname == 'relay1mbyteRBR'][0] result = measure_relay(args, conf, dests, cb, rl, relay)

1 0

[sbws/master] Replace variables for results' fixtures
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit 4999ed64dfdeb693f2e72d4b5675c07d1e5a9746 Author: juga0 <juga(a)riseup.net> Date: Thu Jul 5 15:03:10 2018 +0000 Replace variables for results' fixtures --- tests/unit/lib/test_resultdump.py | 61 +++++++++++++-------------------------- 1 file changed, 20 insertions(+), 41 deletions(-) diff --git a/tests/unit/lib/test_resultdump.py b/tests/unit/lib/test_resultdump.py index 13b0db8..c956dea 100644 --- a/tests/unit/lib/test_resultdump.py +++ b/tests/unit/lib/test_resultdump.py @@ -1,53 +1,32 @@ # -*- coding: utf-8 -*- """Unit tests for resultdump.""" -from sbws.lib.resultdump import trim_results_ip_changed, Result, ResultSuccess - - -TIME1 = 1529232277.9028733 -TIME2 = 1529232278.9028733 -FP1 = 'A' * 40 -FP2 = 'Z' * 40 -ED25519 = 'g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s' -CIRC = [FP1, FP2] -DEST_URL = 'http://example.com/sbws.bin' -NICK = 'A' -RELAY_IP1 = '169.254.100.1' -RELAY_IP2 = '169.254.100.2' -RELAY1 = Result.Relay(FP1, NICK, RELAY_IP1, ED25519) -RELAY2 = Result.Relay(FP1, NICK, RELAY_IP2, ED25519) -RTTS = [5, 25] -DOWNLOADS = [{'duration': 4, 'amount': 40}] - -RESULTSUCCESS1 = ResultSuccess(RTTS, DOWNLOADS, RELAY1, CIRC, DEST_URL, - 'sbws', t=TIME1) -RESULTSUCCESS2 = ResultSuccess(RTTS, DOWNLOADS, RELAY2, CIRC, DEST_URL, - 'sbws', t=TIME2) -RESULTDICT_IP_CHANGED = {FP1: [RESULTSUCCESS1, RESULTSUCCESS2]} -RESULTDICT_IP_NOT_CHANGED = {FP1: [RESULTSUCCESS1, RESULTSUCCESS1]} - - -def test_trim_results_ip_changed_defaults(): - results_dict = trim_results_ip_changed(RESULTDICT_IP_NOT_CHANGED) - assert RESULTDICT_IP_NOT_CHANGED == results_dict - - -def test_trim_results_ip_changed_on_changed_ipv4_changed(): - expected_results_dict = {FP1: [RESULTSUCCESS2]} - results_dict = trim_results_ip_changed(RESULTDICT_IP_CHANGED, +from sbws.lib.resultdump import trim_results_ip_changed + + +def test_trim_results_ip_changed_defaults(resultdict_ip_not_changed): + results_dict = trim_results_ip_changed(resultdict_ip_not_changed) + assert resultdict_ip_not_changed == results_dict + + +def test_trim_results_ip_changed_on_changed_ipv4_changed( + resultdict_ip_changed, resultdict_ip_changed_trimmed): + results_dict = trim_results_ip_changed(resultdict_ip_changed, on_changed_ipv4=True) - assert expected_results_dict == results_dict + assert resultdict_ip_changed_trimmed == results_dict -def test_trim_results_ip_changed_on_changed_ipv4_no_changed(): - results_dict = trim_results_ip_changed(RESULTDICT_IP_NOT_CHANGED, +def test_trim_results_ip_changed_on_changed_ipv4_no_changed( + resultdict_ip_not_changed): + results_dict = trim_results_ip_changed(resultdict_ip_not_changed, on_changed_ipv4=True) - assert RESULTDICT_IP_NOT_CHANGED == results_dict + assert resultdict_ip_not_changed == results_dict -def test_trim_results_ip_changed_on_changed_ipv6(caplog): - results_dict = trim_results_ip_changed(RESULTDICT_IP_NOT_CHANGED, +def test_trim_results_ip_changed_on_changed_ipv6(caplog, + resultdict_ip_not_changed): + results_dict = trim_results_ip_changed(resultdict_ip_not_changed, on_changed_ipv6=True) - assert RESULTDICT_IP_NOT_CHANGED == results_dict + assert resultdict_ip_not_changed == results_dict for record in caplog.records: assert record.levelname == 'WARNING' assert 'Reseting bandwidth results when IPv6 changes, ' \

1 0

[sbws/master] Use fixtures
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit 3f6e83aaf366766543f5fccb9258c8fcd3b4990e Author: juga0 <juga(a)riseup.net> Date: Thu Jul 5 15:08:56 2018 +0000 Use fixtures --- tests/integration/lib/test_relayprioritizer.py | 72 +++++++++----------------- 1 file changed, 25 insertions(+), 47 deletions(-) diff --git a/tests/integration/lib/test_relayprioritizer.py b/tests/integration/lib/test_relayprioritizer.py index d626fe0..d5464b8 100644 --- a/tests/integration/lib/test_relayprioritizer.py +++ b/tests/integration/lib/test_relayprioritizer.py @@ -1,8 +1,6 @@ from sbws.lib.resultdump import ResultDump -from sbws.lib.resultdump import (ResultSuccess, ResultErrorCircuit) -from sbws.lib.relaylist import RelayList +from sbws.lib.resultdump import ResultSuccess, ResultErrorCircuit from sbws.lib.relayprioritizer import RelayPrioritizer -from sbws.util.config import get_config from threading import Event from unittest.mock import patch @@ -12,66 +10,46 @@ def static_time(value): yield value -def get_global_stuff(dotsbws, cont, parser): - args = parser.parse_args( - '-d {} --log-level debug'.format(dotsbws).split()) - conf = get_config(args) - rl = RelayList(args, conf, cont) - return { - 'args': args, - 'conf': conf, - 'rl': rl, - 'end': Event(), - } - - -def _build_result_for_relay(relay_nick, result_type, timestamp, rl): +def _build_result_for_relay(conf, rl, result_type, relay_nick, + timestamp): relay = [r for r in rl.relays if r.nickname == relay_nick] assert len(relay) == 1 relay = relay[0] other = [r for r in rl.relays if r.nickname != relay_nick][0] circ = [relay.fingerprint, other.fingerprint] - url = 'http://example.com/sbws.bin' - nick = 'sbws_scanner' + rtts = [0.5, 0.5, 0.5] + dls = [ + {'amount': 1024, 'duration': 1}, + {'amount': 1024, 'duration': 1}, + {'amount': 1024, 'duration': 1}, + ] if result_type == ResultSuccess: - rtts = [0.5, 0.5, 0.5] - dls = [ - {'amount': 1024, 'duration': 1}, - {'amount': 1024, 'duration': 1}, - {'amount': 1024, 'duration': 1}, - ] - return ResultSuccess(rtts, dls, relay, circ, url, nick, t=timestamp) + return ResultSuccess(rtts, dls, relay, circ, + conf['destinations.foo']['url'], + 'test', t=timestamp) + elif result_type == ResultErrorCircuit: - return ResultErrorCircuit( - relay, circ, url, nick, msg='Test error circ message', t=timestamp) + return ResultErrorCircuit(relay, circ, + conf['destinations.foo']['url'], + 'test', msg='Test error circ message', + t=timestamp) @patch('time.time') -def test_relayprioritizer_general( - time_mock, persistent_empty_dotsbws, parser, persistent_launch_tor): +def test_relayprioritizer_general(time_mock, sbwshome_empty, args, + conf, rl, + persistent_launch_tor): now = 1000000 time_mock.side_effect = static_time(now) - cont = persistent_launch_tor - dotsbws = persistent_empty_dotsbws.name - d = get_global_stuff(dotsbws, cont, parser) - args = d['args'] - conf = d['conf'] - end_event = d['end'] - rl = d['rl'] + end_event = Event() rd = ResultDump(args, conf, end_event) try: rp = RelayPrioritizer(args, conf, rl, rd) + results = [] results = [ - _build_result_for_relay( - 'relay1', ResultSuccess, now - 100, rl), - _build_result_for_relay( - 'relay2', ResultSuccess, now - 200, rl), - _build_result_for_relay( - 'relay3', ResultSuccess, now - 300, rl), - _build_result_for_relay( - 'relay4', ResultSuccess, now - 400, rl), - _build_result_for_relay( - 'relay5', ResultSuccess, now - 500, rl), + _build_result_for_relay(conf, rl, ResultSuccess, + 'relay{}'.format(i), now - (i * 100)) + for i in range(1, 6) ] for result in results: rd.store_result(result)

1 0

[sbws/master] Release 0.6.0
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit e14928509b2170cc5921a46015d553baa00248ca Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Wed Jul 11 10:55:27 2018 -0400 Release 0.6.0 **Important changes**: - The way users configure logging has changed. No longer are most users expected to be familiar with how to configure python's standard logging library with a config file. Instead we've abstracted out the setting of log level, format, and destinations to make these settings more accessible to users. Expert users familiar with [the logging config file format][logconffmt] can still make tweaks. Summary of changes: - Make logging configuration easier for the user. - Add UML diagrams to documentation. They can be found in docs/source/images/ and regenerated with `make umlsvg` in docs/. [logconffmt]: https://docs.python.org/3/library/logging.config.html#logging-config-filefo… --- CHANGELOG.md | 22 +++++++++++++++++++++- sbws/__init__.py | 2 +- tests/unit/lib/data/v3bw/20180425_131057.v3bw | 2 +- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8608b1a..c94761d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,25 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +## [0.6.0] - 2018-07-11 + +**Important changes**: + +- The way users configure logging has changed. No longer are most users + expected to be familiar with how to configure python's standard logging +library with a config file. Instead we've abstracted out the setting of log +level, format, and destinations to make these settings more accessible to +users. Expert users familiar with [the logging config file format][logconffmt] +can still make tweaks. + +Summary of changes: + +- Make logging configuration easier for the user. +- Add UML diagrams to documentation. They can be found in docs/source/images/ + and regenerated with `make umlsvg` in docs/. + +[logconffmt]: https://docs.python.org/3/library/logging.config.html#logging-config-filefo… + ### Added - UML diagrams to documentation. In docs/ run `make umlsvg` to rebuild them. @@ -109,6 +128,7 @@ So fix that. - `earliest_bandwidth` being the newest bw not the oldest (thanks juga0) - `node_id` was missing the character "$" at the beginning -[Unreleased]: https://github.com/pastly/simple-bw-scanner/compare/v0.5.0...master +[Unreleased]: https://github.com/pastly/simple-bw-scanner/compare/v0.6.0...master +[0.6.0]: https://github.com/pastly/simple-bw-scanner/compare/v0.5.0...v0.6.0 [0.5.0]: https://github.com/pastly/simple-bw-scanner/compare/v0.4.1...v0.5.0 [0.4.1]: https://github.com/pastly/simple-bw-scanner/compare/v0.4.0...v0.4.1 diff --git a/sbws/__init__.py b/sbws/__init__.py index 1cb6639..ef7eb44 100644 --- a/sbws/__init__.py +++ b/sbws/__init__.py @@ -1 +1 @@ -__version__ = '0.5.1-dev' +__version__ = '0.6.0' diff --git a/tests/unit/lib/data/v3bw/20180425_131057.v3bw b/tests/unit/lib/data/v3bw/20180425_131057.v3bw index 911d483..602943b 100644 --- a/tests/unit/lib/data/v3bw/20180425_131057.v3bw +++ b/tests/unit/lib/data/v3bw/20180425_131057.v3bw @@ -5,6 +5,6 @@ file_created=2018-04-25T13:10:57 generator_started=2018-04-16T14:09:05 latest_bandwidth=2018-04-17T14:09:07 software=sbws -software_version=0.5.1-dev +software_version=0.6.0 ==== bw=54 error_circ=0 error_misc=0 error_stream=1 master_key_ed25519=g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s nick=A node_id=$AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA rtt=456 success=1 time=2018-04-17T14:09:07

1 0

[tor/master] Move all use cases of micro-revision.i to a single place
by nickm＠torproject.org 11 Jul '18

11 Jul '18

commit 5aee26ee46d8d38759713d00ce4310a3aef4a559 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 11 09:52:39 2018 -0400 Move all use cases of micro-revision.i to a single place That place is git-revision.c; git-revision.c now lives in lib/log. Also fix the compilation rules so that all object files that need micro-revision.i depend on it. --- src/app/config/config.c | 2 +- src/core/include.am | 6 ------ src/{core/or => lib/log}/git_revision.c | 10 +++++++++- src/{core/or => lib/log}/git_revision.h | 2 +- src/lib/log/include.am | 9 +++++++-- src/lib/log/log.c | 14 ++++---------- 6 files changed, 22 insertions(+), 21 deletions(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index 1be1803f2..74aa64ded 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -85,7 +85,7 @@ #include "feature/relay/dns.h" #include "core/or/dos.h" #include "feature/client/entrynodes.h" -#include "core/or/git_revision.h" +#include "lib/log/git_revision.h" #include "feature/stats/geoip.h" #include "feature/hibernate/hibernate.h" #include "core/mainloop/main.h" diff --git a/src/core/include.am b/src/core/include.am index 1f37044e9..cd9edc449 100644 --- a/src/core/include.am +++ b/src/core/include.am @@ -34,7 +34,6 @@ LIBTOR_APP_A_SOURCES = \ src/core/or/connection_edge.c \ src/core/or/connection_or.c \ src/core/or/dos.c \ - src/core/or/git_revision.c \ src/core/or/policies.c \ src/core/or/protover.c \ src/core/or/reasons.c \ @@ -135,10 +134,6 @@ else src_core_libtor_app_testing_a_SOURCES = endif -src/core/or/git_revision.$(OBJEXT) \ - src/core/or/src_core_libtor_app_testing_a-git_revision.$(OBJEXT): \ - micro-revision.i - AM_CPPFLAGS += -DSHARE_DATADIR="\"$(datadir)\"" \ -DLOCALSTATEDIR="\"$(localstatedir)\"" \ -DBINDIR="\"$(bindir)\"" @@ -190,7 +185,6 @@ noinst_HEADERS += \ src/core/or/entry_connection_st.h \ src/core/or/entry_port_cfg_st.h \ src/core/or/extend_info_st.h \ - src/core/or/git_revision.h \ src/core/or/listener_connection_st.h \ src/core/or/or.h \ src/core/or/or_circuit_st.h \ diff --git a/src/core/or/git_revision.c b/src/lib/log/git_revision.c similarity index 73% rename from src/core/or/git_revision.c rename to src/lib/log/git_revision.c index 28ec1a793..9d29ecd2a 100644 --- a/src/core/or/git_revision.c +++ b/src/lib/log/git_revision.c @@ -3,7 +3,8 @@ * Copyright (c) 2007-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -#include "core/or/git_revision.h" +#include "orconfig.h" +#include "lib/log/git_revision.h" /** String describing which Tor Git repository version the source was * built from. This string is generated by a bit of shell kludging in @@ -14,3 +15,10 @@ const char tor_git_revision[] = #include "micro-revision.i" #endif ""; + +const char tor_bug_suffix[] = " (on Tor " VERSION +#ifndef _MSC_VER + " " +#include "micro-revision.i" +#endif + ")"; diff --git a/src/core/or/git_revision.h b/src/lib/log/git_revision.h similarity index 90% rename from src/core/or/git_revision.h rename to src/lib/log/git_revision.h index 02070cfd5..0ce119079 100644 --- a/src/core/or/git_revision.h +++ b/src/lib/log/git_revision.h @@ -7,6 +7,6 @@ #define TOR_GIT_REVISION_H extern const char tor_git_revision[]; +extern const char tor_bug_suffix[]; #endif /* !defined(TOR_GIT_REVISION_H) */ - diff --git a/src/lib/log/include.am b/src/lib/log/include.am index b5a1c5ca2..4a6c9b368 100644 --- a/src/lib/log/include.am +++ b/src/lib/log/include.am @@ -7,6 +7,7 @@ endif src_lib_libtor_log_a_SOURCES = \ src/lib/log/escape.c \ + src/lib/log/git_revision.c \ src/lib/log/ratelim.c \ src/lib/log/log.c \ src/lib/log/util_bug.c @@ -20,11 +21,15 @@ src_lib_libtor_log_testing_a_SOURCES = \ src_lib_libtor_log_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_lib_libtor_log_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) -src/lib/log/torlog.$(OBJEXT) \ - src/lib/log/src_lib_libtor_log_testing_a-torlog.$(OBJEXT): micro-revision.i +# Declare that these object files depend on micro-revision.i. Without this +# rule, we could try to build them before micro-revision.i was created. +src/lib/log/git_revision.$(OBJEXT) \ + src/lib/log/src_lib_libtor_log_testing_a-git_revision.$(OBJEXT): \ + micro-revision.i noinst_HEADERS += \ src/lib/log/escape.h \ + src/lib/log/git_revision.h \ src/lib/log/ratelim.h \ src/lib/log/log.h \ src/lib/log/util_bug.h \ diff --git a/src/lib/log/log.c b/src/lib/log/log.c index 8349041ab..e2514a341 100644 --- a/src/lib/log/log.c +++ b/src/lib/log/log.c @@ -32,6 +32,7 @@ #define LOG_PRIVATE #include "lib/log/log.h" +#include "lib/log/git_revision.h" #include "lib/log/ratelim.h" #include "lib/lock/compat_mutex.h" #include "lib/smartlist_core/smartlist_core.h" @@ -353,13 +354,6 @@ log_tor_version(logfile_t *lf, int reset) return 0; } -static const char bug_suffix[] = " (on Tor " VERSION -#ifndef _MSC_VER - " " -#include "micro-revision.i" -#endif - ")"; - /** Helper: Format a log message into a fixed-sized buffer. (This is * factored out of <b>logv</b> so that we never format a message more * than once.) Return a pointer to the first character of the message @@ -442,9 +436,9 @@ format_msg(char *buf, size_t buf_len, } if (domain == LD_BUG && - buf_len - n > strlen(bug_suffix)+1) { - memcpy(buf+n, bug_suffix, strlen(bug_suffix)); - n += strlen(bug_suffix); + buf_len - n > strlen(tor_bug_suffix)+1) { + memcpy(buf+n, tor_bug_suffix, strlen(tor_bug_suffix)); + n += strlen(tor_bug_suffix); } buf[n]='\n';

1 0

[tor/master] Merge branch 'unify_microrevision_users'
by nickm＠torproject.org 11 Jul '18

11 Jul '18

commit 66074ad1e21cfe6c98a70b279ed690e357d1c41c Merge: 537092cdb 5aee26ee4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 11 10:20:39 2018 -0400 Merge branch 'unify_microrevision_users' src/app/config/config.c | 2 +- src/core/include.am | 6 ------ src/{core/or => lib/log}/git_revision.c | 10 +++++++++- src/{core/or => lib/log}/git_revision.h | 2 +- src/lib/log/include.am | 9 +++++++-- src/lib/log/log.c | 14 ++++---------- 6 files changed, 22 insertions(+), 21 deletions(-)

1 0

[onionoo/master] Avoid IllegalStateException when descriptors are missing.
by karsten＠torproject.org 11 Jul '18

11 Jul '18

commit b6e3a1d51722f02f2d391295a676c7b241090213 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 11 09:35:07 2018 +0200 Avoid IllegalStateException when descriptors are missing. A missing descriptor directory has caused an IllegalStateException when we attempted to write our parse history files. Let's be more careful about this case and skip this history file if there is no such directory. Fixes #26711. --- CHANGELOG.md | 2 ++ src/main/java/org/torproject/onionoo/updater/DescriptorQueue.java | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca0142b..d4cfb82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ * Minor changes - Index relays with no known country code or autonomous system number using the special values "xz" and "AS0" respectively. + - Avoid running into an IllegalStateException when CollecTor is + missing a whole descriptor directory. # Changes in version 6.0-1.14.0 - 2018-05-29 diff --git a/src/main/java/org/torproject/onionoo/updater/DescriptorQueue.java b/src/main/java/org/torproject/onionoo/updater/DescriptorQueue.java index c19fabd..d00b8b2 100644 --- a/src/main/java/org/torproject/onionoo/updater/DescriptorQueue.java +++ b/src/main/java/org/torproject/onionoo/updater/DescriptorQueue.java @@ -108,6 +108,11 @@ class DescriptorQueue { if (this.historyFile == null) { return; } + if (null == this.descriptors) { + log.debug("Not writing history file {}, because we did not read a single " + + "descriptor from {}.", this.historyFile, this.directory); + return; + } SortedMap<String, Long> excludedAndParsedFiles = new TreeMap<>(); excludedAndParsedFiles.putAll( this.descriptorReader.getExcludedFiles());

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 11 Jul '18

11 Jul '18

commit 2a3442a8d87a45c7c7540999723718b40c78910c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 11 12:45:39 2018 +0000 Update translations for https_everywhere_completed --- uk/https-everywhere.dtd | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/uk/https-everywhere.dtd b/uk/https-everywhere.dtd index 95844e5e0..d79eda646 100644 --- a/uk/https-everywhere.dtd +++ b/uk/https-everywhere.dtd @@ -2,7 +2,7 @@ <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> <!ENTITY https-everywhere.about.ext_description "Зашифруйте мережу! Автоматично використовуйте безпеку HTTPS на багатьох сайтах."> <!ENTITY https-everywhere.about.version "Версія"> -<!ENTITY https-everywhere.about.rulesets_version "Версія правил для"> +<!ENTITY https-everywhere.about.rulesets_version "Набори правил, версія для"> <!ENTITY https-everywhere.about.add_new_rule "Додати нове правило"> <!ENTITY https-everywhere.menu.donate_eff_imperative "Зробити пожертву EFF"> @@ -17,11 +17,13 @@ <!ENTITY https-everywhere.options.importSettings "Імпортувати налаштування"> <!ENTITY https-everywhere.options.import "Імпортувати"> <!ENTITY https-everywhere.options.enableMixedRulesets "Увімкнути набір правил змішаного вмісту"> +<!ENTITY https-everywhere.options.showDevtoolsTab "Показати вкладку знарядь розробника"> <!ENTITY https-everywhere.options.autoUpdateRulesets "Автоматичне оновлення наборів правил"> <!ENTITY https-everywhere.options.imported "Ваші налаштування було імпортовано."> <!ENTITY https-everywhere.prefs.export_settings "Експортувати налаштування"> <!ENTITY https-everywhere.prefs.reset_defaults "Скинути до типових"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "Це поверне кожен набір правил до стану за вмовчанням. Продовжити?"> <!ENTITY https-everywhere.chrome.stable_rules "Стабільні правила"> <!ENTITY https-everywhere.chrome.stable_rules_description "Примусово створювати зашифровані з'єдання до цих веб-сайтів: "> @@ -34,6 +36,6 @@ <!ENTITY https-everywhere.chrome.show_advanced "Показати розширені"> <!ENTITY https-everywhere.chrome.hide_advanced "Сховати розширені"> <!ENTITY https-everywhere.chrome.rule_name "Ім'я правила"> -<!ENTITY https-everywhere.chrome.regex "Підходящий регулярний вираз"> +<!ENTITY https-everywhere.chrome.regex "Підхожий регулярний вираз"> <!ENTITY https-everywhere.chrome.redirect_to "Перенаправити на"> <!ENTITY https-everywhere.chrome.status_cancel_button "Скасувати">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 11 Jul '18

11 Jul '18

commit b54b350b232ca88e5cf0e9be6fe526ff62c2e863 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 11 12:45:30 2018 +0000 Update translations for https_everywhere --- uk/https-everywhere.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/uk/https-everywhere.dtd b/uk/https-everywhere.dtd index ed56c0bb1..d79eda646 100644 --- a/uk/https-everywhere.dtd +++ b/uk/https-everywhere.dtd @@ -2,7 +2,7 @@ <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> <!ENTITY https-everywhere.about.ext_description "Зашифруйте мережу! Автоматично використовуйте безпеку HTTPS на багатьох сайтах."> <!ENTITY https-everywhere.about.version "Версія"> -<!ENTITY https-everywhere.about.rulesets_version "Rulesets version for"> +<!ENTITY https-everywhere.about.rulesets_version "Набори правил, версія для"> <!ENTITY https-everywhere.about.add_new_rule "Додати нове правило"> <!ENTITY https-everywhere.menu.donate_eff_imperative "Зробити пожертву EFF"> @@ -17,13 +17,13 @@ <!ENTITY https-everywhere.options.importSettings "Імпортувати налаштування"> <!ENTITY https-everywhere.options.import "Імпортувати"> <!ENTITY https-everywhere.options.enableMixedRulesets "Увімкнути набір правил змішаного вмісту"> -<!ENTITY https-everywhere.options.showDevtoolsTab "Show Devtools tab"> +<!ENTITY https-everywhere.options.showDevtoolsTab "Показати вкладку знарядь розробника"> <!ENTITY https-everywhere.options.autoUpdateRulesets "Автоматичне оновлення наборів правил"> <!ENTITY https-everywhere.options.imported "Ваші налаштування було імпортовано."> <!ENTITY https-everywhere.prefs.export_settings "Експортувати налаштування"> <!ENTITY https-everywhere.prefs.reset_defaults "Скинути до типових"> -<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "Це поверне кожен набір правил до стану за вмовчанням. Продовжити?"> <!ENTITY https-everywhere.chrome.stable_rules "Стабільні правила"> <!ENTITY https-everywhere.chrome.stable_rules_description "Примусово створювати зашифровані з'єдання до цих веб-сайтів: "> @@ -36,6 +36,6 @@ <!ENTITY https-everywhere.chrome.show_advanced "Показати розширені"> <!ENTITY https-everywhere.chrome.hide_advanced "Сховати розширені"> <!ENTITY https-everywhere.chrome.rule_name "Ім'я правила"> -<!ENTITY https-everywhere.chrome.regex "Підходящий регулярний вираз"> +<!ENTITY https-everywhere.chrome.regex "Підхожий регулярний вираз"> <!ENTITY https-everywhere.chrome.redirect_to "Перенаправити на"> <!ENTITY https-everywhere.chrome.status_cancel_button "Скасувати">

1 0