- tor-commits - lists.torproject.org

[stem/master] Fix close_circuit test
by atagar＠torproject.org 25 Nov '12

25 Nov '12

commit 3b6ac7bd10c38b9ef52d73bdbf134eced065e291 Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Sun Nov 25 07:33:05 2012 -0700 Fix close_circuit test Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/integ/control/controller.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 58208b5..6a000c2 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -420,13 +420,13 @@ class TestController(unittest.TestCase): circ_id = controller.new_circuit() controller.close_circuit(circ_id) circuit_output = controller.get_info("circuit-status") - circ = filter(re.compile("^%i " % circ_id).match, circuit_output.splitlines())[0] + circ = [x.split()[0] for x in circuit_output.splitlines()] self.assertFalse(circ_id in circ) circ_id = controller.new_circuit() controller.close_circuit(circ_id, "IfUnused") circuit_output = controller.get_info("circuit-status") - circ = filter(re.compile("^%i " % circ_id).match, circuit_output.splitlines())[0] + circ = [x.split()[0] for x in circuit_output.splitlines()] self.assertFalse(circ_id in circ) circ_id = controller.new_circuit()

1 0

[stem/master] Add a close_circuit method to Controller
by atagar＠torproject.org 25 Nov '12

25 Nov '12

commit d682c8cd13a0f6bffcd056a2a938db2dfa65f500 Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Thu Nov 22 08:09:42 2012 -0700 Add a close_circuit method to Controller Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- stem/control.py | 21 +++++++++++++++++++++ test/integ/control/controller.py | 26 ++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 0 deletions(-) diff --git a/stem/control.py b/stem/control.py index a2d408b..0b7baee 100644 --- a/stem/control.py +++ b/stem/control.py @@ -29,6 +29,7 @@ providing its own for interacting at a higher level. |- signal - sends a signal to the tor client |- new_circuit - create new circuits |- extend_circuit - create new circuits and extend existing ones + |- close_circuit - close a circuit |- repurpose_circuit - change a circuit's purpose |- map_address - maps one address to another such that connections to the original are replaced with the other |- get_version - convenience method to get tor version @@ -1268,6 +1269,26 @@ class Controller(BaseController): return int(new_circuit) + def close_circuit(self, circuit_id, flag = ''): + """ + Closes the specified circuit. + + :param int circuit_id: id of the circuit to be closed + :param str flag: optional value to modify closing, the only flag available + is "IfUnused" which will not close the circuit unless it is unused + + :raises: :class:`stem.InvalidArguments` if the circuit doesn't exist or not enough information is provided + """ + + response = self.msg("CLOSECIRCUIT %s %s"% (str(circuit_id), flag)) + stem.response.convert("SINGLELINE", response) + + if not response.is_ok(): + if response.code in ('512', '552'): + raise stem.InvalidRequest(response.code, response.message) + else: + raise stem.ProtocolError("CLOSECIRCUIT returned unexpected response code: %s" % response.code) + def map_address(self, mapping): """ Map addresses to replacement addresses. Tor replaces subseqent connections diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 571d3ab..58208b5 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -406,6 +406,32 @@ class TestController(unittest.TestCase): self.assertRaises(stem.InvalidRequest, controller.repurpose_circuit, 'f934h9f3h4', "fooo") self.assertRaises(stem.InvalidRequest, controller.repurpose_circuit, '4', "fooo") + def test_close_circuit(self): + """ + Tests Controller.close_circuit with valid and invalid input. + """ + + if test.runner.require_control(self): return + elif test.runner.require_online(self): return + + runner = test.runner.get_runner() + + with runner.get_tor_controller() as controller: + circ_id = controller.new_circuit() + controller.close_circuit(circ_id) + circuit_output = controller.get_info("circuit-status") + circ = filter(re.compile("^%i " % circ_id).match, circuit_output.splitlines())[0] + self.assertFalse(circ_id in circ) + + circ_id = controller.new_circuit() + controller.close_circuit(circ_id, "IfUnused") + circuit_output = controller.get_info("circuit-status") + circ = filter(re.compile("^%i " % circ_id).match, circuit_output.splitlines())[0] + self.assertFalse(circ_id in circ) + + circ_id = controller.new_circuit() + self.assertRaises(stem.InvalidRequest, controller.close_circuit, circ_id + 1024) + def test_mapaddress(self): if test.runner.require_control(self): return elif test.runner.require_online(self): return

1 0

[stem/master] Whitespace fixes
by atagar＠torproject.org 25 Nov '12

25 Nov '12

commit 368fedfaffc6e86dc8febd1d6d82e54f91b6ad01 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Nov 25 14:01:18 2012 -0800 Whitespace fixes The prior couple patches lacked whitespace on empty lines, causing our whitespace checker to complain. I wonder if I should stop fighting with the world here - they're clearly wrong, but I'm pretty alone in this... --- stem/control.py | 10 +++++----- test/integ/control/controller.py | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/stem/control.py b/stem/control.py index 0b7baee..cd990d8 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1272,23 +1272,23 @@ class Controller(BaseController): def close_circuit(self, circuit_id, flag = ''): """ Closes the specified circuit. - + :param int circuit_id: id of the circuit to be closed :param str flag: optional value to modify closing, the only flag available is "IfUnused" which will not close the circuit unless it is unused - + :raises: :class:`stem.InvalidArguments` if the circuit doesn't exist or not enough information is provided """ - + response = self.msg("CLOSECIRCUIT %s %s"% (str(circuit_id), flag)) stem.response.convert("SINGLELINE", response) - + if not response.is_ok(): if response.code in ('512', '552'): raise stem.InvalidRequest(response.code, response.message) else: raise stem.ProtocolError("CLOSECIRCUIT returned unexpected response code: %s" % response.code) - + def map_address(self, mapping): """ Map addresses to replacement addresses. Tor replaces subseqent connections diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 6a000c2..1ba06bb 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -410,28 +410,28 @@ class TestController(unittest.TestCase): """ Tests Controller.close_circuit with valid and invalid input. """ - + if test.runner.require_control(self): return elif test.runner.require_online(self): return - + runner = test.runner.get_runner() - + with runner.get_tor_controller() as controller: circ_id = controller.new_circuit() controller.close_circuit(circ_id) circuit_output = controller.get_info("circuit-status") circ = [x.split()[0] for x in circuit_output.splitlines()] self.assertFalse(circ_id in circ) - + circ_id = controller.new_circuit() controller.close_circuit(circ_id, "IfUnused") circuit_output = controller.get_info("circuit-status") circ = [x.split()[0] for x in circuit_output.splitlines()] self.assertFalse(circ_id in circ) - + circ_id = controller.new_circuit() self.assertRaises(stem.InvalidRequest, controller.close_circuit, circ_id + 1024) - + def test_mapaddress(self): if test.runner.require_control(self): return elif test.runner.require_online(self): return

1 0

[stem/master] Adding a setup.py
by atagar＠torproject.org 25 Nov '12

25 Nov '12

commit 337f2221109ae61ed90fbf640d23fa434bed8049 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Nov 25 12:11:59 2012 -0800 Adding a setup.py I've had a setup.py sitting around since the GSoC mentor summit, but didn't check it in since I haven't made a method for testing the Python 3 conversion. robinson submitted a patch adding a setup.py so guess I should stop waiting on that. --- setup.py | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..c54b999 --- /dev/null +++ b/setup.py @@ -0,0 +1,26 @@ +#!/usr/bin/env python + +from stem import __version__, \ + __author__, \ + __contact__, \ + __url__, \ + __license__ + +from distutils.core import setup + +try: + from distutils.command.build_py import build_py_2to3 as build_py +except ImportError: + from distutils.command.build_py import build_py + +setup(name = 'stem', + version = __version__, + description = 'Controller library for tor', + license = __license__, + author = __author__, + author_email = __contact__, + url = __url__, + packages = ['stem', 'stem.descriptor', 'stem.response', 'stem.util'], + cmdclass = {'build_py': build_py}, +) +

1 0

[stem/master] Borrowing setup.py corrections from robinson
by atagar＠torproject.org 25 Nov '12

25 Nov '12

commit 4c65738d100ab0802a75cc4b9d64065c8a8ef881 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Nov 25 13:03:46 2012 -0800 Borrowing setup.py corrections from robinson Borrowing a couple things from robinson's patch on... https://trac.torproject.org/7565 ... including the description, updated stem url, and provides/keywords args. Tested by simply running 'python setup.py build'. --- setup.py | 9 ++++++++- stem/__init__.py | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index c54b999..395f97c 100644 --- a/setup.py +++ b/setup.py @@ -8,6 +8,11 @@ from stem import __version__, \ from distutils.core import setup +DESCRIPTION = """\ +Stem is a python controller library for Tor <https://www.torproject.org/>. +Like its predecessor, TorCtl, it uses Tor's control protocol to help +developers program against the Tor process.""" + try: from distutils.command.build_py import build_py_2to3 as build_py except ImportError: @@ -15,12 +20,14 @@ except ImportError: setup(name = 'stem', version = __version__, - description = 'Controller library for tor', + description = DESCRIPTION, license = __license__, author = __author__, author_email = __contact__, url = __url__, packages = ['stem', 'stem.descriptor', 'stem.response', 'stem.util'], + provides = ['stem'], cmdclass = {'build_py': build_py}, + keywords = "tor onion controller", ) diff --git a/stem/__init__.py b/stem/__init__.py index dd0061f..961bc48 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -18,7 +18,7 @@ Library for working with the tor process. __version__ = '0.0.1' __author__ = 'Damian Johnson' __contact__ = 'atagar(a)torproject.org' -__url__ = 'http://www.atagar.com/stem/' +__url__ = 'http://stem.readthedocs.org' __license__ = 'LGPLv3' __all__ = [

1 0

[metrics-tasks/master] add hex_digest attribute
by karsten＠torproject.org 25 Nov '12

25 Nov '12

commit 814c78aa6a6641c1be9efde1a6d58c6c6998fea0 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Fri Nov 23 22:24:12 2012 +0530 add hex_digest attribute --- task-1854/pylinf.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/task-1854/pylinf.py b/task-1854/pylinf.py index 1f50dc9..91ea2f8 100644 --- a/task-1854/pylinf.py +++ b/task-1854/pylinf.py @@ -25,6 +25,7 @@ class Router: def __init__(self): self.prob = None self.bandwidth = None + self.hex_digest = None self.advertised_bw = None self.country = None self.as_no = None @@ -32,8 +33,8 @@ class Router: self.is_guard = None def add_router_info(self, values): - hex_digest = b2a_hex(a2b_base64(values[2]+"=")) - self.advertised_bw = self.get_advertised_bw(hex_digest) + self.hex_digest = b2a_hex(a2b_base64(values[2]+"=")) + self.advertised_bw = self.get_advertised_bw(self.hex_digest) ip = values[5] #self.country = gi_db.country_code_by_addr(ip) #self.as_no = self.get_as_details(ip)

1 0

[metrics-tasks/master] pickle output
by karsten＠torproject.org 25 Nov '12

25 Nov '12

commit 9d02762d4e1cef6b24e5915d46a386fd0fee0f20 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Sat Nov 24 00:03:32 2012 +0530 pickle output --- task-1854/pylinf.py | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/task-1854/pylinf.py b/task-1854/pylinf.py index 91ea2f8..9ccac13 100644 --- a/task-1854/pylinf.py +++ b/task-1854/pylinf.py @@ -13,6 +13,7 @@ import math import os import pygeoip import tarfile +import pickle import StringIO import stem.descriptor.server_descriptor as server_descriptor @@ -25,8 +26,8 @@ class Router: def __init__(self): self.prob = None self.bandwidth = None - self.hex_digest = None self.advertised_bw = None + self.hex_digest = None self.country = None self.as_no = None self.is_exit = None @@ -56,7 +57,7 @@ class Router: return "" def get_advertised_bw(self, hex_digest): - return descriptors[self.hex_digest] + return descriptors[self.hex_digest.upper()] def parse_bw_weights(values): data = {} @@ -219,6 +220,10 @@ if __name__ == "__main__": server_desc_files.append(os.path.join(options.server_desc, file_name)) load_server_desc(server_desc_files) + # Pickle descriptors + with open('data.pkl', 'wb') as output: + pickle.dump(descriptors, output) + with open(options.output, 'w') as out_fh: for file_name in os.listdir(options.consensus): file_path = os.path.join(options.consensus, file_name)

1 0

[metrics-tasks/master] Merge remote-tracking branch 'gsathya/bug_1854_v2'
by karsten＠torproject.org 25 Nov '12

25 Nov '12

commit 99a21d55b607daeb79033642ffda0ce288528992 Merge: 3f7a92b 6da2e5b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Nov 25 14:04:40 2012 -0500 Merge remote-tracking branch 'gsathya/bug_1854_v2' task-1854/README.txt | 17 +++--- task-1854/pylinf.py | 139 +++++++++++++++++++++++++++++++++++--------------- 2 files changed, 105 insertions(+), 51 deletions(-)

1 0

[metrics-tasks/master] don't crash if you can't find a desc
by karsten＠torproject.org 25 Nov '12

25 Nov '12

commit 6da2e5b741a96eb543cf1adcf9eb64a1c2877ec2 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Sat Nov 24 15:23:42 2012 +0530 don't crash if you can't find a desc --- task-1854/pylinf.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/task-1854/pylinf.py b/task-1854/pylinf.py index eba39ea..9d324d6 100644 --- a/task-1854/pylinf.py +++ b/task-1854/pylinf.py @@ -57,7 +57,9 @@ class Router: return "" def get_advertised_bw(self, hex_digest): - return descriptors[self.hex_digest.upper()] + try: + return descriptors[self.hex_digest.upper()] + except: return 0 def parse_bw_weights(values): data = {} @@ -193,7 +195,7 @@ def parse_args(): parser.add_option("-a", "--as", dest="as_db", default="GeoIPASNum.dat", help="Input AS GeoIP database") parser.add_option("-s", "--server_desc", dest="server_desc", - default="data/relay-descriptors/server-descriptors/", help="Server descriptors directory") + default=False, help="Server descriptors directory") parser.add_option("-o", "--output", dest="output", default="entropy.csv", help="Output filename") parser.add_option("-c", "--consensus", dest="consensus", default="in/consensus", @@ -216,7 +218,8 @@ if __name__ == "__main__": if options.pickled_data: with open('data.pkl', 'rb') as pkl_input: descriptors = pickle.load(pkl_input) - else: + + if options.server_desc: # load all server descs into memeory for file_name in os.listdir(options.server_desc): server_desc_files.append(os.path.join(options.server_desc, file_name))

1 0

[metrics-tasks/master] pickle data
by karsten＠torproject.org 25 Nov '12

25 Nov '12

commit 4167cc7499c7609f200417d03f34b3fc03000b9a Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Sat Nov 24 09:24:30 2012 +0530 pickle data --- task-1854/pylinf.py | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/task-1854/pylinf.py b/task-1854/pylinf.py index 9ccac13..eba39ea 100644 --- a/task-1854/pylinf.py +++ b/task-1854/pylinf.py @@ -67,7 +67,6 @@ def parse_bw_weights(values): data[key] = float(value) / 10000 return data except: - print "Unexpected error:", sys.exc_info()[0] return None def load_server_desc(tar_file_path): @@ -88,18 +87,16 @@ def load_server_desc(tar_file_path): tar_file_data=tar_fh.extractfile(member) data=tar_file_data.read() - try: - desc_iter = server_descriptor.parse_file(StringIO.StringIO(data), validate=False) - desc_entries = list(desc_iter) - desc = desc_entries[0] - - # currently we require only advertised_bw - descriptors[desc.digest()] = min(desc.average_bandwidth, - desc.burst_bandwidth, - desc.observed_bandwidth) - except: - print "Unexpected error:", sys.exc_info() - continue + + desc_iter = server_descriptor.parse_file(StringIO.StringIO(data), validate=False) + desc_entries = list(desc_iter) + desc = desc_entries[0] + + # currently we require only advertised_bw + descriptors[desc.digest()] = min(desc.average_bandwidth, + desc.burst_bandwidth, + desc.observed_bandwidth) + tar_fh.close() def run(data): @@ -114,8 +111,6 @@ def run(data): key = line.split()[0] values = line.split()[1:] except: - print "Unexpected error:", sys.exc_info()[0] - # we don't need sigs continue if key =='r': router = Router() @@ -203,6 +198,8 @@ def parse_args(): help="Output filename") parser.add_option("-c", "--consensus", dest="consensus", default="in/consensus", help="Input consensus dir") + parser.add_option("-p", "--pickled_data", dest="pickled_data", default=False, + help="Input pickled file") (options, args) = parser.parse_args() @@ -214,15 +211,18 @@ if __name__ == "__main__": as_db = pygeoip.GeoIP(options.as_db) server_desc_files = [] + global descriptors - # load all server descs into memeory - for file_name in os.listdir(options.server_desc): - server_desc_files.append(os.path.join(options.server_desc, file_name)) - load_server_desc(server_desc_files) - - # Pickle descriptors - with open('data.pkl', 'wb') as output: - pickle.dump(descriptors, output) + if options.pickled_data: + with open('data.pkl', 'rb') as pkl_input: + descriptors = pickle.load(pkl_input) + else: + # load all server descs into memeory + for file_name in os.listdir(options.server_desc): + server_desc_files.append(os.path.join(options.server_desc, file_name)) + load_server_desc(server_desc_files) + with open('data.pkl', 'wb') as output: + pickle.dump(descriptors, output) with open(options.output, 'w') as out_fh: for file_name in os.listdir(options.consensus):

1 0