- tor-commits - lists.torproject.org

[stem/master] Adding get_pid and get_bsd_jail_id util functoins
by atagar＠torproject.org 17 Oct '11

17 Oct '11

commit aa01c0798960a520ac1da81e5a1a447c29dbb962 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 16 19:23:57 2011 -0700 Adding get_pid and get_bsd_jail_id util functoins Stealing arm's getTorPid and getBsdJailId from the torTools util, generalizing both functions to be for arbitrary processes rather than just tor. This also adds unit tests for get_pid and a simple exercise of get_bsd_jail_id (I can't really test the later since I'm not on BSD). --- run_tests.py | 11 +++- stem/util/system.py | 162 ++++++++++++++++++++++++++++++++++++++++++++++++++ test/integ/runner.py | 29 ++++++++- test/integ/system.py | 20 ++++++ 4 files changed, 217 insertions(+), 5 deletions(-) diff --git a/run_tests.py b/run_tests.py index 4f3eee7..284f48c 100755 --- a/run_tests.py +++ b/run_tests.py @@ -5,6 +5,7 @@ Runs unit and integration tests. """ import sys +import time import getopt import unittest import test.unit.message @@ -52,6 +53,7 @@ Runs tests for the stem library. """ if __name__ == '__main__': + start_time = time.time() run_unit_tests = False run_integ_tests = False integ_targets = TARGETS.values() @@ -111,20 +113,20 @@ if __name__ == '__main__': if run_integ_tests: print "%s\n%s\n%s\n" % (DIVIDER, "INTEGRATION TESTS".center(70), DIVIDER) - integ_runner = test.integ.runner.Runner() + integ_runner = test.integ.runner.get_runner() try: integ_runner.run_setup() integ_runner.start() print term.format("Running tests...", term.Color.BLUE, term.Attr.BOLD) + print + for name, test_class in INTEG_TESTS: print "%s\n%s\n%s\n" % (DIVIDER, name, DIVIDER) suite = unittest.TestLoader().loadTestsFromTestCase(test_class) unittest.TextTestRunner(verbosity=2).run(suite) print - - print except OSError: pass finally: @@ -144,4 +146,7 @@ if __name__ == '__main__': # print " %s" % term.format("Unimplemented", term.Color.RED, term.Attr.BOLD) # # print "" + + print term.format("Testing Completed (%i seconds)" % (time.time() - start_time), term.Color.GREEN, term.Attr.BOLD) + print diff --git a/stem/util/system.py b/stem/util/system.py index bdada9b..746eed4 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -89,6 +89,168 @@ def is_running(command, suppress_exc = True): if suppress_exc: return None else: raise OSError("Unable to check via 'ps -A co command'") +def get_pid(process_name, process_port = None): + """ + Attempts to determine the process id for a running process, using the + following: + + 1. "pgrep -x <name>" + 2. "pidof <name>" + 3. "netstat -npl | grep 127.0.0.1:<port>" + 4. "ps -o pid -C <name>" + 5. "sockstat -4l -P tcp -p <port> | grep <name>" + 6. "ps axc | egrep \" <name>$\"" + 7. "lsof -wnPi | egrep \"^<name>.*:<port>\"" + + If pidof or ps provide multiple instance of the process then their results + are discarded (since only netstat can differentiate using a bound port). + + Arguments: + process_name (str) - process name for which to fetch the pid + process_port (int) - port that the process we're interested in is bound to, + this is used to disambiguate if there's multiple + instances running + + Returns: + int with the process id, None if either no running process exists or it + can't be determined + """ + + # attempts to resolve using pgrep, failing if: + # - the process is running under a different name + # - there are multiple instances + + try: + results = call("pgrep -x %s" % process_name) + + if len(results) == 1 and len(results[0].split()) == 1: + pid = results[0].strip() + if pid.isdigit(): return int(pid) + except IOError: pass + + # attempts to resolve using pidof, failing if: + # - the process is running under a different name + # - there are multiple instances + + try: + results = call("pidof %s" % process_name) + + if len(results) == 1 and len(results[0].split()) == 1: + pid = results[0].strip() + if pid.isdigit(): return int(pid) + except IOError: pass + + # attempts to resolve using netstat, failing if: + # - the process being run as a different user due to permissions + + if process_port: + try: + results = call("netstat -npl | grep 127.0.0.1:%i" % process_port) + + if len(results) == 1: + results = results[0].split()[6] # process field (ex. "7184/tor") + pid = results[:results.find("/")] + if pid.isdigit(): return int(pid) + except IOError: pass + + # attempts to resolve using ps, failing if: + # - the process is running under a different name + # - there are multiple instances + + try: + results = call("ps -o pid -C %s" % process_name) + + if len(results) == 2: + pid = results[1].strip() + if pid.isdigit(): return int(pid) + except IOError: pass + + # attempts to resolve using sockstat, failing if: + # - sockstat doesn't accept the -4 flag (BSD only) + # - the process is running under a different name + # - there are multiple instances using the same port on different addresses + # + # TODO: The later two issues could be solved by filtering for an expected IP + # address instead of the process name. + + if process_port: + try: + results = call("sockstat -4l -P tcp -p %i | grep %s" % (process_port, process_name)) + + if len(results) == 1 and len(results[0].split()) == 7: + pid = results[0].split()[2] + if pid.isdigit(): return int(pid) + except IOError: pass + + # attempts to resolve via a ps command that works on mac/bsd (this and lsof + # are the only resolvers to work on that platform). This fails if: + # - the process is running under a different name + # - there are multiple instances + + try: + results = call("ps axc | egrep \" %s$\"" % process_name) + + if len(results) == 1 and len(results[0].split()) > 0: + pid = results[0].split()[0] + if pid.isdigit(): return int(pid) + except IOError: pass + + # attempts to resolve via lsof, this should work on linux, mac, and bsd + # and only fail if: + # - the process is running under a different name + # - the process being run as a different user due to permissions + # - there are multiple instances using the same port on different addresses + + try: + port_comp = str(process_port) if process_port else "" + results = call("lsof -wnPi | egrep \"^%s.*:%s\"" % (process_name, port_comp)) + + # This can result in multiple entries with the same pid (from the query + # itself). Checking all lines to see if they're in agreement about the pid. + + if results: + pid = "" + + for line in results: + line_comp = line.split() + + if len(line_comp) >= 2 and (not pid or line_comp[1] == pid): + pid = line_comp[1] + else: raise IOError + + if pid.isdigit(): return int(pid) + except IOError: pass + + return None + +def get_bsd_jail_id(pid): + """ + Get the FreeBSD jail id for a process. + + Arguments: + pid (int) - process id of the jail id to be queried + + Returns: + int for the jail id, zero if this can't be determined + """ + + # Output when called from a FreeBSD jail or when Tor isn't jailed: + # JID + # 0 + # + # Otherwise it's something like: + # JID + # 1 + + ps_output = call("ps -p %s -o jid" % pid) + + if len(ps_output) == 2 and len(ps_output[1].split()) == 1: + jid = ps_output[1].strip() + if jid.isdigit(): return int(jid) + + log.log(log.WARN, "Failed to figure out the FreeBSD jail id. Assuming 0.") + return 0 + def call(command, suppress_exc = True): """ Issues a command in a subprocess, blocking until completion and returning the diff --git a/test/integ/runner.py b/test/integ/runner.py index 4805c20..c83fd2d 100644 --- a/test/integ/runner.py +++ b/test/integ/runner.py @@ -12,13 +12,25 @@ import subprocess from stem.util import term # number of seconds before we time out our attempt to start a tor instance -TOR_INIT_TIMEOUT = 30 +TOR_INIT_TIMEOUT = 60 BASIC_TORRC = """# configuration for stem integration tests DataDirectory %s ControlPort 1111 """ +# singleton Runner instance +INTEG_RUNNER = None + +def get_runner(): + """ + Singleton for the runtime context of integration tests. + """ + + global INTEG_RUNNER + if not INTEG_RUNNER: INTEG_RUNNER = Runner() + return INTEG_RUNNER + class Runner: def __init__(self): self._test_dir = tempfile.mktemp("-stem-integ") @@ -125,8 +137,9 @@ class Runner: if self._tor_process: sys.stdout.write(term.format("Shutting down tor... ", term.Color.BLUE, term.Attr.BOLD)) self._tor_process.kill() + self._tor_process.communicate() # blocks until the process is done + self._tor_process = None sys.stdout.write(term.format("done\n", term.Color.BLUE, term.Attr.BOLD)) - print # extra newline def get_pid(self): """ @@ -139,4 +152,16 @@ class Runner: if self._tor_process: return self._tor_process.pid else: return None + + def get_control_port(self): + """ + Provides the control port tor is running with. + + Returns: + int for the port tor's controller interface is bound to, None if it + doesn't have one + """ + + # TODO: this will be fetched from torrc contents when we use custom configs + return 1111 diff --git a/test/integ/system.py b/test/integ/system.py index 6b38615..edc0291 100644 --- a/test/integ/system.py +++ b/test/integ/system.py @@ -3,6 +3,7 @@ Unit tests for the util.system functions in the context of a tor process. """ import unittest +import test.integ.runner from stem.util import system @@ -30,3 +31,22 @@ class TestSystemFunctions(unittest.TestCase): self.assertTrue(system.is_running("tor")) self.assertFalse(system.is_running("blarg_and_stuff")) + def test_get_pid(self): + """ + Checks the util.system.get_pid function. + """ + + runner = test.integ.runner.get_runner() + self.assertEquals(runner.get_pid(), system.get_pid("tor")) + self.assertEquals(runner.get_pid(), system.get_pid("tor", runner.get_control_port())) + self.assertEquals(None, system.get_pid("blarg_and_stuff")) + + def test_get_bsd_jail_id(self): + """ + Exercises the util.system.get_bsd_jail_id function, running through the + failure case (since I'm not on BSD I can't really test this function + properly). + """ + + self.assertEquals(0, system.get_bsd_jail_id("blarg_and_stuff")) +

1 0

[stem/master] Moving integ runner into testing base
by atagar＠torproject.org 17 Oct '11

17 Oct '11

commit 24d4881025c891c829a63de9b9b1b8849c8c4faf Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 16 19:30:57 2011 -0700 Moving integ runner into testing base Moving the integ runner module from 'test/integ/runner.py' to 'test/runner.py'. The 'test/unit/*' and 'test/integ/*' are for test cases, and will later be kinda crowded. The runner is special since it doesn't test, but rather provides the runtime context for the integ tests so probably best to keep this separate from the rest. --- run_tests.py | 4 +- test/__init__.py | 2 +- test/integ/__init__.py | 2 +- test/integ/runner.py | 167 ------------------------------------------------ test/integ/system.py | 4 +- test/runner.py | 167 ++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 173 insertions(+), 173 deletions(-) diff --git a/run_tests.py b/run_tests.py index 284f48c..6d62ab3 100755 --- a/run_tests.py +++ b/run_tests.py @@ -8,9 +8,9 @@ import sys import time import getopt import unittest +import test.runner import test.unit.message import test.unit.version -import test.integ.runner import test.integ.system from stem.util import enum, term @@ -113,7 +113,7 @@ if __name__ == '__main__': if run_integ_tests: print "%s\n%s\n%s\n" % (DIVIDER, "INTEGRATION TESTS".center(70), DIVIDER) - integ_runner = test.integ.runner.get_runner() + integ_runner = test.runner.get_runner() try: integ_runner.run_setup() diff --git a/test/__init__.py b/test/__init__.py index 031299c..9afce0a 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -2,5 +2,5 @@ Unit and integration tests for the stem library. """ -__all__ = [] +__all__ = ["runner"] diff --git a/test/integ/__init__.py b/test/integ/__init__.py index ecfc9cd..d6d7b31 100644 --- a/test/integ/__init__.py +++ b/test/integ/__init__.py @@ -2,5 +2,5 @@ Integration tests for the stem library. """ -__all__ = ["runner"] +__all__ = ["system"] diff --git a/test/integ/runner.py b/test/integ/runner.py deleted file mode 100644 index c83fd2d..0000000 --- a/test/integ/runner.py +++ /dev/null @@ -1,167 +0,0 @@ -""" -Starts and stops test instances for integration tests. -""" - -import os -import sys -import time -import signal -import tempfile -import subprocess - -from stem.util import term - -# number of seconds before we time out our attempt to start a tor instance -TOR_INIT_TIMEOUT = 60 - -BASIC_TORRC = """# configuration for stem integration tests -DataDirectory %s -ControlPort 1111 -""" - -# singleton Runner instance -INTEG_RUNNER = None - -def get_runner(): - """ - Singleton for the runtime context of integration tests. - """ - - global INTEG_RUNNER - if not INTEG_RUNNER: INTEG_RUNNER = Runner() - return INTEG_RUNNER - -class Runner: - def __init__(self): - self._test_dir = tempfile.mktemp("-stem-integ") - self._torrc_contents = BASIC_TORRC % self._test_dir - self._tor_process = None - - def run_setup(self): - """ - Makes a temporary directory for the runtime resources of our integ tests. - - Raises: - OSError if unsuccessful - """ - - print term.format("Setting up a test instance...", term.Color.BLUE, term.Attr.BOLD) - - # makes a temporary directory for the runtime resources of our integ test - try: - sys.stdout.write(term.format(" making test directory (%s)... " % self._test_dir, term.Color.BLUE, term.Attr.BOLD)) - os.makedirs(self._test_dir) - sys.stdout.write(term.format("done\n", term.Color.BLUE, term.Attr.BOLD)) - except OSError, exc: - sys.stdout.write(term.format("failed (%s)\n" % exc, term.Color.RED, term.Attr.BOLD)) - raise exc - - # writes our testing torrc - torrc_dst = os.path.join(self._test_dir, "torrc") - try: - sys.stdout.write(term.format(" writing torrc (%s)... " % torrc_dst, term.Color.BLUE, term.Attr.BOLD)) - - torrc_file = open(torrc_dst, "w") - torrc_file.write(self._torrc_contents) - torrc_file.close() - - sys.stdout.write(term.format("done\n", term.Color.BLUE, term.Attr.BOLD)) - - for line in self._torrc_contents.strip().split("\n"): - print term.format(" %s" % line.strip(), term.Color.BLUE) - except Exception, exc: - sys.stdout.write(term.format("failed (%s)\n" % exc, term.Color.RED, term.Attr.BOLD)) - raise exc - finally: - print # extra newline - - def start(self): - """ - Initializes a tor process. This blocks until initialization completes or we - error out. - - Raises: - OSError if we either fail to create the tor process or reached a timeout - without success - """ - - print term.format("Starting tor...", term.Color.BLUE, term.Attr.BOLD) - start_time = time.time() - - try: - # terminate our previous instance before continuing if we had one - if self._tor_process: self._tor_process.kill() - - # double check that we have a torrc to work with - torrc_dst = os.path.join(self._test_dir, "torrc") - if not os.path.exists(torrc_dst): - raise OSError("torrc doesn't exist (%s)" % torrc_dst) - - # starts a tor subprocess, raising an OSError if it fails - self._tor_process = subprocess.Popen(["tor", "-f", torrc_dst], stdout = subprocess.PIPE, stderr = subprocess.PIPE) - - # time ourselves out if we reach TOR_INIT_TIMEOUT - def timeout_handler(signum, frame): - # terminates the uninitialized tor process and raise on timeout - self._tor_process.kill() - raise OSError("reached a %i second timeout without success" % TOR_INIT_TIMEOUT) - - signal.signal(signal.SIGALRM, timeout_handler) - signal.alarm(TOR_INIT_TIMEOUT) - - while True: - init_line = self._tor_process.stdout.readline().strip() - - # this will provide empty results if the process is terminated - if not init_line: - self._tor_process.kill() # ... but best make sure - raise OSError("process terminated") - - print term.format(" %s" % init_line, term.Color.BLUE) - - # return the process if we're done with bootstrapping - if init_line.endswith("Bootstrapped 100%: Done."): - print term.format(" done (%i seconds)" % (time.time() - start_time), term.Color.BLUE, term.Attr.BOLD) - return - except OSError, exc: - print term.format(" failed to start tor: %s" % exc, term.Color.RED, term.Attr.BOLD) - raise exc - finally: - print # extra newline - - def stop(self): - """ - Terminates our tor instance. - """ - - if self._tor_process: - sys.stdout.write(term.format("Shutting down tor... ", term.Color.BLUE, term.Attr.BOLD)) - self._tor_process.kill() - self._tor_process.communicate() # blocks until the process is done - self._tor_process = None - sys.stdout.write(term.format("done\n", term.Color.BLUE, term.Attr.BOLD)) - - def get_pid(self): - """ - Provides the process id of tor. - - Returns: - int pid for the tor process, or None if it isn't running - """ - - if self._tor_process: - return self._tor_process.pid - else: return None - - def get_control_port(self): - """ - Provides the control port tor is running with. - - Returns: - int for the port tor's controller interface is bound to, None if it - doesn't have one - """ - - # TODO: this will be fetched from torrc contents when we use custom configs - return 1111 - diff --git a/test/integ/system.py b/test/integ/system.py index edc0291..8661660 100644 --- a/test/integ/system.py +++ b/test/integ/system.py @@ -3,7 +3,7 @@ Unit tests for the util.system functions in the context of a tor process. """ import unittest -import test.integ.runner +import test.runner from stem.util import system @@ -36,7 +36,7 @@ class TestSystemFunctions(unittest.TestCase): Checks the util.system.get_pid function. """ - runner = test.integ.runner.get_runner() + runner = test.runner.get_runner() self.assertEquals(runner.get_pid(), system.get_pid("tor")) self.assertEquals(runner.get_pid(), system.get_pid("tor", runner.get_control_port())) self.assertEquals(None, system.get_pid("blarg_and_stuff")) diff --git a/test/runner.py b/test/runner.py new file mode 100644 index 0000000..b3abdfa --- /dev/null +++ b/test/runner.py @@ -0,0 +1,167 @@ +""" +Runtime context for the integration tests. +""" + +import os +import sys +import time +import signal +import tempfile +import subprocess + +from stem.util import term + +# number of seconds before we time out our attempt to start a tor instance +TOR_INIT_TIMEOUT = 60 + +BASIC_TORRC = """# configuration for stem integration tests +DataDirectory %s +ControlPort 1111 +""" + +# singleton Runner instance +INTEG_RUNNER = None + +def get_runner(): + """ + Singleton for the runtime context of integration tests. + """ + + global INTEG_RUNNER + if not INTEG_RUNNER: INTEG_RUNNER = Runner() + return INTEG_RUNNER + +class Runner: + def __init__(self): + self._test_dir = tempfile.mktemp("-stem-integ") + self._torrc_contents = BASIC_TORRC % self._test_dir + self._tor_process = None + + def run_setup(self): + """ + Makes a temporary directory for the runtime resources of our integ tests. + + Raises: + OSError if unsuccessful + """ + + print term.format("Setting up a test instance...", term.Color.BLUE, term.Attr.BOLD) + + # makes a temporary directory for the runtime resources of our integ test + try: + sys.stdout.write(term.format(" making test directory (%s)... " % self._test_dir, term.Color.BLUE, term.Attr.BOLD)) + os.makedirs(self._test_dir) + sys.stdout.write(term.format("done\n", term.Color.BLUE, term.Attr.BOLD)) + except OSError, exc: + sys.stdout.write(term.format("failed (%s)\n" % exc, term.Color.RED, term.Attr.BOLD)) + raise exc + + # writes our testing torrc + torrc_dst = os.path.join(self._test_dir, "torrc") + try: + sys.stdout.write(term.format(" writing torrc (%s)... " % torrc_dst, term.Color.BLUE, term.Attr.BOLD)) + + torrc_file = open(torrc_dst, "w") + torrc_file.write(self._torrc_contents) + torrc_file.close() + + sys.stdout.write(term.format("done\n", term.Color.BLUE, term.Attr.BOLD)) + + for line in self._torrc_contents.strip().split("\n"): + print term.format(" %s" % line.strip(), term.Color.BLUE) + except Exception, exc: + sys.stdout.write(term.format("failed (%s)\n" % exc, term.Color.RED, term.Attr.BOLD)) + raise exc + finally: + print # extra newline + + def start(self): + """ + Initializes a tor process. This blocks until initialization completes or we + error out. + + Raises: + OSError if we either fail to create the tor process or reached a timeout + without success + """ + + print term.format("Starting tor...", term.Color.BLUE, term.Attr.BOLD) + start_time = time.time() + + try: + # terminate our previous instance before continuing if we had one + if self._tor_process: self._tor_process.kill() + + # double check that we have a torrc to work with + torrc_dst = os.path.join(self._test_dir, "torrc") + if not os.path.exists(torrc_dst): + raise OSError("torrc doesn't exist (%s)" % torrc_dst) + + # starts a tor subprocess, raising an OSError if it fails + self._tor_process = subprocess.Popen(["tor", "-f", torrc_dst], stdout = subprocess.PIPE, stderr = subprocess.PIPE) + + # time ourselves out if we reach TOR_INIT_TIMEOUT + def timeout_handler(signum, frame): + # terminates the uninitialized tor process and raise on timeout + self._tor_process.kill() + raise OSError("reached a %i second timeout without success" % TOR_INIT_TIMEOUT) + + signal.signal(signal.SIGALRM, timeout_handler) + signal.alarm(TOR_INIT_TIMEOUT) + + while True: + init_line = self._tor_process.stdout.readline().strip() + + # this will provide empty results if the process is terminated + if not init_line: + self._tor_process.kill() # ... but best make sure + raise OSError("process terminated") + + print term.format(" %s" % init_line, term.Color.BLUE) + + # return the process if we're done with bootstrapping + if init_line.endswith("Bootstrapped 100%: Done."): + print term.format(" done (%i seconds)" % (time.time() - start_time), term.Color.BLUE, term.Attr.BOLD) + return + except OSError, exc: + print term.format(" failed to start tor: %s" % exc, term.Color.RED, term.Attr.BOLD) + raise exc + finally: + print # extra newline + + def stop(self): + """ + Terminates our tor instance. + """ + + if self._tor_process: + sys.stdout.write(term.format("Shutting down tor... ", term.Color.BLUE, term.Attr.BOLD)) + self._tor_process.kill() + self._tor_process.communicate() # blocks until the process is done + self._tor_process = None + sys.stdout.write(term.format("done\n", term.Color.BLUE, term.Attr.BOLD)) + + def get_pid(self): + """ + Provides the process id of tor. + + Returns: + int pid for the tor process, or None if it isn't running + """ + + if self._tor_process: + return self._tor_process.pid + else: return None + + def get_control_port(self): + """ + Provides the control port tor is running with. + + Returns: + int for the port tor's controller interface is bound to, None if it + doesn't have one + """ + + # TODO: this will be fetched from torrc contents when we use custom configs + return 1111 +

1 0

[flashproxy/master] Add a debugging message before making the RTMFP socket.
by dcf＠torproject.org 17 Oct '11

17 Oct '11

commit 5ea3322df2b3576e16161289f9dbe1dad8595488 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 16 15:13:17 2011 -0700 Add a debugging message before making the RTMFP socket. --- swfcat.as | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/swfcat.as b/swfcat.as index f114051..fe29bbb 100644 --- a/swfcat.as +++ b/swfcat.as @@ -255,6 +255,7 @@ package { 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);

1 0

[flashproxy/master] Remove self-disabling based on User-Agent.
by dcf＠torproject.org 17 Oct '11

17 Oct '11

commit 31715a422e9509d76aa0a70f0478087def1f6269 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 16 17:15:38 2011 -0700 Remove self-disabling based on User-Agent. This doesn't work across domains. (It causes a Flash exception that disables the proxy for everyone.) It's going to be replaced with a bit of JavaScript in the page itself that does the same check. --- swfcat.as | 44 -------------------------------------------- 1 files changed, 0 insertions(+), 44 deletions(-) diff --git a/swfcat.as b/swfcat.as index fe29bbb..3489bf2 100644 --- a/swfcat.as +++ b/swfcat.as @@ -135,56 +135,12 @@ package return default_addr; } - /* 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.… - */ - private function should_disable():Boolean - { - var ua:String; - - ua = ExternalInterface.call("window.navigator.userAgent.toString"); - if (ua != null) { - const UA_LIST:Array = [ - /\bmobile\b/i, - /\bandroid\b/i, - /\bopera mobi\b/i, - ]; - - for (var i:uint = 0; i < UA_LIST.length; i++) { - var re:RegExp = UA_LIST[i]; - - if (ua.match(re)) { - puts("Disabling because User-Agent matched " + re + "."); - return true; - } - } - } - - return false; - } - /* The main logic begins here, after start-up issues are taken care of. */ private function proxy_main():void { var fac_url:String; var loader:URLLoader; - if (should_disable()) { - puts("Disabling self."); - return; - } - if (proxy_pairs.length >= MAX_NUM_PROXY_PAIRS) { setTimeout(proxy_main, FACILITATOR_POLL_INTERVAL); return;

1 0

[flashproxy/master] Add flashproxy.js.
by dcf＠torproject.org 17 Oct '11

17 Oct '11

commit 038c8f7c215ea1fcf32c61cd76f0ff80f4bb7990 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 16 19:12:11 2011 -0700 Add flashproxy.js. This is a file that will be hosted at crypto.stanford.edu to make it easy to install the badge on a web page. This script also does the User-Agent detection (to politely disable itself for cell phones) that was formerly done by swfcat itself. --- README | 12 +++--- flashproxy.js | 141 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 147 insertions(+), 6 deletions(-) diff --git a/README b/README index 1a49686..6db4ee0 100644 --- a/README +++ b/README @@ -150,13 +150,13 @@ wait a few minutes. It can take a while to download relay descriptors. == How to put a flash proxy badge on a web page. -Copy swfcat.swf to your server, then paste in this HTML: +Copy swfcat.swf to your server, then paste in this HTML where you want +the badge to appear: + +<script type="text/javascript" src="https://crypto.stanford.edu/flashproxy/flashproxy.js"></script> + +It will be inserted as a span element with the id "flashproxy-badge". -<object width="70" height="23"> - <param name="movie" value="swfcat.swf"> - <param name="flashvars" value=""> - <embed src="swfcat.swf" width="70" height="23" flashvars=""></embed> -</object> == For developers diff --git a/flashproxy.js b/flashproxy.js new file mode 100644 index 0000000..fea72f9 --- /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) { + const 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) +{ + const BADGE_ID = "flashproxy-badge"; + const 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() +{ + const WIDTH = 70; + const HEIGHT = 23; + const FLASHVARS = ""; + const 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() +{ + const 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

[flashproxy/master] Regen tor-ignore-bridge-failure.patch and use git a/b prefixes.
by dcf＠torproject.org 16 Oct '11

16 Oct '11

commit 4d7607575e3bffec622b0983c40b633f5a22d94d Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 16 12:48:17 2011 -0700 Regen tor-ignore-bridge-failure.patch and use git a/b prefixes. --- patches/tor-ignore-bridge-failure.patch | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/patches/tor-ignore-bridge-failure.patch b/patches/tor-ignore-bridge-failure.patch index fa50366..dd7290b 100644 --- a/patches/tor-ignore-bridge-failure.patch +++ b/patches/tor-ignore-bridge-failure.patch @@ -2,11 +2,11 @@ This patch causes Tor to ignore bridge reachability failures. This is helpful when the bridge is only intermittently available, as when connecting through a flash proxy. -diff --git src/or/circuitbuild.c src/or/circuitbuild.c -index ac0df91..1794634 100644 ---- src/or/circuitbuild.c -+++ src/or/circuitbuild.c -@@ -3855,6 +3855,10 @@ entry_guard_register_connect_status(const char *digest, int succeeded, +diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c +index f7d5524..0ffcf06 100644 +--- a/src/or/circuitbuild.c ++++ b/src/or/circuitbuild.c +@@ -3894,6 +3894,10 @@ entry_guard_register_connect_status(const char *digest, int succeeded, int idx = -1; char buf[HEX_DIGEST_LEN+1];

1 0

[flashproxy/master] Make a more user-oriented README.
by dcf＠torproject.org 16 Oct '11

16 Oct '11

commit 1b3ca42959884dc165e874a5da19c640fcd9712b Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 16 13:21:10 2011 -0700 Make a more user-oriented README. Start with how to run the client software using the public servers, and put the stuff about compiling SWF and running your own server at the bottom. --- README | 245 +++++++++++++++++++++++++++++++++++++++------------------------- 1 files changed, 151 insertions(+), 94 deletions(-) diff --git a/README b/README index fa6bf1d..bc09542 100644 --- a/README +++ b/README @@ -16,17 +16,149 @@ There are five main parts. Our terminology for each part is in quotes. 5. A Tor "relay," which is just a normal Tor relay except that its host must also serve a Flash crossdomain policy. -A proxy is capable of connecting to a client in two ways: Using a normal -TCP connection; or over RTMFP, which requires Flash on the client but is -capable of traversing NAT. +The purpose of this project is to create many, generally ephemeral +bridge IP addresses, with the goal of outpacing a censor's ability to +block them. Rather than increasing the number of bridges at static +addresses, we aim to make existing bridges reachable by a larger and +changing pool of addresses. + == Demonstration page +This page has a description of the project; viewing it also turns your +computer into a flash proxy as long as the page is open. (Only if you +have Adobe Flash Player installed.) + https://crypto.stanford.edu/flashproxy/ -== Quick start -=== Building +== Quick start for users + +You must have a version of Tor that supports the Socks4Proxy option. +This means version 0.2.2.32 (released 2011-08-29) or later. + +All the flashproxy programs and source code can be downloaded this way: + git clone https://git.torproject.org/flashproxy.git +But as a user you only need these files: + https://gitweb.torproject.org/flashproxy.git/blob_plain/HEAD:/connector.py + https://gitweb.torproject.org/flashproxy.git/blob_plain/HEAD:/torrc + +There are different ways to get connected, depending on whether you are +able to receive direct TCP connections. The first method is preferred, +if you are able to configure port forwarding or receive direct +connections from the Internet. + +If you don't get a connection within 30 seconds or so, make sure someone +with Flash Player is viewing https://crypto.stanford.edu/flashproxy/. +There aren't yet enough operational proxies that one is available all +the time. + +=== Direct TCP connection + +This is the preferred way to use a flash proxy when it's possible. The +only communication your computer makes with a fixed IP address is +registration with the facilitator: everything else happens over +ephemeral proxies. + +1. Run the connector and instruct it to register with a public + facilitator. + $ python connector.py -f tor-facilitator.bamsoftware.com + 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 line like this (here using port + 8888): + $ python connector.py -f tor-facilitator.bamsoftware.com 127.0.0.1:9001 :8888 +2. Run Tor using the included torrc file. + $ tor -f flashproxy/torrc + +Watch the logs of connector.py and tor. From connector.py you are +expecting output lines like this: + Remote connection from XXX.XXX.XXX.XXX:YYYYY. + Local connection from 127.0.0.1:ZZZZZ. + Linking 127.0.0.1:ZZZZZ and XXX.XXX.XXX.XXX:YYYYY. +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. + +1. Edit the included torrc file to comment one line and uncomment + another: + # Socks4Proxy 127.0.0.1:9001 + Socks4Proxy tor-facilitator.bamsoftware.com:9999 +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 +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 +another web page with a flash proxy badge on it. + +Sometimes Tor can think that the bridge you reach through a proxy is +unreachable after the proxy is disconnected, even if there is another +proxy immediately available. If you are able to build Tor from source, +try applying the patch patches/tor-ignore-bridge-failure.patch. + $ git apply ~/flashproxy/patches/tor-ignore-bridge-failure.patch +or + $ patch -p1 < ~/flashproxy/patches/tor-ignore-bridge-failure.patch + +If tor hangs at 10% with these messages: + [notice] Bootstrapped 10%: Finishing handshake with directory server. + [notice] no known bridge descriptors running yet; stalling +as a last resort you can try deleting the files in ~/.tor and +/var/lib/tor, and then restarting tor. + +If tor apparently hangs here: + [notice] Bootstrapped 50%: Loading relay descriptors. + [notice] new bridge descriptor '...' (fresh) +wait a few minutes. It can take a while to download relay descriptors. + + +== How to put a flash proxy badge on a web page. + +Copy swfcat.swf to your server, then paste in this HTML: + +<object width="70" height="23"> + <param name="movie" value="swfcat.swf"> + <param name="flashvars" value=""> + <embed src="swfcat.swf" width="70" height="23" flashvars=""></embed> +</object> + +== For developers + +See design.txt for some more technical information. + +=== Building swfcat.swf Download the (free software) Flex SDK. http://opensource.adobe.com/wiki/display/flexsdk/Flex+SDK @@ -36,7 +168,15 @@ To build, run $ make Copy the resulting swfcat.swf file to a web server. -=== Connecting +You can pass swfcat.swf the parameter debug=1 to see lots of debugging +information. + +This is a good tutorial on ActionScript programming with the Flex tools, +with sample code: + http://www.senocular.com/flash/tutorials/as3withmxmlc/ + http://www.senocular.com/flash/tutorials/as3withmxmlc/AS3Flex2b3StarterFile… + +=== Running a relay or facilitator On the Tor relay, run # ./crossdomaind.py @@ -45,52 +185,11 @@ crossdomain policy, but the connector and facilitator have it built in. On the facilitator, run $ ./facilitator.py -r <relay-ip> -The facilitator runs on port 9002 by default. - -In a browser somewhere, open swfcat.swf and pass it a parameters telling it -which facilitator to use, for example - http://www.example.com/swfcat.swf?facilitator=<facilitator-ip>:9002&debug=1 - -There are two ways in which the client can receive connections: over TCP -or RTMFP. TCP doesn't send traffic to anyone other than the facilitator -and the proxy, but it only works if you have a public IP address. RTMFP -coordinates connections using another server (which may be the same as -the facilitator) and works when the client is behind a NAT. - -To connect with TCP, run - $ ./connector.py -f <facilitator-ip> -(If you are running the facilitator locally, be sure to use an external -IP address, not 127.0.0.1.) The connector informs the facilitator that -it wants a connection, then listens on 0.0.0.0:9000 and 127.0.0.1:9001. -The proxy will connect on port 9000 and the local Tor will connect on -9001. - -To connect with RTMFP, run - $ ./connector.py 127.0.0.1:9001 127.0.0.1:9002 -and open in a browser - http://www.example.com/swfcat.swf?client=1&facilitator=<facilitator-ip>:9002 -In this case, it is swfcat running in client mode that registers with -the facilitator. The connector acts to join the local swfcat and the -local Tor client. - -The client needs to be running a version of Tor that supports the -Socks4Proxy configuration. This means version 0.2.2.1-alpha or -later--not the current stable release. - -Start Tor with the following configuration (you can use the included torrc file): - UseBridges 1 - Bridge 127.0.0.1:9001 - Socks4Proxy 127.0.0.1:9001 - -If you see messages like - [notice] Bootstrapped 10%: Finishing handshake with directory server. - [notice] no known bridge descriptors running yet; stalling -try deleting the files in ~/.tor or /var/lib/tor. +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 will be able to see byte counts flowing in the browser window, and -eventually be able to build a circuit. - -== Installing so as to restart at boot +=== 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. @@ -109,7 +208,7 @@ crossdomaind server on CentOS. "make install" copies files to /usr/local/bin. # chkconfig --add crossdomaind # service crossdomaind start -== Building the Cumulus RTMFP server +=== 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/. @@ -140,45 +239,3 @@ Follow these steps to install the Cumulus server. You need to open port # cp flashproxy/init.d/cumulus /etc/init.d/cumulus # chkconfig --add cumulus # service cumulus start - -== Rationale - -The purpose of this project is to create many, generally ephemeral -bridge IP addresses, with the goal of outpacing a censor's ability to -block them. Rather than increasing the number of bridges at static -addresses, we aim to make existing bridges reachable by a larger and -changing pool of addresses. - -== Design notes - -Any Tor relay can be used, as long as it also serves a crossdomain -policy. - -Clients register with the facilitator by sending an HTTP message: - POST / HTTP/1.0\r\n - \r\n - client=<ip-addr/rtmfp-id> -The flash proxy also gets a client address over HTTP: - GET / HTTP/1.0\r\n - \r\n -The server sends back address specifications of a client and a relay in -an HTTP respose. - HTTP/1.0 200 OK\r\n - \r\n - client=<ip-addr/rtmfp-id>&relay=<relay-ip> - -== Embedding in HTML - -<object width="70" height="23"> - <param name="movie" value="swfcat.swf"> - <param name="flashvars" value=""> - <embed src="swfcat.swf" width="70" height="23" flashvars=""></embed> -</object> - -== ActionScript programming - -A good tutorial on ActionScript programming with the Flex tools, with -sample code: - -http://www.senocular.com/flash/tutorials/as3withmxmlc/ -http://www.senocular.com/flash/tutorials/as3withmxmlc/AS3Flex2b3StarterFiles.zip

1 0

[flashproxy/master] Mention that you should not run Flash in your Tor browser.
by dcf＠torproject.org 16 Oct '11

16 Oct '11

commit aad8ce3c5287c2eed1db7830b2c285830ab83d1f Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 16 16:32:55 2011 -0700 Mention that you should not run Flash in your Tor browser. Just because the RTMFP client connector uses Flash, we don't want to give anyone another excuse to install Flash in the browser they use for Tor. --- README | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/README b/README index bc09542..7e4dceb 100644 --- a/README +++ b/README @@ -114,6 +114,10 @@ the Tor client, which the other methods don't. $ ./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

1 0

[flashproxy/master] Add link to debug version of Flash Player.
by dcf＠torproject.org 16 Oct '11

16 Oct '11

commit 29c02df8ef1fff012b9e7b3e1f10be7e93fc1538 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 16 13:57:08 2011 -0700 Add link to debug version of Flash Player. --- README | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/README b/README index 7e4dceb..1a49686 100644 --- a/README +++ b/README @@ -175,6 +175,10 @@ Copy the resulting swfcat.swf file to a web server. You can pass swfcat.swf the parameter debug=1 to see lots of debugging information. +Adobe makes a debug version of Flash player that raises a window on +errors instead of silently failing, and exposes some logging functions. + http://www.adobe.com/support/flashplayer/downloads.html + This is a good tutorial on ActionScript programming with the Flex tools, with sample code: http://www.senocular.com/flash/tutorials/as3withmxmlc/

1 0

[flashproxy/master] Move patches into a subdirectory.
by dcf＠torproject.org 16 Oct '11

16 Oct '11

commit b6be6a5217212b9455e44aaa3940716484caef27 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 16 12:43:31 2011 -0700 Move patches into a subdirectory. --- README | 2 +- cumulus-no-manage-log.patch | 39 ------------------------------- patches/cumulus-no-manage-log.patch | 39 +++++++++++++++++++++++++++++++ patches/tor-ignore-bridge-failure.patch | 19 +++++++++++++++ tor-ignore-bridge-failure.patch | 19 --------------- 5 files changed, 59 insertions(+), 59 deletions(-) diff --git a/README b/README index 933895a..fa6bf1d 100644 --- a/README +++ b/README @@ -127,7 +127,7 @@ 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 < cumulus-no-manage-log.patch + $ patch -p0 < ~/flashproxy/patches/cumulus-no-manage-log.patch $ cd CumulusLib $ make LIBS=./ # cp libCumulus.so /usr/local/lib diff --git a/cumulus-no-manage-log.patch b/cumulus-no-manage-log.patch deleted file mode 100644 index 810b52d..0000000 --- a/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/patches/cumulus-no-manage-log.patch b/patches/cumulus-no-manage-log.patch new file mode 100644 index 0000000..810b52d --- /dev/null +++ b/patches/cumulus-no-manage-log.patch @@ -0,0 +1,39 @@ +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/patches/tor-ignore-bridge-failure.patch b/patches/tor-ignore-bridge-failure.patch new file mode 100644 index 0000000..fa50366 --- /dev/null +++ b/patches/tor-ignore-bridge-failure.patch @@ -0,0 +1,19 @@ +This patch causes Tor to ignore bridge reachability failures. This is +helpful when the bridge is only intermittently available, as when +connecting through a flash proxy. + +diff --git src/or/circuitbuild.c src/or/circuitbuild.c +index ac0df91..1794634 100644 +--- src/or/circuitbuild.c ++++ src/or/circuitbuild.c +@@ -3855,6 +3855,10 @@ entry_guard_register_connect_status(const char *digest, int succeeded, + int idx = -1; + char buf[HEX_DIGEST_LEN+1]; + ++ /* Ignore bridge reachability problems. */ ++ if (! succeeded) ++ return 0; ++ + if (! entry_guards) + return 0; + diff --git a/tor-ignore-bridge-failure.patch b/tor-ignore-bridge-failure.patch deleted file mode 100644 index fa50366..0000000 --- a/tor-ignore-bridge-failure.patch +++ /dev/null @@ -1,19 +0,0 @@ -This patch causes Tor to ignore bridge reachability failures. This is -helpful when the bridge is only intermittently available, as when -connecting through a flash proxy. - -diff --git src/or/circuitbuild.c src/or/circuitbuild.c -index ac0df91..1794634 100644 ---- src/or/circuitbuild.c -+++ src/or/circuitbuild.c -@@ -3855,6 +3855,10 @@ entry_guard_register_connect_status(const char *digest, int succeeded, - int idx = -1; - char buf[HEX_DIGEST_LEN+1]; - -+ /* Ignore bridge reachability problems. */ -+ if (! succeeded) -+ return 0; -+ - if (! entry_guards) - return 0; -

1 0