January 2021 - tor-commits - lists.torproject.org

[snowflake/master] Bump version of pion/sdp
by cohosh＠torproject.org 25 Jan '21

25 Jan '21

commit 1b29ad7de14fb0a6d2bf88aea38353733682cd26 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon Jan 25 10:28:17 2021 -0500 Bump version of pion/sdp Update our dependency on pion/sdp from v2 to v3, to match pion/webrtc v3. This requires some changes in how we parse out addresses from ice candidates. This will ease tor browser builds of snowflake since we are now only relying on one version of pion/sdp instead of two different ones. --- common/util/util.go | 9 +++++---- go.mod | 3 ++- go.sum | 2 -- proxy/snowflake.go | 7 ++++--- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/common/util/util.go b/common/util/util.go index 3d2acc3..00f7302 100644 --- a/common/util/util.go +++ b/common/util/util.go @@ -5,7 +5,8 @@ import ( "errors" "net" - "github.com/pion/sdp/v2" + "github.com/pion/ice/v2" + "github.com/pion/sdp/v3" "github.com/pion/webrtc/v3" ) @@ -77,9 +78,9 @@ func StripLocalAddresses(str string) string { attrs := make([]sdp.Attribute, 0) for _, a := range m.Attributes { if a.IsICECandidate() { - ice, err := a.ToICECandidate() - if err == nil && ice.Typ == "host" { - ip := net.ParseIP(ice.Address) + c, err := ice.UnmarshalCandidate(a.Value) + if err == nil && c.Type() == ice.CandidateTypeHost { + ip := net.ParseIP(c.Address()) if ip != nil && (IsLocal(ip) || ip.IsUnspecified() || ip.IsLoopback()) { /* no append in this case */ continue diff --git a/go.mod b/go.mod index 2931be7..a7f9ad2 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,8 @@ go 1.13 require ( git.torproject.org/pluggable-transports/goptlib.git v1.1.0 github.com/gorilla/websocket v1.4.1 - github.com/pion/sdp/v2 v2.3.4 + github.com/pion/ice/v2 v2.0.14 + github.com/pion/sdp/v3 v3.0.3 github.com/pion/stun v0.3.5 github.com/pion/webrtc/v3 v3.0.0 github.com/smartystreets/goconvey v1.6.4 diff --git a/go.sum b/go.sum index 6214f5c..eac95e1 100644 --- a/go.sum +++ b/go.sum @@ -66,8 +66,6 @@ github.com/pion/rtp v1.6.2/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko github.com/pion/sctp v1.7.10/go.mod h1:EhpTUQu1/lcK3xI+eriS6/96fWetHGCvBi9MSsnaBN0= github.com/pion/sctp v1.7.11 h1:UCnj7MsobLKLuP/Hh+JMiI/6W5Bs/VF45lWKgHFjSIE= github.com/pion/sctp v1.7.11/go.mod h1:EhpTUQu1/lcK3xI+eriS6/96fWetHGCvBi9MSsnaBN0= -github.com/pion/sdp/v2 v2.3.4 h1:+f3F5Xl7ynVhc9Il8Dc7BFroYJWG3PMbfWtwFlVI+kg= -github.com/pion/sdp/v2 v2.3.4/go.mod h1:jccXVYW0fuK6ds2pwKr89SVBDYlCjhgMI6nucl5R5rA= github.com/pion/sdp/v3 v3.0.3 h1:gJK9hk+JFD2NGIM1nXmqNCq1DkVaIZ9dlA3u3otnkaw= github.com/pion/sdp/v3 v3.0.3/go.mod h1:bNiSknmJE0HYBprTHXKPQ3+JjacTv5uap92ueJZKsRk= github.com/pion/srtp/v2 v2.0.0-rc.3 h1:1fPiK1nJlNyh235tSGgBnXrPc99wK1/D707f6ntb3qY= diff --git a/proxy/snowflake.go b/proxy/snowflake.go index 78a053d..1bc21ab 100644 --- a/proxy/snowflake.go +++ b/proxy/snowflake.go @@ -23,7 +23,8 @@ import ( "git.torproject.org/pluggable-transports/snowflake.git/common/util" "git.torproject.org/pluggable-transports/snowflake.git/common/websocketconn" "github.com/gorilla/websocket" - "github.com/pion/sdp/v2" + "github.com/pion/ice/v2" + "github.com/pion/sdp/v3" "github.com/pion/webrtc/v3" ) @@ -83,9 +84,9 @@ func remoteIPFromSDP(str string) net.IP { for _, m := range desc.MediaDescriptions { for _, a := range m.Attributes { if a.IsICECandidate() { - ice, err := a.ToICECandidate() + c, err := ice.UnmarshalCandidate(a.Value) if err == nil { - ip := net.ParseIP(ice.Address) + ip := net.ParseIP(c.Address()) if ip != nil && isRemoteAddress(ip) { return ip }

1 0

[sbws/maint-1.1] chg: generate, cleanup: Use 28 days of measurements
by juga＠torproject.org 25 Jan '21

25 Jan '21

commit e416547c73d166bd085a10843c6ba4d1a4167092 Author: juga0 <juga(a)riseup.net> Date: Sat Jan 23 09:54:19 2021 +0000 chg: generate, cleanup: Use 28 days of measurements When generating the Bandwidth File as Torflow, use 28 days of past raw measurements instead of 5, by default. Also keep the raw measurements for that long before compressing or deleting them. And stop checking whether the compression and delete periods are valid, without checking defaults first and based on arbitrary values. Closes: #40017 --- docs/source/how_works.rst | 3 ++- docs/source/man_sbws.ini.rst | 4 ++-- sbws/config.default.ini | 11 ++++++++--- sbws/core/cleanup.py | 25 ------------------------- sbws/core/generate.py | 9 ++++++--- sbws/globals.py | 12 +++++++++--- 6 files changed, 27 insertions(+), 37 deletions(-) diff --git a/docs/source/how_works.rst b/docs/source/how_works.rst index f7d7533..24f8689 100644 --- a/docs/source/how_works.rst +++ b/docs/source/how_works.rst @@ -137,7 +137,8 @@ Each relay bandwidth measurements are selected in the following way: If they are not, the relay MUST NOT be included in the Bandwith File. #. The measurements than are are older than an arbitrary number of senconds in the past MUST be discarded. - Currently this number is the same as ``data_period`` (5 days). + Currently this number is the same as ``data_period`` (5 days) when not + scaling as Torflow and 28 days when scaling as Torflow. If the number of relays to include in the Bandwidth File are less than a percententage (currently 60%) than the number of relays in the consensus, diff --git a/docs/source/man_sbws.ini.rst b/docs/source/man_sbws.ini.rst index e2127ab..31effc7 100644 --- a/docs/source/man_sbws.ini.rst +++ b/docs/source/man_sbws.ini.rst @@ -143,9 +143,9 @@ relayprioritizer cleanup data_files_compress_after_days = INT - After this many days, compress data files. (Default: 10) + After this many days, compress data files. (Default: 29) data_files_delete_after_days = INT - After this many days, delete data files. (Default: 90) + After this many days, delete data files. (Default: 57) v3bw_files_compress_after_days = INT After this many days, compress v3bw files. (Default: 1) v3bw_files_delete_after_days = INT diff --git a/sbws/config.default.ini b/sbws/config.default.ini index 0105527..c47e4fd 100644 --- a/sbws/config.default.ini +++ b/sbws/config.default.ini @@ -71,9 +71,14 @@ extra_lines = [cleanup] # After this many days, compress data files -data_files_compress_after_days = 10 -# After this many days, delete data files -data_files_delete_after_days = 90 +# #40017: To generate files as Torflow the result files must be kept for +# GENERATE_PERIOD seconds. +# The number of days after they are compressed or deleted could be added +# as defaults (currently globals.py), and just as a factor of GENERATE_PERIOD. +data_files_compress_after_days = 29 +# After this many days, delete data files. +# 57 == 28 * 2 + 1. +data_files_delete_after_days = 57 # After this many days, compress v3bw files (1d) v3bw_files_compress_after_days = 1 # After this many days, delete v3bw files (7d) diff --git a/sbws/core/cleanup.py b/sbws/core/cleanup.py index aa16fba..1d21989 100644 --- a/sbws/core/cleanup.py +++ b/sbws/core/cleanup.py @@ -99,28 +99,6 @@ def _check_validity_periods_v3bw(compress_after_days, delete_after_days): "after a bigger number of days.") -def _check_validity_periods_results( - data_period, compress_after_days, delete_after_days): - if compress_after_days - 2 < data_period: - fail_hard( - 'For safetly, cleanup/data_files_compress_after_days (%d) must be ' - 'at least 2 days larger than general/data_period (%d)', - compress_after_days, data_period) - if delete_after_days < compress_after_days: - fail_hard( - 'cleanup/data_files_delete_after_days (%d) must be the same or ' - 'larger than cleanup/data_files_compress_after_days (%d)', - delete_after_days, compress_after_days) - if compress_after_days / 2 < data_period: - log.warning( - 'cleanup/data_files_compress_after_days (%d) is less than twice ' - 'general/data_period (%d). For ease of parsing older results ' - 'if necessary, it is recommended to make ' - 'data_files_compress_after_days at least twice the data_period.', - compress_after_days, data_period) - return True - - def _clean_v3bw_files(args, conf): v3bw_dname = conf.getpath('paths', 'v3bw_dname') if not os.path.isdir(v3bw_dname): @@ -147,13 +125,10 @@ def _clean_result_files(args, conf): datadir = conf.getpath('paths', 'datadir') if not os.path.isdir(datadir): fail_hard('%s does not exist', datadir) - data_period = conf.getint('general', 'data_period') compress_after_days = conf.getint( 'cleanup', 'data_files_compress_after_days') delete_after_days = conf.getint( 'cleanup', 'data_files_delete_after_days') - _check_validity_periods_results( - data_period, compress_after_days, delete_after_days) # first delete so that the files to be deleted are not compressed first files_to_delete = _get_files_mtime_older_than( diff --git a/sbws/core/generate.py b/sbws/core/generate.py index 7283c25..8fa8ec4 100644 --- a/sbws/core/generate.py +++ b/sbws/core/generate.py @@ -2,7 +2,7 @@ from math import ceil from sbws.globals import (fail_hard, SBWS_SCALE_CONSTANT, TORFLOW_SCALING, SBWS_SCALING, TORFLOW_BW_MARGIN, PROP276_ROUND_DIG, - DAY_SECS, NUM_MIN_RESULTS) + DAY_SECS, NUM_MIN_RESULTS, GENERATE_PERIOD) from sbws.lib.v3bwfile import V3BWFile from sbws.lib.resultdump import load_recent_results_in_datadir from argparse import ArgumentDefaultsHelpFormatter @@ -60,8 +60,9 @@ def gen_parser(sub): help="Number of most significant digits to round bw.") p.add_argument('-p', '--secs-recent', default=None, type=int, help="How many secs in the past are results being " - "still considered. Note this value will supersede " - "data_period in the configuration.") + "still considered. Default is {} secs. If not scaling " + "as Torflow the default is data_period in the " + "configuration.".format(GENERATE_PERIOD)) p.add_argument('-a', '--secs-away', default=DAY_SECS, type=int, help="How many secs results have to be away from each " "other.") @@ -90,6 +91,8 @@ def main(args, conf): scaling_method = TORFLOW_SCALING if args.secs_recent: fresh_days = ceil(args.secs_recent / 24 / 60 / 60) + elif scaling_method == TORFLOW_SCALING: + fresh_days = ceil(GENERATE_PERIOD / 24 / 60 / 60) else: fresh_days = conf.getint('general', 'data_period') reset_bw_ipv4_changes = conf.getboolean('general', 'reset_bw_ipv4_changes') diff --git a/sbws/globals.py b/sbws/globals.py index 253e2aa..2e4481c 100644 --- a/sbws/globals.py +++ b/sbws/globals.py @@ -101,16 +101,22 @@ MAX_BW_DIFF_PERC = 50 # Tor already accept lines of any size, but leaving the limit anyway. BW_LINE_SIZE = 1022 -# RelayList, ResultDump, v3bwfile +# RelayList, ResultDump # For how many seconds in the past the relays and measurements data is keep/ # considered valid. -# This is currently set by default in config.default.ini as ``date_period``, -# and used in ResultDump and v3bwfile. +# This is currently set by default in config.default.ini as ``data_period``, +# and used in ResultDump. # In a future refactor, constants in config.default.ini should be moved here, # or calculated in settings, so that there's no need to pass the configuration # to all the functions. MEASUREMENTS_PERIOD = 5 * 24 * 60 * 60 +# #40017: To make sbws behave similar to Torflow, the number of raw past +# measurements used when generating the Bandwidth File has to be 28, not 5. +# Note that this is different from the number of raw past measurements used +# when measuring, which are used for the monitoring values and storing json. +GENERATE_PERIOD = 28 * 24 * 60 * 60 + # Metadata to send in every requests, so that data servers can know which # scanners are using them. # In Requests these keys are case insensitive.

1 0

[sbws/maint-1.1] Merge remote-tracking branch 'gitlab/merge-requests/56' into maint-1.1
by juga＠torproject.org 25 Jan '21

25 Jan '21

commit 7430b4ef9f4b0371502560126b5342dc4f117371 Merge: 96aadc6 e416547 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 25 14:32:00 2021 +0000 Merge remote-tracking branch 'gitlab/merge-requests/56' into maint-1.1 docs/source/how_works.rst | 3 ++- docs/source/man_sbws.ini.rst | 4 ++-- sbws/config.default.ini | 11 ++++++++--- sbws/core/cleanup.py | 25 ------------------------- sbws/core/generate.py | 9 ++++++--- sbws/globals.py | 12 +++++++++--- 6 files changed, 27 insertions(+), 37 deletions(-)

1 0

[sbws/maint-1.1] chg: config: Add option to connect to external tor
by juga＠torproject.org 25 Jan '21

25 Jan '21

commit f6e300c83508508a6f38abe76390f9c6c3de00a2 Author: juga0 <juga(a)riseup.net> Date: Wed Dec 16 15:14:48 2020 +0000 chg: config: Add option to connect to external tor via control port. --- docs/source/man_sbws.ini.rst | 4 ++++ sbws/config.default.ini | 1 + sbws/util/config.py | 4 +++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/source/man_sbws.ini.rst b/docs/source/man_sbws.ini.rst index f878ce8..e2127ab 100644 --- a/docs/source/man_sbws.ini.rst +++ b/docs/source/man_sbws.ini.rst @@ -93,6 +93,10 @@ tor sbws's owned tor pid file. (Default: ~/.sbws/tor/sbws/tor.pid) log = STR sbws's owned tor directory log files. (Default: ~/.sbws/tor/log) + external_control_port = INT + tor control port to connect to. Useful to run integration tests with + chutney. + (Default: not set. If set, it takes preference over the control socket) extra_lines = sbws's tor extra configuration. (Default: None) diff --git a/sbws/config.default.ini b/sbws/config.default.ini index cb943d0..0105527 100644 --- a/sbws/config.default.ini +++ b/sbws/config.default.ini @@ -66,6 +66,7 @@ control_socket = ${tor:run_dpath}/control pid = ${tor:run_dpath}/tor.pid # note this is a directory log = ${tor:datadir}/log +external_control_port = extra_lines = [cleanup] diff --git a/sbws/util/config.py b/sbws/util/config.py index e1bc429..5ba3fd5 100644 --- a/sbws/util/config.py +++ b/sbws/util/config.py @@ -323,7 +323,9 @@ def _validate_tor(conf): sec = 'tor' err_tmpl = Template('$sec/$key ($val): $e') unvalidated_keys = [ - 'datadir', 'run_dpath', 'control_socket', 'pid', 'log', 'extra_lines'] + 'datadir', 'run_dpath', 'control_socket', 'pid', 'log', + 'external_control_port', 'extra_lines', + ] all_valid_keys = unvalidated_keys errors.extend(_validate_section_keys(conf, sec, all_valid_keys, err_tmpl)) return errors

1 0

[sbws/maint-1.1] fix: stem: Exit on failure connecting to control port
by juga＠torproject.org 25 Jan '21

25 Jan '21

commit 6cfd60ed6272afa15458d893ffbbe2fe3703f87c Author: juga0 <juga(a)riseup.net> Date: Wed Dec 16 15:21:44 2020 +0000 fix: stem: Exit on failure connecting to control port because when trying to connect to an external tor (chutney), it does not make sense to start own tor. Also log how the connection has been made. --- sbws/util/stem.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sbws/util/stem.py b/sbws/util/stem.py index 05f8e90..d2c596f 100644 --- a/sbws/util/stem.py +++ b/sbws/util/stem.py @@ -110,8 +110,9 @@ def _init_controller_port(port): c = Controller.from_port(port=port) c.authenticate() except (IncorrectSocketType, SocketError): - return None + fail_hard("Unable to connect to control port %s.", port) # TODO: Allow for auth via more than just CookieAuthentication + log.info("Connected to tor via port %s", port) return c @@ -127,6 +128,7 @@ def _init_controller_socket(socket): log.exception("Error initting controller socket: %s", e) return None # TODO: Allow for auth via more than just CookieAuthentication + log.info("Connected to tor via socket %s", socket) return c @@ -233,6 +235,7 @@ def launch_tor(conf): torrc, init_msg_handler=log.debug, take_ownership=True) except Exception as e: fail_hard('Error trying to launch tor: %s', e) + log.info("Started own tor.") # And return a controller to it cont = _init_controller_socket(conf.getpath('tor', 'control_socket')) # Set options that can fail at runtime @@ -240,8 +243,7 @@ def launch_tor(conf): # Set runtime options set_torrc_runtime_options(cont) - log.info('Started and connected to Tor %s via %s', cont.get_version(), - conf.getpath('tor', 'control_socket')) + log.info('Started or connected to Tor %s.', cont.get_version()) return cont

1 0

[sbws/maint-1.1] fix: doc: Update values in config_tor.rst + clean-up
by juga＠torproject.org 25 Jan '21

25 Jan '21

commit 17e6eca63645271cbf2f5553b1a71aafd3f542cd Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 7 14:38:00 2021 +0000 fix: doc: Update values in config_tor.rst + clean-up Closes #40035. --- docs/source/config_tor.rst | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/docs/source/config_tor.rst b/docs/source/config_tor.rst index 175a9ff..e609468 100644 --- a/docs/source/config_tor.rst +++ b/docs/source/config_tor.rst @@ -3,7 +3,7 @@ Internal Tor configuration for the scanner ------------------------------------------ -The scanner needs an specific Tor configuration. +The scanner needs a specific Tor configuration. The following options are either set when launching Tor or required when connection to an existing Tor daemon. @@ -16,6 +16,9 @@ Default configuration: - ``SafeLogging 0``: Useful for logging, since there's no need for anonymity. - ``LogTimeGranularity 1`` - ``ProtocolWarnings 1`` +- ``FetchDirInfoEarly 1`` +- ``FetchDirInfoExtraEarly 1``: Respond to `MaxAdvertisedBandwidth` as soon as possible. +- ``FetchUselessDescriptors 1``: Keep fetching descriptors, even when idle. - ``LearnCircuitBuildTimeout 0``: To keep circuit build timeouts static. Configuration that depends on the user configuration file: @@ -29,9 +32,13 @@ Configuration that depends on the user configuration file: Configuration that needs to be set on runtime: - ``__DisablePredictedCircuits 1``: To build custom circuits. -- ``__LeaveStreamsUnattached 1`` +- ``__LeaveStreamsUnattached 1``: The scanner is attaching the streams itself. + +Configuration that can be set on runtime and fail: + +- ``ConnectionPadding 0``: Useful for avoiding extra traffic, since scanner anonymity is not a goal. Currently most of the code that sets this configuration is in :func:`sbws.util.stem.launch_tor` and the default configuration is ``sbws/globals.py``. -.. note:: the location of these code is being refactored. \ No newline at end of file +.. note:: the location of this code is being refactored.

1 0

[sbws/maint-1.1] fix: stem: Remove unused code
by juga＠torproject.org 25 Jan '21

25 Jan '21

commit 553f4a8fa35a35b686c27a808671b0c1f0f76807 Author: juga0 <juga(a)riseup.net> Date: Wed Dec 16 15:27:55 2020 +0000 fix: stem: Remove unused code --- sbws/util/stem.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/sbws/util/stem.py b/sbws/util/stem.py index d2c596f..746fa88 100644 --- a/sbws/util/stem.py +++ b/sbws/util/stem.py @@ -80,13 +80,6 @@ def init_controller(port=None, path=None, set_custom_stream_settings=True): if not c: return None, 'Unable to reach tor on control socket' assert c is not None - if set_custom_stream_settings: - # These options are also set in launch_tor. - # In a future refactor they could be set in the case they are not - # already in the running instance. This way the controller_port - # could also be used. - set_torrc_options_can_fail(c) - set_torrc_runtime_options(c) return c, ''

1 0

[sbws/maint-1.1] chg: stem: Add function to connect or start tor
by juga＠torproject.org 25 Jan '21

25 Jan '21

commit f7847ed28cab55bd1260d307b42c4ef59772937a Author: juga0 <juga(a)riseup.net> Date: Wed Dec 16 15:51:55 2020 +0000 chg: stem: Add function to connect or start tor Move initialization via existing socket to this new function and start tor only when it fails. Closes: #33150. --- sbws/core/scanner.py | 17 ++--------------- sbws/util/stem.py | 22 ++++++++++++++++------ tests/integration/conftest.py | 4 ++-- 3 files changed, 20 insertions(+), 23 deletions(-) diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py index bcbeb47..312993a 100644 --- a/sbws/core/scanner.py +++ b/sbws/core/scanner.py @@ -679,21 +679,8 @@ def run_speedtest(args, conf): """ global rd, pool, controller - controller = stem_utils.init_controller(conf) - if not controller: - controller = stem_utils.launch_tor(conf) - else: - log.warning( - 'Is sbws already running? ' - 'We found an existing Tor process at %s. We are not going to ' - 'launch Tor, nor are we going to try to configure it to behave ' - 'like we expect. This might work okay, but it also might not. ' - 'If you experience problems, you should try letting sbws launch ' - 'Tor for itself. The ability to use an already running Tor only ' - 'exists for sbws developers. It is expected to be broken and may ' - 'even lead to messed up results.', - conf.getpath('tor', 'control_socket')) - time.sleep(15) + + controller = stem_utils.launch_or_connect_to_tor(conf) # When there will be a refactor where conf is global, this can be removed # from here. diff --git a/sbws/util/stem.py b/sbws/util/stem.py index 169acda..5605c29 100644 --- a/sbws/util/stem.py +++ b/sbws/util/stem.py @@ -6,7 +6,6 @@ from stem import (SocketError, InvalidRequest, UnsatisfiableRequest, ProtocolError, SocketClosed) from stem.connection import IncorrectSocketType import stem.process -from configparser import ConfigParser from threading import RLock import copy import logging @@ -68,10 +67,8 @@ def init_controller(conf): control_port = int(control_port) # If it can not connect, the program will exit here c = _init_controller_port(control_port) - else: - c = _init_controller_socket( - socket=conf.getpath('tor', 'control_socket') - ) + # There is no configuration for external control socket, therefore do not + # attempt to connect to the control socket. return c @@ -190,7 +187,6 @@ def set_torrc_options_can_fail(controller): def launch_tor(conf): - assert isinstance(conf, ConfigParser) os.makedirs(conf.getpath('tor', 'datadir'), mode=0o700, exist_ok=True) os.makedirs(conf.getpath('tor', 'log'), exist_ok=True) os.makedirs(conf.getpath('tor', 'run_dpath'), mode=0o700, exist_ok=True) @@ -216,6 +212,8 @@ def launch_tor(conf): torrc = parse_user_torrc_config(torrc, conf['tor']['extra_lines']) # Finally launch Tor try: + # If there is already a tor process running with the same control + # socket, this will exit here. stem.process.launch_tor_with_config( torrc, init_msg_handler=log.debug, take_ownership=True) except Exception as e: @@ -223,6 +221,18 @@ def launch_tor(conf): log.info("Started own tor.") # And return a controller to it cont = _init_controller_socket(conf.getpath('tor', 'control_socket')) + # In the case it was not possible to connect to own tor socket. + if not cont: + fail_hard('Could not connect to own tor control socket.') + return cont + + +def launch_or_connect_to_tor(conf): + # If connecting to an existing controller, there is no need to configure + # own tor. + cont = init_controller(conf) + if not cont: + cont = launch_tor(conf) # Set options that can fail at runtime set_torrc_options_can_fail(cont) # Set runtime options diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index afd7256..2c0e675 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -7,7 +7,7 @@ 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 +from sbws.util.stem import launch_or_connect_to_tor class _PseudoArguments(argparse.Namespace): @@ -91,7 +91,7 @@ SafeLogging 0 @pytest.fixture(scope='session') def persistent_launch_tor(conf): - cont = launch_tor(conf) + cont = launch_or_connect_to_tor(conf) return cont

1 0

[sbws/maint-1.1] chg: stem, scanner: Change args initializing controller
by juga＠torproject.org 25 Jan '21

25 Jan '21

commit 80f379ac5f12078ca358d7645beee5f4278acd95 Author: juga0 <juga(a)riseup.net> Date: Wed Dec 16 15:39:31 2020 +0000 chg: stem, scanner: Change args initializing controller to check whether the external control port configuration is set. There is no need to assert all argument options nor to return the error. --- sbws/core/scanner.py | 3 +-- sbws/util/stem.py | 30 +++++++++++------------------- 2 files changed, 12 insertions(+), 21 deletions(-) diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py index 5e6cac3..bcbeb47 100644 --- a/sbws/core/scanner.py +++ b/sbws/core/scanner.py @@ -679,8 +679,7 @@ def run_speedtest(args, conf): """ global rd, pool, controller - controller, _ = stem_utils.init_controller( - path=conf.getpath('tor', 'control_socket')) + controller = stem_utils.init_controller(conf) if not controller: controller = stem_utils.launch_tor(conf) else: diff --git a/sbws/util/stem.py b/sbws/util/stem.py index 746fa88..169acda 100644 --- a/sbws/util/stem.py +++ b/sbws/util/stem.py @@ -60,27 +60,19 @@ def remove_event_listener(controller, func): log.exception("Exception trying to remove event %s", e) -def init_controller(port=None, path=None, set_custom_stream_settings=True): - # NOTE: we do not currently support a control port even though the rest of - # this function will pretend like port could be set. - assert port is None - # make sure only one is set - assert port is not None or path is not None - assert not (port is not None and path is not None) - # and for the one that is set, make sure it is likely valid - assert port is None or isinstance(port, int) - assert path is None or isinstance(path, str) +def init_controller(conf): c = None - if port: - c = _init_controller_port(port) - if not c: - return None, 'Unable to reach tor on control port' + # If the external control port is set, use it to initialize the controller. + control_port = conf['tor']['external_control_port'] + if control_port: + control_port = int(control_port) + # If it can not connect, the program will exit here + c = _init_controller_port(control_port) else: - c = _init_controller_socket(path) - if not c: - return None, 'Unable to reach tor on control socket' - assert c is not None - return c, '' + c = _init_controller_socket( + socket=conf.getpath('tor', 'control_socket') + ) + return c def is_bootstrapped(c):

1 0

[sbws/maint-1.1] fix: stem: Add possible exception cause
by juga＠torproject.org 25 Jan '21

25 Jan '21

commit cb6a8a76da0d77ef2896c9f99003649b3d43c1b4 Author: juga0 <juga(a)riseup.net> Date: Wed Dec 16 15:55:13 2020 +0000 fix: stem: Add possible exception cause --- sbws/util/stem.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sbws/util/stem.py b/sbws/util/stem.py index 5605c29..ce5253c 100644 --- a/sbws/util/stem.py +++ b/sbws/util/stem.py @@ -181,9 +181,12 @@ def set_torrc_options_can_fail(controller): for k, v in TORRC_OPTIONS_CAN_FAIL.items(): try: controller.set_conf(k, v) - except InvalidArguments as error: + except (InvalidArguments, InvalidRequest) as error: log.debug('Ignoring option not supported by this Tor version. %s', error) + except ControllerError as e: + log.exception(e) + exit(1) def launch_tor(conf):

1 0