- tor-commits - lists.torproject.org

[stem/master] Fixed bugs in calls to test.runner.skip()
by atagar＠torproject.org 01 Jul '12

01 Jul '12

commit 8edfe7123997e99885ae514bbc1ae76d4c9bc1f8 Author: Beck <csybeck(a)gmail.com> Date: Fri Jun 22 23:31:39 2012 +0800 Fixed bugs in calls to test.runner.skip() --- test/integ/descriptor/reader.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/integ/descriptor/reader.py b/test/integ/descriptor/reader.py index 25952de..6ecfa72 100644 --- a/test/integ/descriptor/reader.py +++ b/test/integ/descriptor/reader.py @@ -118,7 +118,7 @@ class TestDescriptorReader(unittest.TestCase): # http://docs.python.org/library/os.html#os.chmod if system.is_windows(): - test.runner.skip("(chmod not functional)") + test.runner.skip(self, "(chmod not functional)") test_listing_path = _make_processed_files_listing(BASIC_LISTING) os.chmod(test_listing_path, 0077) # remove read permissions @@ -298,7 +298,7 @@ class TestDescriptorReader(unittest.TestCase): """ # Skip on windows since SIGALRM is unavailable - if system.is_windows(): test.runner.skip("(SIGALRM unavailable)") + if system.is_windows(): test.runner.skip(self, "(SIGALRM unavailable)") is_test_running = True reader = stem.descriptor.reader.DescriptorReader("/usr") @@ -422,7 +422,7 @@ class TestDescriptorReader(unittest.TestCase): """ if system.is_windows(): - test.runner.skip("(chmod not functional)") + test.runner.skip(self, "(chmod not functional)") test_path = test.runner.get_runner().get_test_dir("secret_file")

1 0

[stem/master] First complete draft of proc unit testing code.
by atagar＠torproject.org 01 Jul '12

01 Jul '12

commit e94e48ecf3209273b6de13bd405fa87d3f1203b4 Author: Megan <mchang01(a)wesleyan.edu> Date: Mon Jun 25 18:05:44 2012 -0400 First complete draft of proc unit testing code. Most mocked functions utilize mock_fn(), which checks for expected input and either returns the appropriate output given the mocking or lets the original function be called. This is necessary in cases where outside code calls these functions and the mocked version is not able to supply them with the needed output. Private methods in the stem/util/proc.py file are not tested, nor is is_available(). This decision was based on the conventions set in system.py testing code. --- run_tests.py | 4 +- test/unit/util/proc.py | 262 ++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 220 insertions(+), 46 deletions(-) diff --git a/run_tests.py b/run_tests.py index 670947a..a93b20e 100755 --- a/run_tests.py +++ b/run_tests.py @@ -29,6 +29,7 @@ import test.unit.util.connection import test.unit.util.enum import test.unit.util.system import test.unit.util.tor_tools +import test.unit.util.proc import test.unit.version import test.integ.connection.authentication import test.integ.connection.connect @@ -44,7 +45,6 @@ import test.integ.util.conf import test.integ.util.system import test.integ.process import test.integ.version -import test.unit.util.proc import stem.prereq import stem.util.conf @@ -99,6 +99,7 @@ UNIT_TESTS = ( test.unit.util.enum.TestEnum, test.unit.util.connection.TestConnection, test.unit.util.conf.TestConf, + test.unit.util.proc.TestProc, test.unit.util.system.TestSystem, test.unit.util.tor_tools.TestTorTools, test.unit.descriptor.reader.TestDescriptorReader, @@ -111,7 +112,6 @@ UNIT_TESTS = ( test.unit.response.protocolinfo.TestProtocolInfoResponse, test.unit.response.authchallenge.TestAuthChallengeResponse, test.unit.connection.authentication.TestAuthenticate, - test.unit.util.proc.TestProc, ) INTEG_TESTS = ( diff --git a/test/unit/util/proc.py b/test/unit/util/proc.py index a474800..2e3dd67 100644 --- a/test/unit/util/proc.py +++ b/test/unit/util/proc.py @@ -1,70 +1,244 @@ """ -Unit testing code for proc utilities located in /stem/util/proc.py +Unit testing code for the stem.util.proc functions. + """ import os import time import unittest +import operator import functools +import cStringIO import test.mocking as mocking import stem.util.proc as proc -def mock_get_lines(file_path, line_prefixes, return_values): +class TargetError(Exception): """ - Provides mocking for the proc module's _get_line function. + Raised when a function that needs to be mocked cannot be called. + + This occurs when the caller's arguments don't match the expected arguments + and no target is given. """ - if isinstance(line_prefixes, tuple): - prefix_list = sorted(list(line_prefixes)) - else: - # Only one line prefix given. - prefix_list = line_prefixes - def _mock_get_lines(path, prefixes, return_values, caller_path, - caller_prefixes, caller_parameter): - if isinstance(caller_prefixes, tuple): - caller_prefix_list = sorted(list(caller_prefixes)) - else: - #Only one line prefix given. - caller_prefix_list = caller_prefixes - if path == caller_path and prefixes == caller_prefix_list: - return return_values + def __init__(self, value): + self.value = value + def __str__(self): + return repr(self.value) + +def mock_fn(exp_args, return_vals, target=None): + """ + Provides a lambda function that may be used to mock another function. + + :param list of tuples exp_args: expected input value(s) to be used for comparison + :param list return_vals: value(s) to be returned if expected input matches given input + :param function target: target function to be called if mocking doesn't cover this input + + :precondition: len(exp_args) = len(return_vals) + + return_vals[i] a=exp_args[i] + :returns: function _mocker such that: f(*a) = target(*a) a != exp_args[i] and target != None + raise TargetError a != exp_args[i] and target = None + """ + + def _mocked(tgt, exp_args, return_vals, *arg): + try: + # + i = operator.indexOf(exp_args, arg) + except ValueError: + i = -1 + if i == -1: + if tgt: + return tgt(*arg) else: - return None + raise TargetError("A relevant function could not be applied") + else: + return return_vals[i] - return functools.partial(_mock_get_lines, file_path, prefix_list, - return_values) + return functools.partial(_mocked, target, exp_args, return_vals) + +def find_subsets(xs): + """ + Used with the builtin zip function to create all possible combinations + of two lists. Called in test_get_stats(). + + :param xs: list of tuples given by calling zip on two lists + + :returns: a list of lists of tuples + """ + + # Base case is the empty list. + if len(xs) == 0: + return [[]] + else: + subs = find_subsets(xs[1:]) + subs_w_x0 = [] + for s in subs: + subs_w_x0 = subs_w_x0 + [s + [xs[0]]] + return subs + subs_w_x0 class TestProc(unittest.TestCase): + + def setUp(self): + mocking.mock(time.time, mocking.return_value(3.14159)) + def tearDown(self): - mocking.revert_mocking() + mocking.revert_mocking() def test_get_system_start_time(self): - """ - Tests the get_system_start_time function. - """ - mocking.mock(proc._get_line, mock_get_lines("/proc/stat", "btime", - "btime 1001001")) - - self.assertEquals(1001001, proc.get_system_start_time()) + """ + Tests the get_system_start_time function. + """ + + mocking.mock(proc._get_line, mock_fn([("/proc/stat", "btime", 'system start time')], + ["btime 1001001"])) + + # Single test as get_system_start_time takes no arguments + self.assertEquals(1001001, proc.get_system_start_time()) def test_get_physical_memory(self): - """ - Tests the get_physical_memory function. - """ - mocking.mock(proc._get_line, mock_get_lines("/proc/meminfo", - "MemTotal:", "MemTotal: 12345 kB")) + """ + Tests the get_physical_memory function. + """ + + mocking.mock(proc._get_line, mock_fn([("/proc/meminfo", + "MemTotal:", 'system physical memory')], ["MemTotal: 12345 kB"])) + + self.assertEquals((12345*1024), proc.get_physical_memory()) + + def test_get_cwd(self): + """ + Tests the get_cwd function with a given pid. + """ + + mocking.mock(os.readlink, mock_fn([('/proc/24019/cwd',)], + ['/home/directory/TEST'], os.listdir), os) + + # Test edge case of pid = 0 and a standard pid. + self.assertEquals('', proc.get_cwd(0)) + self.assertEquals('/home/directory/TEST', proc.get_cwd(24019)) + + + def test_get_uid(self): + """ + Tests the get_uid function with a given pid. + """ + + pid_list = [(24019, 11111), (0, 22222)] + + for pid in pid_list: + pid_id, user_id = pid + status_path = "/proc/%s/status" % pid_id + mocking.mock(proc._get_line, mock_fn([(status_path, "Uid:", "uid")], + ["Uid: %s" % user_id])) + self.assertEquals(user_id, proc.get_uid(pid_id)) - self.assertEquals((12345*1024), proc.get_physical_memory()) - def test_get_memory_usage(self): - """ - Tests the get_memory_usage function. + """ + Tests the get_memory_usage function with a given pid. + + This is the only function in proc.py that calls _get_lines explicitly. + """ + + mocking.mock(proc._get_lines, mock_fn([("/proc/1111/status", + ("VmRSS:", "VmSize:"), 'memory usage')], [{"VmRSS:": "VmRSS: 100 kB", + "VmSize:":"VmSize: 1800 kB"}])) + + # Test edge case of pid = 0 and a standard pid + self.assertEqual((0,0), proc.get_memory_usage(0)) + self.assertEqual((100*1024, 1800*1024), proc.get_memory_usage(1111)) + + def test_get_stats(self): + """ + Tests get_stats() with all combinations of stat_type arguments. + """ + + # Need to bypass proc.Stat.<command> calls as they aren't in this scope. + args = ['command', 'utime', 'stime', 'start time'] + responses = ['test_program', '0.13', '0.14', '10.21'] + + stat_path = "/proc/24062/stat" + stat = '1 (test_program) 2 3 4 5 6 7 8 9 10 11 12 13.0 14.0 15 16 17 18 19 20 21.0 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43' + + # List of all combinations of args with respective return values. + subsets = find_subsets(zip(args, responses)) + + mocking.mock(proc.get_system_start_time, mocking.return_value(10)) + + + # Tests the case where no stat_types are specified. + mocking.mock(proc._get_line, mock_fn( + [(stat_path, str(24062), 'process ')], [stat])) + self.assertEquals((), proc.get_stats(24062)) + + # Don't handle empty set of commands here. (just did above) + subsets.remove([]) + + for sub in subsets: + # sub = [(arg1, resp1), (arg2, resp2),...]. We need (arg1,arg2,...) + # and (resp1,resp2,...). + arg, response = zip(*sub) + + mocking.mock(proc._get_line, mock_fn( + [(stat_path, str(24062), 'process %s' % ", ".join(arg))], [stat])) + # Iterates through each combination of commands. + self.assertEquals(response, proc.get_stats(24062, *arg)) + + # Tests the case where pid = 0. + for sub in subsets: + arg, response = zip(*sub) + if 'start time' in arg: + response = 10 + else: + response = () + for a in arg: + if a == 'command': + response += ('sched',) + elif a == 'utime': + response += ('0',) + elif a == 'stime': + response += ('0',) + + mocking.mock(proc._get_line, mock_fn( + [('/proc/0/stat', str(0), 'process %s' % ", ".join(arg))], [stat])) - This is the only function in proc.py that utilizes - _get_lines explicitly. - """ + self.assertEquals(response, proc.get_stats(0, *arg)) + + def test_get_connections(self): + """ + Tests the get_connections function along with a given pid. + """ + + pid = 1111 + fd_list = ['1', '2', '3', '4'] + fd_paths = [] + for fd in fd_list: + fd_paths.append(('/proc/%s/fd/%s' % (str(pid), fd),)) + readlink_results = ['socket:[99999999]', 'socket:[IIIIIIII]', 'pipe:[30303]', 'pipe:[40404]'] + + # Will be put in cStringIO wrappers and treated as files. + tcp = '\n 0: 11111111:1111 22222222:2222 01 44444444:44444444 55:55555555 66666666 1111 8 99999999' + udp = '\n A: BBBBBBBB:BBBB CCCCCCCC:CCCC DD EEEEEEEE:EEEEEEEE FF:FFFFFFFF GGGGGGGG 1111 H IIIIIIII' + + file_list = [cStringIO.StringIO(tcp), cStringIO.StringIO(udp)] + contents_list = [tcp, udp] + + # Mock os.listdir, os.readlink, and open. + mocking.mock(os.listdir, mock_fn([('/proc/%s/fd' % str(pid),)], [fd_list], os.listdir), os) + mocking.mock(os.readlink, mock_fn(fd_paths, readlink_results, os.readlink), os) + + mocking.mock(open, mock_fn([('/proc/net/tcp',), ('/proc/net/udp',)], file_list, open)) + + # Tests the edge case of pid = 0. + self.assertEquals([], proc.get_connections(0)) + + # First build expected responses, then call the function to be tested. + results = [] + for proc_file in file_list: + contents = proc_file.getvalue() - mocking.mock(proc._get_lines, mock_get_lines("/proc/1111/status", - ("VmRSS:", "VmSize:"), {"VmRSS:": "VmRSS: 100 kB", - "VmSize:":"VmSize: 1800 kB"})) + _, l_addr, f_addr, status, _, _, _, _, _, inode = contents.split()[:10] - self.assertEqual((100*1024, 1800*1024), proc.get_memory_usage(1111)) + local_ip, local_port = proc._decode_proc_address_encoding(l_addr) + foreign_ip, foreign_port = proc._decode_proc_address_encoding(f_addr) + results.append((local_ip, local_port, foreign_ip, foreign_port)) + + self.assertEquals(results, proc.get_connections(1111))

1 0

[stem/master] Fixed test_expand_path_unix, and added test_expand_path_windows
by atagar＠torproject.org 01 Jul '12

01 Jul '12

commit c001394928e01eb9807c747fed0283c7748578f9 Author: Beck <csybeck(a)gmail.com> Date: Tue Jun 26 23:58:32 2012 +0800 Fixed test_expand_path_unix, and added test_expand_path_windows test_expand_path_unix was changing os.path.sep in order to change the path seperator used by os.path.join. However, this did not work. The path seperator was hardcoded in os.path.join, which is posixpath.join on *unix systems and ntpath.join on windows. We now mock os.path.join to use posixpath.join or ntpath.join in different test cases. --- test/unit/util/system.py | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/test/unit/util/system.py b/test/unit/util/system.py index 397ba7d..2fee30d 100644 --- a/test/unit/util/system.py +++ b/test/unit/util/system.py @@ -9,6 +9,8 @@ import os import platform import functools import unittest +import ntpath +import posixpath import stem.util.proc import stem.util.system as system import test.mocking as mocking @@ -292,8 +294,7 @@ class TestSystem(unittest.TestCase): """ mocking.mock(platform.system, mocking.return_value("Linux")) - original_path_sep = os.path.sep - os.path.sep = "/" + mocking.mock(os.path.join, posixpath.join, os.path) self.assertEquals("", system.expand_path("")) self.assertEquals("/tmp", system.expand_path("/tmp")) @@ -303,5 +304,21 @@ class TestSystem(unittest.TestCase): self.assertEquals("/tmp/foo", system.expand_path("foo", "/tmp")) self.assertEquals("/tmp/foo", system.expand_path("./foo", "/tmp")) - os.path.sep = original_path_sep - + def test_expand_path_windows(self): + """ + Tests the expand_path function on windows. This does not exercise + home directory expansions since that deals with our environment + (that's left to integ tests). + """ + + mocking.mock(platform.system, mocking.return_value("Windows")) + mocking.mock(os.path.join, ntpath.join, os.path) + + self.assertEquals("", system.expand_path("")) + self.assertEquals("C:\\tmp", system.expand_path("C:\\tmp")) + self.assertEquals("C:\\tmp", system.expand_path("C:\\tmp\\")) + self.assertEquals("C:\\tmp", system.expand_path(".", "C:\\tmp")) + self.assertEquals("C:\\tmp", system.expand_path(".\\", "C:\\tmp")) + self.assertEquals("C:\\tmp\\foo", system.expand_path("foo", "C:\\tmp")) + self.assertEquals("C:\\tmp\\foo", system.expand_path(".\\foo", "C:\\tmp")) + \ No newline at end of file

1 0

[stem/master] Replaced a hardcoded path in test_relative_cookie
by atagar＠torproject.org 01 Jul '12

01 Jul '12

commit 7515471fa13c92873307054ea9e40ef5eea64c4a Author: Beck <csybeck(a)gmail.com> Date: Wed Jun 27 00:31:55 2012 +0800 Replaced a hardcoded path in test_relative_cookie --- test/unit/response/protocolinfo.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/test/unit/response/protocolinfo.py b/test/unit/response/protocolinfo.py index c82c8f8..09d4414 100644 --- a/test/unit/response/protocolinfo.py +++ b/test/unit/response/protocolinfo.py @@ -2,6 +2,7 @@ Unit tests for the stem.response.protocolinfo.ProtocolInfoResponse class. """ +import os import unittest import stem.socket @@ -170,7 +171,7 @@ class TestProtocolInfoResponse(unittest.TestCase): stem.connection._expand_cookie_path(control_message, stem.util.system.get_pid_by_name, "tor") - self.assertEquals("/tmp/foo/tor-browser_en-US/Data/control_auth_cookie", control_message.cookie_path) + self.assertEquals(os.path.join("/tmp/foo", "tor-browser_en-US", "Data", "control_auth_cookie"), control_message.cookie_path) # exercise cookie expansion where both calls fail (should work, just # leaving the path unexpanded)

1 0

[stem/master] Skipped some unrelevant integ test cases on windows
by atagar＠torproject.org 01 Jul '12

01 Jul '12

commit 489c7bab48001e8af82b897f2d7ab5a487169643 Author: Beck <csybeck(a)gmail.com> Date: Fri Jun 29 23:22:36 2012 +0800 Skipped some unrelevant integ test cases on windows --- test/integ/util/system.py | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/run_tests.py b/run_tests.py old mode 100644 new mode 100755 diff --git a/test/integ/util/system.py b/test/integ/util/system.py index a99e56c..8293120 100644 --- a/test/integ/util/system.py +++ b/test/integ/util/system.py @@ -76,6 +76,9 @@ class TestSystem(unittest.TestCase): Checks the stem.util.system.is_running function. """ + if not stem.util.system.is_available("ps"): + test.runner.skip(self, "(ps unavailable)") + return self.assertTrue(stem.util.system.is_running("tor")) self.assertFalse(stem.util.system.is_running("blarg_and_stuff")) @@ -85,6 +88,9 @@ class TestSystem(unittest.TestCase): will fail if there's other tor instances running. """ + if stem.util.system.is_windows(): + test.runner.skip(self, "(unavailable on windows)") + return if self.is_extra_tor_running: test.runner.skip(self, "(multiple tor instances)") return @@ -197,7 +203,9 @@ class TestSystem(unittest.TestCase): """ Checks general usage of the stem.util.system.get_pid_by_port function. """ - + if stem.util.system.is_windows(): + test.runner.skip(self, "(unavailable on windows)") + return runner = test.runner.get_runner() if not _has_port(): test.runner.skip(self, "(test instance has no port)") @@ -225,7 +233,7 @@ class TestSystem(unittest.TestCase): elif not stem.util.system.is_available("netstat"): test.runner.skip(self, "(netstat unavailable)") return - elif stem.util.system.is_bsd(): + elif stem.util.system.is_bsd() or stem.util.system.is_windows(): test.runner.skip(self, "(linux only)") return elif not runner.is_ptraceable(): @@ -311,6 +319,9 @@ class TestSystem(unittest.TestCase): runner = test.runner.get_runner() + if stem.util.system.is_windows(): + test.runner.skip(self, "(unavailable on windows)") + return if not runner.is_ptraceable(): test.runner.skip(self, "(DisableDebuggerAttachment is set)") return

1 0

r25705: {} add my "june 2012 tor update" slides (projects/presentations)
by Roger Dingledine 30 Jun '12

30 Jun '12

Author: arma Date: 2012-06-30 23:07:44 +0000 (Sat, 30 Jun 2012) New Revision: 25705 Added: projects/presentations/slides-june2012.odp projects/presentations/slides-june2012.pdf Log: add my "june 2012 tor update" slides Added: projects/presentations/slides-june2012.odp =================================================================== (Binary files differ) Property changes on: projects/presentations/slides-june2012.odp ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: projects/presentations/slides-june2012.pdf =================================================================== (Binary files differ) Property changes on: projects/presentations/slides-june2012.pdf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r25704: {website} tell us about new pluggable transports too please! (website/trunk/docs/en)
by Roger Dingledine 30 Jun '12

30 Jun '12

Author: arma Date: 2012-06-30 21:10:22 +0000 (Sat, 30 Jun 2012) New Revision: 25704 Modified: website/trunk/docs/en/pluggable-transports.wml Log: tell us about new pluggable transports too please! Modified: website/trunk/docs/en/pluggable-transports.wml =================================================================== --- website/trunk/docs/en/pluggable-transports.wml 2012-06-30 21:06:14 UTC (rev 25703) +++ website/trunk/docs/en/pluggable-transports.wml 2012-06-30 21:10:22 UTC (rev 25704) @@ -78,7 +78,16 @@ </li> </ul> + <hr> + <p> + Our goal is to have a wide variety of pluggable transport designs. + Many are at the research phase now, so it's a perfect time to play + with them or suggest new designs. Please let us know if you find or + start other projects that could be useful for making Tor's traffic + flows more DPI-resistant! + </p> + </div>  <div id = "sidecol">

1 0

r25703: {website} change alternate for obfsproxy diagram; link to new pluggabl (website/trunk/projects/en)
by Roger Dingledine 30 Jun '12

30 Jun '12

Author: arma Date: 2012-06-30 21:06:14 +0000 (Sat, 30 Jun 2012) New Revision: 25703 Modified: website/trunk/projects/en/obfsproxy.wml Log: change alternate for obfsproxy diagram; link to new pluggable transports page Modified: website/trunk/projects/en/obfsproxy.wml =================================================================== --- website/trunk/projects/en/obfsproxy.wml 2012-06-30 10:09:47 UTC (rev 25702) +++ website/trunk/projects/en/obfsproxy.wml 2012-06-30 21:06:14 UTC (rev 25703) @@ -27,12 +27,12 @@ client and the bridge, will see innocent-looking transformed traffic instead of the actual Tor traffic. - <img src="$(IMGROOT)/obfsproxy_diagram.png" alt="client torrc"></a> + <img src="$(IMGROOT)/obfsproxy_diagram.png" alt="obfsproxy diagram"></a> </p> <p> - obfsproxy supports multiple protocols, called pluggable - transports, which specify how the traffic is transformed. For + obfsproxy supports multiple protocols, called <a href="<page docs/pluggable-transports>">pluggable + transports</a>, which specify how the traffic is transformed. For example, there might be a HTTP transport which transforms Tor traffic to look like regular HTTP traffic. </p>

1 0

r25702: {} new page to keep track of our pluggable transport projects (website/trunk/docs/en)
by Roger Dingledine 30 Jun '12

30 Jun '12

Author: arma Date: 2012-06-30 10:09:47 +0000 (Sat, 30 Jun 2012) New Revision: 25702 Added: website/trunk/docs/en/pluggable-transports.wml Log: new page to keep track of our pluggable transport projects Added: website/trunk/docs/en/pluggable-transports.wml =================================================================== --- website/trunk/docs/en/pluggable-transports.wml (rev 0) +++ website/trunk/docs/en/pluggable-transports.wml 2012-06-30 10:09:47 UTC (rev 25702) @@ -0,0 +1,92 @@ +## translation metadata +# Revision: $Revision$ +# Translation-Priority: 3-low + +#include "head.wmi" TITLE="Tor Project: Pluggable Transports" CHARSET="UTF-8" +<div id="content" class="clearfix"> + <div id="breadcrumbs"> + <a href="<page index>">Home » </a> + <a href="<page docs/documentation>">Documentation » </a> + <a href="<page docs/pluggable-transports>">Pluggable Transports</a> + </div> + <div id="maincol"> + <h2>Tor: Pluggable Transports</h2> + <hr> + + <p> + An increasing number of censoring countries are using Deep Packet + Inspection (DPI) to classify Internet traffic flows by protocol. + While Tor uses <a href="<page docs/bridges>">bridge relays</a> to + get around a censor that blocks by IP address, the censor can use + DPI to recognize and filter Tor traffic flows even when they connect + to unexpected IP addresses. + </p> + + <p> + Pluggable transports transform the Tor traffic flow between the client + and the bridge. This way, censors who monitor traffic between the + client and the bridge will see innocent-looking transformed traffic + instead of the actual Tor traffic. + External programs can talk to Tor clients and Tor bridges using the <a +href="https://gitweb.torproject.org/torspec.git/blob/HEAD:/proposals/180-pluggabl…">pluggable +transport API</a>, to make it easier to build interoperable programs. + </p> + + <hr> + + <ul> + <li><b>Obfsproxy</b> is a framework for implementing new transport + protocols in C using libevent. See its + <a href="<page projects/obfsproxy>">web page</a>, + <a href="https://gitweb.torproject.org/obfsproxy.git">git repository</a>, + <a href="https://gitweb.torproject.org/obfsproxy.git/blob/HEAD:/doc/obfs2/protocol-s…">obfs2 protocol description</a>, + and + <a href="https://blog.torproject.org/blog/obfsproxy-next-step-censorship-arms-race">blog post</a>. + Maintained by George Kadianakis. + </li> + + <li><b>Flashproxy</b> turns ordinary web browsers into bridges using + websockets, and has a little python stub to hook Tor clients to the + websocket connection. See its + <a href="http://crypto.stanford.edu/flashproxy/">web page</a>, + <a href="https://gitweb.torproject.org/flashproxy.git">git repository</a>, + and + <a href="http://crypto.stanford.edu/flashproxy/flashproxy.pdf">design paper</a>. + Maintained by David Fifield. + </li> + + <li><b>StegoTorus</b> is an Obfsproxy fork that extends it to a) + split Tor streams across multiple connections to avoid packet size + signatures, and b) embed the traffic flows in traces that look like + html, javascript, or pdf. See its + <a href="https://gitweb.torproject.org/stegotorus.git">git repository</a>. + Maintained by Zack Weinberg. + </li> + + <li><b>SkypeMorph</b> transforms Tor traffic flows so they look like + Skype Video. See its + <a href="http://crysp.uwaterloo.ca/software/SkypeMorph-0.5.1.tar.gz">source code</a> + and + <a href="http://cacr.uwaterloo.ca/techreports/2012/cacr2012-08.pdf">design paper</a>. + Maintained by Hooman Mohajeri Moghaddam. + </li> + + <li><b>Dust</b> aims to provide a packet-based (rather than + connection-based) DPI-resistant protocol. See its + <a href="https://github.com/blanu/Dust">git repository</a>. + Maintained by Brandon Wiley. + </li> + + </ul> + + </div> +  + <div id = "sidecol"> +#include "side.wmi" +#include "info.wmi" + </div> +  +</div> + +#include <foot.wmi> + Property changes on: website/trunk/docs/en/pluggable-transports.wml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native

1 0

[vidalia/alpha] Add changes file
by chiiph＠torproject.org 30 Jun '12

30 Jun '12

commit b3822d6b745e75dd228eb6454f7b25886950dce6 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Jun 29 21:53:30 2012 -0300 Add changes file --- changes/bug6249 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/bug6249 b/changes/bug6249 new file mode 100644 index 0000000..ab72fb6 --- /dev/null +++ b/changes/bug6249 @@ -0,0 +1,3 @@ + New features: + o Display how much traffic runs through each stream in the Network Map. + Resolves ticket 6249.

1 0