- tor-commits - lists.torproject.org

[flashproxy/master] Fix error handling for key and password file reading.
by dcf＠torproject.org 28 Sep '12

28 Sep '12

commit 70bb6cbc5837b1fcb11ac6f751350db469ac95df Author: David Fifield <david(a)bamsoftware.com> Date: Thu Sep 20 07:40:15 2012 -0700 Fix error handling for key and password file reading. The finally code was trying to close a file that had not been successfully opened. --- facilitator/facilitator-email-poller | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/facilitator/facilitator-email-poller b/facilitator/facilitator-email-poller index 77f81e0..e3f3053 100755 --- a/facilitator/facilitator-email-poller +++ b/facilitator/facilitator-email-poller @@ -155,12 +155,12 @@ if options.password_filename is None: sys.exit(1) try: password_file = open(options.password_filename) -except OSError, e: +except Exception, e: print >> sys.stderr, """\ Failed to open password file "%s": %s.\ """ % (options.password_filename, str(e)) sys.exit(1) -else: +try: if not check_perms(password_file.fileno()): print >> sys.stderr, "Refusing to run with group- or world-readable password file. Try" print >> sys.stderr, "\tchmod 600 %s" % options.password_filename @@ -175,12 +175,12 @@ if options.key_filename is None: sys.exit(1) try: key_file = open(options.key_filename) -except OSError, e: +except Exception, e: print >> sys.stderr, """\ Failed to open private key file "%s": %s.\ """ % (options.key_filename, str(e)) sys.exit(1) -else: +try: if not check_perms(key_file.fileno()): print >> sys.stderr, "Refusing to run with group- or world-readable private key file. Try" print >> sys.stderr, "\tchmod 600 %s" % options.key_filename

1 0

[flashproxy/master] Use flashproxy-reg-email in flashproxy-client.
by dcf＠torproject.org 28 Sep '12

28 Sep '12

commit b83d4f2f781b279b544dbb59f26794788b1114da Author: David Fifield <david(a)bamsoftware.com> Date: Wed Sep 19 17:05:09 2012 -0700 Use flashproxy-reg-email in flashproxy-client. --- flashproxy-client | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index 6f7477e..6b4edf3 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -631,7 +631,7 @@ def register(): if not script_dir: # Maybe the script was read from stdin; in any case don't guess at the directory. return - command = [os.path.join(script_dir, "flashproxy-reg-http")] + command = [os.path.join(script_dir, "flashproxy-reg-email")] spec = format_addr(options.remote_addr) if options.facilitator_addr is None: log(u"Registering \"%s\"." % spec)

1 0

[flashproxy/master] Reestablish broken IMAP connections.
by dcf＠torproject.org 28 Sep '12

28 Sep '12

commit 39158f59ed697a14a7fcb7d3f471051dd0e0ffcb Author: David Fifield <david(a)bamsoftware.com> Date: Thu Sep 20 08:28:12 2012 -0700 Reestablish broken IMAP connections. --- facilitator/facilitator-email-poller | 70 ++++++++++++++++++++-------------- 1 files changed, 41 insertions(+), 29 deletions(-) diff --git a/facilitator/facilitator-email-poller b/facilitator/facilitator-email-poller index e3f3053..1d42823 100755 --- a/facilitator/facilitator-email-poller +++ b/facilitator/facilitator-email-poller @@ -261,35 +261,47 @@ if options.daemonize: if options.imaplib_debug: imaplib.Debug = 4 -ca_certs_file = tempfile.NamedTemporaryFile(prefix="facilitator-email-poller-", suffix=".crt", delete=True) -try: - ca_certs_file.write(CA_CERTS) - ca_certs_file.flush() - imap = IMAP4_SSL_REQUIRED(options.imap_addr[0], options.imap_addr[1], - None, ca_certs_file.name) -finally: - ca_certs_file.close() - -# Check that the public key is what we expect. -cert_der = imap.ssl().getpeercert(binary_form=True) -cert = X509.load_cert_string(cert_der, format=X509.FORMAT_DER) -pubkey_der = cert.get_pubkey().as_der() -pubkey_digest = sha1(pubkey_der).digest() - -if pubkey_digest != PUBKEY_SHA1: - raise ValueError("Public key does not match pin: got %s but expected %s" % - (pubkey_digest.encode("hex"), PUBKEY_SHA1.encode("hex"))) - -pre_debug = imap.debug -if options.safe_logging: - # Don't log the login call without --unsafe-logging because it contains a - # secret password. - imap.debug = 0 -log(u"logging in as %s" % options.email_addr) -imap.login(options.email_addr, email_password) -imap.debug = pre_debug - -imap_loop(imap) +def imap_login(): + """Make an IMAP connection, check the certificate and public key, and log in.""" + ca_certs_file = tempfile.NamedTemporaryFile(prefix="facilitator-email-poller-", suffix=".crt", delete=True) + try: + ca_certs_file.write(CA_CERTS) + ca_certs_file.flush() + imap = IMAP4_SSL_REQUIRED(options.imap_addr[0], options.imap_addr[1], + None, ca_certs_file.name) + finally: + ca_certs_file.close() + + # Check that the public key is what we expect. + cert_der = imap.ssl().getpeercert(binary_form=True) + cert = X509.load_cert_string(cert_der, format=X509.FORMAT_DER) + pubkey_der = cert.get_pubkey().as_der() + pubkey_digest = sha1(pubkey_der).digest() + + if pubkey_digest != PUBKEY_SHA1: + raise ValueError("Public key does not match pin: got %s but expected %s" % + (pubkey_digest.encode("hex"), PUBKEY_SHA1.encode("hex"))) + + pre_debug = imap.debug + if options.safe_logging: + # Don't log the login call without --unsafe-logging because it contains a + # secret password. + imap.debug = 0 + log(u"logging in as %s" % options.email_addr) + imap.login(options.email_addr, email_password) + imap.debug = pre_debug + + return imap + +while True: + imap = imap_login() + try: + imap_loop(imap) + except imaplib.IMAP4.abort, e: + # Try again after a disconnection. + log(u"lost server connection: %s" % str(e)) + else: + break log(u"closing") imap.close()

1 0

[flashproxy/master] Limit the rate of IMAP login attempts.
by dcf＠torproject.org 28 Sep '12

28 Sep '12

commit 4ae836265ba67337d95a9baba152704d6dcbe0da Author: David Fifield <david(a)bamsoftware.com> Date: Thu Sep 20 08:41:10 2012 -0700 Limit the rate of IMAP login attempts. --- facilitator/facilitator-email-poller | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/facilitator/facilitator-email-poller b/facilitator/facilitator-email-poller index 1d42823..4b94460 100755 --- a/facilitator/facilitator-email-poller +++ b/facilitator/facilitator-email-poller @@ -3,6 +3,7 @@ import email import getopt import imaplib +import math import os import socket import ssl @@ -293,6 +294,26 @@ def imap_login(): return imap +class RateLimit(object): + INITIAL_INTERVAL = 1.0 + # These constants are chosen to reach a steady state of one attempt every + # ten minutes, assuming a new failing attempt after each penalty interval. + MAX_INTERVAL = 10 * 60 + MULTIPLIER = 2.0 + DECAY = math.log(MULTIPLIER) / MAX_INTERVAL + def __init__(self): + self.time_last = time.time() + self.interval = self.INITIAL_INTERVAL + def time_to_wait(self): + now = time.time() + delta = now - self.time_last + # Discount time already served. + wait = max(self.interval - delta, 0) + self.time_last = now + self.interval = self.interval * math.exp(-self.DECAY * delta) * self.MULTIPLIER + return wait + +login_limit = RateLimit() while True: imap = imap_login() try: @@ -300,6 +321,11 @@ while True: except imaplib.IMAP4.abort, e: # Try again after a disconnection. log(u"lost server connection: %s" % str(e)) + # Don't reconnect too fast. + t = login_limit.time_to_wait() + if t > 0: + log(u"waiting %.2f seconds before logging in again" % t) + time.sleep(t) else: break

1 0

[flashproxy/master] Don't try to hide the LOGIN imaplib log.
by dcf＠torproject.org 28 Sep '12

28 Sep '12

commit cc8531b8678d7ba7981f2735382ecff80f9c326f Author: David Fifield <david(a)bamsoftware.com> Date: Thu Sep 20 10:13:55 2012 -0700 Don't try to hide the LOGIN imaplib log. The username and password are leaked anyway through other messages like this: 49:07.85 last 3 IMAP4 interactions: 49:07.56 > DIHD1 LOGIN "example(a)gmail.com" "..." To avoid these logs, just don't use the --imaplib-debug option. --- facilitator/facilitator-email-poller | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/facilitator/facilitator-email-poller b/facilitator/facilitator-email-poller index 4b94460..f849fd0 100755 --- a/facilitator/facilitator-email-poller +++ b/facilitator/facilitator-email-poller @@ -88,7 +88,7 @@ them, and forwards the registrations to the facilitator. -e, --email=ADDRESS log in as ADDRESS (default "%(email_addr)s"). -h, --help show this help. -i, --imap=HOST[:PORT] use the given IMAP server (default "%(imap_addr)s"). - --imaplib-debug show raw IMAP messages. + --imaplib-debug show raw IMAP messages (will include email password). -k, --key=KEYFILE read a facilitator private key from KEYFILE. -l, --log FILENAME write log to FILENAME (default \"%(log)s\"). -p, --pass=PASSFILE use the email password contained in PASSFILE. @@ -283,14 +283,8 @@ def imap_login(): raise ValueError("Public key does not match pin: got %s but expected %s" % (pubkey_digest.encode("hex"), PUBKEY_SHA1.encode("hex"))) - pre_debug = imap.debug - if options.safe_logging: - # Don't log the login call without --unsafe-logging because it contains a - # secret password. - imap.debug = 0 log(u"logging in as %s" % options.email_addr) imap.login(options.email_addr, email_password) - imap.debug = pre_debug return imap

1 0

[flashproxy/master] Reorganize.
by dcf＠torproject.org 28 Sep '12

28 Sep '12

commit ba80dd5eab18f2d0270066d1e6f992d7cd927f79 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Sep 20 10:22:22 2012 -0700 Reorganize. --- facilitator/facilitator-email-poller | 60 +++++++++++++++++----------------- 1 files changed, 30 insertions(+), 30 deletions(-) diff --git a/facilitator/facilitator-email-poller b/facilitator/facilitator-email-poller index f849fd0..ff3997c 100755 --- a/facilitator/facilitator-email-poller +++ b/facilitator/facilitator-email-poller @@ -77,6 +77,17 @@ class options(object): safe_logging = True imaplib_debug = False +class IMAP4_SSL_REQUIRED(imaplib.IMAP4_SSL): + """A subclass of of IMAP4_SSL that uses ssl_version=ssl.PROTOCOL_TLSv1 and + cert_reqs=ssl.CERT_REQUIRED.""" + def open(self, host = "", port = imaplib.IMAP4_SSL_PORT): + self.host = host + self.port = port + self.sock = socket.create_connection((host, port)) + self.sslobj = ssl.wrap_socket(self.sock, ssl_version=ssl.PROTOCOL_TLSv1, + cert_reqs=ssl.CERT_REQUIRED, ca_certs=self.certfile) + self.file = self.sslobj.makefile('rb') + def usage(f = sys.stdout): print >> f, """\ Usage: %(progname)s --key=KEYFILE --pass=PASSFILE @@ -190,16 +201,25 @@ try: finally: key_file.close() -class IMAP4_SSL_REQUIRED(imaplib.IMAP4_SSL): - """A subclass of of IMAP4_SSL that uses ssl_version=ssl.PROTOCOL_TLSv1 and - cert_reqs=ssl.CERT_REQUIRED.""" - def open(self, host = "", port = imaplib.IMAP4_SSL_PORT): - self.host = host - self.port = port - self.sock = socket.create_connection((host, port)) - self.sslobj = ssl.wrap_socket(self.sock, ssl_version=ssl.PROTOCOL_TLSv1, - cert_reqs=ssl.CERT_REQUIRED, ca_certs=self.certfile) - self.file = self.sslobj.makefile('rb') +if options.log_filename: + options.log_file = open(options.log_filename, "a") + # Send error tracebacks to the log. + sys.stderr = options.log_file +else: + options.log_file = sys.stdout + +if options.daemonize: + log(u"daemonizing") + pid = os.fork() + if pid != 0: + if options.pid_filename: + f = open(options.pid_filename, "w") + print >> f, pid + f.close() + sys.exit(0) + +if options.imaplib_debug: + imaplib.Debug = 4 def find_client_addr(body): """Find and parse the first client line of the form @@ -242,26 +262,6 @@ def imap_loop(imap): time.sleep(POLL_INTERVAL) -if options.log_filename: - options.log_file = open(options.log_filename, "a") - # Send error tracebacks to the log. - sys.stderr = options.log_file -else: - options.log_file = sys.stdout - -if options.daemonize: - log(u"daemonizing") - pid = os.fork() - if pid != 0: - if options.pid_filename: - f = open(options.pid_filename, "w") - print >> f, pid - f.close() - sys.exit(0) - -if options.imaplib_debug: - imaplib.Debug = 4 - def imap_login(): """Make an IMAP connection, check the certificate and public key, and log in.""" ca_certs_file = tempfile.NamedTemporaryFile(prefix="facilitator-email-poller-", suffix=".crt", delete=True)

1 0

[flashproxy/master] flashproxy-reg-email doesn't have a -f option.
by dcf＠torproject.org 28 Sep '12

28 Sep '12

commit df62b2c099fb7ab9c7b2122157ca1f9348e6d40a Author: David Fifield <david(a)bamsoftware.com> Date: Sun Sep 23 15:58:28 2012 -0700 flashproxy-reg-email doesn't have a -f option. --- flashproxy-client | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index 6b4edf3..0a830b6 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -635,8 +635,6 @@ def register(): spec = format_addr(options.remote_addr) if options.facilitator_addr is None: log(u"Registering \"%s\"." % spec) - else: - command += ["-f", format_addr(options.facilitator_addr)] command += [spec] try: p = subprocess.Popen(command)

1 0

[flashproxy/master] Merge branch 'master' into email
by dcf＠torproject.org 28 Sep '12

28 Sep '12

commit 480c5d1fb2ee8735fd657e659b41b13be564a727 Merge: df62b2c 9e0953c Author: David Fifield <david(a)bamsoftware.com> Date: Sun Sep 23 23:33:01 2012 -0700 Merge branch 'master' into email Conflicts: flashproxy-client README | 2 +- experiments/exercise/exercise.sh | 2 +- experiments/facilitator-graph.py | 2 +- facilitator/facilitator | 1 + facilitator/facilitator.cgi | 13 +-- facilitator/init.d/facilitator | 2 +- flashproxy-client | 222 +++++++++++++++++++++++++------------- flashproxy-reg-http | 32 +++--- flashproxy-test.js | 12 ++ flashproxy.js | 117 ++++++++++++--------- 10 files changed, 255 insertions(+), 150 deletions(-) diff --cc facilitator/facilitator.cgi index 2ef4cfa,a453a20..f35c9a3 --- a/facilitator/facilitator.cgi +++ b/facilitator/facilitator.cgi @@@ -17,22 -16,71 +16,20 @@@ Status: %d\ \r""" % status sys.exit() -def fac_socket(): - return socket.create_connection(FACILITATOR_ADDR, 1.0).makefile() - -def transact(f, command, *params): - transaction = fac.render_transaction(command, *params) - print >> f, transaction - f.flush() - line = f.readline() - if not (len(line) > 0 and line[-1] == '\n'): - raise ValueError("No newline at end of string returned by facilitator") - return fac.parse_transaction(line[:-1]) - -def put_reg(client_addr, registrant_addr): - f = fac_socket() - try: - command, params = transact(f, "PUT", ("CLIENT", fac.format_addr(client_addr)), ("FROM", fac.format_addr(registrant_addr))) - finally: - f.close() - if command == "OK": - pass - else: - exit_error(500) - -def get_reg(proxy_addr): - f = fac_socket() - try: - command, params = transact(f, "GET", ("FROM", fac.format_addr(proxy_addr))) - finally: - f.close() - if command == "NONE": - return { - "client": "" - } - elif command == "OK": - client_spec = fac.param_first("CLIENT", params) - relay_spec = fac.param_first("RELAY", params) - if not client_spec or not relay_spec: - exit_error(500) - try: - # Check the syntax returned by the backend. - client = fac.parse_addr_spec(client_spec) - relay = fac.parse_addr_spec(relay_spec) - except ValueError: - exit_error(500) - return { - "client": fac.format_addr(client), - "relay": fac.format_addr(relay), - } - else: - exit_error(500) - method = os.environ.get("REQUEST_METHOD") - path_info = os.environ.get("PATH_INFO") proxy_addr = (os.environ.get("REMOTE_ADDR"), None) + path_info = os.environ.get("PATH_INFO") or "/" - if not method or not path_info or not proxy_addr[0]: + if not method or not proxy_addr[0]: exit_error(400) fs = cgi.FieldStorage() def do_get(): - if path != "/": + if path_info != "/": exit_error(400) try: - reg = get_reg(proxy_addr) or "" + reg = fac.get_reg(FACILITATOR_ADDR, proxy_addr) or "" except: exit_error(500) # Allow XMLHttpRequest from any domain. http://www.w3.org/TR/cors/. diff --cc flashproxy-client index 0a830b6,692a0f0..5cc5061 --- a/flashproxy-client +++ b/flashproxy-client @@@ -631,15 -659,31 +659,29 @@@ def register_one() if not script_dir: # Maybe the script was read from stdin; in any case don't guess at the directory. return - command = [os.path.join(script_dir, "flashproxy-reg-http")] + command = [os.path.join(script_dir, "flashproxy-reg-email")] - spec = format_addr(options.remote_addr) - if options.facilitator_addr is None: - log(u"Registering \"%s\"." % spec) + spec = format_addr(options.register_addr) + log(u"Registering \"%s\"." % spec) - if options.facilitator_url is not None: - command += ["-f", options.facilitator_url] command += [spec] try: - p = subprocess.Popen(command) + p = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + stdout, stderr = p.communicate() except OSError, e: - log(u"Failed to register: %s" % str(e)) + log(u"Error running registration helper: %s" % str(e)) + return + for line in stdout.splitlines(): + log(line) + for line in stderr.splitlines(): + log(line) + if p.returncode != 0: + log("Registration helper ended with status %d." % p.returncode) + + def registration_thread_func(): + while True: + register_condvar.acquire() + register_condvar.wait() + register_condvar.release() + register_one() def proxy_chunk_local_to_remote(local, remote, data = None): if data is None:

1 0

[flashproxy/master] Change a print into a log.
by dcf＠torproject.org 28 Sep '12

28 Sep '12

commit 0329e7a7a33edc0152542355a8167c9595fd5b7f Author: David Fifield <david(a)bamsoftware.com> Date: Sun Sep 23 09:02:09 2012 -0700 Change a print into a log. --- facilitator/facilitator-email-poller | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/facilitator/facilitator-email-poller b/facilitator/facilitator-email-poller index ff3997c..7930a76 100755 --- a/facilitator/facilitator-email-poller +++ b/facilitator/facilitator-email-poller @@ -255,7 +255,7 @@ def imap_loop(imap): msg = email.message_from_string(data[0][1]) handle_message(msg) except Exception, e: - print >> sys.stderr, "Error processing message, deleting anyway:", e + log("Error processing message, deleting anyway: %s", str(e)) imap.store(1, "+FLAGS", "\\Deleted") imap.expunge()

1 0

[flashproxy/master] Add a --register-methods option.
by dcf＠torproject.org 28 Sep '12

28 Sep '12

commit 680318d01d58bb09cc8a9ec681ce475f61230ae6 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Sep 24 00:52:13 2012 -0700 Add a --register-methods option. This is a list of registration methods to try. Known methods are so far "email" and "http", corresponding to the helpers flashproxy-reg-email and flashproxy-reg-http. Each method is tried in order until one succeeds. --- flashproxy-client | 67 +++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 50 insertions(+), 17 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index 5cc5061..b4c32f5 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -32,6 +32,7 @@ except ImportError: DEFAULT_LOCAL_PORT = 9001 DEFAULT_REMOTE_PORT = 9000 +DEFAULT_REGISTER_METHODS = ["email", "http"] LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S" @@ -45,6 +46,7 @@ class options(object): log_file = sys.stdout daemonize = False register = False + register_commands = [] pid_filename = None safe_logging = True @@ -64,11 +66,11 @@ The local connection acts as a SOCKS4a proxy, but the host and port in the SOCKS request are ignored and the local connection is always linked to a remote connection. -If the --register or --register-addr option is used, then your IP address will -be sent to the facilitator so that proxies can connect to you. You need to -register in some way in order to get any service. The --facilitator option -allows controlling which facilitator is used; if omitted, it uses a public -default. +If any of the --register, --register-addr, or --register-methods options are +used, then your IP address will be sent to the facilitator so that proxies can +connect to you. You need to register in some way in order to get any service. +The --facilitator option allows controlling which facilitator is used; if +omitted, it uses a public default. --daemon daemonize (Unix only). -f, --facilitator=URL advertise willingness to receive connections to URL. @@ -78,11 +80,17 @@ default. -r, --register register with the facilitator. --register-addr=ADDR register the given address (in case it differs from REMOTE). Implies --register. + --register-methods=METHOD[,METHOD...] + register using the given comma-separated list of + methods. Implies --register. Possible methods are + email http + Default is "%(reg_methods)s". --unsafe-logging don't scrub IP addresses from logs.\ """ % { "progname": sys.argv[0], "local_port": DEFAULT_LOCAL_PORT, "remote_port": DEFAULT_REMOTE_PORT, + "reg_methods": ",".join(DEFAULT_REGISTER_METHODS), } def safe_str(s): @@ -653,28 +661,28 @@ def register(): register_condvar.notify() register_condvar.release() -def register_one(): - # sys.path[0] is initialized to the directory containing the Python script file. - script_dir = sys.path[0] - if not script_dir: - # Maybe the script was read from stdin; in any case don't guess at the directory. - return - command = [os.path.join(script_dir, "flashproxy-reg-email")] - spec = format_addr(options.register_addr) - log(u"Registering \"%s\"." % spec) - command += [spec] +def register_using_command(command): try: p = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout, stderr = p.communicate() except OSError, e: log(u"Error running registration helper: %s" % str(e)) - return + return False for line in stdout.splitlines(): log(line) for line in stderr.splitlines(): log(line) if p.returncode != 0: log("Registration helper ended with status %d." % p.returncode) + return False + return True + +def register_one(): + spec = format_addr(options.register_addr) + log(u"Registering \"%s\"." % spec) + for command in options.register_commands: + if register_using_command(command): + break def registration_thread_func(): while True: @@ -893,10 +901,27 @@ def main(): websocket_pending.pop(0) report_pending() +def build_register_command(method): + # sys.path[0] is initialized to the directory containing the Python script file. + script_dir = sys.path[0] + if not script_dir: + # Maybe the script was read from stdin; in any case don't guess at the directory. + raise ValueError("Can't find executable directory for registration helpers") + if method == "email": + return [os.path.join(script_dir, "flashproxy-reg-email")] + elif method == "http": + command = [os.path.join(script_dir, "flashproxy-reg-http")] + if options.facilitator_url is not None: + command += ["-f", options.facilitator_url] + return command + else: + raise ValueError("Unknown registration method \"%s\"" % method) + if __name__ == "__main__": register_addr_spec = None + register_methods = [] - opts, args = getopt.gnu_getopt(sys.argv[1:], "f:hl:r", ["daemon", "facilitator=", "help", "log=", "pidfile=", "register", "register-addr=", "unsafe-logging"]) + opts, args = getopt.gnu_getopt(sys.argv[1:], "f:hl:r", ["daemon", "facilitator=", "help", "log=", "pidfile=", "register", "register-addr=", "register-methods=", "unsafe-logging"]) for o, a in opts: if o == "--daemon": options.daemonize = True @@ -917,6 +942,9 @@ if __name__ == "__main__": sys.exit(1) options.register = True register_addr_spec = a + elif o == "--register-methods": + options.register = True + register_methods.extend(a.split(",")) elif o == "--unsafe-logging": options.safe_logging = False @@ -955,6 +983,11 @@ if __name__ == "__main__": options.remote_addrs.append(("::", remote_addr[1])) options.register_addr = parse_addr_spec(register_addr_spec or ":", *remote_addr) + if not register_methods: + register_methods = DEFAULT_REGISTER_METHODS + for method in register_methods: + options.register_commands.append(build_register_command(method)) + # Local sockets, accepting SOCKS requests from localhost local_listen = [] for addr in options.local_addrs:

1 0