September 2013 - tor-commits - lists.torproject.org

[arm/master] Using new argument parsing for the configuration path
by atagar＠torproject.org 15 Sep '13

15 Sep '13

commit 6db5f56c3dabbd8d704c9d1e3ff1f85105af6c92 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 8 16:13:42 2013 -0700 Using new argument parsing for the configuration path Using _get_args() results for the configuration location. --- arm/starter.py | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/arm/starter.py b/arm/starter.py index ec074c1..e2bf175 100644 --- a/arm/starter.py +++ b/arm/starter.py @@ -8,11 +8,11 @@ command line parameters. import collections import getopt +import os +import sys import stem.util.connection -import os -import sys import time import getpass import locale @@ -36,7 +36,6 @@ import stem.util.log import stem.util.system LOG_DUMP_PATH = os.path.expanduser("~/.arm/log") -DEFAULT_CONFIG = os.path.expanduser("~/.arm/armrc") CONFIG = stem.util.conf.config_dict("arm", { "startup.controlPassword": None, @@ -86,7 +85,7 @@ ARGS = { 'user_provided_port': False, 'control_socket': '/var/run/tor/control', 'user_provided_socket': False, - 'config': None, + 'config': os.path.expanduser("~/.arm/armrc"), 'debug': False, 'blind': False, 'logged_events': 'N3', @@ -296,7 +295,6 @@ def main(): startTime = time.time() param = dict([(key, None) for key in CONFIG.keys()]) isDebugMode = False - configPath = DEFAULT_CONFIG # path used for customized configuration # attempts to fetch attributes for parsing tor's logs, configuration, etc @@ -325,7 +323,7 @@ def main(): sys.exit() if args.print_help: - print CONFIG['msg.help'] % (ARGS['control_address'], ARGS['control_port'], ARGS['control_socket'], DEFAULT_CONFIG, LOG_DUMP_PATH, ARGS['logged_events'], arm.logPanel.EVENT_LISTING) + print CONFIG['msg.help'] % (ARGS['control_address'], ARGS['control_port'], ARGS['control_socket'], ARGS['config'], LOG_DUMP_PATH, ARGS['logged_events'], arm.logPanel.EVENT_LISTING) sys.exit() # parses user input, noting any issues @@ -336,8 +334,7 @@ def main(): sys.exit() for opt, arg in opts: - if opt in ("-c", "--config"): configPath = arg # sets path of user's config - elif opt in ("-d", "--debug"): isDebugMode = True # dumps all logs + if opt in ("-d", "--debug"): isDebugMode = True # dumps all logs elif opt in ("-b", "--blind"): param["startup.blindModeEnabled"] = True # prevents connection lookups elif opt in ("-e", "--event"): @@ -367,14 +364,14 @@ def main(): print "Unable to write to debug log file: %s" % arm.util.sysTools.getFileErrorMsg(exc) # loads user's personal armrc if available - if os.path.exists(configPath): + if os.path.exists(args.config): try: - config.load(configPath) + config.load(args.config) except IOError, exc: stem.util.log.warn(STANDARD_CFG_LOAD_FAILED_MSG % arm.util.sysTools.getFileErrorMsg(exc)) else: # no armrc found, falling back to the defaults in the source - stem.util.log.notice(STANDARD_CFG_NOT_FOUND_MSG % configPath) + stem.util.log.notice(STANDARD_CFG_NOT_FOUND_MSG % args.config) # syncs config and parameters, saving changed config options and overwriting # undefined parameters with defaults @@ -425,7 +422,7 @@ def main(): # sets up stem connection, prompting for the passphrase if necessary and # sending problems to stdout if they arise authPassword = config.get("startup.controlPassword", CONFIG["startup.controlPassword"]) - incorrectPasswordMsg = "Password found in '%s' was incorrect" % configPath + incorrectPasswordMsg = "Password found in '%s' was incorrect" % args.config controller = _getController(controlAddr, controlPort, authPassword, incorrectPasswordMsg) # removing references to the controller password so the memory can be freed

1 0

[arm/master] Dropping statup parameter synchronization
by atagar＠torproject.org 15 Sep '13

15 Sep '13

commit 015c82cfb3bf0b78cf78a907d9f39d8bee706672 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 8 16:23:11 2013 -0700 Dropping statup parameter synchronization Since we're generally dropping support for our config parameters being config options we can drop the config/arg synchronization. --- arm/starter.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/arm/starter.py b/arm/starter.py index 8e46932..a3ac5e3 100644 --- a/arm/starter.py +++ b/arm/starter.py @@ -293,7 +293,6 @@ def _dumpConfig(): def main(): startTime = time.time() - param = dict([(key, None) for key in CONFIG.keys()]) # attempts to fetch attributes for parsing tor's logs, configuration, etc @@ -325,8 +324,8 @@ def main(): print CONFIG['msg.help'] % (ARGS['control_address'], ARGS['control_port'], ARGS['control_socket'], ARGS['config'], LOG_DUMP_PATH, ARGS['logged_events'], arm.logPanel.EVENT_LISTING) sys.exit() - param["startup.blindModeEnabled"] = args.blind - param["startup.events"] = args.logged_events + config.set("startup.blindModeEnabled", str(args.blind)) + config.set("startup.events", args.logged_events) if args.debug: try: @@ -361,12 +360,6 @@ def main(): # no armrc found, falling back to the defaults in the source stem.util.log.notice(STANDARD_CFG_NOT_FOUND_MSG % args.config) - # syncs config and parameters, saving changed config options and overwriting - # undefined parameters with defaults - for key in param.keys(): - if param[key] == None: param[key] = CONFIG[key] - else: config.set(key, str(param[key])) - # validates that input has a valid ip address and port controlAddr = args.control_address controlPort = args.control_port @@ -380,7 +373,7 @@ def main(): # validates and expands log event flags try: - arm.logPanel.expandEvents(param["startup.events"]) + arm.logPanel.expandEvents(args.logged_events) except ValueError, exc: for flag in str(exc): print "Unrecognized event flag: %s" % flag

1 0

[arm/master] Removing old argument parsing
by atagar＠torproject.org 15 Sep '13

15 Sep '13

commit adc4b31c4825af793e9f88a54f687960d15f1544 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 8 16:19:13 2013 -0700 Removing old argument parsing Dropping the old getopt usage. Unfortunately blind mode and event logging will be a little trickier to replace since the controller uses the config values. --- arm/starter.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/arm/starter.py b/arm/starter.py index c6c86c5..8e46932 100644 --- a/arm/starter.py +++ b/arm/starter.py @@ -325,18 +325,8 @@ def main(): print CONFIG['msg.help'] % (ARGS['control_address'], ARGS['control_port'], ARGS['control_socket'], ARGS['config'], LOG_DUMP_PATH, ARGS['logged_events'], arm.logPanel.EVENT_LISTING) sys.exit() - # parses user input, noting any issues - try: - opts, _ = getopt.getopt(sys.argv[1:], OPT, OPT_EXPANDED) - except getopt.GetoptError, exc: - print str(exc) + " (for usage provide --help)" - sys.exit() - - for opt, arg in opts: - if opt in ("-b", "--blind"): - param["startup.blindModeEnabled"] = True # prevents connection lookups - elif opt in ("-e", "--event"): - param["startup.events"] = arg # set event flags + param["startup.blindModeEnabled"] = args.blind + param["startup.events"] = args.logged_events if args.debug: try:

1 0

[arm/master] Dropping redundant --interface validity check
by atagar＠torproject.org 15 Sep '13

15 Sep '13

commit dfb6720c3ffef920d91e61065fc9994eb926c026 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 8 16:27:22 2013 -0700 Dropping redundant --interface validity check Now that we're checking the validity of the --interface arguments while parsing, we don't need another check later. --- arm/starter.py | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/arm/starter.py b/arm/starter.py index a3ac5e3..53b28ff 100644 --- a/arm/starter.py +++ b/arm/starter.py @@ -360,17 +360,6 @@ def main(): # no armrc found, falling back to the defaults in the source stem.util.log.notice(STANDARD_CFG_NOT_FOUND_MSG % args.config) - # validates that input has a valid ip address and port - controlAddr = args.control_address - controlPort = args.control_port - - if not arm.util.connections.isValidIpAddress(controlAddr): - print "'%s' isn't a valid IP address" % controlAddr - sys.exit() - elif controlPort < 0 or controlPort > 65535: - print "'%s' isn't a valid port number (ports range 0-65535)" % controlPort - sys.exit() - # validates and expands log event flags try: arm.logPanel.expandEvents(args.logged_events) @@ -404,7 +393,7 @@ def main(): # sending problems to stdout if they arise authPassword = config.get("startup.controlPassword", CONFIG["startup.controlPassword"]) incorrectPasswordMsg = "Password found in '%s' was incorrect" % args.config - controller = _getController(controlAddr, controlPort, authPassword, incorrectPasswordMsg) + controller = _getController(args.control_address, args.control_port, authPassword, incorrectPasswordMsg) # removing references to the controller password so the memory can be freed # (unfortunately python does allow for direct access to the memory so this

1 0

[stem/master] Logging tor's output during integ test runs
by atagar＠torproject.org 14 Sep '13

14 Sep '13

commit fb3907913b09770ed6de5ff8914553e424fa8f47 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 14 13:53:33 2013 -0700 Logging tor's output during integ test runs Saving tor's logging output to disk to help with troubleshooting issues. --- test/runner.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/runner.py b/test/runner.py index cccc587..e8d77d1 100644 --- a/test/runner.py +++ b/test/runner.py @@ -71,6 +71,8 @@ BASE_TORRC = """# configuration for stem integration tests DataDirectory %%s SocksListenAddress %s:%i DownloadExtraInfo 1 +Log notice stdout +Log notice file %%s/tor_log """ % (SOCKS_HOST, SOCKS_PORT) # singleton Runner instance @@ -298,7 +300,7 @@ class Runner(object): self._tor_cmd = tor_cmd self._custom_opts = extra_torrc_opts - self._torrc_contents = BASE_TORRC % data_dir_path + self._torrc_contents = BASE_TORRC % (data_dir_path, data_dir_path) if extra_torrc_opts: self._torrc_contents += "\n".join(extra_torrc_opts) + "\n"

1 0

[stem/master] Dropping config's _raw_contents reference
by atagar＠torproject.org 14 Sep '13

14 Sep '13

commit e2cff0be96640b584fa1e7044878891ff4bb69b0 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 14 17:25:09 2013 -0700 Dropping config's _raw_contents reference On reflection we never do anything with the _raw_contents. In fact, we don't even have getter methods for it, and never use it within the Config class itself. Dropping it to both save a little memory and make it easier to purge values. --- stem/util/conf.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/stem/util/conf.py b/stem/util/conf.py index d50cf14..817c406 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -390,10 +390,9 @@ class Config(object): def __init__(self): self._path = None # location we last loaded from or saved to self._contents = {} # configuration key/value pairs - self._raw_contents = [] # raw contents read from configuration file self._listeners = [] # functors to be notified of config changes - # used for both _contents and _raw_contents access + # used for accessing _contents self._contents_lock = threading.RLock() # keys that have been requested (used to provide unused config contents) @@ -422,11 +421,8 @@ class Config(object): read_contents = config_file.readlines() with self._contents_lock: - self._raw_contents = read_contents - remainder = list(self._raw_contents) - - while remainder: - line = remainder.pop(0) + while read_contents: + line = read_contents.pop(0) # strips any commenting or excess whitespace comment_start = line.find("#") @@ -449,8 +445,8 @@ class Config(object): # this might be a multi-line entry, try processing it as such multiline_buffer = [] - while remainder and remainder[0].lstrip().startswith("|"): - content = remainder.pop(0).lstrip()[1:] # removes '\s+|' prefix + while read_contents and read_contents[0].lstrip().startswith("|"): + content = read_contents.pop(0).lstrip()[1:] # removes '\s+|' prefix content = content.rstrip("\n") # trailing newline multiline_buffer.append(content) @@ -493,7 +489,6 @@ class Config(object): with self._contents_lock: self._contents.clear() - self._raw_contents = [] self._requested_keys = set() def add_listener(self, listener, backfill = True):

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 14 Sep '13

14 Sep '13

commit 102c44411b5cb07c1e908caedd5ecab909373342 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Sep 14 20:16:25 2013 +0000 Update translations for tor-launcher-properties_completed --- da/torlauncher.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/da/torlauncher.properties b/da/torlauncher.properties index 4e12610..18c740d 100644 --- a/da/torlauncher.properties +++ b/da/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor starter torlauncher.tor_exited=Tor lukkede uventet. +torlauncher.please_restart_app=Genstart venligst programmet torlauncher.tor_controlconn_failed=Kunne ikke forbinde til Tor kontrol-porten. torlauncher.tor_failed_to_start=Tor kunne ikke starte. torlauncher.tor_bootstrap_failed=Det lykkedes ikke Tor at etablere forbindelse til Tor netværket.\n\n%S

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 14 Sep '13

14 Sep '13

commit 3ef55b77201ce8e248ff762fd8953b5ac38f0dc5 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Sep 14 20:16:22 2013 +0000 Update translations for tor-launcher-properties --- da/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/da/torlauncher.properties b/da/torlauncher.properties index 1c06970..18c740d 100644 --- a/da/torlauncher.properties +++ b/da/torlauncher.properties @@ -4,7 +4,7 @@ torlauncher.error_title=Tor starter torlauncher.tor_exited=Tor lukkede uventet. -# torlauncher.please_restart_app=Please restart this application. +torlauncher.please_restart_app=Genstart venligst programmet torlauncher.tor_controlconn_failed=Kunne ikke forbinde til Tor kontrol-porten. torlauncher.tor_failed_to_start=Tor kunne ikke starte. torlauncher.tor_bootstrap_failed=Det lykkedes ikke Tor at etablere forbindelse til Tor netværket.\n\n%S

1 0

[doctor/master] Correcting issue that caused script errors to still go to the list
by atagar＠torproject.org 14 Sep '13

14 Sep '13

commit f1d14d4cb67fe592bf2820f4f584eb8ee5656dde Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 14 10:39:29 2013 -0700 Correcting issue that caused script errors to still go to the list Oops! Looks like there was a second spot where TO_ADDRESS was referenced. Fixing it so further script errors go to me rather than the list. --- util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util.py b/util.py index a1837b7..4874327 100644 --- a/util.py +++ b/util.py @@ -112,7 +112,7 @@ def send(subject, body_text = None, body_html = None, attachment = None, destina server = smtplib.SMTP('smtp.gmail.com:587') server.starttls() server.login(FROM_ADDRESS, _get_password()) - server.sendmail(FROM_ADDRESS, [TO_ADDRESS], msg.as_string()) + server.sendmail(FROM_ADDRESS, [destination], msg.as_string()) server.quit()

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 14 Sep '13

14 Sep '13

commit dfa84885fe5562f206f650894ba41c888694a825 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Sep 14 16:16:51 2013 +0000 Update translations for tor-launcher-properties_completed --- es/torlauncher.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/es/torlauncher.properties b/es/torlauncher.properties index 4b95de7..e236d38 100644 --- a/es/torlauncher.properties +++ b/es/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Arranque de Tor torlauncher.tor_exited=Tor se cerró inesperadamente. +torlauncher.please_restart_app=Por favor reinicie esta aplicación. torlauncher.tor_controlconn_failed=No se pudo conectar al puerto de control de Tor torlauncher.tor_failed_to_start=Tor no pudo iniciarse. torlauncher.tor_bootstrap_failed=Tor no pudo establecer una conexión de red Tor.\n\n%S

1 0