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

[sbws/master] Replace _read_config.. by _extend_config...
by pastly＠torproject.org 09 Aug '18

09 Aug '18

commit 9435f6824d9a5341f845a058107eff0e6189ce54 Author: juga0 <juga(a)riseup.net> Date: Mon Jul 23 21:37:04 2018 +0000 Replace _read_config.. by _extend_config... --- sbws/util/config.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/sbws/util/config.py b/sbws/util/config.py index 3171ad2..61a0e61 100644 --- a/sbws/util/config.py +++ b/sbws/util/config.py @@ -31,24 +31,18 @@ def _create_user_config_file(fname): shutil.copyfile(MINIMUM_USER_CONFIG_PATH, fname) -def _read_config_file(conf, fname): - assert os.path.isfile(fname) +def _extend_config(conf, fname): + """Extend ConfigParser from file configuration.""" log.debug('Reading config file %s', fname) with open(fname, 'rt') as fd: conf.read_file(fd, source=fname) return conf -def _extend_config(conf, fpath): - """Extend ConfigParser from file configuration.""" - conf = _read_config_file(conf, fpath) - return conf - - def _get_default_config(): """Return ConfigParser with default configuration.""" conf = ConfigParser(interpolation=ExtendedInterpolation()) - return _read_config_file(conf, DEFAULT_CONFIG_PATH) + return _extend_config(conf, DEFAULT_CONFIG_PATH) def _get_user_config(args, conf=None):

1 0

[sbws/master] Remove init and sbwshome with config
by pastly＠torproject.org 09 Aug '18

09 Aug '18

commit 4e824dea6d98bd5a6477bcfa31f43e567039ae90 Author: juga0 <juga(a)riseup.net> Date: Wed Jul 18 20:20:25 2018 +0000 Remove init and sbwshome with config --- tests/integration/conftest.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index 1294624..727148f 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -3,7 +3,6 @@ import argparse import pytest 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 @@ -80,7 +79,6 @@ SafeLogging 0 @pytest.fixture(scope='session') def sbwshome(sbwshome_dir, args, conf): - init.main(args, conf) return sbwshome_dir

1 0

[sbws/master] Remove unneded sbwshome fixture in tests
by pastly＠torproject.org 09 Aug '18

09 Aug '18

commit bcf5b6c9cf6b89c49cce4a9c9c65a588877a8c95 Author: juga0 <juga(a)riseup.net> Date: Mon Jul 23 22:36:48 2018 +0000 Remove unneded sbwshome fixture in tests --- tests/integration/conftest.py | 5 ----- tests/integration/core/test_scanner.py | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index 727148f..1cadb3b 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -78,11 +78,6 @@ SafeLogging 0 @pytest.fixture(scope='session') -def sbwshome(sbwshome_dir, args, conf): - return sbwshome_dir - - -(a)pytest.fixture(scope='session') def persistent_launch_tor(conf): cont = launch_tor(conf) return cont diff --git a/tests/integration/core/test_scanner.py b/tests/integration/core/test_scanner.py index fc9a6c5..61927d7 100644 --- a/tests/integration/core/test_scanner.py +++ b/tests/integration/core/test_scanner.py @@ -17,7 +17,7 @@ def assert_within(value, target, radius): def test_measure_relay_with_maxadvertisedbandwidth( - persistent_launch_tor, sbwshome, args, conf, + persistent_launch_tor, sbwshome_dir, args, conf, dests, cb, rl, caplog): caplog.set_level(logging.DEBUG) # d = get_everything_to_measure(sbwshome, cont, args, conf)

1 0

[sbws/master] Fix sentence
by pastly＠torproject.org 09 Aug '18

09 Aug '18

commit 0222780afc0ce1cdf4de10a96c57e3f2b8c0eb44 Author: juga0 <juga(a)riseup.net> Date: Mon Jul 23 21:45:22 2018 +0000 Fix sentence --- sbws/util/parser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbws/util/parser.py b/sbws/util/parser.py index 1ef15cc..2264d7c 100644 --- a/sbws/util/parser.py +++ b/sbws/util/parser.py @@ -22,7 +22,7 @@ def create_parser(): choices=['debug', 'info', 'warning', 'error', 'critical'], help='Override the sbws log level') p.add_argument('-c', '--config', - help='Path the sbws config file') + help='Path to the sbws config file') sub = p.add_subparsers(dest='command') sbws.core.cleanup.gen_parser(sub) sbws.core.scanner.gen_parser(sub)

1 0

[sbws/master] Add forgotten exist_ok param when creating dirs
by pastly＠torproject.org 09 Aug '18

09 Aug '18

commit f6021532fd21969dd4f845efa0aa795c6d23d191 Author: juga0 <juga(a)riseup.net> Date: Mon Jul 23 22:37:47 2018 +0000 Add forgotten exist_ok param when creating dirs --- sbws/sbws.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sbws/sbws.py b/sbws/sbws.py index 64d126c..6481df6 100644 --- a/sbws/sbws.py +++ b/sbws/sbws.py @@ -18,10 +18,12 @@ log = logging.getLogger(__name__) def _ensure_dirs(conf): - log.debug('Ensuring all dirs exits.') - os.makedirs(conf['paths']['datadir']) - os.makedirs(conf['paths']['v3bw']) - os.makedirs(conf['paths']['log']) + log.debug('Ensuring all dirs exists.') + # it is not needed to check sbws_home dir, since the following + # will create parent dirs too (in case they don't exist) + os.makedirs(conf['paths']['datadir'], exist_ok=True) + os.makedirs(conf['paths']['v3bw_dname'], exist_ok=True) + os.makedirs(conf['paths']['log_dname'], exist_ok=True) def _adjust_log_level(args, conf):

1 0

[sbws/master] Add _expand_paths function as suggested by pastly
by pastly＠torproject.org 09 Aug '18

09 Aug '18

commit 8f30e18d8aabfd25239aff9cc4dd03a1488798ec Author: juga0 <juga(a)riseup.net> Date: Tue Jul 24 17:09:19 2018 +0000 Add _expand_paths function as suggested by pastly --- sbws/util/config.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sbws/util/config.py b/sbws/util/config.py index ee7bde7..325b713 100644 --- a/sbws/util/config.py +++ b/sbws/util/config.py @@ -25,6 +25,13 @@ _LOG_LEVELS = ['debug', 'info', 'warning', 'error', 'critical'] log = logging.getLogger(__name__) +def _expand_path(path): + """Expand path string containing shell variables and ~ constructions + into their values. + """ + return os.path.expanduser(os.path.expandvars(path)) + + def _create_user_config_file(fname): """Copy minimal user config to user config path.""" if not os.path.isfile(fname):

1 0

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

09 Aug '18

commit bb2c5129ae19d4f39e9abd0d1188da2a2334bdac Author: juga0 <juga(a)riseup.net> Date: Tue Jul 24 17:25:50 2018 +0000 Replace conf['paths'] by conf.getpath('paths') --- tests/unit/conftest.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py index e0fa938..3ebee46 100644 --- a/tests/unit/conftest.py +++ b/tests/unit/conftest.py @@ -182,7 +182,7 @@ def sbwshome_error_result(sbwshome_only_datadir, conf): ''' Creates an ~/.sbws with a single fresh ResultError in it ''' - dd = conf['paths']['datadir'] + dd = conf.getpath('paths', 'datadir') write_result_to_datadir(RESULT_ERROR_STREAM, dd) return sbwshome_only_datadir @@ -192,7 +192,7 @@ def sbwshome_success_result(sbwshome_only_datadir, conf): ''' Creates an ~/.sbws with a single fresh ResultSuccess in it ''' - dd = conf['paths']['datadir'] + dd = conf.getpath('paths', 'datadir') write_result_to_datadir(RESULT_SUCCESS1, dd) return sbwshome_only_datadir @@ -202,7 +202,7 @@ def sbwshome_success_result_one_relay(sbwshome_only_datadir, conf): ''' Creates an ~/.sbws with a a couple of fresh ResultSuccess for one relay ''' - dd = conf['paths']['datadir'] + dd = conf.getpath('paths', 'datadir') write_result_to_datadir(RESULT_SUCCESS1, dd) write_result_to_datadir(RESULT_SUCCESS1, dd) return sbwshome_only_datadir @@ -214,7 +214,7 @@ def sbwshome_success_result_two_relays(sbwshome_only_datadir, conf): Creates an ~/.sbws with a a couple of fresh ResultSuccess for a couple or relays ''' - dd = conf['paths']['datadir'] + dd = conf.getpath('paths', 'datadir') write_result_to_datadir(RESULT_SUCCESS1, dd) write_result_to_datadir(RESULT_SUCCESS1, dd) write_result_to_datadir(RESULT_SUCCESS2, dd)

1 0

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

09 Aug '18

commit 566887b9640f67011e33ab70e5081bd0544c04ca Author: juga0 <juga(a)riseup.net> Date: Tue Jul 24 17:13:13 2018 +0000 Replace conf['paths'] by conf.getpath('paths') --- sbws/util/config.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/sbws/util/config.py b/sbws/util/config.py index 325b713..50979b3 100644 --- a/sbws/util/config.py +++ b/sbws/util/config.py @@ -48,7 +48,8 @@ def _extend_config(conf, fname): def _get_default_config(): """Return ConfigParser with default configuration.""" - conf = ConfigParser(interpolation=ExtendedInterpolation()) + conf = ConfigParser(interpolation=ExtendedInterpolation(), + converters={'path': _expand_path}) return _extend_config(conf, DEFAULT_CONFIG_PATH) @@ -59,7 +60,8 @@ def _get_user_config(args, conf=None): , in case it needs to be overwritten. """ if not conf: - conf = ConfigParser(interpolation=ExtendedInterpolation()) + conf = ConfigParser(interpolation=ExtendedInterpolation(), + converters={'path': _expand_path}) else: assert isinstance(conf, ConfigParser) if args.config: @@ -77,7 +79,8 @@ def _get_user_config(args, conf=None): def _get_default_logging_config(conf=None): """Get default logging configuration.""" if not conf: - conf = ConfigParser(interpolation=ExtendedInterpolation()) + conf = ConfigParser(interpolation=ExtendedInterpolation(), + converters={'path': _expand_path}) else: assert isinstance(conf, ConfigParser) return _extend_config(conf, DEFAULT_LOG_CONFIG_PATH) @@ -88,10 +91,6 @@ 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 @@ -110,7 +109,7 @@ def _can_log_to_file(conf): # If there is an issue getting this option, tell the caller that we can't # log to file. try: - conf['paths']['log_dname'] + conf.getpath('paths', 'log_dname') except InterpolationMissingOptionError as e: return False, e return True, '' @@ -142,7 +141,7 @@ def configure_logging(args, conf): # The first argument is the file name to which it should log. Set it to # the sbws command (like 'scanner' or 'generate') if possible, or to # 'sbws' failing that. - dname = conf['paths']['log_dname'] + dname = conf.getpath('paths', 'log_dname') os.makedirs(dname, exist_ok=True) fname = os.path.join(dname, '{}.log'.format(args.command or 'sbws')) # The second argument is the file mode, and it should be left alone

1 0

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

09 Aug '18

commit 9677357d73a37e8ad67a701784ddde05d8b46ff6 Author: juga0 <juga(a)riseup.net> Date: Tue Jul 24 17:16:14 2018 +0000 Replace conf['paths'] by conf.getpath('paths') --- sbws/sbws.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sbws/sbws.py b/sbws/sbws.py index 6481df6..6f8752c 100644 --- a/sbws/sbws.py +++ b/sbws/sbws.py @@ -21,9 +21,9 @@ def _ensure_dirs(conf): log.debug('Ensuring all dirs exists.') # it is not needed to check sbws_home dir, since the following # will create parent dirs too (in case they don't exist) - os.makedirs(conf['paths']['datadir'], exist_ok=True) - os.makedirs(conf['paths']['v3bw_dname'], exist_ok=True) - os.makedirs(conf['paths']['log_dname'], exist_ok=True) + os.makedirs(conf.getpath('paths', 'datadir'), exist_ok=True) + os.makedirs(conf.getpath('paths', 'v3bw_dname'), exist_ok=True) + os.makedirs(conf.getpath('paths', 'log_dname'), exist_ok=True) def _adjust_log_level(args, conf):

1 0

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

09 Aug '18

commit e0a3b0a68bcdb9480be6f3ca9a2268bd7311955b Author: juga0 <juga(a)riseup.net> Date: Tue Jul 24 17:16:40 2018 +0000 Replace conf['paths'] by conf.getpath('paths') --- sbws/core/stats.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbws/core/stats.py b/sbws/core/stats.py index 38f8978..f865b92 100644 --- a/sbws/core/stats.py +++ b/sbws/core/stats.py @@ -156,7 +156,7 @@ def main(args, conf): :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