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

[sbws/master] Replace conf['paths'] by conf.getpath('paths')
by pastly＠torproject.org 09 Aug '18

09 Aug '18

commit 2c4cef012b2f9f0ecee1c15f5a9f7bffaaa3165a Author: juga0 <juga(a)riseup.net> Date: Tue Jul 24 17:24:52 2018 +0000 Replace conf['paths'] by conf.getpath('paths') --- sbws/lib/resultdump.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbws/lib/resultdump.py b/sbws/lib/resultdump.py index 2e51be9..c5d88d3 100644 --- a/sbws/lib/resultdump.py +++ b/sbws/lib/resultdump.py @@ -491,11 +491,11 @@ class ResultDump: ''' Runs the enter() method in a new thread and collects new Results on its queue. Writes them to daily result files in the data directory ''' def __init__(self, args, conf, end_event): - assert os.path.isdir(conf['paths']['datadir']) + assert os.path.isdir(conf.getpath('paths', 'datadir')) assert isinstance(end_event, Event) self.conf = conf self.fresh_days = conf.getint('general', 'data_period') - self.datadir = conf['paths']['datadir'] + self.datadir = conf.getpath('paths', 'datadir') self.end_event = end_event self.data = {} self.data_lock = RLock()

1 0

[sbws/master] Expand paths strings to fs dirs
by pastly＠torproject.org 09 Aug '18

09 Aug '18

commit 99f3aea100f0be1a45e2bc1d3872f04dae4028f8 Author: juga0 <juga(a)riseup.net> Date: Mon Jul 23 22:39:09 2018 +0000 Expand paths strings to fs dirs --- sbws/util/config.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sbws/util/config.py b/sbws/util/config.py index 61a0e61..ee7bde7 100644 --- a/sbws/util/config.py +++ b/sbws/util/config.py @@ -81,6 +81,10 @@ def get_config(args): conf = _get_default_config() conf = _get_default_logging_config(conf=conf) conf = _get_user_config(args, conf=conf) + # it is only needed to expand user and vars to have the rest of the + # paths correctly expanded too + conf['paths']['sbws_home'] = os.path.expanduser(os.path.expandvars( + conf['paths']['sbws_home'])) return conf

1 0

[sbws/master] Replace conf['paths'] by conf.getpath('paths')
by pastly＠torproject.org 09 Aug '18

09 Aug '18

commit 18af4c847c993448373b765fc8497c295090bb74 Author: juga0 <juga(a)riseup.net> Date: Tue Jul 24 17:24:23 2018 +0000 Replace conf['paths'] by conf.getpath('paths') --- sbws/core/generate.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbws/core/generate.py b/sbws/core/generate.py index f345f11..2055189 100644 --- a/sbws/core/generate.py +++ b/sbws/core/generate.py @@ -39,9 +39,9 @@ def gen_parser(sub): def main(args, conf): - os.makedirs(conf['paths']['v3bw_dname'], exist_ok=True) + os.makedirs(conf.getpath('paths', 'v3bw_dname'), exist_ok=True) - datadir = conf['paths']['datadir'] + datadir = conf.getpath('paths', 'datadir') if not os.path.isdir(datadir): fail_hard('%s does not exist', datadir) if args.scale_constant < 1:

1 0

[sbws/master] Replace conf['paths'] by conf.getpath('paths')
by pastly＠torproject.org 09 Aug '18

09 Aug '18

commit 87818dfe5efc07be3131779d8dfc28a38a9e41a9 Author: juga0 <juga(a)riseup.net> Date: Tue Jul 24 17:23:52 2018 +0000 Replace conf['paths'] by conf.getpath('paths') --- sbws/core/cleanup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbws/core/cleanup.py b/sbws/core/cleanup.py index 4600cf8..9a04ec0 100644 --- a/sbws/core/cleanup.py +++ b/sbws/core/cleanup.py @@ -174,7 +174,7 @@ def main(args, conf): :param argparse.Namespace args: command line arguments :param configparser.ConfigParser conf: parsed config files ''' - datadir = conf['paths']['datadir'] + datadir = conf.getpath('paths', 'datadir') if not os.path.isdir(datadir): fail_hard('%s does not exist', datadir)

1 0

[sbws/master] Replace conf['paths'] by conf.getpath('paths')
by pastly＠torproject.org 09 Aug '18

09 Aug '18

commit 110dcfa3e797147a3cdb8ece41f69142593d82ef Author: juga0 <juga(a)riseup.net> Date: Tue Jul 24 17:28:18 2018 +0000 Replace conf['paths'] by conf.getpath('paths') --- sbws/core/scanner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py index f7a08d7..64d6dba 100644 --- a/sbws/core/scanner.py +++ b/sbws/core/scanner.py @@ -376,7 +376,7 @@ def main(args, conf): fail_hard('Max download size %d cannot be smaller than min %d', max_dl, min_dl) - os.makedirs(conf['paths']['datadir'], exist_ok=True) + os.makedirs(conf.getpath('paths', 'datadir'), exist_ok=True) state = State(conf['paths']['state_fname']) state['scanner_started'] = now_isodt_str()

1 0

[sbws/master] Add runtime dir for non-persistent data
by pastly＠torproject.org 09 Aug '18

09 Aug '18

commit c803c3d098bb65516be1b766e46e444d8a8d64e3 Author: juga0 <juga(a)riseup.net> Date: Tue Jul 24 17:38:33 2018 +0000 Add runtime dir for non-persistent data --- sbws/config.default.ini | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sbws/config.default.ini b/sbws/config.default.ini index 17e3a25..5dcc8f4 100644 --- a/sbws/config.default.ini +++ b/sbws/config.default.ini @@ -58,8 +58,12 @@ max_download_size = 1073741824 [tor] datadir = ${paths:sbws_home}/tor -control_socket = ${tor:datadir}/control_socket -log = ${tor:datadir}/log.txt +# create runtime dir for data that does not need to be persistent +run_dpath = $XDG_RUNTIME_DIR/sbws +control_socket = ${tor:run_dpath}/control +pid = ${tor:run_dpath}/tor.pid +# note this is a directory +log = ${tor:datadir}/log extra_lines = [cleanup]

1 0

[sbws/master] Replace conf['tor']x by conf.getpath('tor', x)
by pastly＠torproject.org 09 Aug '18

09 Aug '18

commit 88ffb0eb431db7984f97c87901d16641fb91b5f4 Author: juga0 <juga(a)riseup.net> Date: Tue Jul 24 17:30:03 2018 +0000 Replace conf['tor']x by conf.getpath('tor', x) --- sbws/core/scanner.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py index 64d6dba..3e24d22 100644 --- a/sbws/core/scanner.py +++ b/sbws/core/scanner.py @@ -316,7 +316,7 @@ def result_putter_error(target): def run_speedtest(args, conf): controller, _ = stem_utils.init_controller( - path=conf['tor']['control_socket']) + path=conf.getpath('tor', 'control_socket')) if not controller: controller = stem_utils.launch_tor(conf) else: @@ -328,7 +328,8 @@ def run_speedtest(args, conf): '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['tor']['control_socket']) + 'even lead to messed up results.', + conf.getpath('tor', 'control_socket')) time.sleep(15) rl = RelayList(args, conf, controller) cb = CB(args, conf, controller, rl)

1 0

[sbws/master] Replace conf['tor']x by conf.getpath('tor', x)
by pastly＠torproject.org 09 Aug '18

09 Aug '18

commit dd4629e270fd42d9e37652497aa857ccf5ceb6de Author: juga0 <juga(a)riseup.net> Date: Tue Jul 24 17:37:19 2018 +0000 Replace conf['tor']x by conf.getpath('tor', x) --- sbws/util/stem.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sbws/util/stem.py b/sbws/util/stem.py index 32c9b8c..566261b 100644 --- a/sbws/util/stem.py +++ b/sbws/util/stem.py @@ -119,7 +119,7 @@ def _init_controller_socket(socket): def launch_tor(conf): assert isinstance(conf, ConfigParser) - os.makedirs(conf['tor']['datadir'], mode=0o700, exist_ok=True) + os.makedirs(conf.getpath('tor', 'datadir'), mode=0o700, exist_ok=True) # Bare minimum things, more or less torrc = copy.deepcopy(TORRC_STARTING_POINT) # Very important and/or common settings that we don't know until runtime @@ -190,7 +190,7 @@ def launch_tor(conf): except Exception as e: fail_hard('Error trying to launch tor: %s', e) # And return a controller to it - cont = _init_controller_socket(conf['tor']['control_socket']) + cont = _init_controller_socket(conf.getpath('tor', 'control_socket')) # Because we build things by hand and can't set these before Tor bootstraps try: cont.set_conf('__DisablePredictedCircuits', '1') @@ -201,7 +201,7 @@ def launch_tor(conf): "sbws instance?", e) exit(1) log.info('Started and connected to Tor %s via %s', cont.get_version(), - conf['tor']['control_socket']) + conf.getpath('tor', 'control_socket')) return cont

1 0

[sbws/master] Add runtime dir option in validate
by pastly＠torproject.org 09 Aug '18

09 Aug '18

commit ee1596eccf30778ff9e124590ed409980ec442f9 Author: juga0 <juga(a)riseup.net> Date: Tue Jul 24 17:39:01 2018 +0000 Add runtime dir option in validate --- sbws/util/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbws/util/config.py b/sbws/util/config.py index 50979b3..99c7d67 100644 --- a/sbws/util/config.py +++ b/sbws/util/config.py @@ -275,7 +275,7 @@ def _validate_tor(conf): sec = 'tor' err_tmpl = Template('$sec/$key ($val): $e') unvalidated_keys = [ - 'datadir', 'control_socket', 'log', 'extra_lines'] + 'datadir', 'run_dpath', 'control_socket', 'pid', 'log', 'extra_lines'] all_valid_keys = unvalidated_keys errors.extend(_validate_section_keys(conf, sec, all_valid_keys, err_tmpl)) return errors

1 0

[sbws/master] Replace conf['tor']x by conf.getpath('tor', x)
by pastly＠torproject.org 09 Aug '18

09 Aug '18

commit 75d93f803fb8659999c98a0c925808bbada97e1e Author: juga0 <juga(a)riseup.net> Date: Tue Jul 24 17:40:43 2018 +0000 Replace conf['tor']x by conf.getpath('tor', x) and use correct paths --- sbws/util/stem.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sbws/util/stem.py b/sbws/util/stem.py index 566261b..8e57f96 100644 --- a/sbws/util/stem.py +++ b/sbws/util/stem.py @@ -120,15 +120,17 @@ def _init_controller_socket(socket): def launch_tor(conf): assert isinstance(conf, ConfigParser) os.makedirs(conf.getpath('tor', 'datadir'), mode=0o700, exist_ok=True) + os.makedirs(conf.getpath('tor', 'run_dpath'), mode=0o700, exist_ok=True) # Bare minimum things, more or less torrc = copy.deepcopy(TORRC_STARTING_POINT) # Very important and/or common settings that we don't know until runtime torrc.update({ - 'DataDirectory': conf['tor']['datadir'], - 'PidFile': os.path.join(conf['tor']['datadir'], 'tor.pid'), - 'ControlSocket': conf['tor']['control_socket'], + 'DataDirectory': conf.getpath('tor', 'datadir'), + 'PidFile': conf.getpath('tor', 'pid'), + 'ControlSocket': conf.getpath('tor', 'control_socket'), 'Log': [ - 'NOTICE file {}'.format(conf['tor']['log']), + 'NOTICE file {}'.format(os.path.join(conf.getpath('tor', 'log'), + 'notice.log')), ], # Things needed to make circuits fail a little faster. We get the # circuit_timeout as a string instead of an int on purpose: stem only

1 0