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

[tor/master] Make it clear that bridges should not be set in MyFamily
by nickm＠torproject.org 02 Apr '12

02 Apr '12

commit 116dcf6ca99b39173c28e7ff910ef0ec1181393d Author: Daniel 'koolfy' Faucon <koolfy(a)geekmx.org> Date: Thu Mar 29 04:28:20 2012 +0200 Make it clear that bridges should not be set in MyFamily --- src/config/torrc.bridge.in | 2 ++ src/config/torrc.sample.in | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/config/torrc.bridge.in b/src/config/torrc.bridge.in index 6e77ecc..927c7bb 100644 --- a/src/config/torrc.bridge.in +++ b/src/config/torrc.bridge.in @@ -140,6 +140,8 @@ DirPort 9030 # what port to advertise for directory connections ## different networks. You declare it here so Tor clients can avoid ## using more than one of your relays in a single circuit. See ## https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#MultipleServers +## However, you should never include a bridge's fingerprint here, as it would +## break its concealability and potentionally reveal its IP/TCP address. #MyFamily $keyid,$keyid,... ## A comma-separated list of exit policies. They're considered first diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index 1ea5d9f..17e3f0b 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -144,6 +144,8 @@ SocksListenAddress 127.0.0.1 # accept connections only from localhost ## different networks. You declare it here so Tor clients can avoid ## using more than one of your relays in a single circuit. See ## https://www.torproject.org/docs/faq#MultipleRelays +## However, you should never include a bridge's fingerprint here, as it would +## break its concealability and potentionally reveal its IP/TCP address. #MyFamily $keyid,$keyid,... ## A comma-separated list of exit policies. They're considered first

1 0

r25594: {website} it is properly called an otr fingerprint, add today's news b (in website/trunk: about/en press/en)
by Andrew Lewman 02 Apr '12

02 Apr '12

Author: phobos Date: 2012-04-02 18:36:15 +0000 (Mon, 02 Apr 2012) New Revision: 25594 Modified: website/trunk/about/en/contact.wml website/trunk/press/en/inthemedia.wml Log: it is properly called an otr fingerprint, add today's news blurb about the UK. Modified: website/trunk/about/en/contact.wml =================================================================== --- website/trunk/about/en/contact.wml 2012-04-01 18:19:23 UTC (rev 25593) +++ website/trunk/about/en/contact.wml 2012-04-02 18:36:15 UTC (rev 25594) @@ -79,7 +79,7 @@ The best time to reach someone is 10:00 - 12:00 GMT-5 on Tuesday and 16:00 - 18:00 GMT-5 on Thursday. - Our OTR key is F624A3 158D22 19F48E E28A73 09F527 1AD5DF 668D. + Our OTR fingerprint is F624A3 158D22 19F48E E28A73 09F527 1AD5DF 668D. Learn more about <a href="http://www.cypherpunks.ca/otr/">Off-the-Record</a> Messenging. Modified: website/trunk/press/en/inthemedia.wml =================================================================== --- website/trunk/press/en/inthemedia.wml 2012-04-01 18:19:23 UTC (rev 25593) +++ website/trunk/press/en/inthemedia.wml 2012-04-02 18:36:15 UTC (rev 25594) @@ -32,6 +32,10 @@ <th>Topic</th> </tr> </thead> +<tr style="background-color: #e5e5e5;"> +<td>2012 Apr 02</td> +<td><a href="http://www.guardian.co.uk/media/2012/apr/02/internet-companies-warn-governm…">Internet companies warn over government email surveillance plans</a></td> +</td> <tr> <td>2012 Mar 22</td> <td>Reuters</td>

1 0

[flashproxy/js] Remove manual flashproxy-reg-http.py from README.
by dcf＠torproject.org 02 Apr '12

02 Apr '12

commit bb3e3e7c419937ced4ef5f1d3f695f3cb12cd5c1 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Apr 2 10:19:22 2012 -0700 Remove manual flashproxy-reg-http.py from README. --- README | 7 ++++--- torrc | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README b/README index b263862..b593328 100644 --- a/README +++ b/README @@ -59,14 +59,11 @@ ephemeral proxies. 1. Run the connector. $ python connector.py - Register with a public facilitator. - $ python flashproxy-reg-http.py By default the connector listens on Internet-facing TCP port 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): $ python connector.py 127.0.0.1:9001 :8888 - $ python flashproxy-reg-http.py -a :8888 2. Run Tor using the included torrc file. $ tor -f flashproxy/torrc @@ -103,6 +100,10 @@ If tor apparently hangs here: [notice] new bridge descriptor '...' (fresh) wait a few minutes. It can take a while to download relay descriptors. +If you suspect that the facilitator has lost your client registration, you can +re-register: + $ python flashproxy-reg-http.py + == How to run a relay diff --git a/torrc b/torrc index 9b9ca70..f13cf87 100644 --- a/torrc +++ b/torrc @@ -1,7 +1,6 @@ ## Configuration file for Tor over flash proxies. ## Usage: ## connector.py -## flashproxy-reg-http.py ## tor -f torrc ClientTransportPlugin websocket socks4 127.0.0.1:9001

1 0

[flashproxy/js] Restore automatic registration to connector.py.
by dcf＠torproject.org 02 Apr '12

02 Apr '12

commit 5eb6529fda3aaefdfede5ceed0bcbc9b9fa3c379 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Apr 2 10:17:40 2012 -0700 Restore automatic registration to connector.py. This works now by calling flashproxy-reg-http.py. --- connector.py | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/connector.py b/connector.py index db32f03..f7f35e3 100755 --- a/connector.py +++ b/connector.py @@ -4,11 +4,13 @@ import base64 import cStringIO import getopt import hashlib +import httplib import os import re import select import socket import struct +import subprocess import sys import time import traceback @@ -26,6 +28,7 @@ LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S" class options(object): local_addr = None remote_addr = None + facilitator_addr = None log_filename = None log_file = sys.stdout @@ -38,7 +41,7 @@ UNCONNECTED_BUFFER_LIMIT = 10240 def usage(f = sys.stdout): print >> f, """\ -Usage: %(progname)s [LOCAL][:PORT] [REMOTE][:PORT] +Usage: %(progname)s -f FACILITATOR[:PORT] [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". @@ -46,7 +49,12 @@ LOCAL is "%(local)s" and REMOTE is "%(remote)s". 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 connection. + +The REMOTE address is registered with the given FACILITATOR:PORT (or whatever +is the default of the flashproxy-reg-http.py program). --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.\ @@ -535,6 +543,16 @@ def handle_socks_request(fd): 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])) + +def register(): + spec = format_addr((None, options.remote_addr[1])) + command = ["./flashproxy-reg-http.py"] + if options.facilitator_addr is None: + log(u"Registering \"%s\"." % spec) + else: + command += [format_addr(options.facilitator_addr)] + command += ["-a", spec] + p = subprocess.Popen(command) def proxy_chunk_local_to_remote(local, remote): try: @@ -661,6 +679,7 @@ def main(): local_c, addr = fd.accept() log(u"Local connection from %s." % format_addr(addr)) socks_pending.append(local_c) + register() elif fd in websocket_pending: log(u"Data from WebSocket-pending %s." % format_addr(addr)) protocols = handle_websocket_request(fd) @@ -688,10 +707,12 @@ def main(): if not proxy_chunk_remote_to_local(fd, local): remotes.remove(fd) locals.remove(local) + register() else: if not receive_unlinked(fd, "remote"): remotes.remove(fd) unlinked_remotes.remove(fd) + register() report_pending() elif fd in locals: remote = fd.partner @@ -715,10 +736,12 @@ def main(): report_pending() if __name__ == "__main__": - opts, args = getopt.gnu_getopt(sys.argv[1:], "hl:", ["daemon", "help", "log=", "pidfile="]) + opts, args = getopt.gnu_getopt(sys.argv[1:], "f:hl:", ["daemon", "facilitator=", "help", "log=", "pidfile="]) for o, a in opts: if o == "--daemon": options.daemonize = True + elif o == "-f" or o == "--facilitator": + options.facilitator_addr = parse_addr_spec(a) elif o == "-h" or o == "--help": usage() sys.exit() @@ -765,6 +788,8 @@ if __name__ == "__main__": # Locals not yet linked with a remote. This is a subset of remotes. unlinked_locals = [] + register() + if options.daemonize: log(u"Daemonizing.") pid = os.fork()

1 0

[vidalia/alpha] Fold in more changes for 0.3.2
by chiiph＠torproject.org 02 Apr '12

02 Apr '12

commit ca90234b233ba1fb47d55f557564c51b81b91350 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Apr 2 14:01:38 2012 -0300 Fold in more changes for 0.3.2 --- CHANGELOG | 13 ++++++++++++- changes/bug2727 | 3 --- changes/bug2905 | 6 ------ changes/bug5518 | 4 ---- changes/bug5522 | 3 --- 5 files changed, 12 insertions(+), 17 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index acccab1..a32871b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -24,6 +24,13 @@ connect to the tor process (ControlPort or ControlSocket and authentication) and everything else would be handled through the torrc file. + o In Network View, store layout of network map panes. Fixes ticket + 2727. + o Add a wizard for the special cases where the user starts Vidalia + while tor has DisableNetwork=1 or the Panic feature enabled. This + wizard is meant to warn the user about either the Panic feature or + that she might need to configure a proxy or a bridge before tor + connects to the outside world. Fixes ticket 2905. Bugfixes relative to Vidalia 0.2.x: o Fix deadlock when the browser process fails to launch in OS X. @@ -39,6 +46,9 @@ used. Fixes bug 5277. o Fix the bridge line parsing for requests to bridges.torproject.org when the user clicks 'find bridges now'. Fixes bug 5730. + o In Advanced Settings tab, corrected radio buttons minimum sizes to + prevent hiding of socket controls on window resize. Fixes bug + 5518. Bugfixes relative to Vidalia 0.3.x: o Center detached tabs to avoid placing them out of reach. Fixes bug @@ -59,7 +69,8 @@ o Migrate the code that handles Marble to the new library interface. It works as expected with the latest Marble from the upstream git repo. - + o Always create settings access object, with default section name + set to General. Fixes bug 5522. 0.3.1 27-Feb-2012 o Draw the bandwidth graph curves based on the local maximum, not diff --git a/changes/bug2727 b/changes/bug2727 deleted file mode 100644 index 1095804..0000000 --- a/changes/bug2727 +++ /dev/null @@ -1,3 +0,0 @@ - New Features: - o In Network View, store layout of network map panes. - Fixes ticket 2727. diff --git a/changes/bug2905 b/changes/bug2905 deleted file mode 100644 index 3eae285..0000000 --- a/changes/bug2905 +++ /dev/null @@ -1,6 +0,0 @@ - New Features: - o Add a wizard for the special cases where the user starts Vidalia - while tor has DisableNetwork=1 or the Panic feature enabled. This - wizard is meant to warn the user about either the Panic feature or - that she might need to configure a proxy or a bridge before tor - connects to the outside world. Fixes ticket 2905. \ No newline at end of file diff --git a/changes/bug5518 b/changes/bug5518 deleted file mode 100644 index f2323f9..0000000 --- a/changes/bug5518 +++ /dev/null @@ -1,4 +0,0 @@ - Bugfixes relative to Vidalia 0.2.x: - o In Advanced Settings tab, corrected radio buttons minimum sizes - to prevent hiding of socket controls on window resize. - Fixes bug 5518. \ No newline at end of file diff --git a/changes/bug5522 b/changes/bug5522 deleted file mode 100644 index 091756b..0000000 --- a/changes/bug5522 +++ /dev/null @@ -1,3 +0,0 @@ - Internal cleanups and improvements: - o Always create settings access object, with default section name - set to General. Fixes bug 5522. \ No newline at end of file

1 0

[vidalia/alpha] Add missing files
by chiiph＠torproject.org 02 Apr '12

02 Apr '12

commit d82d738850715a3b58e6014c037effd20f7a7e1a Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Apr 2 13:55:00 2012 -0300 Add missing files --- src/vidalia/FirstRunWizard.cpp | 151 ++++++++++++++++++++++++++++++++++++++++ src/vidalia/FirstRunWizard.h | 66 +++++++++++++++++ 2 files changed, 217 insertions(+), 0 deletions(-) diff --git a/src/vidalia/FirstRunWizard.cpp b/src/vidalia/FirstRunWizard.cpp new file mode 100644 index 0000000..5e59d7a --- /dev/null +++ b/src/vidalia/FirstRunWizard.cpp @@ -0,0 +1,151 @@ +/* +** This file is part of Vidalia, and is subject to the license terms in the +** LICENSE file, found in the top level directory of this distribution. If you +** did not receive the LICENSE file with this file, you may obtain it from the +** Vidalia source package distributed by the Vidalia Project at +** http://www.torproject.org/projects/vidalia.html. No part of Vidalia, +** including this file, may be copied, modified, propagated, or distributed +** except according to the terms described in the LICENSE file. +*/ + +/* +** \file FirstRunWizard.cpp +** \brief Wizard for the first time Vidalia is executed under certain circumstances +*/ + +#include "FirstRunWizard.h" +#include "MainWindow.h" +#include "AdvancedPage.h" +#include "NetworkPage.h" +#include "VMessageBox.h" + +#include <QtGui> + +FirstRunWizard::FirstRunWizard(QWidget *parent, bool withPanic, bool withNetwork) + : _withPanic(withPanic), _withNetwork(withNetwork), QWizard(parent), + _panicPage(0), _ap(0), _networkPage(0), _np(0) +{ + createPages(); +} + +FirstRunWizard::~FirstRunWizard() +{ + if(_ap) delete _ap; + if(_np) delete _np; +} + +void +FirstRunWizard::handleNext() +{ + QString errmsg; + + switch(currentId()) { + case IntroPageID: + case PanicPageID: + next(); + break; + case NetworkPageID: + if(_ap->save(errmsg)) { + next(); + } else { + VMessageBox::warning(0, tr("There was a problem saving your Panic settings"), + tr("Error: %1").arg(errmsg), + VMessageBox::Ok|VMessageBox::Default); + } + case DonePageID: + if(_np->save(errmsg) and _np->apply(errmsg)) { + next(); + } else { + back(); + VMessageBox::warning(0, tr("There was a problem saving your network settings"), + tr("Error: %1").arg(errmsg), + VMessageBox::Ok|VMessageBox::Default); + } + } +} + +void +FirstRunWizard::createPages() +{ + QPushButton *bt = new QPushButton("Continue"); + setButton(QWizard::NextButton, bt); + disconnect(bt, 0, 0, 0); + connect(bt, SIGNAL(clicked()), + this, SLOT(handleNext())); + + _introPage = new QWizardPage; + _introPage->setTitle(tr("Welcome to Vidalia")); + + QLabel *label = new QLabel(tr("Welcome to Vidalia, the Tor Controller. " + "This wizard will guide you through the first " + "run configuration, please read the directions " + "carefully.")); + label->setWordWrap(true); + + QVBoxLayout *layout = new QVBoxLayout; + layout->addWidget(label); + _introPage->setLayout(layout); + + setPage(IntroPageID, _introPage); + + _panicPage = new QWizardPage; + _panicPage->setTitle(tr("Panic! configuration")); + label = new QLabel(tr("You have the Panic! button enabled. This " + "means that you will have a button on the " + "main toolbar that will allow you to remove " + "Vidalia and all its components quickly.\n" + "WARNING: This will also remove your " + "bookmarks and everything you save inside " + "the configured path.\n\n" + "If you would like to disable this feature, " + "please uncheck where it says \"Enable panic\" and " + "click \"%1\"").arg(buttonText(QWizard::NextButton))); + label->setWordWrap(true); + + _ap = new AdvancedPage(); + _ap->hideGroup(AdvancedPage::Control); + _ap->hideGroup(AdvancedPage::ConfigurationFile); + _ap->hideGroup(AdvancedPage::DataDirectory); + _ap->load(); + + layout = new QVBoxLayout; + layout->addWidget(label); + layout->addWidget(_ap); + _panicPage->setLayout(layout); + + if(_withPanic) + setPage(PanicPageID, _panicPage); + + _networkPage = new QWizardPage; + _networkPage->setTitle(tr("Network configuration")); + label = new QLabel(tr("You should configure your network now. Please " + "provide the bridges to use or uncheck the option.\n\n" + "If you would like to change these settings, " + "please edit the values and click \"%1\"") + .arg(buttonText(QWizard::NextButton))); + label->setWordWrap(true); + + _np = new NetworkPage(); + _np->load(); + + layout = new QVBoxLayout; + layout->addWidget(label); + layout->addWidget(_np); + _networkPage->setLayout(layout); + + if(_withNetwork) + setPage(NetworkPageID, _networkPage); + + _donePage = new QWizardPage; + _donePage->setTitle(tr("That's it!")); + + label = new QLabel(tr("We hope you enjoy using Tor! Consider becoming a Relay, " + "read more here: https://torproject.org/relay")); + label->setWordWrap(true); + + layout = new QVBoxLayout; + layout->addWidget(label); + _donePage->setLayout(layout); + + setPage(DonePageID, _donePage); +} diff --git a/src/vidalia/FirstRunWizard.h b/src/vidalia/FirstRunWizard.h new file mode 100644 index 0000000..437fff8 --- /dev/null +++ b/src/vidalia/FirstRunWizard.h @@ -0,0 +1,66 @@ +/* +** This file is part of Vidalia, and is subject to the license terms in the +** LICENSE file, found in the top level directory of this distribution. If you +** did not receive the LICENSE file with this file, you may obtain it from the +** Vidalia source package distributed by the Vidalia Project at +** http://www.torproject.org/projects/vidalia.html. No part of Vidalia, +** including this file, may be copied, modified, propagated, or distributed +** except according to the terms described in the LICENSE file. +*/ + +/* +** \file FirstRunWizard.cpp +** \brief Wizard for the first time Vidalia is executed under certain circumstances +*/ + +#ifndef FIRSTRUNWIZARD_H +#define FIRSTRUNWIZARD_H + +class QWizardPage; +class MainWindow; +class AdvancedPage; +class NetworkPage; + +#include <QWizard> + +class FirstRunWizard : public QWizard +{ + Q_OBJECT + + public: + /** Default constructor */ + FirstRunWizard(QWidget *parent = 0, + bool withPanic = false, + bool withNetwork = false); + /** Default destructor */ + virtual ~FirstRunWizard(); + + public slots: + /** Slot that handles the transition between pages */ + void handleNext(); + + private: + /** Ids for the pages */ + enum IDs { + IntroPageID = 0, + PanicPageID, + NetworkPageID, + DonePageID + }; + + /** Wizard pages */ + QWizardPage *_introPage, *_panicPage; + QWizardPage *_networkPage, *_donePage; + QPushButton *_btnNext; + /** Boolean values that identify the pages to display */ + bool _withPanic, _withNetwork; + + /** Configuration pages that will be used in the wizard */ + AdvancedPage *_ap; + NetworkPage *_np; + + /** Called at the beginning. It creates the whole wizard */ + void createPages(); +}; + +#endif

1 0

[flashproxy/js] The MIME type is application/x-www-form-urlencoded.
by dcf＠torproject.org 02 Apr '12

02 Apr '12

commit 5dcc14f7655ffd16df31d6ffe60fd5c4242af13d Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 13 09:21:34 2012 -0700 The MIME type is application/x-www-form-urlencoded. Previously the "application/" was left off. --- facilitator.py | 2 +- swfcat.as | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/facilitator.py b/facilitator.py index f028ae3..3e7ca09 100755 --- a/facilitator.py +++ b/facilitator.py @@ -296,7 +296,7 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): # "server not found." client_str = "" self.send_response(200) - self.send_header("Content-Type", "x-www-form-urlencoded") + self.send_header("Content-Type", "application/x-www-form-urlencoded") self.send_header("Cache-Control", "no-cache") # Allow XMLHttpRequest from any domain. http://www.w3.org/TR/cors/. self.send_header("Access-Control-Allow-Origin", "*") diff --git a/swfcat.as b/swfcat.as index 76b35c4..7ec9a5b 100644 --- a/swfcat.as +++ b/swfcat.as @@ -260,7 +260,7 @@ package } loader = new URLLoader(); - /* Get the x-www-form-urlencoded values. */ + /* Get the application/x-www-form-urlencoded values. */ loader.dataFormat = URLLoaderDataFormat.VARIABLES; loader.addEventListener(Event.COMPLETE, fac_complete); loader.addEventListener(IOErrorEvent.IO_ERROR, function (e:IOErrorEvent):void {

1 0

[flashproxy/js] Replace a magic number.
by dcf＠torproject.org 02 Apr '12

02 Apr '12

commit dabbd5e747fb638155a61bb8f88a31bb511c83e0 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 31 15:10:03 2012 -0700 Replace a magic number. --- flashproxy.js | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index bdec17d..7b8b0bc 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -202,8 +202,7 @@ function FlashProxy() } xhr.responseType = "text"; xhr.onreadystatechange = function() { - /* Status 4 is DONE. */ - if (xhr.readyState == 4) { + if (xhr.readyState == xhr.DONE) { if (xhr.status == 200) this.fac_complete(xhr.responseText); else if (xhr.status == 0 && xhr.statusText == "")

1 0

[flashproxy/js] Add max_client and facilitator_poll_interval query parameters.
by dcf＠torproject.org 02 Apr '12

02 Apr '12

commit a69d9149f458aec16ad9a8e180b1832898aa4667 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 31 15:38:39 2012 -0700 Add max_client and facilitator_poll_interval query parameters. --- flashproxy.js | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 74 insertions(+), 0 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 7b8b0bc..4a758f9 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -15,6 +15,14 @@ * The address of the facilitator to use. By default it is * DEFAULT_FACILITATOR_ADDR. Both <HOST> and <PORT> must be present. * + * facilitator_poll_interval=<FLOAT> + * How often to poll the facilitator, in seconds. The default is + * DEFAULT_FACILITATOR_POLL_INTERVAL. There is a sanity-check minimum of 1.0 s. + * + * max_clients=<NUM> + * How many clients to serve concurrently. The default is + * DEFAULT_MAX_NUM_PROXY_PAIRS. + * * relay=<HOST>:<PORT> * The address of the relay to connect to. The proxy normally receives this * information from the facilitator. When this option is used, the facilitator @@ -26,6 +34,11 @@ var DEFAULT_FACILITATOR_ADDR = { port: 9002 }; +var DEFAULT_MAX_NUM_PROXY_PAIRS = 10; + +var DEFAULT_FACILITATOR_POLL_INTERVAL = 10.0; +var MIN_FACILITATOR_POLL_INTERVAL = 1.0; + /* 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, @@ -80,6 +93,54 @@ function get_query_param_addr(query, param, default_val) return parse_addr_spec(val); } +/* Get an integer from the given movie parameter, or the given default. Returns + null on error. */ +function get_query_param_integer(query, param, default_val) +{ + var spec; + var val; + + spec = query[param]; + if (spec === undefined) { + return default_val; + } else if (!spec.match(/^-?[0-9]+/)) { + return null; + } else { + val = parseInt(spec, 10); + if (isNaN(val)) + return null; + else + return val; + } +} + +/* Get a number from the given movie parameter, or the given default. Returns + null on error. */ +function get_query_param_number(query, param, default_val) +{ + var spec; + var val; + + spec = query[param]; + if (spec === undefined) { + return default_val; + } else { + val = Number(spec); + if (isNaN(val)) + return null; + else + return val; + } +} + +/* Get a floating-point number of seconds from a time specification. The only + time specification format is a decimal number of seconds. Returns null on + error. */ +function get_query_param_timespec(query, param, default_val) +{ + return get_query_param_number(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) @@ -165,6 +226,19 @@ function FlashProxy() puts("Error: Facilitator spec must be in the form \"host:port\"."); return; } + + this.max_num_proxy_pairs = get_query_param_integer(this.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."); + return; + } + + this.facilitator_poll_interval = get_query_param_timespec(this.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 + "."); + return; + } + client_addr = get_query_param_addr(this.query, "client"); relay_addr = get_query_param_addr(this.query, "relay"); if (client_addr !== undefined && relay_addr !== undefined) {

1 0

[flashproxy/js] Typo.
by dcf＠torproject.org 02 Apr '12

02 Apr '12

commit f2ab3c90d39c61b644baa045b7f28c3a54e844cb Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 24 22:19:42 2012 -0700 Typo. --- README | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/README b/README index 006db8c..c7d6a79 100644 --- a/README +++ b/README @@ -148,7 +148,7 @@ If tor apparently hangs here: wait a few minutes. It can take a while to download relay descriptors. -== How to put a flash proxy badge on a web page. +== How to put a flash proxy badge on a web page Paste in this HTML where you want the badge to appear:

1 0