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

[flashproxy/master] Don't log IP addresses in registration helpers
by dcf＠torproject.org 31 Jul '13

31 Jul '13

commit 0938d7ccb9ceaf3d45020fca03639f706dc74c61 Author: Arlo Breault <arlolra(a)gmail.com> Date: Tue Jul 2 10:17:29 2013 -0700 Don't log IP addresses in registration helpers See #9185 --- flashproxy-client | 6 ++++++ flashproxy-reg-appspot | 22 ++++++++++++++++++---- flashproxy-reg-email | 20 +++++++++++++++++--- flashproxy-reg-http | 17 ++++++++++++++--- 4 files changed, 55 insertions(+), 10 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index 5c6f9e0..89eda2a 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -1001,16 +1001,22 @@ def build_register_command(method): command = [os.path.join(script_dir, "flashproxy-reg-appspot")] + af if options.facilitator_pubkey_filename is not None: command += ["--facilitator-pubkey", options.facilitator_pubkey_filename] + if not options.safe_logging: + command += ["--unsafe-logging"] return command elif method == "email": command = [os.path.join(script_dir, "flashproxy-reg-email")] + af if options.facilitator_pubkey_filename is not None: command += ["--facilitator-pubkey", options.facilitator_pubkey_filename] + if not options.safe_logging: + command += ["--unsafe-logging"] return command elif method == "http": command = [os.path.join(script_dir, "flashproxy-reg-http")] + af if options.facilitator_url is not None: command += ["-f", options.facilitator_url] + if not options.safe_logging: + command += ["--unsafe-logging"] return command else: raise ValueError("Unknown registration method \"%s\"" % method) diff --git a/flashproxy-reg-appspot b/flashproxy-reg-appspot index 27bb09b..16d0e7f 100755 --- a/flashproxy-reg-appspot +++ b/flashproxy-reg-appspot @@ -73,6 +73,7 @@ class options(object): address_family = socket.AF_UNSPEC facilitator_pubkey_filename = None use_certificate_pin = True + safe_logging = True def usage(f = sys.stdout): print >> f, """\ @@ -87,12 +88,20 @@ external IP address is guessed). --facilitator-pubkey=FILENAME encrypt registrations to the given PEM-formatted public key (default built-in). - -h, --help show this help.\ + -h, --help show this help. + --unsafe-logging don't scrub IP addresses from logs.\ """ % { "progname": sys.argv[0], "remote_addr": format_addr((DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT)), } +def safe_str(s): + """Return "[scrubbed]" if options.safe_logging is true, and s otherwise.""" + if options.safe_logging: + return "[scrubbed]" + else: + return s + def parse_addr_spec(spec, defhost = None, defport = None): host = None port = None @@ -143,6 +152,9 @@ def format_addr(addr): result += u":%d" % port return result +def safe_format_addr(addr): + return safe_str(format_addr(addr)) + def get_state_dir(): """Get a directory where we can put temporary files. Returns None if any suitable temporary directory will do.""" @@ -223,7 +235,7 @@ def get_external_ip(): finally: f.close() -opt, args = getopt.gnu_getopt(sys.argv[1:], "46h", ["disable-pin", "facilitator-pubkey=", "help"]) +opt, args = getopt.gnu_getopt(sys.argv[1:], "46h", ["disable-pin", "facilitator-pubkey=", "help", "unsafe-logging"]) for o, a in opt: if o == "-4": options.address_family = socket.AF_INET @@ -236,6 +248,8 @@ for o, a in opt: elif o == "-h" or o == "--help": usage() sys.exit() + elif o == "--unsafe-logging": + options.safe_logging = False if len(args) == 0: remote_addr = (DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT) @@ -277,7 +291,7 @@ if not remote_addr[0]: 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)) + print >> sys.stderr, "Error parsing external IP address %s: %s" % (safe_str(repr(ip)), str(e)) sys.exit(1) try: @@ -299,4 +313,4 @@ except Exception, e: sys.exit(1) http.close() -print "Registered \"%s\" with %s." % (format_addr(remote_addr), TARGET_DOMAIN) +print "Registered \"%s\" with %s." % (safe_format_addr(remote_addr), TARGET_DOMAIN) diff --git a/flashproxy-reg-email b/flashproxy-reg-email index 3f77b10..2d3cba9 100755 --- a/flashproxy-reg-email +++ b/flashproxy-reg-email @@ -88,6 +88,7 @@ class options(object): address_family = socket.AF_UNSPEC facilitator_pubkey_filename = None use_certificate_pin = True + safe_logging = True def usage(f = sys.stdout): print >> f, """\ @@ -112,7 +113,8 @@ This program requires the M2Crypto library for Python. public key (default built-in). -h, --help show this help. -s, --smtp=HOST[:PORT] use the given SMTP server - (default "%(smtp_addr)s").\ + (default "%(smtp_addr)s"). + --unsafe-logging don't scrub IP addresses from logs.\ """ % { "progname": sys.argv[0], "remote_addr": format_addr((DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT)), @@ -120,6 +122,13 @@ This program requires the M2Crypto library for Python. "smtp_addr": format_addr((DEFAULT_SMTP_HOST, DEFAULT_SMTP_PORT)), } +def safe_str(s): + """Return "[scrubbed]" if options.safe_logging is true, and s otherwise.""" + if options.safe_logging: + return "[scrubbed]" + else: + return s + def parse_addr_spec(spec, defhost = None, defport = None): host = None port = None @@ -170,6 +179,9 @@ def format_addr(addr): result += u":%d" % port return result +def safe_format_addr(addr): + return safe_str(format_addr(addr)) + def get_state_dir(): """Get a directory where we can put temporary files. Returns None if any suitable temporary directory will do.""" @@ -192,7 +204,7 @@ def get_facilitator_pubkey(): options.email_addr = DEFAULT_EMAIL_ADDRESS options.smtp_addr = (DEFAULT_SMTP_HOST, DEFAULT_SMTP_PORT) -opts, args = getopt.gnu_getopt(sys.argv[1:], "46de:hs:", ["debug", "disable-pin", "email=", "facilitator-pubkey=", "help", "smtp="]) +opts, args = getopt.gnu_getopt(sys.argv[1:], "46de:hs:", ["debug", "disable-pin", "email=", "facilitator-pubkey=", "help", "smtp=", "unsafe-logging"]) for o, a in opts: if o == "-4": options.address_family = socket.AF_INET @@ -211,6 +223,8 @@ for o, a in opts: sys.exit() elif o == "-s" or o == "--smtp": options.smtp_addr = parse_addr_spec(a, DEFAULT_SMTP_HOST, DEFAULT_SMTP_PORT) + elif o == "--unsafe-logging": + options.safe_logging = False if len(args) == 0: options.remote_addr = (DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT) @@ -310,4 +324,4 @@ except Exception, e: print >> sys.stderr, "Failed to register: %s" % str(e) sys.exit(1) -print "Registered \"%s\" with %s." % (format_addr(options.remote_addr), options.email_addr) +print "Registered \"%s\" with %s." % (safe_format_addr(options.remote_addr), options.email_addr) diff --git a/flashproxy-reg-http b/flashproxy-reg-http index 68fe46a..975ebda 100755 --- a/flashproxy-reg-http +++ b/flashproxy-reg-http @@ -16,6 +16,7 @@ class options(object): remote_addr = None facilitator_url = None address_family = socket.AF_UNSPEC + safe_logging = True def usage(f = sys.stdout): print >> f, """\ @@ -27,13 +28,21 @@ remote address registered is "%(remote_addr)s". -6 name lookups use only IPv6. -f, --facilitator=URL register with the given facilitator (by default "%(fac_url)s"). - -h, --help show this help.\ + -h, --help show this help. + --unsafe-logging don't scrub IP addresses from logs.\ """ % { "progname": sys.argv[0], "fac_url": DEFAULT_FACILITATOR_URL, "remote_addr": format_addr((DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT)), } +def safe_str(s): + """Return "[scrubbed]" if options.safe_logging is true, and s otherwise.""" + if options.safe_logging: + return "[scrubbed]" + else: + return s + def parse_addr_spec(spec, defhost = None, defport = None): host = None port = None @@ -87,7 +96,7 @@ def format_addr(addr): options.facilitator_url = DEFAULT_FACILITATOR_URL options.remote_addr = (DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT) -opts, args = getopt.gnu_getopt(sys.argv[1:], "46f:h", ["facilitator=", "help"]) +opts, args = getopt.gnu_getopt(sys.argv[1:], "46f:h", ["facilitator=", "help", "unsafe-logging"]) for o, a in opts: if o == "-4": options.address_family = socket.AF_INET @@ -98,6 +107,8 @@ for o, a in opts: elif o == "-h" or o == "--help": usage() sys.exit() + elif o == "--unsafe-logging": + options.safe_logging = False if len(args) == 0: pass @@ -127,4 +138,4 @@ except Exception, e: sys.exit(1) http.close() -print "Registered \"%s\" with %s." % (spec, options.facilitator_url) +print "Registered \"%s\" with %s." % (safe_str(spec), options.facilitator_url)

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 31 Jul '13

31 Jul '13

commit 747fd9979b96f3ab7045c60b1f788e3be15ca69d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 31 03:45:09 2013 +0000 Update translations for bridgedb_completed --- kn/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kn/LC_MESSAGES/bridgedb.po b/kn/LC_MESSAGES/bridgedb.po index a4ba5b5..905e22d 100644 --- a/kn/LC_MESSAGES/bridgedb.po +++ b/kn/LC_MESSAGES/bridgedb.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2013-07-04 07:51+0000\n" +"PO-Revision-Date: 2013-07-31 03:40+0000\n" "Last-Translator: msj2\n" "Language-Team: Kannada (http://www.transifex.com/projects/p/torproject/language/kn/)\n" "MIME-Version: 1.0\n" @@ -23,7 +23,7 @@ msgstr "" #: lib/bridgedb/templates/base.html:33 msgid "What are bridges?" -msgstr "ಗಳು ಅಂದರೆ ಏನು?" +msgstr "ಬ್ರಿಡ್ಜ್ ಗಳು ಅಂದರೆ ಏನು?" #: lib/bridgedb/templates/base.html:34 #, python-format

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 31 Jul '13

31 Jul '13

commit 02a0b4d68cc6c0602d38e3944787dd5220f40e59 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 31 03:45:03 2013 +0000 Update translations for bridgedb --- kn/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kn/LC_MESSAGES/bridgedb.po b/kn/LC_MESSAGES/bridgedb.po index a4ba5b5..905e22d 100644 --- a/kn/LC_MESSAGES/bridgedb.po +++ b/kn/LC_MESSAGES/bridgedb.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2013-07-04 07:51+0000\n" +"PO-Revision-Date: 2013-07-31 03:40+0000\n" "Last-Translator: msj2\n" "Language-Team: Kannada (http://www.transifex.com/projects/p/torproject/language/kn/)\n" "MIME-Version: 1.0\n" @@ -23,7 +23,7 @@ msgstr "" #: lib/bridgedb/templates/base.html:33 msgid "What are bridges?" -msgstr "ಗಳು ಅಂದರೆ ಏನು?" +msgstr "ಬ್ರಿಡ್ಜ್ ಗಳು ಅಂದರೆ ಏನು?" #: lib/bridgedb/templates/base.html:34 #, python-format

1 0

[flashproxy/master] ChangeLog for standalone Node.js proxy.
by dcf＠torproject.org 31 Jul '13

31 Jul '13

commit 0506689b2ce710821d0ffaa6e91f51d046dcb3dd Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jul 30 15:54:37 2013 -0700 ChangeLog for standalone Node.js proxy. --- ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index 1ce243e..9e1c6a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -45,6 +45,10 @@ information like IP addresses. Patch by Arlo Breault. Fixes bug 9170. + o The new modules/nodejs allows running a standalone flash proxy + (outside a browser) under Node.js. Patch by Arlo Breault. Fixes bug + 7944. + Changes in version 1.1 o Programs that use certificate pins now take a --disable-pin option that causes pins to be ignored.

1 0

[flashproxy/master] ChangeLog for IP scrubbing in the proxy.
by dcf＠torproject.org 31 Jul '13

31 Jul '13

commit 8c3b6e55d0553c7e1134e4542b90442f7dfee840 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jul 30 16:45:22 2013 -0700 ChangeLog for IP scrubbing in the proxy. --- ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index 0df25f9..1ce243e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,10 @@ to invoke tor-fw-helper to forward ports automatically. Patch by Arlo Breault and David Fifield. Fixes bug 9033. + o The flash proxy, in debug mode, now hides potentially sensistive + information like IP addresses. Patch by Arlo Breault. Fixes bug + 9170. + Changes in version 1.1 o Programs that use certificate pins now take a --disable-pin option that causes pins to be ignored.

1 0

[flashproxy/master] Don't log IP addresses by default in flashproxy.js
by dcf＠torproject.org 31 Jul '13

31 Jul '13

commit 1ad6266027de163f23a421509306844d2040ae51 Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Jun 28 14:08:51 2013 -0700 Don't log IP addresses by default in flashproxy.js Adds an undocumented query string parameter, unsafe_logging. See #9170. --- proxy/flashproxy.js | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 3265a11..248e0e2 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -86,6 +86,7 @@ var WebSocket = window.WebSocket || window.MozWebSocket; var query = parse_query_string(window.location.search.substr(1)); var cookies = parse_cookie_string(document.cookie); var DEBUG = get_param_boolean(query, "debug", false); +var SAFE_LOGGING = !get_param_boolean(query, "unsafe_logging", false); var debug_div; if (DEBUG) { @@ -541,7 +542,7 @@ function FlashProxy() { this.proxy_main = function() { var params; - var url; + var base_url, url; var xhr; if (this.proxy_pairs.length >= this.max_num_proxy_pairs) { @@ -554,7 +555,8 @@ function FlashProxy() { /* Clients we're currently handling. */ for (var i = 0; i < this.proxy_pairs.length; i++) params.push(["client", format_addr(this.proxy_pairs[i].client_addr)]); - url = this.fac_url.replace(/\?.*/, "") + "?" + build_query_string(params); + base_url = this.fac_url.replace(/\?.*/, ""); + url = base_url + "?" + build_query_string(params); xhr = new XMLHttpRequest(); try { xhr.open("GET", url); @@ -579,6 +581,11 @@ function FlashProxy() { } } }.bind(this); + + /* Remove query string if scrubbing. */ + if (SAFE_LOGGING) + url = base_url; + puts("Facilitator: connecting to " + url + "."); xhr.send(null); }; @@ -612,7 +619,7 @@ function FlashProxy() { } client_addr = parse_addr_spec(response.client); if (client_addr === null) { - puts("Error: can't parse client spec " + repr(response.client) + "."); + puts("Error: can't parse client spec " + safe_repr(response.client) + "."); return; } if (!response.relay) { @@ -621,11 +628,11 @@ function FlashProxy() { } relay_addr = parse_addr_spec(response.relay); if (relay_addr === null) { - puts("Error: can't parse relay spec " + repr(response.relay) + "."); + puts("Error: can't parse relay spec " + safe_repr(response.relay) + "."); return; } - puts("Facilitator: got client:" + repr(client_addr) + " " - + "relay:" + repr(relay_addr) + "."); + puts("Facilitator: got client:" + safe_repr(client_addr) + " " + + "relay:" + safe_repr(relay_addr) + "."); this.begin_proxy(client_addr, relay_addr); }; @@ -653,7 +660,7 @@ function FlashProxy() { try { proxy_pair.connect(); } catch (err) { - puts("ProxyPair: exception while connecting: " + repr(err.message) + "."); + puts("ProxyPair: exception while connecting: " + safe_repr(err.message) + "."); this.die(); return; } @@ -997,6 +1004,10 @@ function repr(x) { } } +function safe_repr(s) { + return SAFE_LOGGING ? "[scrubbed]" : repr(s); +} + /* Do we seem to be running in Tor Browser? Check the user-agent string and for no listing of supported MIME types. */ var TBB_UAS = [

1 0

[flashproxy/master] Fix the safe_str comment.
by dcf＠torproject.org 31 Jul '13

31 Jul '13

commit 3c24f311a4e74bdf72d960c2b949b6a878cf5153 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jul 30 16:24:25 2013 -0700 Fix the safe_str comment. Found by Arlo. https://trac.torproject.org/projects/tor/attachment/ticket/9170/0001-Don-t-… --- facilitator/facilitator | 2 +- facilitator/facilitator-email-poller | 2 +- facilitator/facilitator-reg-daemon | 2 +- flashproxy-client | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index cd3473a..4049dc6 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -63,7 +63,7 @@ again. Listen on 127.0.0.1 and port PORT (by default %(port)d). } def safe_str(s): - """Return s if options.safe_logging is true, and "[scrubbed]" otherwise.""" + """Return "[scrubbed]" if options.safe_logging is true, and s otherwise.""" if options.safe_logging: return "[scrubbed]" else: diff --git a/facilitator/facilitator-email-poller b/facilitator/facilitator-email-poller index f520033..2b03799 100755 --- a/facilitator/facilitator-email-poller +++ b/facilitator/facilitator-email-poller @@ -120,7 +120,7 @@ them, and forwards the registrations to the facilitator. } def safe_str(s): - """Return s if options.safe_logging is true, and "[scrubbed]" otherwise.""" + """Return "[scrubbed]" if options.safe_logging is true, and s otherwise.""" if options.safe_logging: return "[scrubbed]" else: diff --git a/facilitator/facilitator-reg-daemon b/facilitator/facilitator-reg-daemon index bf39696..73d9199 100755 --- a/facilitator/facilitator-reg-daemon +++ b/facilitator/facilitator-reg-daemon @@ -61,7 +61,7 @@ single process. } def safe_str(s): - """Return s if options.safe_logging is true, and "[scrubbed]" otherwise.""" + """Return "[scrubbed]" if options.safe_logging is true, and s otherwise.""" if options.safe_logging: return "[scrubbed]" else: diff --git a/flashproxy-client b/flashproxy-client index 41d6559..5c6f9e0 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -132,7 +132,7 @@ omitted, it uses a public default. } def safe_str(s): - """Return s if options.safe_logging is true, and "[scrubbed]" otherwise.""" + """Return "[scrubbed]" if options.safe_logging is true, and s otherwise.""" if options.safe_logging: return "[scrubbed]" else:

1 0

[flashproxy/master] Small style change.
by dcf＠torproject.org 31 Jul '13

31 Jul '13

commit 90b2aefb4bcfea6904dd95900436f957873a4157 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jul 30 16:34:36 2013 -0700 Small style change. --- proxy/flashproxy.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 248e0e2..cb36247 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -584,9 +584,10 @@ function FlashProxy() { /* Remove query string if scrubbing. */ if (SAFE_LOGGING) - url = base_url; + puts("Facilitator: connecting to " + base_url + "."); + else + puts("Facilitator: connecting to " + url + "."); - puts("Facilitator: connecting to " + url + "."); xhr.send(null); };

1 0

[flashproxy/master] Add HEADLESS global indicating whether we have a DOM.
by dcf＠torproject.org 31 Jul '13

31 Jul '13

commit 7a8278c91effb41a97c3141b875e7ef0bae53a80 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jun 23 19:04:24 2013 -0700 Add HEADLESS global indicating whether we have a DOM. --- proxy/flashproxy.js | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index cb36247..4367eff 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -84,14 +84,21 @@ var OPT_IN_COOKIE = "flashproxy-allow"; var WebSocket = window.WebSocket || window.MozWebSocket; var query = parse_query_string(window.location.search.substr(1)); -var cookies = parse_cookie_string(document.cookie); var DEBUG = get_param_boolean(query, "debug", false); var SAFE_LOGGING = !get_param_boolean(query, "unsafe_logging", false); var debug_div; - -if (DEBUG) { - debug_div = document.createElement("pre"); - debug_div.className = "debug"; +/* HEADLESS is true if we are running not in a browser with a DOM. */ +var HEADLESS = typeof(document) === "undefined"; + +var cookies; +if (HEADLESS) { + cookies = {}; +} else { + cookies = parse_cookie_string(document.cookie); + if (DEBUG) { + debug_div = document.createElement("pre"); + debug_div.className = "debug"; + } } function puts(s) { @@ -459,13 +466,16 @@ function make_websocket(addr) { } function FlashProxy() { - if (DEBUG) { + if (HEADLESS) { + /* No badge. */ + } else if (DEBUG) { this.badge_elem = debug_div; } else { this.badge = new Badge(); this.badge_elem = this.badge.elem; } - this.badge_elem.setAttribute("id", "flashproxy-badge"); + if (this.badge_elem) + this.badge_elem.setAttribute("id", "flashproxy-badge"); this.proxy_pairs = [];

1 0

[flashproxy/master] Support for running flashproxy.js in node.js
by dcf＠torproject.org 31 Jul '13

31 Jul '13

commit e84a25ccdd93d027e30136c4b3011b676526fac5 Author: Arlo Breault <arlolra(a)gmail.com> Date: Sat Jun 1 14:49:37 2013 -0700 Support for running flashproxy.js in node.js --- .gitignore | 2 ++ modules/nodejs/Makefile | 4 ++++ modules/nodejs/README | 29 +++++++++++++++++++++++++++++ modules/nodejs/main.js | 30 ++++++++++++++++++++++++++++++ modules/nodejs/package.json | 30 ++++++++++++++++++++++++++++++ 5 files changed, 95 insertions(+) diff --git a/.gitignore b/.gitignore index cc97752..6195b6c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ /py2exe-tmp /websocket-transport/websocket-client /websocket-transport/websocket-server +/modules/nodejs/node_modules +/modules/nodejs/flashproxy.js diff --git a/modules/nodejs/Makefile b/modules/nodejs/Makefile new file mode 100644 index 0000000..e4a11d4 --- /dev/null +++ b/modules/nodejs/Makefile @@ -0,0 +1,4 @@ +.PHONY: prepublish +prepublish: flashproxy.js +flashproxy.js: ../../proxy/flashproxy.js + cp -f $< $@ diff --git a/modules/nodejs/README b/modules/nodejs/README new file mode 100644 index 0000000..cbda782 --- /dev/null +++ b/modules/nodejs/README @@ -0,0 +1,29 @@ +== Headless flash proxies with node.js + +Traditionally, flash proxies have run in the browser. However, it may be +desirable to run them as background daemons. This directory contains a main.js +file which wraps the regular flashproxy.js (symlinked here) and runs +headlessly from node.js. + +To install the requirements (known to be in Debian testing and Ubuntu universe), + + > apt-get install git nodejs npm + +Then, if you've checked out the flashproxy source from git, + + > git clone https://git.torproject.org/flashproxy.git + > cd flashproxy/modules/nodejs + > npm install + > npm start # or, node main.js + +This package is also being published on the npm registry. To add a `flashproxy` +bin to your path without checking out from git, at any time run, + + > npm install -g flashproxy + > flashproxy + +Rather than install globally, you can also, + + > cd ~/ # or, to the dir of your choice + > npm install flashproxy + > npm start flashproxy # or, node node_modules/flashproxy diff --git a/modules/nodejs/main.js b/modules/nodejs/main.js new file mode 100755 index 0000000..64e50b9 --- /dev/null +++ b/modules/nodejs/main.js @@ -0,0 +1,30 @@ +#!/usr/bin/env node + +var path = require("path"); +var fs = require("fs"); + +// Get a querystring from the command line +var location_search = "debug=1&initial_facilitator_poll_interval=10"; +if (process.argv[2] != null) + location_search = process.argv[2]; + +// Setup environment variables for node.js +var XMLHttpRequest = require("xmlhttprequest").XMLHttpRequest; +var window = { + location: { search: "?" + location_search }, + navigator: { userAgent: "Chrome/16" }, + WebSocket: require("ws") +}; + +// Include flashproxy.js using eval to avoid modifying it. +var file = path.join(__dirname, "flashproxy.js"); +try { + var data = fs.readFileSync(file, "utf8"); +} catch (e) { + console.log("Can't locate the flashproxy.js file. You probably need to run \"npm install\"."); + process.exit(1); +} +eval(data); + +// Start 'er up +flashproxy_badge_new().start(); diff --git a/modules/nodejs/package.json b/modules/nodejs/package.json new file mode 100644 index 0000000..15cdf4c --- /dev/null +++ b/modules/nodejs/package.json @@ -0,0 +1,30 @@ +{ + "name": "flashproxy", + "version": "1.1.0", + "description": "Standalone flash proxy. A flash proxy is a lightweight proxy providing access to the Tor network.", + "main": "main.js", + "scripts": { + "prepublish": "make prepublish", + "start": "node main.js" + }, + "bin": { + "flashproxy": "main.js" + }, + "dependencies": { + "xmlhttprequest": "1.5.0", + "ws": "0.4.27" + }, + "repository": { + "type": "git", + "url": "https://git.torproject.org/flashproxy.git" + }, + "keywords": [ + "flashproxy", + "tor", + "bridge", + "relay", + "websocket", + "pluggable transport" + ], + "license": "MIT" +}

1 0