tor-commits October 2013

tor-commits@lists.torproject.org

17 participants
1284 discussions

[flashproxy/master] Credit George for --transport.
by dcf＠torproject.org 10 Oct '13

10 Oct '13

commit 919d69499dc9e4d86eb477b9f44186f2f8a2d350 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Oct 10 12:45:27 2013 -0700 Credit George for --transport. --- ChangeLog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9b498a6..29db7e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,7 +8,8 @@ o New --transport options in the client programs allow you to inform the facilitator that you want to receive connections of a certain kind. Transports other than the default "websocket" are - experimental. + experimental. Patch by George Kadianakis and David Fifield. Part of + bug 9349. Changes in version 1.3 o Added a new observed Google public key pin.

1 0

[flashproxy/master] ChangeLog for transport list in polling requests.
by dcf＠torproject.org 10 Oct '13

10 Oct '13

commit bd92abdb0e5a58c08281df74edf5f1631f3fc96c Author: David Fifield <david(a)bamsoftware.com> Date: Thu Oct 10 12:47:27 2013 -0700 ChangeLog for transport list in polling requests. --- ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index 29db7e2..ff115cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,11 @@ experimental. Patch by George Kadianakis and David Fifield. Part of bug 9349. + o Proxies now send a list of transport protocols they support + (currently only "websocket"). This will allow the facilitator to + assign proxies to clients that use matching transports. Patch by + George Kadianakis. Part of bug 9349. + Changes in version 1.3 o Added a new observed Google public key pin.

1 0

[check/master] Introduce some design changes.
by arlo＠torproject.org 10 Oct '13

10 Oct '13

commit ec6b0a4fafc489ef930bd311db9b170447a20f21 Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Oct 3 11:58:47 2013 -0700 Introduce some design changes. Mainly, adding the available languages to a header. --- handlers.go | 20 +++----------------- public/base.html | 35 +++++++++++++++++++++++++++++++---- public/bulk.html | 8 +++++--- public/index.html | 36 ++++++++++++++++++++++++++---------- utils.go | 11 +++++++++++ 5 files changed, 76 insertions(+), 34 deletions(-) diff --git a/handlers.go b/handlers.go index 3a91087..57e82f8 100644 --- a/handlers.go +++ b/handlers.go @@ -19,12 +19,11 @@ var Locales = GetLocaleList() type Page struct { IsTor bool UpToDate bool - NotSmall bool + Small bool Fingerprint string OnOff string Lang string IP string - Extra string Locales map[string]string } @@ -72,28 +71,15 @@ func RootHandler(Layout *template.Template, Exits *Exits, domain *gettext.Domain onOff = "off" } - small := Small(r) - upToDate := UpToDate(r) - - // querystring params - extra := "" - if small { - extra += "&small=1" - } - if !upToDate { - extra += "&uptodate=0" - } - // instance of your page model p := Page{ isTor, - isTor && !upToDate, - !small, + UpToDate(r), + Small(r), fingerprint, onOff, Lang(r), host, - extra, Locales, } diff --git a/public/base.html b/public/base.html index c3e3427..9b1c668 100644 --- a/public/base.html +++ b/public/base.html @@ -6,10 +6,12 @@ <title>{{ template "title" . }}</title> <link rel="icon" type="image/x-icon" href="/torcheck/favicon.ico" /> <style> + html { height: 100%; } body { - text-align: center; - font-family: Helvetica, sans-serif; - margin: 2em 4em; + height: 100%; + text-align: center; + font-family: Helvetica, sans-serif; + margin: 0; } a { text-decoration: none; } a:hover { text-decoration: underline; } @@ -42,9 +44,34 @@ display: inline; margin-right: 0.4em; } + .content { + padding: 4em; + } + .foot { + padding: 2em 4em; + } + .head { + background-color: #85559f; + padding: 0.8em 0; + color: #fff; + } + .project { + margin: 0; + font-size: 0.8em; + } + .project a { color: #fff; } </style> </head> <body> - {{ template "body" . }} + <div class="head"> + {{ template "head" . }} + </div> + <div class="content"> + {{ template "body" . }} + </div> + <div class="foot"> + {{ template "foot" . }} + <p class="project">The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy. <a href="https://www.torproject.org/about/overview.html.en">Learn More »</a></p> + </div> </body> </html> \ No newline at end of file diff --git a/public/bulk.html b/public/bulk.html index d190d9e..4d3e793 100644 --- a/public/bulk.html +++ b/public/bulk.html @@ -1,9 +1,10 @@ {{ template "base.html" . }} {{ define "lang" }}en{{ end }} {{ define "title" }}Bulk Tor Exit Exporter{{ end }} +{{ define "head" }}{{ end }} {{ define "body" }} - <p><img src="/torcheck/img/tor-on.png" class="onion" /></p> - <p>Welcome to the Tor Bulk Exit List exporting tool.</p> + <img src="/torcheck/img/tor-on.png" class="onion" /> + <h4>Welcome to the Tor Bulk Exit List exporting tool.</h4> <p>If you are a service provider and you wish to build a list of possible Tor nodes that might contact one of your servers, enter that single server address below. Giving you the whole list means you can query the list privately, rather than telling us your users' IP addresses. This list allows you to have a nearly real time authoritative source for Tor exits that allow contacting your server on port 80. We don't log the IP address that queries for a given list. If you'd like, you're free to run your own copy of this program. It's Free Software and can be downloaded from the <a href="https://gitweb.torproject.org/check.git">git repository</a>.</p> <form action="/cgi-bin/TorBulkExitList.py" name="ip"> @@ -20,4 +21,5 @@ </div> </form> -{{ end }} \ No newline at end of file +{{ end }} +{{ define "foot" }}{{ end }} \ No newline at end of file diff --git a/public/index.html b/public/index.html index 652f7ae..2c6adbe 100644 --- a/public/index.html +++ b/public/index.html @@ -1,9 +1,24 @@ {{ template "base.html" . }} {{ define "lang" }}{{ .Lang }}{{ end }} {{ define "title" }}{{ GetText .Lang "Are you using Tor?" }}{{ end }} +{{ define "head" }} +<form action="/" method="get" id="lang"> + {{ if .Small }}<input type="hidden" name="small" value="1" />{{ end }} + {{ if And .IsTor (Not .UpToDate) }}<input type="hidden" name="uptodate" value="0" />{{ end }} + <label for="lang" class="small">{{ GetText .Lang "This page is also available in the following languages:" }}</label> + <select name="lang" onchange="onChange()"> + {{ $out := . }} + <option value="en_US"> + {{ range $k, $i := .Locales }} + <option value="{{ $k }}" {{ if Equal $k $out.Lang }}selected="selected"{{ end }}>{{ $i | UnEscaped }}</option> + {{ end }} + </select> + <input type="submit" value="Go" /> +</form> +{{ end }} {{ define "body" }} - {{ if .NotSmall }} - <p><img src="/torcheck/img/tor-{{ .OnOff }}.png" class="onion" /></p> + {{ if Not .Small }} + <img src="/torcheck/img/tor-{{ .OnOff }}.png" class="onion" /> {{ end }} <h1 class="{{ .OnOff }}"> {{ if .IsTor }} @@ -13,7 +28,7 @@ {{ end }} </h1> <p>{{ GetText .Lang "Your IP address appears to be: " }} <strong>{{ .IP }}</strong></p> - {{ if .UpToDate }} + {{ if And .IsTor (Not .UpToDate) }} <p class="security"> {{ GetText .Lang "There is a security update available for the Tor Browser Bundle." }}<br /> {{ GetText .Lang "<a href=\"https://www.torproject.org/download/download-easy.html\">Click here to go to the download page</a>" | UnEscaped }} @@ -27,11 +42,12 @@ {{ GetText .Lang "If you are attempting to use a Tor client, please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for configuring your Tor client</a>." | UnEscaped }} {{ end }} </p> - <p class="small">{{ GetText .Lang "This page is also available in the following languages:" }}</p> - <ul class="small"> - {{ $out := . }} - {{ range $k, $i := .Locales }} - <li><a href="/?lang={{ $k }}{{ $out.Extra | UnEscapedURL }}">{{ $i | UnEscaped }}</a></li> - {{ end }} - </ul> +{{ end }} +{{ define "foot" }} +<script> + function onChange() { + var form = document.getElementById("lang"); + form.submit(); + } +</script> {{ end }} \ No newline at end of file diff --git a/utils.go b/utils.go index 9d2667b..ef7be1d 100644 --- a/utils.go +++ b/utils.go @@ -59,6 +59,15 @@ func FuncMap(domain *gettext.Domain) template.FuncMap { "GetText": func(lang string, text string) string { return domain.GetText(lang, text) }, + "Equal": func(one string, two string) bool { + return one == two + }, + "Not": func(b bool) bool { + return !b + }, + "And": func(a bool, b bool) bool { + return a && b + }, } } @@ -164,6 +173,8 @@ func GetInstalledLocales(webLocales map[string]locale, nameTranslations map[stri } locales := make(map[string]string, len(localFiles)) + locales["en_US"] = "English" + for _, f := range localFiles { // TODO: Ensure a language has 100% of the template file // Currently this is what should be on the torcheck_completed

1 0

[flashproxy/master] Factor -4, -6, and --unsafe-logging into "common" options.
by dcf＠torproject.org 10 Oct '13

10 Oct '13

commit 309f9b6e55e1000186c7affd48cf02ef8465931a Author: David Fifield <david(a)bamsoftware.com> Date: Thu Oct 10 12:08:21 2013 -0700 Factor -4, -6, and --unsafe-logging into "common" options. --- flashproxy-client | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index c4216e3..bd314aa 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -1005,35 +1005,32 @@ def build_register_command(method): 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") - af = [] - if options.address_family == socket.AF_INET: - af = ["-4"] - elif options.address_family == socket.AF_INET6: - af = ["-6"] + # "common" is options shared by every registration helper. common = [] + if options.address_family == socket.AF_INET: + common += ["-4"] + elif options.address_family == socket.AF_INET6: + common += ["-6"] if options.transport is not None: common += ["--transport", options.transport] + if not options.safe_logging: + common += ["--unsafe-logging"] + if method == "appspot": - command = [os.path.join(script_dir, "flashproxy-reg-appspot")] + af + common + command = [os.path.join(script_dir, "flashproxy-reg-appspot")] + common if options.facilitator_pubkey_filename is not None: command += ["--facilitator-pubkey", options.facilitator_pubkey_filename] - if not options.safe_logging: - command += ["--unsafe-logging"] return command elif method == "email": - command = [os.path.join(script_dir, "flashproxy-reg-email")] + af + common + command = [os.path.join(script_dir, "flashproxy-reg-email")] + common if options.facilitator_pubkey_filename is not None: command += ["--facilitator-pubkey", options.facilitator_pubkey_filename] - if not options.safe_logging: - command += ["--unsafe-logging"] return command elif method == "http": - command = [os.path.join(script_dir, "flashproxy-reg-http")] + af + common + command = [os.path.join(script_dir, "flashproxy-reg-http")] + common if options.facilitator_url is not None: command += ["-f", options.facilitator_url] - if not options.safe_logging: - command += ["--unsafe-logging"] return command else: raise ValueError("Unknown registration method \"%s\"" % method)

1 0

[flashproxy/master] ChangeLog for --transport.
by dcf＠torproject.org 10 Oct '13

10 Oct '13

commit 78f547c2a1fbff47d85da3fb810e2cdf7a7068a6 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Oct 10 12:15:56 2013 -0700 ChangeLog for --transport. --- ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index a3c7b66..9b498a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,11 @@ o Added a new observed Google public key pin for flashproxy-reg-email. + o New --transport options in the client programs allow you to inform + the facilitator that you want to receive connections of a certain + kind. Transports other than the default "websocket" are + experimental. + Changes in version 1.3 o Added a new observed Google public key pin.

1 0

[flashproxy/master] Break getopt long options into separate lines.
by dcf＠torproject.org 10 Oct '13

10 Oct '13

commit 2c2b956d99dfbcebc3f5288ead093e6335907940 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Oct 10 12:14:03 2013 -0700 Break getopt long options into separate lines. --- facilitator/facilitator | 12 ++++++++++-- facilitator/facilitator-email-poller | 15 +++++++++++++-- facilitator/facilitator-reg | 5 ++++- flashproxy-client | 18 +++++++++++++++++- flashproxy-reg-appspot | 8 +++++++- flashproxy-reg-email | 11 ++++++++++- flashproxy-reg-http | 7 ++++++- flashproxy-reg-url | 7 ++++++- 8 files changed, 73 insertions(+), 10 deletions(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index 080c2f5..7bb3819 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -327,8 +327,16 @@ def put_reg(reg): return REGS.add(reg) def main(): - opts, args = getopt.gnu_getopt(sys.argv[1:], "dhl:p:r:", - ["debug", "help", "log=", "port=", "pidfile=", "privdrop-user=", "relay=", "unsafe-logging"]) + opts, args = getopt.gnu_getopt(sys.argv[1:], "dhl:p:r:", [ + "debug", + "help", + "log=", + "port=", + "pidfile=", + "privdrop-user=", + "relay=", + "unsafe-logging", + ]) for o, a in opts: if o == "-d" or o == "--debug": options.daemonize = False diff --git a/facilitator/facilitator-email-poller b/facilitator/facilitator-email-poller index 6691afc..3504c51 100755 --- a/facilitator/facilitator-email-poller +++ b/facilitator/facilitator-email-poller @@ -163,8 +163,19 @@ def log(msg): options.email_addr = DEFAULT_EMAIL_ADDRESS options.imap_addr = (DEFAULT_IMAP_HOST, DEFAULT_IMAP_PORT) -opts, args = getopt.gnu_getopt(sys.argv[1:], "de:hi:l:p:", - ["debug", "disable-pin", "email=", "help", "imap=", "imaplib-debug", "log=", "pass=", "pidfile=", "privdrop-user=", "unsafe-logging"]) +opts, args = getopt.gnu_getopt(sys.argv[1:], "de:hi:l:p:", [ + "debug", + "disable-pin", + "email=", + "help", + "imap=", + "imaplib-debug", + "log=", + "pass=", + "pidfile=", + "privdrop-user=", + "unsafe-logging", +]) for o, a in opts: if o == "-d" or o == "--debug": options.daemonize = False diff --git a/facilitator/facilitator-reg b/facilitator/facilitator-reg index f3d2dc9..67f8bb1 100755 --- a/facilitator/facilitator-reg +++ b/facilitator/facilitator-reg @@ -25,7 +25,10 @@ registration was successful, 1 otherwise. } def main(): - opts, args = getopt.gnu_getopt(sys.argv[1:], "hp:", ["help", "port="]) + opts, args = getopt.gnu_getopt(sys.argv[1:], "hp:", [ + "help", + "port=", + ]) for o, a in opts: if o == "-h" or o == "--help": usage() diff --git a/flashproxy-client b/flashproxy-client index bd314aa..5bf3f70 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -1110,7 +1110,23 @@ def main(): register_addr_spec = None register_methods = [] - opts, args = getopt.gnu_getopt(sys.argv[1:], "46f:hl:r", ["daemon", "external", "facilitator=", "facilitator-pubkey=", "help", "log=", "pidfile=", "register", "register-addr=", "register-methods=", "port-forwarding", "port-forwarding-helper=", "port-forwarding-external=", "transport=", "unsafe-logging"]) + opts, args = getopt.gnu_getopt(sys.argv[1:], "46f:hl:r", [ + "daemon", + "external", + "facilitator=", + "facilitator-pubkey=", + "help", + "log=", + "pidfile=", + "register", + "register-addr=", + "register-methods=", + "port-forwarding", + "port-forwarding-helper=", + "port-forwarding-external=", + "transport=", + "unsafe-logging", + ]) for o, a in opts: if o == "-4": options.address_family = socket.AF_INET diff --git a/flashproxy-reg-appspot b/flashproxy-reg-appspot index dc8a5aa..0f51e4f 100755 --- a/flashproxy-reg-appspot +++ b/flashproxy-reg-appspot @@ -272,7 +272,13 @@ def get_external_ip(): finally: f.close() -opt, args = getopt.gnu_getopt(sys.argv[1:], "46h", ["disable-pin", "facilitator-pubkey=", "help", "transport=", "unsafe-logging"]) +opt, args = getopt.gnu_getopt(sys.argv[1:], "46h", [ + "disable-pin", + "facilitator-pubkey=", + "help", + "transport=", + "unsafe-logging", +]) for o, a in opt: if o == "-4": options.address_family = socket.AF_INET diff --git a/flashproxy-reg-email b/flashproxy-reg-email index 95edfbf..4b99de8 100755 --- a/flashproxy-reg-email +++ b/flashproxy-reg-email @@ -221,7 +221,16 @@ def get_facilitator_pubkey(): options.email_addr = DEFAULT_EMAIL_ADDRESS options.smtp_addr = (DEFAULT_SMTP_HOST, DEFAULT_SMTP_PORT) -opts, args = getopt.gnu_getopt(sys.argv[1:], "46de:hs:", ["debug", "disable-pin", "email=", "facilitator-pubkey=", "help", "smtp=", "transport=", "unsafe-logging"]) +opts, args = getopt.gnu_getopt(sys.argv[1:], "46de:hs:", [ + "debug", + "disable-pin", + "email=", + "facilitator-pubkey=", + "help", + "smtp=", + "transport=", + "unsafe-logging", +]) for o, a in opts: if o == "-4": options.address_family = socket.AF_INET diff --git a/flashproxy-reg-http b/flashproxy-reg-http index 100edd9..8aa9397 100755 --- a/flashproxy-reg-http +++ b/flashproxy-reg-http @@ -111,7 +111,12 @@ def build_reg(addr, transport): options.facilitator_url = DEFAULT_FACILITATOR_URL options.remote_addr = (DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT) -opts, args = getopt.gnu_getopt(sys.argv[1:], "46f:h", ["facilitator=", "help", "transport=", "unsafe-logging"]) +opts, args = getopt.gnu_getopt(sys.argv[1:], "46f:h", [ + "facilitator=", + "help", + "transport=", + "unsafe-logging", +]) for o, a in opts: if o == "-4": options.address_family = socket.AF_INET diff --git a/flashproxy-reg-url b/flashproxy-reg-url index c8ebd44..26675a0 100755 --- a/flashproxy-reg-url +++ b/flashproxy-reg-url @@ -121,7 +121,12 @@ def get_facilitator_pubkey(): options.facilitator_url = DEFAULT_FACILITATOR_URL -opt, args = getopt.gnu_getopt(sys.argv[1:], "f:h", ["facilitator=", "facilitator-pubkey=", "help", "transport="]) +opt, args = getopt.gnu_getopt(sys.argv[1:], "f:h", [ + "facilitator=", + "facilitator-pubkey=", + "help", + "transport=", +]) for o, a in opt: if o == "-f" or o == "--facilitator": options.facilitator_url = a

1 0

[flashproxy/master] Tolerate other URL parameters in client regisration lines.
by dcf＠torproject.org 10 Oct '13

10 Oct '13

commit 3e80ad4f244841beb53f23d70f13bd925c9bc48d Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 9 23:06:00 2013 -0700 Tolerate other URL parameters in client regisration lines. --- facilitator/facilitator-reg-daemon | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/facilitator/facilitator-reg-daemon b/facilitator/facilitator-reg-daemon index 2cb2904..ed9eb7e 100755 --- a/facilitator/facilitator-reg-daemon +++ b/facilitator/facilitator-reg-daemon @@ -7,6 +7,7 @@ import socket import sys import threading import time +import urlparse import fac @@ -81,9 +82,14 @@ def find_client_addr(body): client=... Returns None if no client line was found.""" for line in body.splitlines(): - if line.startswith("client="): - _, client_spec = line.split("=", 1) - return fac.parse_addr_spec(client_spec) + try: + qs = urlparse.parse_qs(line, keep_blank_values=True, strict_parsing=True) + except ValueError: + continue + client_specs = qs["client"] + if len(client_specs) != 1: + continue + return fac.parse_addr_spec(client_specs[0]) return None class Handler(SocketServer.StreamRequestHandler):

1 0

[flashproxy/master] Add --transport option to reg programs.
by dcf＠torproject.org 10 Oct '13

10 Oct '13

commit bef75a430ad9f1aeb1a6be6fe4cd7f780be38e03 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 9 22:50:33 2013 -0700 Add --transport option to reg programs. --- flashproxy-reg-appspot | 9 ++++++++- flashproxy-reg-email | 7 ++++++- flashproxy-reg-http | 7 ++++++- flashproxy-reg-url | 9 +++++++-- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/flashproxy-reg-appspot b/flashproxy-reg-appspot index 163ec24..dc8a5aa 100755 --- a/flashproxy-reg-appspot +++ b/flashproxy-reg-appspot @@ -93,10 +93,13 @@ external IP address is guessed). encrypt registrations to the given PEM-formatted public key (default built-in). -h, --help show this help. + --transport=TRANSPORT register using the given transport + (default "%(transport)s"). --unsafe-logging don't scrub IP addresses from logs.\ """ % { "progname": sys.argv[0], "remote_addr": format_addr((DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT)), + "transport": DEFAULT_TRANSPORT, } def safe_str(s): @@ -182,6 +185,8 @@ def generate_url(addr): raise ValueError("Can't find executable directory for registration helpers") command = [os.path.join(script_dir, FLASHPROXY_REG_URL)] command += ["-f", urlparse.urlunparse(("https", FRONT_DOMAIN, "/", "", "", ""))] + if options.transport is not None: + command += ["--transport", options.transport] if options.facilitator_pubkey_filename is not None: command += ["--facilitator-pubkey", options.facilitator_pubkey_filename] command.append(format_addr(addr)) @@ -267,7 +272,7 @@ def get_external_ip(): finally: f.close() -opt, args = getopt.gnu_getopt(sys.argv[1:], "46h", ["disable-pin", "facilitator-pubkey=", "help", "unsafe-logging"]) +opt, args = getopt.gnu_getopt(sys.argv[1:], "46h", ["disable-pin", "facilitator-pubkey=", "help", "transport=", "unsafe-logging"]) for o, a in opt: if o == "-4": options.address_family = socket.AF_INET @@ -280,6 +285,8 @@ for o, a in opt: elif o == "-h" or o == "--help": usage() sys.exit() + elif o == "--transport": + options.transport = a elif o == "--unsafe-logging": options.safe_logging = False diff --git a/flashproxy-reg-email b/flashproxy-reg-email index add5e97..95edfbf 100755 --- a/flashproxy-reg-email +++ b/flashproxy-reg-email @@ -122,12 +122,15 @@ This program requires the M2Crypto library for Python. -h, --help show this help. -s, --smtp=HOST[:PORT] use the given SMTP server (default "%(smtp_addr)s"). + --transport=TRANSPORT register using the given transport + (default "%(transport)s"). --unsafe-logging don't scrub IP addresses from logs.\ """ % { "progname": sys.argv[0], "remote_addr": format_addr((DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT)), "email_addr": DEFAULT_EMAIL_ADDRESS, "smtp_addr": format_addr((DEFAULT_SMTP_HOST, DEFAULT_SMTP_PORT)), + "transport": DEFAULT_TRANSPORT, } def safe_str(s): @@ -218,7 +221,7 @@ def get_facilitator_pubkey(): options.email_addr = DEFAULT_EMAIL_ADDRESS options.smtp_addr = (DEFAULT_SMTP_HOST, DEFAULT_SMTP_PORT) -opts, args = getopt.gnu_getopt(sys.argv[1:], "46de:hs:", ["debug", "disable-pin", "email=", "facilitator-pubkey=", "help", "smtp=", "unsafe-logging"]) +opts, args = getopt.gnu_getopt(sys.argv[1:], "46de:hs:", ["debug", "disable-pin", "email=", "facilitator-pubkey=", "help", "smtp=", "transport=", "unsafe-logging"]) for o, a in opts: if o == "-4": options.address_family = socket.AF_INET @@ -237,6 +240,8 @@ for o, a in opts: sys.exit() elif o == "-s" or o == "--smtp": options.smtp_addr = parse_addr_spec(a, DEFAULT_SMTP_HOST, DEFAULT_SMTP_PORT) + elif o == "--transport": + options.transport = a elif o == "--unsafe-logging": options.safe_logging = False diff --git a/flashproxy-reg-http b/flashproxy-reg-http index 4c776c3..100edd9 100755 --- a/flashproxy-reg-http +++ b/flashproxy-reg-http @@ -32,11 +32,14 @@ remote address registered is "%(remote_addr)s". -f, --facilitator=URL register with the given facilitator (default "%(fac_url)s"). -h, --help show this help. + --transport=TRANSPORT register using the given transport + (default "%(transport)s"). --unsafe-logging don't scrub IP addresses from logs.\ """ % { "progname": sys.argv[0], "fac_url": DEFAULT_FACILITATOR_URL, "remote_addr": format_addr((DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT)), + "transport": DEFAULT_TRANSPORT, } def safe_str(s): @@ -108,7 +111,7 @@ def build_reg(addr, transport): options.facilitator_url = DEFAULT_FACILITATOR_URL options.remote_addr = (DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT) -opts, args = getopt.gnu_getopt(sys.argv[1:], "46f:h", ["facilitator=", "help", "unsafe-logging"]) +opts, args = getopt.gnu_getopt(sys.argv[1:], "46f:h", ["facilitator=", "help", "transport=", "unsafe-logging"]) for o, a in opts: if o == "-4": options.address_family = socket.AF_INET @@ -119,6 +122,8 @@ for o, a in opts: elif o == "-h" or o == "--help": usage() sys.exit() + elif o == "--transport": + options.transport = a elif o == "--unsafe-logging": options.safe_logging = False diff --git a/flashproxy-reg-url b/flashproxy-reg-url index e947650..c8ebd44 100755 --- a/flashproxy-reg-url +++ b/flashproxy-reg-url @@ -47,11 +47,14 @@ default PORT is %(port)d. --facilitator-pubkey=FILENAME encrypt registrations to the given PEM-formatted public key (default built-in). - -h, --help show this help.\ + -h, --help show this help. + --transport=TRANSPORT register using the given transport + (default "%(transport)s").\ """ % { "progname": sys.argv[0], "fac_url": DEFAULT_FACILITATOR_URL, "port": DEFAULT_REMOTE_PORT, + "transport": DEFAULT_TRANSPORT, } def parse_addr_spec(spec, defhost = None, defport = None): @@ -118,7 +121,7 @@ def get_facilitator_pubkey(): options.facilitator_url = DEFAULT_FACILITATOR_URL -opt, args = getopt.gnu_getopt(sys.argv[1:], "f:h", ["facilitator=", "facilitator-pubkey=", "help"]) +opt, args = getopt.gnu_getopt(sys.argv[1:], "f:h", ["facilitator=", "facilitator-pubkey=", "help", "transport="]) for o, a in opt: if o == "-f" or o == "--facilitator": options.facilitator_url = a @@ -127,6 +130,8 @@ for o, a in opt: elif o == "-h" or o == "--help": usage() sys.exit() + elif o == "--transport": + options.transport = a if len(args) != 1: usage(sys.stderr)

1 0

[flashproxy/master] Send client-transport=websocket in registrations.
by dcf＠torproject.org 10 Oct '13

10 Oct '13

commit 5750c751df97b4226ee5820b150cd032686a5b75 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 9 22:38:09 2013 -0700 Send client-transport=websocket in registrations. --- flashproxy-client | 2 ++ flashproxy-reg-appspot | 2 ++ flashproxy-reg-email | 11 ++++++++++- flashproxy-reg-http | 12 ++++++++++-- flashproxy-reg-url | 11 ++++++++++- 5 files changed, 34 insertions(+), 4 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index 127bfa9..a36f209 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -38,6 +38,7 @@ DEFAULT_LOCAL_PORT_EXTERNAL = 9001 DEFAULT_REMOTE_PORT = 9000 DEFAULT_REGISTER_METHODS = ["appspot", "email", "http"] DEFAULT_PORT_FORWARDING_HELPER = "tor-fw-helper" +DEFAULT_TRANSPORT = "websocket" # We will re-register if we have fewer than this many waiting proxies. The # facilitator may choose to ignore our requests. @@ -68,6 +69,7 @@ class options(object): port_forwarding_external = None register = False register_commands = [] + transport = DEFAULT_TRANSPORT safe_logging = True def usage(f = sys.stdout): diff --git a/flashproxy-reg-appspot b/flashproxy-reg-appspot index 139cd1e..163ec24 100755 --- a/flashproxy-reg-appspot +++ b/flashproxy-reg-appspot @@ -24,6 +24,7 @@ except ImportError: DEFAULT_REMOTE_ADDRESS = None DEFAULT_REMOTE_PORT = 9000 +DEFAULT_TRANSPORT = "websocket" # The domain to which requests appear to go. FRONT_DOMAIN = "www.google.com" @@ -75,6 +76,7 @@ class options(object): address_family = socket.AF_UNSPEC use_certificate_pin = True facilitator_pubkey_filename = None + transport = DEFAULT_TRANSPORT safe_logging = True def usage(f = sys.stdout): diff --git a/flashproxy-reg-email b/flashproxy-reg-email index 3fdaf90..add5e97 100755 --- a/flashproxy-reg-email +++ b/flashproxy-reg-email @@ -9,6 +9,7 @@ import socket import ssl import sys import tempfile +import urllib from hashlib import sha1 @@ -24,6 +25,7 @@ DEFAULT_EMAIL_ADDRESS = "flashproxyreg.a(a)gmail.com" # dig MX gmail.com DEFAULT_SMTP_HOST = "gmail-smtp-in.l.google.com" DEFAULT_SMTP_PORT = 25 +DEFAULT_TRANSPORT = "websocket" # Use this to prevent Python smtplib from guessing and leaking our hostname. EHLO_FQDN = "[127.0.0.1]" @@ -93,6 +95,7 @@ class options(object): email_addr = None facilitator_pubkey_filename = None smtp_addr = None + transport = DEFAULT_TRANSPORT safe_logging = True def usage(f = sys.stdout): @@ -187,6 +190,12 @@ def format_addr(addr): def safe_format_addr(addr): return safe_str(format_addr(addr)) +def build_reg(addr, transport): + return urllib.urlencode(( + ("client", format_addr(addr)), + ("client-transport", transport), + )) + def get_state_dir(): """Get a directory where we can put temporary files. Returns None if any suitable temporary directory will do.""" @@ -320,7 +329,7 @@ try: spec = "[" + spec + "]" options.remote_addr = parse_addr_spec(spec, *options.remote_addr) - body_plain = (u"client=%s" % format_addr(options.remote_addr)).encode("utf-8") + body_plain = build_reg(options.remote_addr, options.transport) rsa = get_facilitator_pubkey() body_crypt = rsa.public_encrypt(body_plain, RSA.pkcs1_oaep_padding) body = body_crypt.encode("base64") diff --git a/flashproxy-reg-http b/flashproxy-reg-http index 2c2f274..4c776c3 100755 --- a/flashproxy-reg-http +++ b/flashproxy-reg-http @@ -11,12 +11,14 @@ import urllib2 DEFAULT_REMOTE_ADDRESS = "" DEFAULT_REMOTE_PORT = 9000 DEFAULT_FACILITATOR_URL = "https://fp-facilitator.org/" +DEFAULT_TRANSPORT = "websocket" class options(object): remote_addr = None address_family = socket.AF_UNSPEC facilitator_url = None + transport = DEFAULT_TRANSPORT safe_logging = True def usage(f = sys.stdout): @@ -97,6 +99,12 @@ def format_addr(addr): def safe_format_addr(addr): return safe_str(format_addr(addr)) +def build_reg(addr, transport): + return urllib.urlencode(( + ("client", format_addr(addr)), + ("client-transport", transport), + )) + options.facilitator_url = DEFAULT_FACILITATOR_URL options.remote_addr = (DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT) @@ -128,9 +136,9 @@ if options.address_family != socket.AF_UNSPEC: return getaddrinfo(host, port, options.address_family, *args, **kwargs) socket.getaddrinfo = getaddrinfo_replacement -spec = format_addr(options.remote_addr) +body = build_reg(options.remote_addr, options.transport) try: - http = urllib2.urlopen(options.facilitator_url, urllib.urlencode({"client": spec}), 10) + http = urllib2.urlopen(options.facilitator_url, body, 10) except urllib2.HTTPError, e: print >> sys.stderr, "Status code was %d, not 200" % e.code sys.exit(1) diff --git a/flashproxy-reg-url b/flashproxy-reg-url index 8fdd2f1..e947650 100755 --- a/flashproxy-reg-url +++ b/flashproxy-reg-url @@ -5,6 +5,7 @@ import getopt import re import socket import sys +import urllib import urlparse try: @@ -16,6 +17,7 @@ except ImportError: DEFAULT_REMOTE_ADDRESS = None DEFAULT_REMOTE_PORT = 9000 DEFAULT_FACILITATOR_URL = "https://fp-facilitator.org/" +DEFAULT_TRANSPORT = "websocket" DEFAULT_FACILITATOR_PUBKEY_PEM = """\ -----BEGIN PUBLIC KEY----- MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA44Mt8c599/4N2fgu6ppN @@ -31,6 +33,7 @@ gwIDAQAB class options(object): facilitator_url = None facilitator_pubkey_filename = None + transport = DEFAULT_TRANSPORT def usage(f = sys.stdout): print >> f, """\ @@ -101,6 +104,12 @@ def format_addr(addr): result += u":%d" % port return result +def build_reg(addr, transport): + return urllib.urlencode(( + ("client", format_addr(addr)), + ("client-transport", transport), + )) + def get_facilitator_pubkey(): if options.facilitator_pubkey_filename is not None: return RSA.load_pub_key(options.facilitator_pubkey_filename) @@ -139,7 +148,7 @@ On Debian-like systems, use the command "apt-get install python-m2crypto".\ """ sys.exit(1) -reg_plain = (u"client=%s" % format_addr(remote_addr)).encode("utf-8") +reg_plain = build_reg(remote_addr, options.transport) rsa = get_facilitator_pubkey() reg_crypt = rsa.public_encrypt(reg_plain, RSA.pkcs1_oaep_padding) reg = base64.urlsafe_b64encode(reg_crypt)

1 0

[flashproxy/master] Add --transport to flashproxy-client.
by dcf＠torproject.org 10 Oct '13

10 Oct '13

commit 677c8b85b0ab98ae26f6f630e72c36441a641de5 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 9 22:56:39 2013 -0700 Add --transport to flashproxy-client. Also pass it to registration helpers. --- flashproxy-client | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index a36f209..c4216e3 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -124,6 +124,8 @@ omitted, it uses a public default. methods. Implies --register. Possible methods are appspot email http Default is "%(reg_methods)s". + --transport=TRANSPORT register using the given transport + (default "%(transport)s"). --unsafe-logging don't scrub IP addresses from logs.\ """ % { "progname": sys.argv[0], @@ -131,6 +133,7 @@ omitted, it uses a public default. "remote_port": DEFAULT_REMOTE_PORT, "reg_methods": ",".join(DEFAULT_REGISTER_METHODS), "port_forwarding_helper": DEFAULT_PORT_FORWARDING_HELPER, + "transport": DEFAULT_TRANSPORT, } def safe_str(s): @@ -1007,22 +1010,26 @@ def build_register_command(method): af = ["-4"] elif options.address_family == socket.AF_INET6: af = ["-6"] + # "common" is options shared by every registration helper. + common = [] + if options.transport is not None: + common += ["--transport", options.transport] if method == "appspot": - command = [os.path.join(script_dir, "flashproxy-reg-appspot")] + af + command = [os.path.join(script_dir, "flashproxy-reg-appspot")] + af + common if options.facilitator_pubkey_filename is not None: command += ["--facilitator-pubkey", options.facilitator_pubkey_filename] if not options.safe_logging: command += ["--unsafe-logging"] return command elif method == "email": - command = [os.path.join(script_dir, "flashproxy-reg-email")] + af + command = [os.path.join(script_dir, "flashproxy-reg-email")] + af + common if options.facilitator_pubkey_filename is not None: command += ["--facilitator-pubkey", options.facilitator_pubkey_filename] if not options.safe_logging: command += ["--unsafe-logging"] return command elif method == "http": - command = [os.path.join(script_dir, "flashproxy-reg-http")] + af + command = [os.path.join(script_dir, "flashproxy-reg-http")] + af + common if options.facilitator_url is not None: command += ["-f", options.facilitator_url] if not options.safe_logging: @@ -1106,7 +1113,7 @@ def main(): register_addr_spec = None register_methods = [] - opts, args = getopt.gnu_getopt(sys.argv[1:], "46f:hl:r", ["daemon", "external", "facilitator=", "facilitator-pubkey=", "help", "log=", "pidfile=", "register", "register-addr=", "register-methods=", "port-forwarding", "port-forwarding-helper=", "port-forwarding-external=", "unsafe-logging"]) + opts, args = getopt.gnu_getopt(sys.argv[1:], "46f:hl:r", ["daemon", "external", "facilitator=", "facilitator-pubkey=", "help", "log=", "pidfile=", "register", "register-addr=", "register-methods=", "port-forwarding", "port-forwarding-helper=", "port-forwarding-external=", "transport=", "unsafe-logging"]) for o, a in opts: if o == "-4": options.address_family = socket.AF_INET @@ -1146,6 +1153,8 @@ def main(): elif o == "--port-forwarding-external": options.port_forwarding = True options.port_forwarding_external = int(a) + elif o == "--transport": + options.transport = a elif o == "--unsafe-logging": options.safe_logging = False

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits October 2013