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

[onionoo/master] Stop highlighting old news.
by karsten＠torproject.org 23 Sep '12

23 Sep '12

commit 5908eb3dc8bfae23edf65c4a9d0d95af9fa31c4a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Sep 23 14:27:23 2012 -0400 Stop highlighting old news. --- web/index.html | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/web/index.html b/web/index.html index bedfa8c..70e019f 100755 --- a/web/index.html +++ b/web/index.html @@ -186,22 +186,19 @@ was successful yet.</li> <li>"last_restarted": UTC timestamp (YYYY-MM-DD hh:mm:ss) when the relay was last (re-)started. Optional field.</li> -<li>"bandwidth_rate": Average bandwidth +<li>"bandwidth_rate": Average bandwidth in bytes per second that this relay is willing to sustain over long periods. -Required field. -Added field on August 1, 2012.</li> -<li>"bandwidth_burst": Bandwidth in bytes +Required field.</li> +<li>"bandwidth_burst": Bandwidth in bytes per second that this relay is willing to sustain in very short intervals. -Required field. -Added field on August 1, 2012.</li> -<li>"observed_bandwidth": Bandwidth +Required field.</li> +<li>"observed_bandwidth": Bandwidth estimate in bytes per second of the capacity this relay can handle. The relay remembers the maximum bandwidth sustained output over any ten second period in the past day, and another sustained input. The "observed_bandwidth" value is the lesser of these two numbers. -Required field. -Added field on August 1, 2012.</li> +Required field.</li> <li>"advertised_bandwidth": Bandwidth in bytes per second that this relay is willing and capable to provide. Optional field. @@ -211,14 +208,13 @@ found.</li> Optional field. Missing if router descriptor containing this information cannot be found.</li> -<li>"exit_policy_summary": Summary +<li>"exit_policy_summary": Summary version of the relay's exit policy containing a dictionary with either an "accept" or a "reject" element. If there is an "accept" ("reject") element, the relay accepts (rejects) all TCP ports or port ranges in the given list for most IP addresses and rejects (accepts) all other ports. -Optional field. -Added field on August 1, 2012.</li> +Optional field.</li> <li>"contact": Contact address of the relay operator. Omitted if empty or if descriptor containing this information cannot be found.</li>

1 0

[flashproxy/master] Listen on both IPv4 and IPv6 by default in flashproxy-client.
by dcf＠torproject.org 23 Sep '12

23 Sep '12

commit 54c3d895d51562adc3e5b54f44daf8a070fba439 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Sep 23 11:19:23 2012 -0700 Listen on both IPv4 and IPv6 by default in flashproxy-client. If no host is given for the local address, listen on 127.0.0.1 and ::1. If no host is given for the remote address, listen on 0.0.0.0 and ::. This adds the ability to listen on more than one local or remote socket, though this is not exposed in the command-line interface except in this special case. --- README | 2 +- flashproxy-client | 85 +++++++++++++++++++++++++++++++++++------------------ 2 files changed, 57 insertions(+), 30 deletions(-) diff --git a/README b/README index f5654cf..af19893 100644 --- a/README +++ b/README @@ -19,7 +19,7 @@ transport plugin" below to try out the system even behind NAT. 9000. If you have to use a different port (to get through a firewall, for example), give it on the command lines like this (here using port 8888): - $ flashproxy-client --register 127.0.0.1:9001 :8888 + $ flashproxy-client --register :9001 :8888 2. Run Tor using the included torrc file. $ tor -f torrc diff --git a/flashproxy-client b/flashproxy-client index 16c95ec..cf0c0b7 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -29,16 +29,15 @@ try: except ImportError: numpy = None -DEFAULT_REMOTE_ADDRESS = None -DEFAULT_REMOTE_PORT = 9000 -DEFAULT_LOCAL_ADDRESS = "127.0.0.1" DEFAULT_LOCAL_PORT = 9001 +DEFAULT_REMOTE_PORT = 9000 LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S" class options(object): - local_addr = None - remote_addr = None + local_addrs = [] + remote_addrs = [] + register_addr = None facilitator_url = None log_filename = None @@ -57,7 +56,8 @@ def usage(f = sys.stdout): Usage: %(progname)s --register [LOCAL][:PORT] [REMOTE][:PORT] Wait for connections on a local and a remote port. When any pair of connections exists, data is ferried between them until one side is closed. By default -LOCAL is "%(local)s" and REMOTE is "%(remote)s". +LOCAL is localhost addresses on port %(local_port)d and REMOTE is all addresses +on port %(remote_port)d. 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 @@ -76,8 +76,8 @@ facilitator is used; if omitted, it uses a public default. --unsafe-logging don't scrub IP addresses from logs.\ """ % { "progname": sys.argv[0], - "local": format_addr((DEFAULT_LOCAL_ADDRESS, DEFAULT_LOCAL_PORT)), - "remote": format_addr((DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT)), + "local_port": DEFAULT_LOCAL_PORT, + "remote_port": DEFAULT_REMOTE_PORT, } def safe_str(s): @@ -433,10 +433,16 @@ class WebSocketBinaryEncoder(object): def listen_socket(addr): """Return a nonblocking socket listening on the given address.""" - addr = (addr[0] or "0.0.0.0", addr[1]) addrinfo = socket.getaddrinfo(addr[0], addr[1], 0, socket.SOCK_STREAM, socket.IPPROTO_TCP)[0] s = socket.socket(addrinfo[0], addrinfo[1], addrinfo[2]) s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) + if addrinfo[0] == socket.AF_INET6 and socket.has_ipv6: + # Set the IPV6_V6ONLY socket option, otherwise some operating systems + # will listen on an IPv4 address as well as IPv6 by default. For + # example, "::" will listen on both "::" and "0.0.0.0", and "::1" will + # listen on both "::1" and "127.0.0.1". See + # https://trac.torproject.org/projects/tor/ticket/4760. + s.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_V6ONLY, 1) s.bind(addr) s.listen(10) s.setblocking(0) @@ -639,7 +645,7 @@ def register(): # 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")] - spec = format_addr(options.remote_addr) + spec = format_addr(options.register_addr) if options.facilitator_url is None: log(u"Registering \"%s\"." % spec) else: @@ -792,14 +798,14 @@ class LocalSocket(object): def main(): while True: - rset = [remote_s, local_s] + websocket_pending + socks_pending + locals + remotes + rset = remote_listen + local_listen + websocket_pending + socks_pending + locals + remotes rset, _, _ = select.select(rset, [], [], WEBSOCKET_REQUEST_TIMEOUT) for fd in rset: - if fd == remote_s: + if fd in remote_listen: remote_c, addr = fd.accept() log(u"Remote connection from %s." % safe_format_sockaddr(addr)) websocket_pending.append(TimeoutSocket(remote_c)) - elif fd == local_s: + elif fd in local_listen: local_c, addr = fd.accept() log(u"Local connection from %s." % safe_format_sockaddr(addr)) socks_pending.append(local_c) @@ -879,30 +885,51 @@ if __name__ == "__main__": elif o == "--unsafe-logging": options.safe_logging = False + 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 len(args) == 0: - options.local_addr = (DEFAULT_LOCAL_ADDRESS, DEFAULT_LOCAL_PORT) - options.remote_addr = (DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT) + local_addr = (None, DEFAULT_LOCAL_PORT) + remote_addr = (None, DEFAULT_REMOTE_PORT) elif len(args) == 1: - options.local_addr = parse_addr_spec(args[0], DEFAULT_LOCAL_ADDRESS, DEFAULT_LOCAL_PORT) - options.remote_addr = (DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT) + local_addr = parse_addr_spec(args[0], defport=DEFAULT_LOCAL_PORT) + remote_addr = (None, DEFAULT_REMOTE_PORT) elif len(args) == 2: - options.local_addr = parse_addr_spec(args[0], DEFAULT_LOCAL_ADDRESS, DEFAULT_LOCAL_PORT) - options.remote_addr = parse_addr_spec(args[1], DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT) + local_addr = parse_addr_spec(args[0], defport=DEFAULT_LOCAL_PORT) + remote_addr = parse_addr_spec(args[1], defport=DEFAULT_REMOTE_PORT) else: usage(sys.stderr) sys.exit(1) - if options.log_filename: - options.log_file = open(options.log_filename, "a") - # Send error tracebacks to the log. - sys.stderr = options.log_file + # Listen on both IPv4 and IPv6 if no host is given. + if local_addr[0]: + options.local_addrs.append(local_addr) else: - options.log_file = sys.stdout - - # Local socket, accepting SOCKS requests from localhost - local_s = listen_socket(options.local_addr) - # Remote socket, accepting remote WebSocket connections from proxies. - remote_s = listen_socket(options.remote_addr) + options.local_addrs.append(("127.0.0.1", local_addr[1])) + if socket.has_ipv6: + options.local_addrs.append(("::1", local_addr[1])) + if remote_addr[0]: + options.remote_addrs.append(remote_addr) + else: + options.remote_addrs.append(("0.0.0.0", remote_addr[1])) + if socket.has_ipv6: + options.remote_addrs.append(("::", remote_addr[1])) + options.register_addr = remote_addr + + # Local sockets, accepting SOCKS requests from localhost + local_listen = [] + for addr in options.local_addrs: + local_listen.append(listen_socket(addr)) + log(u"Listening local on %s." % format_addr(addr)) + # Remote sockets, accepting remote WebSocket connections from proxies. + remote_listen = [] + for addr in options.remote_addrs: + remote_listen.append(listen_socket(addr)) + log(u"Listening remote on %s." % format_addr(addr)) # New remote sockets waiting to finish their WebSocket negotiation. websocket_pending = []

1 0

[flashproxy/master] Add tests for IPv6 syntax in JavaScript parse_addr_spec.
by dcf＠torproject.org 23 Sep '12

23 Sep '12

commit d8e022718bf1b8493a701ed90bb238ea006e40af Author: David Fifield <david(a)bamsoftware.com> Date: Sun Sep 23 10:24:14 2012 -0700 Add tests for IPv6 syntax in JavaScript parse_addr_spec. --- flashproxy-test.js | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/flashproxy-test.js b/flashproxy-test.js index 3db15e0..2dc185a 100755 --- a/flashproxy-test.js +++ b/flashproxy-test.js @@ -174,6 +174,18 @@ function test_parse_addr_spec() expected: null }, { spec: "3.3.3.3:65536", expected: null }, + { spec: "[1:2::a:f]:4444", + expected: { host: "1:2::a:f", port: 4444 } }, + { spec: "[1:2::a:f]", + expected: null }, + { spec: "[1:2::a:f]:0x1111", + expected: null }, + { spec: "[1:2::a:f]:-4444", + expected: null }, + { spec: "[1:2::a:f]:65536", + expected: null }, + { spec: "[1:2::ffff:1.2.3.4]:4444", + expected: { host: "1:2::ffff:1.2.3.4", port: 4444 } }, ]; announce("test_parse_addr_spec");

1 0

[flashproxy/master] Remove some useless getpeername calls.
by dcf＠torproject.org 23 Sep '12

23 Sep '12

commit 70978593e4f96c77017a707aa513583199b00200 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Sep 23 10:18:47 2012 -0700 Remove some useless getpeername calls. --- flashproxy-client | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index a7e4b50..16c95ec 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -738,8 +738,6 @@ def match_proxies(): while unlinked_remotes and unlinked_locals: remote = unlinked_remotes.pop(0) local = unlinked_locals.pop(0) - remote_addr, remote_port = remote.getpeername() - local_addr, local_port = local.getpeername() log(u"Linking %s and %s." % (safe_format_peername(local), safe_format_peername(remote))) remote.partner = local local.partner = remote

1 0

[flashproxy/master] Understand IPv6 syntax in flashproxy.js.
by dcf＠torproject.org 23 Sep '12

23 Sep '12

commit 4cb229204fff9fb646860dcfc932ed440a7b6d88 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Sep 23 09:51:37 2012 -0700 Understand IPv6 syntax in flashproxy.js. --- flashproxy.js | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index e9fbb37..a2e8863 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -291,14 +291,19 @@ function get_query_param_byte_count(query, param, default_val) { /* Parse an address in the form "host:port". Returns an Object with keys "host" (String) and "port" (int). Returns null on error. */ function parse_addr_spec(spec) { - var groups; - var host, port; - - groups = spec.match(/^([^:]+):(\d+)$/); - if (!groups) + var m, host, port; + + m = null; + /* IPv6 syntax. */ + if (!m) + m = spec.match(/^\[([\0-9a-fA-F:.]+)\]:([0-9]+)$/); + /* IPv4 syntax. */ + if (!m) + m = spec.match(/^([0-9.]+):([0-9]+)$/); + if (!m) return null; - host = groups[1]; - port = parseInt(groups[2], 10); + host = m[1]; + port = parseInt(m[2], 10); if (isNaN(port) || port < 0 || port > 65535) return null;

1 0

[flashproxy/master] Add a format_sockaddr for Python sockaddr tuples.
by dcf＠torproject.org 23 Sep '12

23 Sep '12

commit 1d6c8b543e311cd3b219693723df5b0f5b411023 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Sep 23 10:09:08 2012 -0700 Add a format_sockaddr for Python sockaddr tuples. As opposed to our own internal (host, port) tuples. They are the same in IPv4, but Python IPv6 sockaddr tuples contain an additional two elements: flowinfo and scopeid. --- flashproxy-client | 48 ++++++++++++++++++++++++++++-------------------- 1 files changed, 28 insertions(+), 20 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index 226be6d..293c26c 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -144,6 +144,20 @@ def format_addr(addr): def safe_format_addr(addr): return safe_str(format_addr(addr)) +def format_sockaddr(sockaddr): + host, port = socket.getnameinfo(sockaddr, socket.NI_NUMERICHOST | socket.NI_NUMERICSERV) + port = int(port) + return format_addr((host, port)) + +def safe_format_sockaddr(sockaddr): + return safe_str(format_sockaddr(sockaddr)) + +def safe_format_peername(s): + try: + return safe_format_sockaddr(s.getpeername()) + except socket.error, e: + return "<unconnected>" + def apply_mask_numpy(payload, mask_key): if len(payload) == 0: @@ -428,12 +442,6 @@ def listen_socket(addr): s.setblocking(0) return s -def format_peername(s): - try: - return safe_format_addr(s.getpeername()) - except socket.error, e: - return "<unconnected>" - # How long to wait for a WebSocket request on the remote socket. It is limited # to avoid Slowloris-like attacks. WEBSOCKET_REQUEST_TIMEOUT = 2.0 @@ -618,8 +626,8 @@ def handle_socks_request(fd): return True def report_pending(): - log(u"locals (%d): %s" % (len(locals), [format_peername(x) for x in locals])) - log(u"remotes (%d): %s" % (len(remotes), [format_peername(x) for x in remotes])) + log(u"locals (%d): %s" % (len(locals), [safe_format_peername(x) for x in locals])) + log(u"remotes (%d): %s" % (len(remotes), [safe_format_peername(x) for x in remotes])) def register(): if not options.register: @@ -651,7 +659,7 @@ def proxy_chunk_local_to_remote(local, remote, data = None): remote.close() return False if not data: - log(u"EOF from local %s." % format_peername(local)) + log(u"EOF from local %s." % safe_format_peername(local)) local.close() remote.close() return False @@ -673,7 +681,7 @@ def proxy_chunk_remote_to_local(remote, local, data = None): local.close() return False if not data: - log(u"EOF from remote %s." % format_peername(remote)) + log(u"EOF from remote %s." % safe_format_peername(remote)) remote.close() local.close() return False @@ -690,7 +698,7 @@ def proxy_chunk_remote_to_local(remote, local, data = None): if data is None: break elif not data: - log(u"WebSocket close from remote %s." % format_peername(remote)) + log(u"WebSocket close from remote %s." % safe_format_peername(remote)) remote.close() local.close() return False @@ -714,14 +722,14 @@ def receive_unlinked(fd, label): fd.close() return False if not data: - log(u"EOF from unlinked %s %s with %d bytes buffered." % (label, format_peername(fd), len(fd.buf))) + log(u"EOF from unlinked %s %s with %d bytes buffered." % (label, safe_format_peername(fd), len(fd.buf))) fd.close() return False else: - log(u"Data from unlinked %s %s (%d bytes)." % (label, format_peername(fd), len(data))) + log(u"Data from unlinked %s %s (%d bytes)." % (label, safe_format_peername(fd), len(data))) fd.buf += data if len(fd.buf) >= UNCONNECTED_BUFFER_LIMIT: - log(u"Refusing to buffer more than %d bytes from %s %s." % (UNCONNECTED_BUFFER_LIMIT, label, format_peername(fd))) + log(u"Refusing to buffer more than %d bytes from %s %s." % (UNCONNECTED_BUFFER_LIMIT, label, safe_format_peername(fd))) fd.close() return False return True @@ -732,7 +740,7 @@ def match_proxies(): local = unlinked_locals.pop(0) remote_addr, remote_port = remote.getpeername() local_addr, local_port = local.getpeername() - log(u"Linking %s and %s." % (format_peername(local), format_peername(remote))) + log(u"Linking %s and %s." % (safe_format_peername(local), safe_format_peername(remote))) remote.partner = local local.partner = remote if remote.buf: @@ -791,15 +799,15 @@ def main(): for fd in rset: if fd == remote_s: remote_c, addr = fd.accept() - log(u"Remote connection from %s." % safe_format_addr(addr)) + log(u"Remote connection from %s." % safe_format_sockaddr(addr)) websocket_pending.append(TimeoutSocket(remote_c)) elif fd == local_s: local_c, addr = fd.accept() - log(u"Local connection from %s." % safe_format_addr(addr)) + log(u"Local connection from %s." % safe_format_sockaddr(addr)) socks_pending.append(local_c) register() elif fd in websocket_pending: - log(u"Data from WebSocket-pending %s." % safe_format_addr(addr)) + log(u"Data from WebSocket-pending %s." % safe_format_sockaddr(addr)) protocols = handle_websocket_request(fd) if protocols is not None: wrapped = RemoteSocket(fd, protocols) @@ -811,7 +819,7 @@ def main(): websocket_pending.remove(fd) report_pending() elif fd in socks_pending: - log(u"SOCKS request from %s." % safe_format_addr(addr)) + log(u"SOCKS request from %s." % safe_format_sockaddr(addr)) if handle_socks_request(fd): wrapped = LocalSocket(fd) locals.append(wrapped) @@ -849,7 +857,7 @@ def main(): pending = websocket_pending[0] if pending.age() < WEBSOCKET_REQUEST_TIMEOUT: break - log(u"Expired remote connection from %s." % format_peername(pending)) + log(u"Expired remote connection from %s." % safe_format_peername(pending)) pending.close() websocket_pending.pop(0) report_pending()

1 0

[flashproxy/master] Log the right address for WebSocket- and SOCKS-pending.
by dcf＠torproject.org 23 Sep '12

23 Sep '12

commit 3e30205b55479c07045102e8bcb0ef60eb76dec8 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Sep 23 10:16:23 2012 -0700 Log the right address for WebSocket- and SOCKS-pending. Use the peername, not a leftover potentially unrelated local addr variable. --- flashproxy-client | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index 293c26c..a7e4b50 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -807,7 +807,7 @@ def main(): socks_pending.append(local_c) register() elif fd in websocket_pending: - log(u"Data from WebSocket-pending %s." % safe_format_sockaddr(addr)) + log(u"Data from WebSocket-pending %s." % safe_format_peername(fd)) protocols = handle_websocket_request(fd) if protocols is not None: wrapped = RemoteSocket(fd, protocols) @@ -819,7 +819,7 @@ def main(): websocket_pending.remove(fd) report_pending() elif fd in socks_pending: - log(u"SOCKS request from %s." % safe_format_sockaddr(addr)) + log(u"SOCKS request from %s." % safe_format_peername(fd)) if handle_socks_request(fd): wrapped = LocalSocket(fd) locals.append(wrapped)

1 0

[flashproxy/master] Provide a default of "/" for PATH_INFO.
by dcf＠torproject.org 23 Sep '12

23 Sep '12

commit c455b4b54960e6ad344af554a357db594e135128 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Sep 23 00:36:58 2012 -0700 Provide a default of "/" for PATH_INFO. thttpd doesn't set PATH_INFO if there is nothing after the CGI name in the path. --- facilitator/facilitator.cgi | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/facilitator/facilitator.cgi b/facilitator/facilitator.cgi index 8975aa7..a453a20 100755 --- a/facilitator/facilitator.cgi +++ b/facilitator/facilitator.cgi @@ -2,7 +2,6 @@ import cgi import os -import os.path import socket import sys import urllib @@ -69,18 +68,16 @@ def get_reg(proxy_addr): 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) -path = os.path.normpath(path_info) - fs = cgi.FieldStorage() def do_get(): - if path != "/": + if path_info != "/": exit_error(400) try: reg = get_reg(proxy_addr) or "" @@ -96,7 +93,7 @@ Access-Control-Allow-Origin: *\r sys.stdout.write(urllib.urlencode(reg)) def do_post(): - if path != "/": + if path_info != "/": exit_error(400) client_specs = fs.getlist("client") if len(client_specs) != 1:

1 0

[flashproxy/master] Make flashproxy-reg-http take a URL, not a (host, port) pair.
by dcf＠torproject.org 23 Sep '12

23 Sep '12

commit a13a96297ca07e7c49d5a79e9173ce1e887f4fb9 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Sep 23 00:58:26 2012 -0700 Make flashproxy-reg-http take a URL, not a (host, port) pair. --- flashproxy-client | 23 +++++++++++------------ flashproxy-reg-http | 32 +++++++++++++++++--------------- 2 files changed, 28 insertions(+), 27 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index 6f7477e..226be6d 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -39,7 +39,7 @@ LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S" class options(object): local_addr = None remote_addr = None - facilitator_addr = None + facilitator_url = None log_filename = None log_file = sys.stdout @@ -67,14 +67,13 @@ If the --register 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. - --daemon daemonize (Unix only). - -f, --facilitator=HOST[:PORT] advertise willingness to receive connections to - HOST:PORT. - -h, --help show this help. - -l, --log FILENAME write log to FILENAME (default stdout). - --pidfile FILENAME write PID to FILENAME after daemonizing. - -r, --register register with the facilitator. - --unsafe-logging don't scrub IP addresses from logs.\ + --daemon daemonize (Unix only). + -f, --facilitator=URL advertise willingness to receive connections to URL. + -h, --help show this help. + -l, --log FILENAME write log to FILENAME (default stdout). + --pidfile FILENAME write PID to FILENAME after daemonizing. + -r, --register register with the facilitator. + --unsafe-logging don't scrub IP addresses from logs.\ """ % { "progname": sys.argv[0], "local": format_addr((DEFAULT_LOCAL_ADDRESS, DEFAULT_LOCAL_PORT)), @@ -633,10 +632,10 @@ def register(): return command = [os.path.join(script_dir, "flashproxy-reg-http")] spec = format_addr(options.remote_addr) - if options.facilitator_addr is None: + if options.facilitator_url is None: log(u"Registering \"%s\"." % spec) else: - command += ["-f", format_addr(options.facilitator_addr)] + command += ["-f", options.facilitator_url] command += [spec] try: p = subprocess.Popen(command) @@ -861,7 +860,7 @@ if __name__ == "__main__": if o == "--daemon": options.daemonize = True elif o == "-f" or o == "--facilitator": - options.facilitator_addr = parse_addr_spec(a) + options.facilitator_url = a elif o == "-h" or o == "--help": usage() sys.exit() diff --git a/flashproxy-reg-http b/flashproxy-reg-http index 4372c1f..d137827 100755 --- a/flashproxy-reg-http +++ b/flashproxy-reg-http @@ -6,15 +6,15 @@ import re import socket import sys import urllib +import urllib2 DEFAULT_REMOTE_ADDRESS = "" DEFAULT_REMOTE_PORT = 9000 -DEFAULT_FACILITATOR_HOST = "tor-facilitator.bamsoftware.com" -DEFAULT_FACILITATOR_PORT = 443 +DEFAULT_FACILITATOR_URL = "https://tor-facilitator.bamsoftware.com/" class options(object): remote_addr = None - facilitator_addr = None + facilitator_url = None def usage(f = sys.stdout): print >> f, """\ @@ -22,12 +22,12 @@ Usage: %(progname)s [REMOTE][:PORT] Register with a flash proxy facilitator using an HTTP POST. By default the remote address registered is "%(remote_addr)s". - -f, --facilitator=HOST[:PORT] register with the given facilitator (by - default "%(fac_addr)s".) - -h, --help show this help. \ + -f, --facilitator=URL register with the given facilitator + (by default "%(fac_url)s"). + -h, --help show this help. \ """ % { "progname": sys.argv[0], - "fac_addr": format_addr((DEFAULT_FACILITATOR_HOST, DEFAULT_FACILITATOR_PORT)), + "fac_url": DEFAULT_FACILITATOR_URL, "remote_addr": format_addr((DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT)), } @@ -81,13 +81,13 @@ def format_addr(addr): result += u":%d" % port return result -options.facilitator_addr = (DEFAULT_FACILITATOR_HOST, DEFAULT_FACILITATOR_PORT) +options.facilitator_url = DEFAULT_FACILITATOR_URL options.remote_addr = (DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT) opts, args = getopt.gnu_getopt(sys.argv[1:], "f:h", ["facilitator=", "help"]) for o, a in opts: if o == "-f" or o == "--facilitator": - options.facilitator_addr = parse_addr_spec(a, DEFAULT_FACILITATOR_HOST, DEFAULT_FACILITATOR_PORT) + options.facilitator_url = a elif o == "-h" or o == "--help": usage() sys.exit() @@ -101,15 +101,17 @@ else: sys.exit(1) spec = format_addr(options.remote_addr) -http = httplib.HTTPSConnection(*options.facilitator_addr) try: - http.request("POST", "/", urllib.urlencode({"client": spec})) - resp = http.getresponse() - if resp.status != 200: - raise ValueError("Status code was %d, not 200" % resp.status) + http = urllib2.urlopen(options.facilitator_url, urllib.urlencode({"client": spec}), 10) +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 register: %s" % str(e.reason) + sys.exit(1) except Exception, e: print >> sys.stderr, "Failed to register: %s" % str(e) sys.exit(1) http.close() -print "Registered \"%s\" with %s." % (spec, format_addr(options.facilitator_addr)) +print "Registered \"%s\" with %s." % (spec, options.facilitator_url)

1 0

r25814: {website} Added note about repository with alpha RPMs. In sample rpm r (website/trunk/docs/en)
by Ondrej Mikle 22 Sep '12

22 Sep '12

Author: hiviah Date: 2012-09-22 23:26:52 +0000 (Sat, 22 Sep 2012) New Revision: 25814 Modified: website/trunk/docs/en/rpms.wml Log: Added note about repository with alpha RPMs. In sample rpm repo files, changed 'tor-experimental' to 'tor' Modified: website/trunk/docs/en/rpms.wml =================================================================== --- website/trunk/docs/en/rpms.wml 2012-09-20 20:52:41 UTC (rev 25813) +++ website/trunk/docs/en/rpms.wml 2012-09-22 23:26:52 UTC (rev 25814) @@ -34,14 +34,14 @@ according to your distribution. -<pre>[tor-experimental] +<pre>[tor] name=Tor experimental repo enabled=1 baseurl=http://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/$basearch/ gpgcheck=1 gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.… -[tor-experimental-source] +[tor-source] name=Tor experimental source repo enabled=1 autorefresh=0 @@ -61,14 +61,14 @@ old rpm limitations, put this repo file in /etc/yum.repos.d/ directory: -<pre>[tor-experimental] +<pre>[tor] name=Tor experimental repo enabled=1 baseurl=http://deb.torproject.org/torproject.org/rpm/el/5/$basearch/ gpgcheck=1 gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.… -[tor-experimental-source] +[tor-source] name=Tor experimental source repo enabled=1 autorefresh=0 @@ -114,6 +114,18 @@ <hr> + <h2>Alpha/development packages</a></h2> + + + + There is a repository that contains packages for latest alpha branch of Tor. + If you'd like to experiment with them, use one of the above repo files, just + change the baseurl to (similarly to previous section, substitute + DISTRIBUTION based on your distribution; for source rpms use "SRPMS" instead + of $basearch): + +<pre>baseurl=http://deb.torproject.org/torproject.org/rpm/tor-testing/DISTRIBUTI…</pre> + <a id="source"></a> <h2><a class="anchor" href="#source">Building from source</a></h2>

1 0