tor-commits April 2012

tor-commits@lists.torproject.org

16 participants
941 discussions

[flashproxy/master] Check that handler.path exists.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit 4e9fdcf8b427c2005c0b2fb8a4200b7647d6b918 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Apr 2 14:08:57 2012 -0700 Check that handler.path exists. The connector was crashing when a connection was made to the remote port and then closed without sending any data. --- connector.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/connector.py b/connector.py index f7f35e3..a4e242a 100755 --- a/connector.py +++ b/connector.py @@ -391,7 +391,7 @@ def handle_websocket_request(fd): log(u"handle_websocket_request") request_text = fd.recv(10 * 1024) handler = WebSocketRequestHandler(request_text, fd) - if handler.error: + if handler.error or not hasattr(handler, "path"): return None method = handler.command path = handler.path

1 0

[flashproxy/master] Make query a global variable.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit 1be1f5fd9681e428479ad2fe827f569d29696a98 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Apr 4 22:12:16 2012 -0700 Make query a global variable. This conceptually belongs to the whole page, not only to a single FlashProxy instance. --- flashproxy.js | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 9a0b4fa..6e13ff4 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -51,6 +51,8 @@ var DEFAULT_RATE_LIMIT = undefined; var MIN_RATE_LIMIT = 10 * 1024; var RATE_LIMIT_HISTORY = 5.0; +var query = parse_query_string(window.location.search.substr(1)); + /* Parse a URL query string or application/x-www-form-urlencoded body. The return type is an object mapping string keys to string values. By design, this function doesn't support multiple values for the same named parameter, @@ -234,10 +236,8 @@ function FlashProxy() var debug_div; var rate_limit; - this.query = parse_query_string(window.location.search.substr(1)); - this.badge = new Badge(); - if (this.query.debug) { + if (query.debug) { debug_div = document.createElement("pre"); debug_div.className = "debug"; this.badge_elem = debug_div; @@ -265,31 +265,31 @@ function FlashProxy() var relay_addr; var rate_limit_bytes; - this.fac_addr = get_query_param_addr(this.query, "facilitator", DEFAULT_FACILITATOR_ADDR); + this.fac_addr = get_query_param_addr(query, "facilitator", DEFAULT_FACILITATOR_ADDR); if (!this.fac_addr) { puts("Error: Facilitator spec must be in the form \"host:port\"."); this.die(); return; } - this.max_num_proxy_pairs = get_query_param_integer(this.query, "max_clients", DEFAULT_MAX_NUM_PROXY_PAIRS); + this.max_num_proxy_pairs = get_query_param_integer(query, "max_clients", DEFAULT_MAX_NUM_PROXY_PAIRS); if (this.max_num_proxy_pairs == null || this.max_num_proxy_pairs < 0) { puts("Error: max_clients must be a nonnegative integer."); this.die(); return; } - this.facilitator_poll_interval = get_query_param_timespec(this.query, "facilitator_poll_interval", DEFAULT_FACILITATOR_POLL_INTERVAL); + this.facilitator_poll_interval = get_query_param_timespec(query, "facilitator_poll_interval", DEFAULT_FACILITATOR_POLL_INTERVAL); if (this.facilitator_poll_interval == null || this.facilitator_poll_interval < MIN_FACILITATOR_POLL_INTERVAL) { puts("Error: facilitator_poll_interval must be a nonnegative number at least " + MIN_FACILITATOR_POLL_INTERVAL + "."); this.die(); return; } - if (this.query["ratelimit"] == "off") + if (query["ratelimit"] == "off") rate_limit_bytes = undefined; else - rate_limit_bytes = get_query_param_byte_count(this.query, "ratelimit", DEFAULT_RATE_LIMIT); + rate_limit_bytes = get_query_param_byte_count(query, "ratelimit", DEFAULT_RATE_LIMIT); if (rate_limit_bytes === undefined) { rate_limit = new DummyRateLimit(); } else if (rate_limit_bytes == null || rate_limit_bytes < MIN_FACILITATOR_POLL_INTERVAL) { @@ -300,8 +300,8 @@ function FlashProxy() rate_limit = new BucketRateLimit(rate_limit_bytes * RATE_LIMIT_HISTORY, RATE_LIMIT_HISTORY); } - client_addr = get_query_param_addr(this.query, "client"); - relay_addr = get_query_param_addr(this.query, "relay"); + client_addr = get_query_param_addr(query, "client"); + relay_addr = get_query_param_addr(query, "relay"); if (client_addr !== undefined && relay_addr !== undefined) { this.make_proxy_pair(client_addr, relay_addr); } else if (client_addr !== undefined) {

1 0

[flashproxy/master] Typo.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit c19a0a88060cb692d923b6f7cf6c41285af286bc Author: David Fifield <david(a)bamsoftware.com> Date: Mon Apr 2 19:21:51 2012 -0700 Typo. --- connector.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/connector.py b/connector.py index a4e242a..38acbf7 100755 --- a/connector.py +++ b/connector.py @@ -146,7 +146,7 @@ class WebSocketMessage(object): class WebSocketDecoder(object): """RFC 6455 section 5 is about the WebSocket framing format.""" - # Raise an exception rather than buffer anything arger than this. + # Raise an exception rather than buffer anything larger than this. MAX_MESSAGE_LENGTH = 1024 * 1024 class MaskingError(ValueError):

1 0

[flashproxy/master] Move puts to the global scope.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit 795e366400df1fbe3fb1cdb1ff05581c0bcb02da Author: David Fifield <david(a)bamsoftware.com> Date: Wed Apr 4 22:17:23 2012 -0700 Move puts to the global scope. --- flashproxy.js | 39 +++++++++++++++++++++------------------ 1 files changed, 21 insertions(+), 18 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 6e13ff4..d076aa5 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -52,6 +52,25 @@ var MIN_RATE_LIMIT = 10 * 1024; var RATE_LIMIT_HISTORY = 5.0; var query = parse_query_string(window.location.search.substr(1)); +var debug_div; + +if (query.debug) { + debug_div = document.createElement("pre"); + debug_div.className = "debug"; +} + +function puts(s) +{ + if (debug_div) { + var at_bottom; + + /* http://www.w3.org/TR/cssom-view/#element-scrolling-members */ + at_bottom = (debug_div.scrollTop + debug_div.clientHeight == debug_div.scrollHeight); + debug_div.appendChild(document.createTextNode(s + "\n")); + if (at_bottom) + debug_div.scrollTop = debug_div.scrollHeight; + } +} /* Parse a URL query string or application/x-www-form-urlencoded body. The return type is an object mapping string keys to string values. By design, @@ -233,31 +252,15 @@ function make_websocket(addr) function FlashProxy() { - var debug_div; var rate_limit; this.badge = new Badge(); - if (query.debug) { - debug_div = document.createElement("pre"); - debug_div.className = "debug"; + if (query.debug) this.badge_elem = debug_div; - } else { + else this.badge_elem = this.badge.elem; - } this.badge_elem.setAttribute("id", "flashproxy-badge"); - function puts(s) { - if (debug_div) { - var at_bottom; - - /* http://www.w3.org/TR/cssom-view/#element-scrolling-members */ - at_bottom = (debug_div.scrollTop + debug_div.clientHeight == debug_div.scrollHeight); - debug_div.appendChild(document.createTextNode(s + "\n")); - if (at_bottom) - debug_div.scrollTop = debug_div.scrollHeight; - } - }; - this.proxy_pairs = []; this.start = function() {

1 0

[flashproxy/master] Move ProxyPair out of the FlashProxy class.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit b105c5eeae29872337e77ab8381e24e50ad14b98 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Apr 4 22:18:27 2012 -0700 Move ProxyPair out of the FlashProxy class. --- flashproxy.js | 261 ++++++++++++++++++++++++++++----------------------------- 1 files changed, 130 insertions(+), 131 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index d076aa5..94154b1 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -252,8 +252,6 @@ function make_websocket(addr) function FlashProxy() { - var rate_limit; - this.badge = new Badge(); if (query.debug) this.badge_elem = debug_div; @@ -294,13 +292,13 @@ function FlashProxy() else rate_limit_bytes = get_query_param_byte_count(query, "ratelimit", DEFAULT_RATE_LIMIT); if (rate_limit_bytes === undefined) { - rate_limit = new DummyRateLimit(); + this.rate_limit = new DummyRateLimit(); } else if (rate_limit_bytes == null || rate_limit_bytes < MIN_FACILITATOR_POLL_INTERVAL) { puts("Error: ratelimit must be a nonnegative number at least " + MIN_RATE_LIMIT + "."); this.die(); return; } else { - rate_limit = new BucketRateLimit(rate_limit_bytes * RATE_LIMIT_HISTORY, RATE_LIMIT_HISTORY); + this.rate_limit = new BucketRateLimit(rate_limit_bytes * RATE_LIMIT_HISTORY, RATE_LIMIT_HISTORY); } client_addr = get_query_param_addr(query, "client"); @@ -395,7 +393,7 @@ function FlashProxy() this.make_proxy_pair = function(client_addr, relay_addr) { var proxy_pair; - proxy_pair = new ProxyPair(client_addr, relay_addr); + proxy_pair = new ProxyPair(client_addr, relay_addr, this.rate_limit); this.proxy_pairs.push(proxy_pair); proxy_pair.complete_callback = function(event) { puts("Complete."); @@ -412,138 +410,156 @@ function FlashProxy() puts("die"); this.badge.set_color("#111"); } +} - /* An instance of a client-relay connection. */ - function ProxyPair(client_addr, relay_addr) - { - function log(s) - { - puts(s) - } +/* This is the non-functional badge that occupies space when + flashproxy_should_disable decides that the proxy shouldn't run. */ +function DummyFlashProxy() +{ + var img; - this.client_addr = client_addr; - this.relay_addr = relay_addr; + img = document.createElement("img"); + img.setAttribute("src", "https://crypto.stanford.edu/flashproxy/badge.png"); + img.setAttribute("border", 0); + img.setAttribute("id", "flashproxy-badge"); - this.c2r_schedule = []; - this.r2c_schedule = []; + this.badge_elem = img; - this.running = true; - this.flush_timeout_id = null; + this.start = function() { + }; +} - /* This callback function can be overridden by external callers. */ - this.complete_callback = function() { - }; +/* An instance of a client-relay connection. */ +function ProxyPair(client_addr, relay_addr, rate_limit) +{ + function log(s) + { + puts(s) + } - /* Return a function that shows an error message and closes the other - half of a communication pair. */ - this.make_onerror_callback = function(partner) - { - return function(event) { - var ws = event.target; + this.client_addr = client_addr; + this.relay_addr = relay_addr; + this.rate_limit = rate_limit; - log(ws.label + ": error."); - partner.close(); - }.bind(this); - }; + this.c2r_schedule = []; + this.r2c_schedule = []; - this.onopen_callback = function(event) { - var ws = event.target; + this.running = true; + this.flush_timeout_id = null; - log(ws.label + ": connected."); - }.bind(this); + /* This callback function can be overridden by external callers. */ + this.complete_callback = function() { + }; - this.onclose_callback = function(event) { + /* Return a function that shows an error message and closes the other + half of a communication pair. */ + this.make_onerror_callback = function(partner) + { + return function(event) { var ws = event.target; - log(ws.label + ": closed."); - this.flush(); - - if (this.running && is_closed(this.client_s) && is_closed(this.relay_s)) { - this.running = false; - this.complete_callback(); - } + log(ws.label + ": error."); + partner.close(); }.bind(this); + }; - this.onmessage_client_to_relay = function(event) { - this.c2r_schedule.push(event.data); - this.flush(); - }.bind(this); + this.onopen_callback = function(event) { + var ws = event.target; - this.onmessage_relay_to_client = function(event) { - this.r2c_schedule.push(event.data); - this.flush(); - }.bind(this); + log(ws.label + ": connected."); + }.bind(this); - this.connect = function() { - log("Client: connecting."); - this.client_s = make_websocket(this.client_addr); - - log("Relay: connecting."); - this.relay_s = make_websocket(this.relay_addr); - - this.client_s.label = "Client"; - this.client_s.onopen = this.onopen_callback; - this.client_s.onclose = this.onclose_callback; - this.client_s.onerror = this.make_onerror_callback(this.relay_s); - this.client_s.onmessage = this.onmessage_client_to_relay; - - this.relay_s.label = "Relay"; - this.relay_s.onopen = this.onopen_callback; - this.relay_s.onclose = this.onclose_callback; - this.relay_s.onerror = this.make_onerror_callback(this.client_s); - this.relay_s.onmessage = this.onmessage_relay_to_client; - }; - - function is_open(ws) - { - return ws.readyState == ws.OPEN; - } + this.onclose_callback = function(event) { + var ws = event.target; - function is_closed(ws) - { - return ws.readyState == ws.CLOSED; + log(ws.label + ": closed."); + this.flush(); + + if (this.running && is_closed(this.client_s) && is_closed(this.relay_s)) { + this.running = false; + this.complete_callback(); } + }.bind(this); + + this.onmessage_client_to_relay = function(event) { + this.c2r_schedule.push(event.data); + this.flush(); + }.bind(this); + + this.onmessage_relay_to_client = function(event) { + this.r2c_schedule.push(event.data); + this.flush(); + }.bind(this); + + this.connect = function() { + log("Client: connecting."); + this.client_s = make_websocket(this.client_addr); + + log("Relay: connecting."); + this.relay_s = make_websocket(this.relay_addr); + + this.client_s.label = "Client"; + this.client_s.onopen = this.onopen_callback; + this.client_s.onclose = this.onclose_callback; + this.client_s.onerror = this.make_onerror_callback(this.relay_s); + this.client_s.onmessage = this.onmessage_client_to_relay; + + this.relay_s.label = "Relay"; + this.relay_s.onopen = this.onopen_callback; + this.relay_s.onclose = this.onclose_callback; + this.relay_s.onerror = this.make_onerror_callback(this.client_s); + this.relay_s.onmessage = this.onmessage_relay_to_client; + }; - /* Send as much data as the rate limit currently allows. */ - this.flush = function() { - var busy; - - if (this.flush_timeout_id) - clearTimeout(this.flush_timeout_id); - this.flush_timeout_id = null; - - busy = true; - while (busy && !rate_limit.is_limited()) { - var chunk; - - busy = false; - if (is_open(this.client_s) && this.r2c_schedule.length > 0) { - chunk = this.r2c_schedule.shift(); - rate_limit.update(chunk.length); - this.client_s.send(chunk); - busy = true; - } - if (is_open(this.relay_s) && this.c2r_schedule.length > 0) { - chunk = this.c2r_schedule.shift(); - rate_limit.update(chunk.length); - this.relay_s.send(chunk); - busy = true; - } - } + function is_open(ws) + { + return ws.readyState == ws.OPEN; + } + + function is_closed(ws) + { + return ws.readyState == ws.CLOSED; + } + + /* Send as much data as the rate limit currently allows. */ + this.flush = function() { + var busy; + + if (this.flush_timeout_id) + clearTimeout(this.flush_timeout_id); + this.flush_timeout_id = null; - if (is_closed(this.relay_s) && !is_closed(this.client_s) && this.r2c_schedule.length == 0) { - log("Client: closing."); - this.client_s.close(); + busy = true; + while (busy && !this.rate_limit.is_limited()) { + var chunk; + + busy = false; + if (is_open(this.client_s) && this.r2c_schedule.length > 0) { + chunk = this.r2c_schedule.shift(); + this.rate_limit.update(chunk.length); + this.client_s.send(chunk); + busy = true; } - if (is_closed(this.client_s) && !is_closed(this.relay_s) && this.c2r_schedule.length == 0) { - log("Relay: closing."); - this.relay_s.close(); + if (is_open(this.relay_s) && this.c2r_schedule.length > 0) { + chunk = this.c2r_schedule.shift(); + this.rate_limit.update(chunk.length); + this.relay_s.send(chunk); + busy = true; } + } - if (this.r2c_schedule.length > 0 || this.c2r_schedule.length > 0) - this.flush_timeout_id = setTimeout(this.flush.bind(this), rate_limit.when() * 1000); - }; - } + if (is_closed(this.relay_s) && !is_closed(this.client_s) && this.r2c_schedule.length == 0) { + log("Client: closing."); + this.client_s.close(); + } + if (is_closed(this.client_s) && !is_closed(this.relay_s) && this.c2r_schedule.length == 0) { + log("Relay: closing."); + this.relay_s.close(); + } + + if (this.r2c_schedule.length > 0 || this.c2r_schedule.length > 0) + this.flush_timeout_id = setTimeout(this.flush.bind(this), this.rate_limit.when() * 1000); + }; } function BucketRateLimit(capacity, time) @@ -670,23 +686,6 @@ function Badge() this.refresh(); } -/* This is the non-functional badge that occupies space when - flashproxy_should_disable decides that the proxy shouldn't run. */ -function DummyFlashProxy() -{ - var img; - - img = document.createElement("img"); - img.setAttribute("src", "https://crypto.stanford.edu/flashproxy/badge.png"); - img.setAttribute("border", 0); - img.setAttribute("id", "flashproxy-badge"); - - this.badge_elem = img; - - this.start = function() { - }; -} - function quote(s) { return "\"" + s.replace(/([\\\"])/, "\\$1") + "\"";

1 0

[flashproxy/js] Restore public connector to the README.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit f5536c57ebe5ac7d8ee0cf1c6971057368b3160e Author: David Fifield <david(a)bamsoftware.com> Date: Sun Apr 8 20:37:48 2012 -0700 Restore public connector to the README. I restarted it using the JS/WebSocket code. --- README | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/README b/README index e6ad198..e9917e4 100644 --- a/README +++ b/README @@ -76,6 +76,15 @@ From tor you are looking for: [notice] Tor has successfully opened a circuit. Looks like client functionality is working. [notice] Bootstrapped 100%: Done. +=== Using a public connector + +Rather than running connector.py on your computer, you can use a public +connector. This way is not as realistic because all your Tor traffic +will first go to a public connector, which is at a fixed address and can +be easily blocked. However this is an easy way to try out the system +without having to do port forwarding. + $ tor ClientTransportPlugin "websocket socks4 127.0.0.1:9001" UseBridges 1 Bridge "websocket tor-facilitator.bamsoftware.com:9999" + === Troubleshooting Make sure someone is viewing https://crypto.stanford.edu/flashproxy/, or

1 0

[flashproxy/master] Remove crossdomain stuff.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit 4ed6768b2777a4fe800186355db06a91dfad90e1 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Mar 11 22:37:15 2012 -0700 Remove crossdomain stuff. It still remains vestigially in facilitator.py and connector.py. Facilitator because it's easy and there's no reason to cut off Flash-based proxies yet, and connector because that has to be replaced with a WebSocket shim. --- Makefile | 2 +- README | 21 +++--------- crossdomaind.py | 94 --------------------------------------------------- design.txt | 20 ++++------- init.d/crossdomaind | 62 --------------------------------- init.d/facilitator | 3 +- 6 files changed, 14 insertions(+), 188 deletions(-) diff --git a/Makefile b/Makefile index 3861c09..7f6e02e 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ swfcat.swf: *.as badge.png install: mkdir -p $(BINDIR) - cp -f connector.py crossdomaind.py facilitator.py $(BINDIR) + cp -f connector.py facilitator.py $(BINDIR) clean: rm -f $(TARGETS) diff --git a/README b/README index 86524c7..ced9527 100644 --- a/README +++ b/README @@ -13,8 +13,7 @@ There are five main parts. Our terminology for each part is in quotes. called swfcat because it is like a netcat implemented in Flash. 4. A "facilitator," a pseudo-HTTP server that keeps a list of clients that want a connection, and hands them out to proxies. -5. A Tor "relay," which is just a normal Tor relay except that its host - must also serve a Flash crossdomain policy. +5. A Tor "relay," which is just a normal Tor relay. The purpose of this project is to create many, generally ephemeral bridge IP addresses, with the goal of outpacing a censor's ability to @@ -156,21 +155,15 @@ with sample code: === Running a relay or facilitator -On the Tor relay, run - # ./crossdomaind.py -In general, any computer that a proxy connects to needs to serve a -crossdomain policy, but the connector and facilitator have it built in. - On the facilitator, run $ ./facilitator.py -r <relay-ip> -You can use "tor1.bamsoftware.com" for <relay-ip>; it is already set up -to serve a crossdomain policy. The facilitator runs on port 9002 by -default. +You can use "tor1.bamsoftware.com" for <relay-ip>. The facilitator runs +on port 9002 by default. === Installing so as to restart at boot -The directory init.d contains scripts to start the facilitator and -crossdomaind server on CentOS. "make install" copies files to /usr/local/bin. +The directory init.d contains scripts to start the facilitator on +CentOS. "make install" copies files to /usr/local/bin. # make install # useradd -d /dev/null -s /bin/false flashproxy @@ -181,7 +174,3 @@ crossdomaind server on CentOS. "make install" copies files to /usr/local/bin. -- Edit /etc/init.d/facilitator to set $RELAY. # chkconfig --add facilitator # service facilitator start - - # cp init.d/crossdomaind /etc/init.d/crossdomaind - # chkconfig --add crossdomaind - # service crossdomaind start diff --git a/crossdomaind.py b/crossdomaind.py deleted file mode 100755 index 72d4327..0000000 --- a/crossdomaind.py +++ /dev/null @@ -1,94 +0,0 @@ -#!/usr/bin/env python - -import getopt -import os -import socket -import sys -import xml.sax.saxutils - -DEFAULT_ADDRESS = "0.0.0.0" -DEFAULT_PORT = 843 -DEFAULT_DOMAIN = "*" -DEFAULT_PORTS = "*" - -class options(object): - daemonize = False - pid_filename = None - domain = DEFAULT_DOMAIN - ports = DEFAULT_PORTS - -def usage(f = sys.stdout): - print >> f, """\ -Usage: %(progname)s <OPTIONS> [HOST] [PORT] -Serve a Flash crossdomain policy. By default HOST is \"%(addr)s\" -and PORT is %(port)d. - --daemon daemonize (Unix only). - -d, --domain=DOMAIN limit access to the given DOMAIN (default \"%(domain)s\"). - -h, --help show this help. - --pidfile FILENAME write PID to FILENAME after daemonizing. - -p, --ports=PORTS limit access to the given PORTS (default \"%(ports)s\").\ -""" % { - "progname": sys.argv[0], - "addr": DEFAULT_ADDRESS, - "port": DEFAULT_PORT, - "domain": DEFAULT_DOMAIN, - "ports": DEFAULT_PORTS, -} - -def make_policy(domain, ports): - return """\ -<cross-domain-policy> -<allow-access-from domain="%s" to-ports="%s"/> -</cross-domain-policy> -\0""" % (xml.sax.saxutils.escape(domain), xml.sax.saxutils.escape(ports)) - -opts, args = getopt.gnu_getopt(sys.argv[1:], "d:hp:", ["daemon", "domain", "help", "pidfile=", "ports"]) -for o, a in opts: - if o == "--daemon": - options.daemonize = True - elif o == "-h" or o == "--help": - usage() - sys.exit() - elif o == "-d" or o == "--domain": - options.domain = a - elif o == "--pidfile": - options.pid_filename = a - elif o == "-p" or o == "--ports": - options.ports = a - -if len(args) == 0: - address = (DEFAULT_ADDRESS, DEFAULT_PORT) -elif len(args) == 1: - # Either HOST or PORT may be omitted; figure out which one. - if args[0].isdigit(): - address = (DEFAULT_ADDRESS, args[0]) - else: - address = (args[0], DEFAULT_PORT) -elif len(args) == 2: - address = (args[0], args[1]) -else: - usage(sys.stderr) - sys.exit(1) - -policy = make_policy(options.domain, options.ports) - -addrinfo = socket.getaddrinfo(address[0], address[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) -s.bind(addrinfo[4]) -s.listen(10) - -if options.daemonize: - pid = os.fork() - if pid != 0: - if options.pid_filename: - f = open(options.pid_filename, "w") - print >> f, pid - f.close() - sys.exit(0) - -while True: - (c, c_addr) = s.accept() - c.sendall(policy) - c.close() diff --git a/design.txt b/design.txt index b797262..ecee83c 100644 --- a/design.txt +++ b/design.txt @@ -26,10 +26,9 @@ Design of flash proxies initiate outgoing connections, not receive incoming ones. The flash proxy can only connect to external hosts by connecting directly to them. The other significant restriction is that the proxy cannot - connect to just any destination: Adobe Flash player requires the - server to provide a "crossdomain policy" allowing access. A third, but - less important, restriction is that browser-based networking does not - provide low-level socket access such as control of source address. + connect to just any destination. A third, but less important, + restriction is that browser-based networking does not provide + low-level socket access such as control of source address. 2. Components @@ -59,8 +58,7 @@ Design of flash proxies variety of ways. It sends registrations to flash proxies over HTTP. The facilitator is responsible for matching clients to proxies in a reasonable manner. - 5. Tor relay: An ordinary Tor relay with no special configuration - apart from serving a crossdomain policy to allow Flash connections. + 5. Tor relay: An ordinary Tor relay. 4. Sample session @@ -120,10 +118,8 @@ Design of flash proxies both ends, and matches them together. The remote socket listens on port 9000 and the local on port 9001. - The connector can serve a crossdomain policy in response to a - crossdomain request, allowing the flash proxy to connect. On the local - side, it acts as a SOCKS proxy (albeit one that always goes to the - same destination). + On the local side, it acts as a SOCKS proxy (albeit one that always + goes to the same destination). 7. Behavior of the flash proxy @@ -158,6 +154,4 @@ Design of flash proxies 9. Behavior of the Tor relay. - The Tor relay requires no special configuration. It must also be - running a program that serves a crossdomain policy to allow a flash - proxy to connect to it. + The Tor relay requires no special configuration. diff --git a/init.d/crossdomaind b/init.d/crossdomaind deleted file mode 100755 index 3aecaaa..0000000 --- a/init.d/crossdomaind +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh -# -# crossdomaind This shell script takes care of starting and stopping -# crossdomaind server. -# -# chkconfig: 2345 90 10 -# description: Crossdomain policy server. -# processname: crossdomaind.py -# pidfile: /var/flashproxy/crossdomaind.pid - -# Installation instructions: -# cp crossdomaind /etc/init.d/crossdomaind -# chkconfig --add crossdomaind -# service crossdomaind start - -# Source function library. -. /etc/rc.d/init.d/functions - -BINDIR=/usr/local/bin -VARDIR=/var/flashproxy -PROG=$BINDIR/crossdomaind.py -PIDFILE=$VARDIR/crossdomaind.pid - -# See how we were called. -case "$1" in - start) - [ -x $PROG ] || exit 1 - echo -n $"Starting flash proxy crossdomaind: " - cd $VARDIR && daemon --pidfile $PIDFILE $PROG --pidfile $PIDFILE --daemon - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/crossdomaind - ;; - stop) - # Stop daemon. - echo -n $"Shutting down flash proxy crossdomaind: " - killproc -p $PIDFILE - RETVAL=$? - echo - if [ $RETVAL -eq 0 ]; then - rm -f /var/lock/subsys/crossdomaind - rm -f $PIDFILE - fi - ;; - status) - status -p $PIDFILE crossdomaind - RETVAL=$? - ;; - restart|reload) - $0 stop - $0 start - ;; - condrestart) - [ -f /var/lock/subsys/crossdomaind ] && restart || : - ;; - *) - echo $"Usage: $0 {start|stop|status|restart}" - RETVAL=3 - ;; -esac - -exit $RETVAL diff --git a/init.d/facilitator b/init.d/facilitator index 03be16e..152f03c 100755 --- a/init.d/facilitator +++ b/init.d/facilitator @@ -16,8 +16,7 @@ # Source function library. . /etc/rc.d/init.d/functions -# Replace this with the address of a Tor relay that allows crossdomain -# connections (i.e., is running crossdomaind.py). You can use host:port +# Replace this with the address of a Tor relay. You can use host:port # syntax. RELAY=...

1 0

[flashproxy/master] Nuke RTMFP stuff.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit a43697091c161330ebc7f59372850f46ea372f65 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Mar 11 22:33:19 2012 -0700 Nuke RTMFP stuff. --- README | 60 ---------- RTMFPSocket.as | 217 ----------------------------------- design.txt | 10 -- init.d/cumulus | 60 ---------- patches/cumulus-no-manage-log.patch | 39 ------ swfcat.as | 108 +----------------- 6 files changed, 2 insertions(+), 492 deletions(-) diff --git a/README b/README index 006db8c..86524c7 100644 --- a/README +++ b/README @@ -95,34 +95,6 @@ without having to do port forwarding. 2. Run Tor using the included torrc file. $ tor -f flashproxy/torrc -=== Using RTMFP - -This method uses a protocol called RTMFP to communicate through a NAT -without port forwarding. However it uses a public server at a fixed -address as an intermediary, so it can be easily blocked. (The -intermediate server is operated by the flash proxy developers, not by -Adobe as is usual with RTMFP.) This method also requires Flash Player on -the Tor client, which the other methods don't. - -1. Download swfcat.swf from - https://crypto.stanford.edu/flashproxy/swfcat.swf - and save it locally. We will assume it is saved at - /home/user/flashproxy/swfcat.swf. -2. Run the connector, without giving it a facilitator, and listening on - local ports only. In this configuration, it is the swfcat.swf program - that communicates with the facilitator, not the connector. - $ ./connector.py 127.0.0.1:9001 127.0.0.1:9002 -3. Open in a browser - file:///home/user/flashproxy/swfcat.swf?client=1&debug=1 - This should *not* be the same browser you use to browse over Tor. You - should not run Flash in your Tor browser. Use a separate Firefox - profile (firefox -no-remote -ProfileManager) or use a separate - browser entirely. -4. Run Tor using the included torrc file. - $ tor -f flashproxy/torrc - -You will see status messages in the swfcat.swf window. - === Troubleshooting Make sure someone is viewing https://crypto.stanford.edu/flashproxy/, or @@ -213,35 +185,3 @@ crossdomaind server on CentOS. "make install" copies files to /usr/local/bin. # cp init.d/crossdomaind /etc/init.d/crossdomaind # chkconfig --add crossdomaind # service crossdomaind start - -=== Building the Cumulus RTMFP server - -There is a free RTMFP rendezvous server called Cumulus. It is a -replacement for the Adobe Cirrus service at rtmfp://p2p.rtmfp.net/. -These are instructions to build and install it. - -First install the prerequisite libpoco, http://poco.sourceforge.net/. -You only need the "Basic Edition." - # apt-get install libpoco-dev -or - $ cd poco-VERSION - $ ./configure && make - # make install - -Follow these steps to install the Cumulus server. You need to open port -1935/udp in the firewall. - $ git clone git://github.com/OpenRTMFP/Cumulus.git - $ cd Cumulus - $ patch -p0 < ~/flashproxy/patches/cumulus-no-manage-log.patch - $ cd CumulusLib - $ make LIBS=./ - # cp libCumulus.so /usr/local/lib - $ cd ../../CumulusService - $ make - # cp CumulusService /usr/local/bin - # useradd -d /dev/null -s /bin/false cumulus - # mkdir /var/cumulus - # chown -R cumulus.cumulus /var/cumulus - # cp flashproxy/init.d/cumulus /etc/init.d/cumulus - # chkconfig --add cumulus - # service cumulus start diff --git a/RTMFPSocket.as b/RTMFPSocket.as deleted file mode 100644 index 421f9cc..0000000 --- a/RTMFPSocket.as +++ /dev/null @@ -1,217 +0,0 @@ -/* -The RTMFPSocket class provides a socket-like interface around RTMFP -NetConnection and NetStream. Each RTMFPSocket contains one NetConnection and two -NetStreams, one for reading and one for writing. - -To create a listening socket: - var rs:RTMFPSocket = new RTMFPSocket(url, key); - rs.addEventListener(Event.COMPLETE, function (e:Event):void { - // rs.id is set and can be sent out of band to the client. - }); - rs.addEventListener(RTMFPSocket.ACCEPT_EVENT, function (e:Event):void { - // rs.peer_id is the ID of the connected client. - }); - rs.listen(); -To connect to a listening socket: - // Receive peer_id out of band. - var rs:RTMFPSocket = new RTMFPSocket(url, key); - rs.addEventListener(Event.CONNECT, function (e:Event):void { - // rs.id and rs.peer_id are now set. - }); -*/ - -package -{ - import flash.events.Event; - import flash.events.EventDispatcher; - import flash.events.IOErrorEvent; - import flash.events.NetStatusEvent; - import flash.events.ProgressEvent; - import flash.net.NetConnection; - import flash.net.NetStream; - import flash.utils.ByteArray; - - public class RTMFPSocket extends EventDispatcher - { - public static const ACCEPT_EVENT:String = "accept"; - - public var connected:Boolean; - - private var nc:NetConnection; - private var incoming:NetStream; - private var outgoing:NetStream; - - /* Cache to hold the peer ID between when connect is called and the - NetConnection exists. */ - private var connect_peer_id:String; - - private var buffer:ByteArray; - - private var cirrus_url:String; - private var cirrus_key:String; - - public function RTMFPSocket(cirrus_url:String, cirrus_key:String = "") - { - connected = false; - - buffer = new ByteArray(); - - this.cirrus_url = cirrus_url; - this.cirrus_key = cirrus_key; - - nc = new NetConnection(); - } - - public function get id():String - { - return nc.nearID; - } - - public function get peer_id():String - { - return incoming.farID; - } - - /* NetStatusEvents that aren't handled more specifically in - listen_netstatus_event or connect_netstatus_event. */ - private function generic_netstatus_event(e:NetStatusEvent):void - { - switch (e.info.code) { - case "NetConnection.Connect.Closed": - connected = false; - dispatchEvent(new Event(Event.CLOSE)); - break; - case "NetStream.Connect.Closed": - connected = false; - close(); - break; - default: - var event:IOErrorEvent = new IOErrorEvent(IOErrorEvent.IO_ERROR); - event.text = e.info.code; - dispatchEvent(event); - break; - } - } - - private function listen_netstatus_event(e:NetStatusEvent):void - { - switch (e.info.code) { - case "NetConnection.Connect.Success": - outgoing = new NetStream(nc, NetStream.DIRECT_CONNECTIONS); - outgoing.client = { - onPeerConnect: listen_onpeerconnect - }; - outgoing.publish("server"); - - /* listen is complete, ready to accept. */ - dispatchEvent(new Event(Event.COMPLETE)); - break; - case "NetStream.Connect.Success": - break; - default: - return generic_netstatus_event(e); - break; - } - } - - private function listen_onpeerconnect(peer:NetStream):Boolean { - incoming = new NetStream(nc, peer.farID); - incoming.client = { - r: receive_data - }; - incoming.play("client"); - - connected = true; - dispatchEvent(new Event(ACCEPT_EVENT)); - - return true; - } - - private function connect_netstatus_event(e:NetStatusEvent):void - { - switch (e.info.code) { - case "NetConnection.Connect.Success": - outgoing = new NetStream(nc, NetStream.DIRECT_CONNECTIONS); - outgoing.publish("client"); - - incoming = new NetStream(nc, connect_peer_id); - incoming.client = { - r: receive_data - }; - incoming.play("server"); - break; - case "NetStream.Connect.Success": - connected = true; - dispatchEvent(new Event(Event.CONNECT)); - break; - default: - return generic_netstatus_event(e); - break; - } - } - - /* Function called back when the other side does a send. */ - private function receive_data(bytes:ByteArray):void { - var event:ProgressEvent; - - event = new ProgressEvent(ProgressEvent.SOCKET_DATA); - event.bytesLoaded = bytes.bytesAvailable; - - bytes.readBytes(buffer, buffer.length, bytes.bytesAvailable); - - dispatchEvent(event); - } - - public function listen():void - { - nc.addEventListener(NetStatusEvent.NET_STATUS, listen_netstatus_event); - nc.connect(cirrus_url, cirrus_key); - } - - public function connect(peer_id:String):void - { - /* Store for later reading by connect_netstatus_event. */ - this.connect_peer_id = peer_id; - - nc.addEventListener(NetStatusEvent.NET_STATUS, connect_netstatus_event); - nc.connect(cirrus_url, cirrus_key); - } - - public function close():void - { - if (outgoing) - outgoing.close(); - if (incoming) - incoming.close(); - if (nc) - nc.close(); - } - - public function readBytes(output:ByteArray, offset:uint = 0, length:uint = 0):void - { - buffer.readBytes(output, offset, length); - if (buffer.bytesAvailable == 0) { - /* Reclaim memory space. */ - buffer.clear(); - } - } - - public function writeBytes(input:ByteArray, offset:uint = 0, length:uint = 0):void - { - var sendbuf:ByteArray; - - /* Read into a new buffer, in case offset and length do not - completely span input. */ - sendbuf = new ByteArray(); - sendbuf.writeBytes(input, offset, length); - - /* Use a short method name because it's sent over the wire. */ - outgoing.send("r", sendbuf); - } - - public function flush():void - { - /* Ignored. */ - } - } -} diff --git a/design.txt b/design.txt index 55427b6..b797262 100644 --- a/design.txt +++ b/design.txt @@ -108,12 +108,6 @@ Design of flash proxies client=[<address>]:<port> - or the form: - - POST / HTTP/1.0 - - client=[<rtmfp-id>]:<port> - The facilitator sends a 200 reply if the registration was successful and an error status otherwise. If the connector omits the [<address>] part, the facilitator will automatically fill it in based on the HTTP @@ -147,10 +141,6 @@ Design of flash proxies client=[<address>:<port>]&relay=<address>:<port> - or this: - - client=[<rtmfp-id>]&relay=<address>:<port> - If the value for the client parameter is empty, it means that there are no client registrations for this proxy. diff --git a/init.d/cumulus b/init.d/cumulus deleted file mode 100755 index ba4f4d8..0000000 --- a/init.d/cumulus +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh -# -# cumulus This shell script takes care of starting and stopping -# the Cumulus server. -# -# chkconfig: 2345 90 10 -# description: Cumulus RTMFP server. -# processname: CumulusService -# pidfile: /var/cumulus/cumulus.pid - -# Installation instructions: -# cp init.d/cumulus /etc/init.d/cumulus -# chkconfig --add cumulus -# service cumulus start - -# Source function library. -. /etc/rc.d/init.d/functions - -BINDIR=/usr/local/bin -VARDIR=/var/cumulus -CUMULUS=$BINDIR/CumulusService -PIDFILE=$VARDIR/cumulus.pid -USER=cumulus - -# See how we were called. -case "$1" in - start) - [ -x $CUMULUS ] || exit 1 - echo -n $"Starting Cumulus server: " - cd $VARDIR && daemon --user cumulus --pidfile $PIDFILE $CUMULUS --daemon --pidfile=$PIDFILE - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cumulus - ;; - stop) - # Stop daemon. - echo -n $"Shutting down Cumulus server: " - killproc CumulusService - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/cumulus - ;; - status) - status cumulus - RETVAL=$? - ;; - restart|reload) - $0 stop - $0 start - ;; - condrestart) - [ -f /var/lock/subsys/cumulus ] && restart || : - ;; - *) - echo $"Usage: $0 {start|stop|status|restart}" - RETVAL=3 - ;; -esac - -exit $RETVAL diff --git a/patches/cumulus-no-manage-log.patch b/patches/cumulus-no-manage-log.patch deleted file mode 100644 index 810b52d..0000000 --- a/patches/cumulus-no-manage-log.patch +++ /dev/null @@ -1,39 +0,0 @@ -Don't try to re-open log files. This avoids a failure after --daemon -causes a chdir to /. - -diff --git a/CumulusService/sources/main.cpp b/CumulusService/sources/main.cpp -index 891621f..39ea4eb 100644 ---- a/CumulusService/sources/main.cpp -+++ b/CumulusService/sources/main.cpp -@@ -132,7 +132,6 @@ protected: - void dumpHandler(const char* data,int size) { - cout.write(data,size); - _logStream.write(data,size); -- manageLogFile(); - } - - void logHandler(Thread::TID threadId,const std::string& threadName,Priority priority,const char *filePath,long line, const char *text) { -@@ -140,23 +139,6 @@ protected: - _logStream << DateTimeFormatter::format(LocalDateTime(),"%d/%m %H:%M:%S.%c ") - << g_logPriorities[priority-1] << '\t' << threadName << '(' << threadId << ")\t" - << Path(filePath).getFileName() << '[' << line << "] " << text << std::endl; -- manageLogFile(); -- } -- -- void manageLogFile() { -- if(_logFile.getSize()>LOG_SIZE) { -- _logStream.close(); -- int num = 10; -- File file(LOG_FILE(10)); -- if(file.exists()) -- file.remove(); -- while(--num>=0) { -- file = LOG_FILE_VAR(num); -- if(file.exists()) -- file.renameTo(LOG_FILE_VAR(num+1)); -- } -- _logStream.open(LOG_FILE(0),ios::in | ios::ate); -- } - } - - bool onConnection(Client& client) { diff --git a/swfcat.as b/swfcat.as index 76b35c4..13d8788 100644 --- a/swfcat.as +++ b/swfcat.as @@ -29,17 +29,6 @@ * What rate to limit all proxy traffic combined to. The special value "off" * disables the limit. The default is DEFAULT_RATE_LIMIT. There is a * sanity-check minimum of "10K". - * - * client=1 - * If set (to any value), run in client RTMFP mode. In this mode, rather than - * connecting to a facilitator and attempting to serve clients, swfcat starts an - * RTMFP socket and connects to a local address (to the connector, to be exact). - * See README for more on running in client RTMFP mode. No argument is required - * to use RTMFP when in the usual server mode. - * - * local=<HOST>:<PORT> - * When in client RTMFP mode (client=1), connect to this local address. The - * default is DEFAULT_LOCAL_TOR_CLIENT_ADDR. */ package @@ -63,19 +52,11 @@ package public class swfcat extends Sprite { - private const RTMFP_URL:String = "rtmfp://tor-facilitator.bamsoftware.com"; - private const DEFAULT_FACILITATOR_ADDR:Object = { host: "tor-facilitator.bamsoftware.com", port: 9002 }; - /* Local Tor client to use in case of RTMFP connection. */ - private const DEFAULT_LOCAL_TOR_CLIENT_ADDR:Object = { - host: "127.0.0.1", - port: 9002 - }; - private const DEFAULT_MAX_NUM_PROXY_PAIRS:uint = 10; /* In seconds. */ @@ -101,7 +82,6 @@ package private var fac_addr:Object; private var max_num_proxy_pairs:uint; private var facilitator_poll_interval:Number; - private var local_addr:Object; public var rate_limit:RateLimit; @@ -133,7 +113,7 @@ package debug = this.loaderInfo.parameters["debug"]; - if (debug || this.loaderInfo.parameters["client"]) { + if (debug) { output_text = new TextField(); output_text.width = stage.stageWidth; output_text.height = stage.stageHeight; @@ -182,16 +162,7 @@ package else rate_limit = new RateUnlimit(); - local_addr = get_param_addr("local", DEFAULT_LOCAL_TOR_CLIENT_ADDR); - if (!local_addr) { - puts("Error: Local spec must be in the form \"host:port\"."); - return; - } - - if (this.loaderInfo.parameters["client"]) - client_main(); - else - proxy_main(); + proxy_main(); } /* Get an address structure from the given movie parameter, or the given @@ -320,68 +291,6 @@ package badge.proxy_begin(); } - private function client_main():void - { - var rs:RTMFPSocket; - - puts("Making RTMFP socket."); - rs = new RTMFPSocket(RTMFP_URL); - rs.addEventListener(Event.COMPLETE, function (e:Event):void { - puts("Got RTMFP id " + rs.id); - register(rs); - }); - rs.addEventListener(RTMFPSocket.ACCEPT_EVENT, client_accept); - - rs.listen(); - } - - private function client_accept(e:Event):void { - var rs:RTMFPSocket; - var s_t:Socket; - var proxy_pair:ProxyPair; - - rs = e.target as RTMFPSocket; - s_t = new Socket(); - - puts("Got RTMFP connection from " + rs.peer_id); - - proxy_pair = new ProxyPair(this, rs, function ():void { - /* Do nothing; already connected. */ - }, s_t, function ():void { - s_t.connect(local_addr.host, local_addr.port); - }); - proxy_pair.connect(); - } - - private function register(rs:RTMFPSocket):void { - var fac_url:String; - var loader:URLLoader; - var request:URLRequest; - - loader = new URLLoader(); - loader.addEventListener(Event.COMPLETE, function (e:Event):void { - puts("Facilitator: registered."); - }); - loader.addEventListener(SecurityErrorEvent.SECURITY_ERROR, function (e:SecurityErrorEvent):void { - puts("Facilitator: security error: " + e.text + "."); - rs.close(); - }); - loader.addEventListener(IOErrorEvent.IO_ERROR, function (e:IOErrorEvent):void { - puts("Facilitator: I/O error: " + e.text + "."); - rs.close(); - }); - - fac_url = "http://" + encodeURIComponent(fac_addr.host) - + ":" + encodeURIComponent(fac_addr.port) + "/"; - request = new URLRequest(fac_url); - request.method = URLRequestMethod.POST; - request.data = new URLVariables(); - request.data["client"] = rs.id; - - puts("Facilitator: connecting to " + fac_url + "."); - loader.load(request); - } - private function make_proxy_pair(client_spec:String, relay_spec:String):ProxyPair { var proxy_pair:ProxyPair; @@ -408,19 +317,6 @@ package return proxy_pair; } - if (client_spec.match(/^[0-9A-Fa-f]{64}$/)) { - s_c = new RTMFPSocket(RTMFP_URL); - s_r = new Socket(); - proxy_pair = new ProxyPair(this, s_c, function ():void { - s_c.connect(client_spec); - }, s_r, function ():void { - s_r.connect(addr_r.host, addr_r.port); - }); - proxy_pair.set_name("<" + client_spec.substr(0, 4) + "...," - + addr_r.host + ":" + addr_r.port + ">"); - return proxy_pair; - } - throw new ArgumentError("Can't parse client spec \"" + client_spec + "\"."); }

1 0

[flashproxy/master] Add basic outline for JS proxy.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit 4e5cfcee07dc68aa6774fe81704a224904a47b2e Author: David Fifield <david(a)bamsoftware.com> Date: Sun Mar 11 23:26:21 2012 -0700 Add basic outline for JS proxy. --- embed.html | 9 ++++ flashproxy.js | 132 +++++++++++++++++++------------------------------------- 2 files changed, 54 insertions(+), 87 deletions(-) diff --git a/embed.html b/embed.html index ce3c1b4..de90209 100644 --- a/embed.html +++ b/embed.html @@ -7,6 +7,15 @@ body { margin: 0; padding: 0; } +#flashproxy-badge.debug { + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 100%; + color: #44cc44; + background-color: #001f0f; +} </style> </head> <body> diff --git a/flashproxy.js b/flashproxy.js index 30ad616..ab55f07 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -1,3 +1,40 @@ +function FlashProxy() +{ + this.debug_div = document.createElement("div"); + this.debug_div.className = "debug"; + + this.badge_elem = this.debug_div; + this.badge_elem.setAttribute("id", "flashproxy-badge"); + + this.puts = function(s) { + if (this.debug_div) { + this.debug_div.appendChild(document.createTextNode(s)); + this.debug_div.appendChild(document.createElement("br")); + } + }; + + this.start = function() { + this.puts("Hello world!"); + } +} + +/* This is the non-functional badge that occupies space when + flashproxy_should_disable decides that the proxy shouldn't run. */ +function DummyFlashProxy() +{ + var img; + + img = document.createElement("img"); + img.setAttribute("src", "https://crypto.stanford.edu/flashproxy/badge.png"); + img.setAttribute("border", 0); + img.setAttribute("id", "flashproxy-badge"); + + this.badge_elem = img; + + this.start = function() { + }; +} + /* Are circumstances such that we should self-disable and not be a proxy? We take a best-effort guess as to whether this device runs on a battery or the data transfer might be expensive. @@ -36,97 +73,15 @@ function flashproxy_should_disable() return false; } -/* Create and return a DOM fragment: -<span id=BADGE_ID> -<a href=FLASHPROXY_INFO_URL> - child -</a> -</span> -*/ -function flashproxy_make_container(child) -{ - var BADGE_ID = "flashproxy-badge"; - var FLASHPROXY_INFO_URL = "https://crypto.stanford.edu/flashproxy/"; - - var container; - var a; - - container = document.createElement("span"); - container.setAttribute("id", "flashproxy-badge"); - a = document.createElement("a"); - a.setAttribute("href", FLASHPROXY_INFO_URL); - a.appendChild(child) - container.appendChild(a); - - return container; -} - -/* Create and return a DOM fragment: -<object width=WIDTH height=HEIGHT> - <param name="movie" value=SWFCAT_URL> - <param name="flashvars" value=FLASHVARS> - <embed src=SWFCAT_URL width=WIDTH height=HEIGHT flashvars=FLASHVARS></embed> -</object> -*/ -function flashproxy_make_badge() -{ - var WIDTH = 70; - var HEIGHT = 23; - var FLASHVARS = ""; - var SWFCAT_URL = "https://crypto.stanford.edu/flashproxy/swfcat.swf"; - - var object; - var param; - var embed; - - object = document.createElement("object"); - object.setAttribute("width", WIDTH); - object.setAttribute("height", HEIGHT); - - param = document.createElement("param"); - param.setAttribute("name", "movie"); - param.setAttribute("value", SWFCAT_URL); - object.appendChild(param); - param = document.createElement("param"); - param.setAttribute("name", "flashvars"); - param.setAttribute("value", FLASHVARS); - object.appendChild(param); - - embed = document.createElement("embed"); - embed.setAttribute("src", SWFCAT_URL); - embed.setAttribute("width", WIDTH); - embed.setAttribute("height", HEIGHT); - embed.setAttribute("flashvars", FLASHVARS); - object.appendChild(embed); - - return object; -} - -/* Create and return a non-functional placeholder badge DOM fragment: -<img src=BADGE_IMAGE_URL border="0"> -*/ -function flashproxy_make_dummy_badge() -{ - var BADGE_IMAGE_URL = "https://crypto.stanford.edu/flashproxy/badge.png"; - - var img; - - img = document.createElement("img"); - img.setAttribute("src", BADGE_IMAGE_URL); - img.setAttribute("border", 0); - - return img; -} - function flashproxy_badge_insert() { - var badge; + var fp; var e; if (flashproxy_should_disable()) { - badge = flashproxy_make_dummy_badge(); + fp = new DummyFlashProxy(); } else { - badge = flashproxy_make_badge(); + fp = new FlashProxy(); } /* http://intertwingly.net/blog/2006/11/10/Thats-Not-Write for this trick to @@ -135,7 +90,10 @@ function flashproxy_badge_insert() while (e.lastChild && e.lastChild.nodeType == 1) { e = e.lastChild; } - e.parentNode.appendChild(flashproxy_make_container(badge)); + e.parentNode.appendChild(fp.badge_elem); + + return fp; } -flashproxy_badge_insert(); +fp = flashproxy_badge_insert(); +fp.start();

1 0

[flashproxy/master] Move embed JavaScript into a separate file flashproxy.js.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit f7b5cc69853aab33052608441ecba463f370ab24 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Mar 11 21:51:16 2012 -0700 Move embed JavaScript into a separate file flashproxy.js. --- embed.html | 146 +-------------------------------------------------------- flashproxy.js | 141 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 142 insertions(+), 145 deletions(-) diff --git a/embed.html b/embed.html index fde5ba8..ce3c1b4 100644 --- a/embed.html +++ b/embed.html @@ -2,148 +2,6 @@ <html> <head> <meta http-equiv="refresh" content="86400"> -<script type="text/javascript"> -/* Are circumstances such that we should self-disable and not be a - proxy? We take a best-effort guess as to whether this device runs on - a battery or the data transfer might be expensive. - - Matching mobile User-Agents is complex; but we only need to match - those devices that can also run a recent version of Adobe Flash, - which is a subset of this list: - https://secure.wikimedia.org/wikipedia/en/wiki/Adobe_Flash_Player#Mobile_op… - - Other resources: - http://www.zytrax.com/tech/web/mobile_ids.html - http://googlewebmastercentral.blogspot.com/2011/03/mo-better-to-also-detect… - http://search.cpan.org/~cmanley/Mobile-UserAgent-1.05/lib/Mobile/UserAgent.… -*/ -function flashproxy_should_disable() -{ - var ua; - - ua = window.navigator.userAgent; - if (ua != null) { - var UA_LIST = [ - /\bmobile\b/i, - /\bandroid\b/i, - /\bopera mobi\b/i, - ]; - - for (var i = 0; i < UA_LIST.length; i++) { - var re = UA_LIST[i]; - - if (ua.match(re)) { - return true; - } - } - } - - return false; -} - -/* Create and return a DOM fragment: -<span id=BADGE_ID> -<a href=FLASHPROXY_INFO_URL> - child -</a> -</span> -*/ -function flashproxy_make_container(child) -{ - var BADGE_ID = "flashproxy-badge"; - var FLASHPROXY_INFO_URL = "https://crypto.stanford.edu/flashproxy/"; - - var container; - var a; - - container = document.createElement("span"); - container.setAttribute("id", "flashproxy-badge"); - a = document.createElement("a"); - a.setAttribute("href", FLASHPROXY_INFO_URL); - a.appendChild(child) - container.appendChild(a); - - return container; -} - -/* Create and return a DOM fragment: -<object width=WIDTH height=HEIGHT> - <param name="movie" value=SWFCAT_URL> - <param name="flashvars" value=FLASHVARS> - <embed src=SWFCAT_URL width=WIDTH height=HEIGHT flashvars=FLASHVARS></embed> -</object> -*/ -function flashproxy_make_badge() -{ - var WIDTH = 70; - var HEIGHT = 23; - var FLASHVARS = ""; - var SWFCAT_URL = "https://crypto.stanford.edu/flashproxy/swfcat.swf"; - - var object; - var param; - var embed; - - object = document.createElement("object"); - object.setAttribute("width", WIDTH); - object.setAttribute("height", HEIGHT); - - param = document.createElement("param"); - param.setAttribute("name", "movie"); - param.setAttribute("value", SWFCAT_URL); - object.appendChild(param); - param = document.createElement("param"); - param.setAttribute("name", "flashvars"); - param.setAttribute("value", FLASHVARS); - object.appendChild(param); - - embed = document.createElement("embed"); - embed.setAttribute("src", SWFCAT_URL); - embed.setAttribute("width", WIDTH); - embed.setAttribute("height", HEIGHT); - embed.setAttribute("flashvars", FLASHVARS); - object.appendChild(embed); - - return object; -} - -/* Create and return a non-functional placeholder badge DOM fragment: -<img src=BADGE_IMAGE_URL border="0"> -*/ -function flashproxy_make_dummy_badge() -{ - var BADGE_IMAGE_URL = "https://crypto.stanford.edu/flashproxy/badge.png"; - - var img; - - img = document.createElement("img"); - img.setAttribute("src", BADGE_IMAGE_URL); - img.setAttribute("border", 0); - - return img; -} - -function flashproxy_badge_insert() -{ - var badge; - var e; - - if (flashproxy_should_disable()) { - badge = flashproxy_make_dummy_badge(); - } else { - badge = flashproxy_make_badge(); - } - - /* http://intertwingly.net/blog/2006/11/10/Thats-Not-Write for this trick to - insert right after the <script> element in the DOM. */ - e = document; - while (e.lastChild && e.lastChild.nodeType == 1) { - e = e.lastChild; - } - e.parentNode.appendChild(flashproxy_make_container(badge)); -} -</script> - <style type="text/css"> body { margin: 0; @@ -152,9 +10,7 @@ body { </style> </head> <body> -<script type="text/javascript"> -flashproxy_badge_insert(); -</script> +<script type="text/javascript" src="flashproxy.js"></script> <noscript> <a href="https://crypto.stanford.edu/flashproxy/" target="_parent"><img src="badge.png" border="0" alt="I support Internet freedom"></a> </noscript> diff --git a/flashproxy.js b/flashproxy.js new file mode 100644 index 0000000..30ad616 --- /dev/null +++ b/flashproxy.js @@ -0,0 +1,141 @@ +/* Are circumstances such that we should self-disable and not be a + proxy? We take a best-effort guess as to whether this device runs on + a battery or the data transfer might be expensive. + + Matching mobile User-Agents is complex; but we only need to match + those devices that can also run a recent version of Adobe Flash, + which is a subset of this list: + https://secure.wikimedia.org/wikipedia/en/wiki/Adobe_Flash_Player#Mobile_op… + + Other resources: + http://www.zytrax.com/tech/web/mobile_ids.html + http://googlewebmastercentral.blogspot.com/2011/03/mo-better-to-also-detect… + http://search.cpan.org/~cmanley/Mobile-UserAgent-1.05/lib/Mobile/UserAgent.… +*/ +function flashproxy_should_disable() +{ + var ua; + + ua = window.navigator.userAgent; + if (ua != null) { + var UA_LIST = [ + /\bmobile\b/i, + /\bandroid\b/i, + /\bopera mobi\b/i, + ]; + + for (var i = 0; i < UA_LIST.length; i++) { + var re = UA_LIST[i]; + + if (ua.match(re)) { + return true; + } + } + } + + return false; +} + +/* Create and return a DOM fragment: +<span id=BADGE_ID> +<a href=FLASHPROXY_INFO_URL> + child +</a> +</span> +*/ +function flashproxy_make_container(child) +{ + var BADGE_ID = "flashproxy-badge"; + var FLASHPROXY_INFO_URL = "https://crypto.stanford.edu/flashproxy/"; + + var container; + var a; + + container = document.createElement("span"); + container.setAttribute("id", "flashproxy-badge"); + a = document.createElement("a"); + a.setAttribute("href", FLASHPROXY_INFO_URL); + a.appendChild(child) + container.appendChild(a); + + return container; +} + +/* Create and return a DOM fragment: +<object width=WIDTH height=HEIGHT> + <param name="movie" value=SWFCAT_URL> + <param name="flashvars" value=FLASHVARS> + <embed src=SWFCAT_URL width=WIDTH height=HEIGHT flashvars=FLASHVARS></embed> +</object> +*/ +function flashproxy_make_badge() +{ + var WIDTH = 70; + var HEIGHT = 23; + var FLASHVARS = ""; + var SWFCAT_URL = "https://crypto.stanford.edu/flashproxy/swfcat.swf"; + + var object; + var param; + var embed; + + object = document.createElement("object"); + object.setAttribute("width", WIDTH); + object.setAttribute("height", HEIGHT); + + param = document.createElement("param"); + param.setAttribute("name", "movie"); + param.setAttribute("value", SWFCAT_URL); + object.appendChild(param); + param = document.createElement("param"); + param.setAttribute("name", "flashvars"); + param.setAttribute("value", FLASHVARS); + object.appendChild(param); + + embed = document.createElement("embed"); + embed.setAttribute("src", SWFCAT_URL); + embed.setAttribute("width", WIDTH); + embed.setAttribute("height", HEIGHT); + embed.setAttribute("flashvars", FLASHVARS); + object.appendChild(embed); + + return object; +} + +/* Create and return a non-functional placeholder badge DOM fragment: +<img src=BADGE_IMAGE_URL border="0"> +*/ +function flashproxy_make_dummy_badge() +{ + var BADGE_IMAGE_URL = "https://crypto.stanford.edu/flashproxy/badge.png"; + + var img; + + img = document.createElement("img"); + img.setAttribute("src", BADGE_IMAGE_URL); + img.setAttribute("border", 0); + + return img; +} + +function flashproxy_badge_insert() +{ + var badge; + var e; + + if (flashproxy_should_disable()) { + badge = flashproxy_make_dummy_badge(); + } else { + badge = flashproxy_make_badge(); + } + + /* http://intertwingly.net/blog/2006/11/10/Thats-Not-Write for this trick to + insert right after the <script> element in the DOM. */ + e = document; + while (e.lastChild && e.lastChild.nodeType == 1) { + e = e.lastChild; + } + e.parentNode.appendChild(flashproxy_make_container(badge)); +} + +flashproxy_badge_insert();

1 0

← Newer
1
...
69
70
71
72
73
74
75
...
95
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2012