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

[flashproxy/master] Raise an exception on non-zero exit from flashproxy-reg-url.
by dcf＠torproject.org 19 May '13

19 May '13

commit 334623e87fdbebbd967aedb25837dd90d0ddb4f5 Author: David Fifield <david(a)bamsoftware.com> Date: Sun May 19 00:45:12 2013 -0700 Raise an exception on non-zero exit from flashproxy-reg-url. --- flashproxy-reg-appspot | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flashproxy-reg-appspot b/flashproxy-reg-appspot index dd1f8ff..84af0a3 100755 --- a/flashproxy-reg-appspot +++ b/flashproxy-reg-appspot @@ -163,6 +163,8 @@ def generate_url(addr): command.append(format_addr(addr)) p = subprocess.Popen(command, stdout=subprocess.PIPE) stdout, stderr = p.communicate() + if p.returncode != 0: + raise ValueError("%s exited with status %d" % (FLASHPROXY_REG_URL, p.returncode)) return stdout.strip() # Certificate validation and pinning for urllib2. Inspired by

1 0

[flashproxy/master] Add appspot to flashproxy-client --help.
by dcf＠torproject.org 19 May '13

19 May '13

commit 7edbdf6c681edad4473c2a4d63a7a043e5bd85f4 Author: David Fifield <david(a)bamsoftware.com> Date: Sun May 19 00:50:39 2013 -0700 Add appspot to flashproxy-client --help. --- flashproxy-client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flashproxy-client b/flashproxy-client index 69405d0..863c74f 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -110,7 +110,7 @@ omitted, it uses a public default. --register-methods=METHOD[,METHOD...] register using the given comma-separated list of methods. Implies --register. Possible methods are - email http + appspot email http Default is "%(reg_methods)s". --unsafe-logging don't scrub IP addresses from logs.\ """ % {

1 0

[flashproxy/master] Install flashproxy-reg-appspot.
by dcf＠torproject.org 19 May '13

19 May '13

commit 1e66d3bb09c569cf0c584449be07c0622cd2e3aa Author: David Fifield <david(a)bamsoftware.com> Date: Sun May 19 01:02:18 2013 -0700 Install flashproxy-reg-appspot. --- Makefile | 4 ++-- doc/Makefile | 4 ++-- setup.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 73b9b5a..79ac5a4 100644 --- a/Makefile +++ b/Makefile @@ -7,8 +7,8 @@ MANDIR = $(PREFIX)/share/man PYTHON = python export PY2EXE_TMPDIR = py2exe-tmp -CLIENT_BIN = flashproxy-client flashproxy-reg-email flashproxy-reg-http flashproxy-reg-url -CLIENT_MAN = doc/flashproxy-client.1 doc/flashproxy-reg-email.1 doc/flashproxy-reg-http.1 doc/flashproxy-reg-url.1 +CLIENT_BIN = flashproxy-client flashproxy-reg-appspot flashproxy-reg-email flashproxy-reg-http flashproxy-reg-url +CLIENT_MAN = doc/flashproxy-client.1 doc/flashproxy-reg-appspot.1 doc/flashproxy-reg-email.1 doc/flashproxy-reg-http.1 doc/flashproxy-reg-url.1 CLIENT_DIST_FILES = $(CLIENT_BIN) README LICENSE ChangeLog torrc CLIENT_DIST_DOC_FILES = $(CLIENT_MAN) doc/LICENSE.PYTHON diff --git a/doc/Makefile b/doc/Makefile index e0ae409..516130d 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -92,7 +92,7 @@ $(PT_BUNDLE_MACOSX_I686): mkdir -p "$(WORKDIR)" unzip "$(BUNDLE_MACOSX_I686)" -d "$(WORKDIR)" - cp "$(FLASHPROXY_DIST)"/{flashproxy-client,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} "$(TBBDIR)"/Contents/MacOS + cp "$(FLASHPROXY_DIST)"/{flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} "$(TBBDIR)"/Contents/MacOS cp -r "$(MACOSX_BUNDLE_ROOT)"/usr/lib/python2.7/site-packages/M2Crypto "$(TBBDIR)"/Contents/MacOS mkdir -p "$(TBBDIR)"/Contents/Resources/Docs/FlashProxy cp "$(FLASHPROXY_DIST)"/{doc/*,README,LICENSE,ChangeLog} "$(TBBDIR)"/Contents/Resources/Docs/FlashProxy @@ -118,7 +118,7 @@ $(PT_BUNDLE_GNULINUX_I686) $(PT_BUNDLE_GNULINUX_X86_64): mkdir -p "$(WORKDIR)" tar zxf "$(BUNDLE_GNULINUX)" -C "$(WORKDIR)" - cp "$(FLASHPROXY_DIST)"/{flashproxy-client,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} "$(TBBDIR)"/App + cp "$(FLASHPROXY_DIST)"/{flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} "$(TBBDIR)"/App cp -rL /usr/lib/pymodules/python2.6/M2Crypto "$(TBBDIR)"/App mkdir -p "$(TBBDIR)"/Docs/FlashProxy cp "$(FLASHPROXY_DIST)"/{doc/*,README,LICENSE,ChangeLog} "$(TBBDIR)"/Docs/FlashProxy diff --git a/setup.py b/setup.py index 29da95f..89ef178 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ build_path = os.path.join(os.environ["PY2EXE_TMPDIR"], "build") dist_path = os.path.join(os.environ["PY2EXE_TMPDIR"], "dist") setup( - console=["flashproxy-client", "flashproxy-reg-email", "flashproxy-reg-http", "flashproxy-reg-url"], + console=["flashproxy-client", "flashproxy-reg-appspot", "flashproxy-reg-email", "flashproxy-reg-http", "flashproxy-reg-url"], zipfile="py2exe-flashproxy.zip", options={ "build": { "build_base": build_path },

1 0

[flashproxy/master] Reflow usage table.
by dcf＠torproject.org 19 May '13

19 May '13

commit ad6f53846740e22f8914443ff0e7c021afce8bf3 Author: David Fifield <david(a)bamsoftware.com> Date: Sun May 19 01:07:44 2013 -0700 Reflow usage table. --- flashproxy-reg-appspot | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/flashproxy-reg-appspot b/flashproxy-reg-appspot index 84af0a3..5d40c41 100755 --- a/flashproxy-reg-appspot +++ b/flashproxy-reg-appspot @@ -74,12 +74,12 @@ Register with a flash proxy facilitator through a Google App Engine app. By default the remote address registered is "%(remote_addr)s" (the external IP address is guessed). - -4 name lookups use only IPv4. - -6 name lookups use only IPv6. + -4 name lookups use only IPv4. + -6 name lookups use only IPv6. --facilitator-pubkey=FILENAME - encrypt registrations to the given PEM-formatted - public key (default built-in). - -h, --help show this help.\ + encrypt registrations to the given PEM-formatted + public key (default built-in). + -h, --help show this help.\ """ % { "progname": sys.argv[0], "remote_addr": format_addr((DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT)),

1 0

[flashproxy/master] Add basic man page for flashproxy-reg-appspot.
by dcf＠torproject.org 19 May '13

19 May '13

commit 04af9f01727bed246defb9197046a557d0b12317 Author: David Fifield <david(a)bamsoftware.com> Date: Sun May 19 01:02:00 2013 -0700 Add basic man page for flashproxy-reg-appspot. --- Makefile | 2 +- doc/flashproxy-reg-appspot.1 | 56 ++++++++++++++++++++++++++++++++++++++ doc/flashproxy-reg-appspot.1.txt | 39 ++++++++++++++++++++++++++ 3 files changed, 96 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c11bec3..73b9b5a 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ all: $(CLIENT_DIST_FILES) $(CLIENT_MAN) %.1: %.1.txt rm -f $@ - a2x --no-xmllint --xsltproc-opts "--stringparam man.th.title.max.length 23" -d manpage -f manpage $< + a2x --no-xmllint --xsltproc-opts "--stringparam man.th.title.max.length 24" -d manpage -f manpage $< install: mkdir -p $(BINDIR) diff --git a/doc/flashproxy-reg-appspot.1 b/doc/flashproxy-reg-appspot.1 new file mode 100644 index 0000000..2f6bfda --- /dev/null +++ b/doc/flashproxy-reg-appspot.1 @@ -0,0 +1,56 @@ +'\" t +.\" Title: flashproxy-reg-appspot +.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] +.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> +.\" Date: 05/19/2013 +.\" Manual: \ \& +.\" Source: \ \& +.\" Language: English +.\" +.TH "FLASHPROXY\-REG\-APPSPOT" "1" "05/19/2013" "\ \&" "\ \&" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +flashproxy-reg-appspot \- Register with a facilitator through Google App Engine\&. +.SH "SYNOPSIS" +.sp +\fBflashproxy\-reg\-appspot\fR [\fIOPTIONS\fR] [\fIREMOTE\fR][:\fIPORT\fR] +.SH "DESCRIPTION" +.sp +Register with a flash proxy facilitator through a Google App Engine app\&. By default the remote address registered is ":9000" (the external IP address is guessed)\&. +.SH "OPTIONS" +.PP +\fB\-\-facilitator\-pubkey\fR=\fIFILENAME\fR +.RS 4 +Encrypt registrations to the given PEM\-formatted public key (default built\-in)\&. +.RE +.PP +\fB\-h\fR, \fB\-\-help\fR +.RS 4 +Display help message and exit\&. +.RE +.SH "SEE ALSO" +.sp +\fBhttp://crypto\&.stanford\&.edu/flashproxy/\fR +.sp +\fBhttps://www\&.torproject\&.org/docs/pluggable\-transports\&.html\&.en\fR +.SH "BUGS" +.sp +Please report using \fBhttps://trac\&.torproject\&.org/projects/tor\fR\&. diff --git a/doc/flashproxy-reg-appspot.1.txt b/doc/flashproxy-reg-appspot.1.txt new file mode 100644 index 0000000..de9f020 --- /dev/null +++ b/doc/flashproxy-reg-appspot.1.txt @@ -0,0 +1,39 @@ +// This file is asciidoc source code. +// To generate manpages, use the a2x command. +// This one has a long name, if you don't change the +// default length parameter it will be truncated, use: +// a2x --no-xmllint --xsltproc-opts "--stringparam man.th.title.max.length 24" -d manpage -f manpage flashproxy-reg-appspot.1.txt +FLASHPROXY-REG-APPSPOT(1) +========================= + +NAME +---- +flashproxy-reg-appspot - Register with a facilitator through Google App Engine. + +SYNOPSIS +-------- +**flashproxy-reg-appspot** [__OPTIONS__] [__REMOTE__][:__PORT__] + +DESCRIPTION +----------- +Register with a flash proxy facilitator through a Google App Engine app. +By default the remote address registered is ":9000" (the +external IP address is guessed). + +OPTIONS +------- +**--facilitator-pubkey**=__FILENAME__:: + Encrypt registrations to the given PEM-formatted public key (default built-in). + +**-h**, **--help**:: + Display help message and exit. + +SEE ALSO +-------- +**http://crypto.stanford.edu/flashproxy/** + +**https://www.torproject.org/docs/pluggable-transports.html.en** + +BUGS +---- +Please report using **https://trac.torproject.org/projects/tor**.

1 0

[flashproxy/master] Error checking on get external IP.
by dcf＠torproject.org 19 May '13

19 May '13

commit 450a1ec36fdca4285cd46422d9ea1fc1d2a9ce16 Author: David Fifield <david(a)bamsoftware.com> Date: Sun May 19 01:11:13 2013 -0700 Error checking on get external IP. --- flashproxy-reg-appspot | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/flashproxy-reg-appspot b/flashproxy-reg-appspot index 5d40c41..b861867 100755 --- a/flashproxy-reg-appspot +++ b/flashproxy-reg-appspot @@ -252,10 +252,21 @@ if options.address_family != socket.AF_UNSPEC: socket.getaddrinfo = getaddrinfo_replacement if not remote_addr[0]: - spec = get_external_ip() - remote_addr = parse_addr_spec(spec, *remote_addr) - if not remote_addr[0]: - print >> sys.stderr, "Could not guess external IP address." + try: + ip = get_external_ip() + except urllib2.HTTPError, e: + print >> sys.stderr, "Status code was %d, not 200" % e.code + sys.exit(1) + except urllib2.URLError, e: + print >> sys.stderr, "Failed to get external IP address: %s" % str(e.reason) + sys.exit(1) + except Exception, e: + print >> sys.stderr, "Failed to get external IP address: %s" % str(e) + sys.exit(1) + try: + remote_addr = parse_addr_spec(ip, *remote_addr) + except ValueError, e: + print >> sys.stderr, "Error parsing external IP address %s: %s" % (repr(ip), str(e)) sys.exit(1) try:

1 0

[flashproxy/master] Explain the trick in flashproxy-reg-appspot man page.
by dcf＠torproject.org 19 May '13

19 May '13

commit 2d28390fb7f858d080eff6b8c5a5acf3dddfe0f7 Author: David Fifield <david(a)bamsoftware.com> Date: Sun May 19 01:20:40 2013 -0700 Explain the trick in flashproxy-reg-appspot man page. --- doc/flashproxy-reg-appspot.1 | 6 +++++- doc/flashproxy-reg-appspot.1.txt | 10 +++++++++- doc/flashproxy-reg-email.1 | 4 ++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/doc/flashproxy-reg-appspot.1 b/doc/flashproxy-reg-appspot.1 index 2f6bfda..63c6b02 100644 --- a/doc/flashproxy-reg-appspot.1 +++ b/doc/flashproxy-reg-appspot.1 @@ -34,7 +34,11 @@ flashproxy-reg-appspot \- Register with a facilitator through Google App Engine\ \fBflashproxy\-reg\-appspot\fR [\fIOPTIONS\fR] [\fIREMOTE\fR][:\fIPORT\fR] .SH "DESCRIPTION" .sp -Register with a flash proxy facilitator through a Google App Engine app\&. By default the remote address registered is ":9000" (the external IP address is guessed)\&. +Register with a flash proxy facilitator through a Google App Engine app\&. By default the remote address registered is ":9000" (the external IP address is guessed)\&. It requires https://www\&.google\&.com/ not to be blocked\&. +.sp +This program uses a trick to talk to App Engine, even though appspot\&.com may be blocked\&. The IP address and Server Name Indication of the request are for www\&.google\&.com, but the Host header inside the request is for an appspot\&.com subdomain\&. +.sp +Requires the \fBflashproxy\-reg\-url\fR program\&. .SH "OPTIONS" .PP \fB\-\-facilitator\-pubkey\fR=\fIFILENAME\fR diff --git a/doc/flashproxy-reg-appspot.1.txt b/doc/flashproxy-reg-appspot.1.txt index de9f020..6370be0 100644 --- a/doc/flashproxy-reg-appspot.1.txt +++ b/doc/flashproxy-reg-appspot.1.txt @@ -18,7 +18,15 @@ DESCRIPTION ----------- Register with a flash proxy facilitator through a Google App Engine app. By default the remote address registered is ":9000" (the -external IP address is guessed). +external IP address is guessed). It requires https://www.google.com/ not +to be blocked. + +This program uses a trick to talk to App Engine, even though appspot.com +may be blocked. The IP address and Server Name Indication of the request +are for www.google.com, but the Host header inside the request is for an +appspot.com subdomain. + +Requires the **flashproxy-reg-url** program. OPTIONS ------- diff --git a/doc/flashproxy-reg-email.1 b/doc/flashproxy-reg-email.1 index 79cc296..13ec7f2 100644 --- a/doc/flashproxy-reg-email.1 +++ b/doc/flashproxy-reg-email.1 @@ -2,12 +2,12 @@ .\" Title: flashproxy-reg-email .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 04/30/2013 +.\" Date: 05/19/2013 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "FLASHPROXY\-REG\-EMAIL" "1" "04/30/2013" "\ \&" "\ \&" +.TH "FLASHPROXY\-REG\-EMAIL" "1" "05/19/2013" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" -----------------------------------------------------------------

1 0

[flashproxy/master] Return string from excepted get_external_ip.
by dcf＠torproject.org 19 May '13

19 May '13

commit 183932a2995c9feaadb634cf50192ab877d97637 Author: Arlo Breault <arlolra(a)gmail.com> Date: Sun May 12 12:24:39 2013 -0700 Return string from excepted get_external_ip. --- flashproxy-reg-appspot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flashproxy-reg-appspot b/flashproxy-reg-appspot index 69f96c3..5415ac1 100755 --- a/flashproxy-reg-appspot +++ b/flashproxy-reg-appspot @@ -36,7 +36,7 @@ def get_external_ip(): try: f = urllib2.urlopen(req) except: - return None + return "" ip = f.read() f.close() return ip

1 0

[flashproxy/master] Prototype registration over App Engine
by dcf＠torproject.org 19 May '13

19 May '13

commit f6b09fc8418364f71d624cc1da3fa88a37b04ee1 Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu May 9 20:00:07 2013 -0700 Prototype registration over App Engine See #8860 for details. --- flashproxy-client | 4 +- flashproxy-reg-appspot | 144 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 146 insertions(+), 2 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index f2f2e26..7fc36fa 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -963,8 +963,8 @@ def build_register_command(method): af = ["-4"] elif options.address_family == socket.AF_INET6: af = ["-6"] - if method == "email": - command = [os.path.join(script_dir, "flashproxy-reg-email")] + af + if method in ["email", "appspot"]: + command = [os.path.join(script_dir, "flashproxy-reg-" + method)] + af if options.facilitator_pubkey_filename is not None: command += ["--facilitator-pubkey", options.facilitator_pubkey_filename] return command diff --git a/flashproxy-reg-appspot b/flashproxy-reg-appspot new file mode 100755 index 0000000..9b9b4c3 --- /dev/null +++ b/flashproxy-reg-appspot @@ -0,0 +1,144 @@ +#!/usr/bin/env python + +import base64 +import getopt +import re +import socket +import sys +import urlparse +import urllib2 + +from M2Crypto import RSA, BIO + +DEFAULT_REMOTE_PORT = 9000 +DEFAULT_FACILITATOR_URL = "https://fp-facilitator.org/" +DEFAULT_FACILITATOR_PUBKEY_PEM = """\ +-----BEGIN PUBLIC KEY----- +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA44Mt8c599/4N2fgu6ppN +oatPW1GOgZxxObljFtEy0OWM1eHB35OOn+Kn9MxNHTRxVWwCEi0HYxWNVs2qrXxV +84LmWBz6A65d2qBlgltgLXusiXLrpwxVmJeO+GfmbF8ur0U9JSYxA20cGW/kujNg +XYDGQxO1Gvxq2lHK2LQmBpkfKEE1DMFASmIvlHDQgDj3XBb5lYeOsHZmg16UrGAq +1UH238hgJITPGLXBtwLtJkYbrATJvrEcmvI7QSm57SgYGpaB5ZdCbJL5bag5Pgt6 +M5SDDYYY4xxEPzokjFJfCQv+kcyAnzERNMQ9kR41ePTXG62bpngK5iWGeJ5XdkxG +gwIDAQAB +-----END PUBLIC KEY----- +""" + +def get_facilitator_pubkey(): + if options.facilitator_pubkey_filename is not None: + return RSA.load_pub_key(options.facilitator_pubkey_filename) + else: + return RSA.load_pub_key_bio(BIO.MemoryBuffer(DEFAULT_FACILITATOR_PUBKEY_PEM)) + +def get_external_ip(): + try: + f = urllib2.urlopen("https://agentgatech.appspot.com/") + except: + return None + ip = f.read() + f.close() + return ip + +class options(object): + facilitator_url = None + facilitator_pubkey_filename = None + +def usage(f = sys.stdout): + print >> f, """\ +Usage: %(progname)s REMOTE[:PORT] +Print a URL, which, when retrieved, will cause the client address +REMOTE[:PORT] to be registered with the flash proxy facilitator. The +default PORT is %(port)d. + + -f, --facilitator=URL register with the given facilitator + (by default "%(fac_url)s"). + --facilitator-pubkey=FILENAME + encrypt registrations to the given PEM-formatted + public key (default built-in). + -h, --help show this help.\ +""" % { + "progname": sys.argv[0], + "fac_url": DEFAULT_FACILITATOR_URL, + "port": DEFAULT_REMOTE_PORT, +} + +def parse_addr_spec(spec, defhost = None, defport = None): + host = None + port = None + af = 0 + m = None + # IPv6 syntax. + if not m: + m = re.match(ur'^\[(.+)\]:(\d*)$', spec) + if m: + host, port = m.groups() + af = socket.AF_INET6 + if not m: + m = re.match(ur'^\[(.+)\]$', spec) + if m: + host, = m.groups() + af = socket.AF_INET6 + # IPv4/hostname/port-only syntax. + if not m: + try: + host, port = spec.split(":", 1) + except ValueError: + host = spec + if re.match(ur'^[\d.]+$', host): + af = socket.AF_INET + else: + af = 0 + host = host or defhost + port = port or defport + if port is not None: + port = int(port) + return host, port + +def format_addr(addr): + host, port = addr + if not host: + return u":%d" % port + # Numeric IPv6 address? + try: + addrs = socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM, socket.IPPROTO_TCP, socket.AI_NUMERICHOST) + af = addrs[0][0] + except socket.gaierror, e: + af = 0 + if af == socket.AF_INET6: + result = u"[%s]" % host + else: + result = "%s" % host + if port is not None: + result += u":%d" % port + return result + +options.facilitator_url = DEFAULT_FACILITATOR_URL + +opt, args = getopt.gnu_getopt(sys.argv[1:], "f:h", ["facilitator=", "facilitator-pubkey=", "help"]) +for o, a in opt: + if o == "-f" or o == "--facilitator": + options.facilitator_url = a + elif o == "--facilitator-pubkey": + options.facilitator_pubkey_filename = a + elif o == "-h" or o == "--help": + usage() + sys.exit() + +if len(args) != 1: + usage(f=sys.stderr) + sys.exit(1) + +remote_addr = parse_addr_spec(args[0], defport=DEFAULT_REMOTE_PORT) +if remote_addr[0] is None: + remote_addr = parse_addr_spec(get_external_ip(), defport=remote_addr[1]) +if remote_addr[0] is None: + print >> sys.stderr, "Could not determine external ip address." + sys.exit(1) + +reg_plain = (u"client=%s" % format_addr(remote_addr)).encode("utf-8") +rsa = get_facilitator_pubkey() +reg_crypt = rsa.public_encrypt(reg_plain, RSA.pkcs1_oaep_padding) +reg = base64.urlsafe_b64encode(reg_crypt) + +url = urlparse.urljoin(options.facilitator_url, "reg/" + reg) +urllib2.urlopen("https://g-proxy.appspot.com/" + urllib2.quote(url))

1 0

[flashproxy/master] Use URL.Path
by dcf＠torproject.org 19 May '13

19 May '13

commit 4d3ec36e3b50d830cadc447269dca6d4d6a8bf08 Author: Arlo Breault <arlolra(a)gmail.com> Date: Sat May 18 21:22:04 2013 -0700 Use URL.Path --- appspot/fp.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appspot/fp.go b/appspot/fp.go index ee569a2..1218681 100644 --- a/appspot/fp.go +++ b/appspot/fp.go @@ -16,7 +16,7 @@ func ipHandler(w http.ResponseWriter, r *http.Request) { func regHandler(w http.ResponseWriter, r *http.Request) { c := appengine.NewContext(r) - blob := r.URL.String()[5:] + blob := r.URL.Path[5:] client := urlfetch.Client(c) _, err := client.Get(BASE + blob) if err != nil {

1 0