- tor-commits - lists.torproject.org

[flashproxy/master] Alphabetize imports.
by dcf＠torproject.org 17 Oct '11

17 Oct '11

commit 460ad063aaa7b703b16f54fc1b2734181d2cfa46 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 16 19:56:36 2011 -0700 Alphabetize imports. It's shocking how badly I do this manually. --- swfcat.as | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/swfcat.as b/swfcat.as index e7afed1..b1dabc1 100644 --- a/swfcat.as +++ b/swfcat.as @@ -3,18 +3,18 @@ package import flash.display.Sprite; import flash.display.StageAlign; import flash.display.StageScaleMode; + import flash.events.Event; + import flash.events.IOErrorEvent; + import flash.events.SecurityErrorEvent; import flash.external.ExternalInterface; - import flash.text.TextField; - import flash.text.TextFormat; import flash.net.Socket; import flash.net.URLLoader; import flash.net.URLLoaderDataFormat; import flash.net.URLRequest; import flash.net.URLRequestMethod; import flash.net.URLVariables; - import flash.events.Event; - import flash.events.IOErrorEvent; - import flash.events.SecurityErrorEvent; + import flash.text.TextField; + import flash.text.TextFormat; import flash.utils.setTimeout; public class swfcat extends Sprite @@ -333,8 +333,8 @@ package import flash.events.MouseEvent; import flash.net.navigateToURL; import flash.net.URLRequest; -import flash.text.TextFormat; import flash.text.TextField; +import flash.text.TextFormat; import flash.utils.getTimer; class Badge extends flash.display.Sprite

1 0

[flashproxy/master] Whitespace consistency.
by dcf＠torproject.org 17 Oct '11

17 Oct '11

commit 6bbbf95b1b5203c2de36e339e6c474062376967a Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 16 19:34:58 2011 -0700 Whitespace consistency. --- flashproxy.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index fea72f9..a16edb3 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -103,7 +103,7 @@ function flashproxy_make_badge() } /* Create and return a non-functional placeholder badge DOM fragment: - <img src=BADGE_IMAGE_URL border="0"> +<img src=BADGE_IMAGE_URL border="0"> */ function flashproxy_make_dummy_badge() {

1 0

[flashproxy/master] Make the badge clickable.
by dcf＠torproject.org 17 Oct '11

17 Oct '11

commit 613b712831be9613167fd7e47a368de4b5194e94 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 16 19:53:11 2011 -0700 Make the badge clickable. --- swfcat.as | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/swfcat.as b/swfcat.as index 3489bf2..e7afed1 100644 --- a/swfcat.as +++ b/swfcat.as @@ -330,12 +330,17 @@ package } } +import flash.events.MouseEvent; +import flash.net.navigateToURL; +import flash.net.URLRequest; import flash.text.TextFormat; import flash.text.TextField; import flash.utils.getTimer; class Badge extends flash.display.Sprite { + private const FLASHPROXY_INFO_URL:String = "https://crypto.stanford.edu/flashproxy/"; + /* Number of proxy pairs currently connected. */ private var num_proxy_pairs:int = 0; /* Number of proxy pairs ever connected. */ @@ -385,6 +390,8 @@ class Badge extends flash.display.Sprite /* Update the client counter on badge. */ update_client_count(); + + addEventListener(MouseEvent.CLICK, mouse_clicked); } public function proxy_begin():void @@ -413,6 +420,15 @@ class Badge extends flash.display.Sprite for(var i:Number = 0; i < num_proxy_pairs; i++) cur_client_count_tf.appendText("."); } + + /* Show a web page with detailed information when the badge is clicked. */ + private function mouse_clicked(e:MouseEvent):void + { + try { + navigateToURL(new URLRequest(FLASHPROXY_INFO_URL)); + } catch (err:Error) { + } + } } class RateLimit

1 0

[stem/master] Moving integration test init/shutdown into class
by atagar＠torproject.org 17 Oct '11

17 Oct '11

commit 0c03d4eb2a04f71942c53caf6314c25ce66be18e Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 16 15:19:03 2011 -0700 Moving integration test init/shutdown into class Making a Runner class which will be available to integration tests. This both better modularizes the code and will allow for us to give runtime context to the tests. --- run_tests.py | 120 +++++--------------------------------------- test/integ/__init__.py | 2 +- test/integ/runner.py | 130 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 143 insertions(+), 109 deletions(-) diff --git a/run_tests.py b/run_tests.py index 9e4487c..dab1c4f 100755 --- a/run_tests.py +++ b/run_tests.py @@ -4,18 +4,14 @@ Runs unit and integration tests. """ -import os import sys -import time import getopt -import signal -import tempfile import unittest -import subprocess import test.unit.message import test.unit.version +import test.integ.runner -from stem.util import enum, system, term +from stem.util import enum, term OPT = "uit:h" OPT_EXPANDED = ["unit", "integ", "targets=", "help"] @@ -51,57 +47,6 @@ Runs tests for the stem library. %s """ -# Number of seconds before we time out our attempt to start a tor instance -TOR_INIT_TIMEOUT = 20 - -def init_tor_process(torrc_dst): - """ - Initializes and returns a tor process. This blocks until initialization - completes or we error out. - - Arguments: - torrc_dst (str) - path for a torrc configuration to use - - Returns: - subprocess.Popen instance for the instantiated tor process - - Raises: - OSError if we either fail to create the tor process or reached a timeout without success - """ - - start_time = time.time() - - # starts a tor subprocess, raising an OSError if it fails - 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 - tor_process.kill() - raise OSError("unable to start tor: reached a %i second timeout without success" % TOR_INIT_TIMEOUT) - - signal.signal(signal.SIGALRM, timeout_handler) - signal.alarm(TOR_INIT_TIMEOUT) - - print term.format("Starting tor...", term.Color.BLUE, term.Attr.BOLD) - - while True: - init_line = tor_process.stdout.readline().strip() - - # this will provide empty results if the process is terminated - if not init_line: - tor_process.kill() # ... but best make sure - raise OSError("tor 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) - print - - return tor_process - if __name__ == '__main__': run_unit_tests = False run_integ_tests = False @@ -160,62 +105,21 @@ if __name__ == '__main__': print if run_integ_tests: - # TODO: check if there's already a tor instance running - print "%s\n%s\n%s\n" % (DIVIDER, "INTEGRATION TESTS".center(70), DIVIDER) - print term.format("Setting up a test instance...", term.Color.BLUE, term.Attr.BOLD) + integ_runner = test.integ.runner.Runner() - # makes a temporary directory for the runtime resources of our integ test - test_dir = tempfile.mktemp("-stem-integ") - - try: - os.makedirs(test_dir) - print term.format(" created test directory: %s" % test_dir, term.Color.BLUE, term.Attr.BOLD) - except OSError, exc: - print term.format("Unable to make testing directory: %s" % exc, term.Color.RED, term.Attr.BOLD) - sys.exit(1) - - # makes a basic torrc for the integration tests to run against - torrc_contents = """# basic integration testing configuration -DataDirectory %s -ControlPort 9051 -""" % test_dir - - # writes our testing torrc - torrc_dst = os.path.join(test_dir, "torrc") - try: - torrc_file = open(torrc_dst, "w") - torrc_file.write(torrc_contents) - torrc_file.close() - - print term.format(" wrote torrc: %s" % torrc_dst, term.Color.BLUE, term.Attr.BOLD) - - for line in torrc_contents.split("\n"): - print term.format(" %s" % line.strip(), term.Color.BLUE) - except Exception, exc: - print term.format("Unable to write testing torrc: %s" % exc, term.Color.RED, term.Attr.BOLD) - sys.exit(1) - - # starts a tor instance try: - tor_process = init_tor_process(torrc_dst) - except OSError, exc: - print term.format("Unable to start a tor instance: %s" % exc, term.Color.RED, term.Attr.BOLD) - sys.exit(1) + integ_runner.run_setup() + integ_runner.start() - print term.format("Running tests...", term.Color.BLUE, term.Attr.BOLD) - print - - # TODO: run tests - - print term.format("Shutting down tor...", term.Color.BLUE, term.Attr.BOLD) - tor_process.kill() - print term.format(" done", term.Color.BLUE, term.Attr.BOLD) - - - - + # TODO: run tests + print term.format("Running tests...", term.Color.BLUE, term.Attr.BOLD) + print + except OSError: + pass + finally: + integ_runner.stop() # TODO: we might do target selection later but for now we should simply # work with a single simple tor instance and see how it works out diff --git a/test/integ/__init__.py b/test/integ/__init__.py index b96692a..ecfc9cd 100644 --- a/test/integ/__init__.py +++ b/test/integ/__init__.py @@ -2,5 +2,5 @@ Integration tests for the stem library. """ -__all__ = [] +__all__ = ["runner"] diff --git a/test/integ/runner.py b/test/integ/runner.py new file mode 100644 index 0000000..207c2e3 --- /dev/null +++ b/test/integ/runner.py @@ -0,0 +1,130 @@ +""" +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 = 30 + +BASIC_TORRC = """# configuration for stem integration tests +DataDirectory %s +ControlPort 1111 +""" + +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() + sys.stdout.write(term.format("done\n", term.Color.BLUE, term.Attr.BOLD)) + print # extra newline +

1 0

[stem/master] Adding BSD compatability to system.is_running
by atagar＠torproject.org 17 Oct '11

17 Oct '11

commit 3731bba464e22dc5501b7b9ae62c29ebc34ad7ba Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 16 17:27:57 2011 -0700 Adding BSD compatability to system.is_running Copying over an arm fix I made earlier this week from util.torTools.isTorRunning so that it would work on OSX/FreeBSD/OpenBSD. --- stem/util/system.py | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/stem/util/system.py b/stem/util/system.py index 3c520e8..bdada9b 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -61,7 +61,27 @@ def is_running(command, suppress_exc = True): OSError if this can't be determined and suppress_exc is False """ - command_listing = call("ps -A co command") + # Linux and the BSD families have different variants of ps. Guess based on + # os.uname() results which to try first, then fall back to the other. + # + # Linux + # -A - Select all processes. Identical to -e. + # -co command - Shows just the base command. + # + # Mac / BSD + # -a - Display information about other users' processes as well as + # your own. + # -o ucomm= - Shows just the ucomm attribute ("name to be used for + # accounting") + + primary_resolver, secondary_resolver = "ps -A co command", "ps -ao ucomm=" + + if os.uname()[0] in ("Darwin", "FreeBSD", "OpenBSD"): + primary_resolver, secondary_resolver = secondary_resolver, primary_resolver + + command_listing = call(primary_resolver) + if not command_listing: + command_listing = call(secondary_resolver) if command_listing: return command in command_listing

1 0

[stem/master] Integration tests for stem.util.system functions
by atagar＠torproject.org 17 Oct '11

17 Oct '11

commit 1a30fbd6526b243468a6ca92f0223eb84ff9b21b Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 16 17:19:01 2011 -0700 Integration tests for stem.util.system functions Very, very basic tests that the tor process is running and available. --- run_tests.py | 13 +++++++++++-- test/integ/runner.py | 12 ++++++++++++ test/integ/system.py | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 2 deletions(-) diff --git a/run_tests.py b/run_tests.py index dab1c4f..4f3eee7 100755 --- a/run_tests.py +++ b/run_tests.py @@ -10,6 +10,7 @@ import unittest import test.unit.message import test.unit.version import test.integ.runner +import test.integ.system from stem.util import enum, term @@ -17,11 +18,14 @@ OPT = "uit:h" OPT_EXPANDED = ["unit", "integ", "targets=", "help"] DIVIDER = "=" * 70 -# (name, class) tuples for all of our unit tests +# (name, class) tuples for all of our unit and integration tests UNIT_TESTS = (("stem.types.ControlMessage", test.unit.message.TestMessageFunctions), ("stem.types.Version", test.unit.version.TestVerionFunctions), ) +INTEG_TESTS = (("stem.util.system", test.integ.system.TestSystemFunctions), + ) + # Configurations that the intergration tests can be ran with. Attributs are # tuples of the test runner and description. TARGETS = enum.Enum(*[(v, v) for v in ("NONE", "NO_CONTROL", "NO_AUTH", "COOKIE", "PASSWORD", "SOCKET")]) @@ -113,8 +117,13 @@ if __name__ == '__main__': integ_runner.run_setup() integ_runner.start() - # TODO: run tests print term.format("Running tests...", term.Color.BLUE, term.Attr.BOLD) + 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 diff --git a/test/integ/runner.py b/test/integ/runner.py index 207c2e3..4805c20 100644 --- a/test/integ/runner.py +++ b/test/integ/runner.py @@ -127,4 +127,16 @@ class Runner: self._tor_process.kill() sys.stdout.write(term.format("done\n", term.Color.BLUE, term.Attr.BOLD)) print # extra newline + + 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 diff --git a/test/integ/system.py b/test/integ/system.py new file mode 100644 index 0000000..6b38615 --- /dev/null +++ b/test/integ/system.py @@ -0,0 +1,32 @@ +""" +Unit tests for the util.system functions in the context of a tor process. +""" + +import unittest + +from stem.util import system + +class TestSystemFunctions(unittest.TestCase): + """ + Tests the util.system functions against the tor process that we're running. + """ + + def test_is_available(self): + """ + Checks the util.system.is_available function. + """ + + # since we're running tor it would be kinda sad if this didn't detect it + self.assertTrue(system.is_available("tor")) + + # but it would be kinda weird if this did... + self.assertFalse(system.is_available("blarg_and_stuff")) + + def test_is_running(self): + """ + Checks the util.system.is_running function. + """ + + self.assertTrue(system.is_running("tor")) + self.assertFalse(system.is_running("blarg_and_stuff")) +

1 0

[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