- tor-commits - lists.torproject.org

[stem/master] Support for NEWCONSENSUS events
by atagar＠torproject.org 03 Dec '12

03 Dec '12

commit c1e88e4257c606593ecd2abf4212cc5266b34bf4 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 2 18:24:54 2012 -0800 Support for NEWCONSENSUS events Implementation and testing for NEWCONSENSUS events. This is pretty much the exact same thing from our perspective as NS events. --- stem/response/events.py | 24 ++++++++++++++++++++++++ test/unit/response/events.py | 29 +++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 0 deletions(-) diff --git a/stem/response/events.py b/stem/response/events.py index 49a8169..522f9cc 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -438,6 +438,29 @@ class NetworkStatusEvent(Event): entry_class = stem.descriptor.router_status_entry.RouterStatusEntryV3, )) +class NewConsensusEvent(Event): + """ + Event for when we have a new consensus. This is similar to + :class:`~stem.response.events.NetworkStatusEvent`, except that it contains + the whole consensus so anything not listed is implicitly no longer + recommended. + + This was introduced in tor version 0.2.1.13. + + :param list desc: :class:`~stem.descriptor.router_status_entry.RouterStatusEntryV3` for the changed descriptors + """ + + _SKIP_PARSING = True + + def _parse(self): + content = str(self).lstrip("NEWCONSENSUS\n") + + self.desc = list(stem.descriptor.router_status_entry.parse_file( + StringIO.StringIO(content), + True, + entry_class = stem.descriptor.router_status_entry.RouterStatusEntryV3, + )) + class NewDescEvent(Event): """ Event that indicates that a new descriptor is available. @@ -644,6 +667,7 @@ EVENT_TYPE_TO_CLASS = { "ERR": LogEvent, "GUARD": GuardEvent, "INFO": LogEvent, + "NEWCONSENSUS": NewConsensusEvent, "NEWDESC": NewDescEvent, "NOTICE": LogEvent, "NS": NetworkStatusEvent, diff --git a/test/unit/response/events.py b/test/unit/response/events.py index 0b225d9..6f18676 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -54,6 +54,17 @@ GUARD_NEW = "650 GUARD ENTRY $36B5DBA788246E8369DBAF58577C6BC044A9A374 NEW" GUARD_GOOD = "650 GUARD ENTRY $5D0034A368E0ABAF663D21847E1C9B6CFA09752A GOOD" GUARD_BAD = "650 GUARD ENTRY $5D0034A368E0ABAF663D21847E1C9B6CFA09752A BAD" +# NEWCONSENSUS event from v0.2.1.30. + +NEWCONSENSUS_EVENT = """650+NEWCONSENSUS +r Beaver /96bKo4soysolMgKn5Hex2nyFSY pAJH9dSBp/CG6sPhhVY/5bLaVPM 2012-12-02 22:02:45 77.223.43.54 9001 0 +s Fast Named Running Stable Valid +r Unnamed /+fJRWjmIGNAL2C5rRZHq3R91tA 7AnpZjfdBpYzXnMNm+w1bTsFF6Y 2012-12-02 17:51:10 91.121.184.87 9001 0 +s Fast Guard Running Stable Valid +. +650 OK +""" + # NS event from tor v0.2.1.30. NS_EVENT = """650+NS @@ -405,6 +416,24 @@ class TestEvents(unittest.TestCase): self.assertEqual(NEWDESC_MULTIPLE.lstrip("650 "), str(event)) self.assertEqual(expected_relays, event.relays) + def test_new_consensus_event(self): + expected_desc = [] + + expected_desc.append(mocking.get_router_status_entry_v3({ + "r": "Beaver /96bKo4soysolMgKn5Hex2nyFSY pAJH9dSBp/CG6sPhhVY/5bLaVPM 2012-12-02 22:02:45 77.223.43.54 9001 0", + "s": "Fast Named Running Stable Valid", + })) + + expected_desc.append(mocking.get_router_status_entry_v3({ + "r": "Unnamed /+fJRWjmIGNAL2C5rRZHq3R91tA 7AnpZjfdBpYzXnMNm+w1bTsFF6Y 2012-12-02 17:51:10 91.121.184.87 9001 0", + "s": "Fast Guard Running Stable Valid", + })) + + event = _get_event(NEWCONSENSUS_EVENT) + + self.assertTrue(isinstance(event, stem.response.events.NewConsensusEvent)) + self.assertEqual(expected_desc, event.desc) + def test_ns_event(self): expected_desc = mocking.get_router_status_entry_v3({ "r": "whnetz dbBxYcJriTTrcxsuy4PUZcMRwCA VStM7KAIH/mXXoGDUpoGB1OXufg 2012-12-02 21:03:56 141.70.120.13 9001 9030",

1 0

[stem/master] Support for CLIENTS_SEEN events
by atagar＠torproject.org 03 Dec '12

03 Dec '12

commit 92419a54b83d80d7b124482df9bdf42fb931c7a0 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 2 17:23:02 2012 -0800 Support for CLIENTS_SEEN events Implementation and testing for CLINETS_SEEN events. This would be a difficult event to get examples for, but luckily the spec has one. --- stem/control.py | 1 + stem/response/events.py | 58 ++++++++++++++++++++++++++++++++++++++++++ test/unit/response/events.py | 16 +++++++++++ 3 files changed, 75 insertions(+), 0 deletions(-) diff --git a/stem/control.py b/stem/control.py index 5fd69c7..ec727ce 100644 --- a/stem/control.py +++ b/stem/control.py @@ -82,6 +82,7 @@ providing its own for interacting at a higher level. **AUTHDIR_NEWDESCS** :class:`stem.response.events.AuthDirNewDescEvent` **BW** :class:`stem.response.events.BandwidthEvent` **CIRC** :class:`stem.response.events.CircuitEvent` + **CLIENTS_SEEN** :class:`stem.response.events.ClientsSeenEvent` **DEBUG** :class:`stem.response.events.LogEvent` **DESCCHANGED** :class:`stem.response.events.DescChangedEvent` **ERR** :class:`stem.response.events.LogEvent` diff --git a/stem/response/events.py b/stem/response/events.py index 1bdfd02..49a8169 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -311,6 +311,63 @@ class CircuitEvent(Event): log_id = "event.circ.unknown_remote_reason.%s" % self.remote_reason log.log_once(log_id, log.INFO, unrecognized_msg % ('remote reason', self.remote_reason)) +class ClientsSeenEvent(Event): + """ + Periodic event on bridge relays that provides a summary of our users. + + :var datetime start_time: time in UTC that we started collecting these stats + :var dict locales: mapping of country codes to a rounded count for the number of users + :var dict ip_versions: mapping of ip protocols to a rounded count for the number of users + """ + + _KEYWORD_ARGS = { + "TimeStarted": "start_time", + "CountrySummary": "locales", + "IPVersions": "ip_versions", + } + + _QUOTED = ("TimeStarted",) + + def _parse(self): + if self.start_time != None: + self.start_time = datetime.datetime.strptime(self.start_time, "%Y-%m-%d %H:%M:%S") + + if self.locales != None: + locale_to_count = {} + + for entry in self.locales.split(','): + if not '=' in entry: + raise stem.ProtocolError("The CLIENTS_SEEN's CountrySummary should be a comma separated listing of '<locale>=<count>' mappings: %s" % self) + + locale, count = entry.split('=', 1) + + if len(locale) != 2: + raise stem.ProtocolError("Locales should be a two character code, got '%s': %s" % (locale, self)) + elif not count.isdigit(): + raise stem.ProtocolError("Locale count was non-numeric (%s): %s" % (count, self)) + elif locale in locale_to_count: + raise stem.ProtocolError("CountrySummary had multiple mappings for '%s': %s" % (locale, self)) + + locale_to_count[locale] = int(count) + + self.locales = locale_to_count + + if self.ip_versions != None: + protocol_to_count = {} + + for entry in self.ip_versions.split(','): + if not '=' in entry: + raise stem.ProtocolError("The CLIENTS_SEEN's IPVersions should be a comma separated listing of '<protocol>=<count>' mappings: %s" % self) + + protocol, count = entry.split('=', 1) + + if not count.isdigit(): + raise stem.ProtocolError("IP protocol count was non-numeric (%s): %s" % (count, self)) + + protocol_to_count[protocol] = int(count) + + self.ip_versions = protocol_to_count + class DescChangedEvent(Event): """ Event that indicates that our descriptor has changed. This was first added in @@ -581,6 +638,7 @@ EVENT_TYPE_TO_CLASS = { "AUTHDIR_NEWDESCS": AuthDirNewDescEvent, "BW": BandwidthEvent, "CIRC": CircuitEvent, + "CLIENTS_SEEN": ClientsSeenEvent, "DEBUG": LogEvent, "DESCCHANGED": DescChangedEvent, "ERR": LogEvent, diff --git a/test/unit/response/events.py b/test/unit/response/events.py index 84a1e7b..0b225d9 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -41,6 +41,13 @@ $E57A476CD4DFBD99B4EE52A100A58610AD6E80B9,hamburgerphone" CIRC_BUILT_OLD = "650 CIRC 1 BUILT \ $E57A476CD4DFBD99B4EE52A100A58610AD6E80B9,hamburgerphone,PrivacyRepublic14" +# CLIENTS_SEEN example from the spec + +CLIENTS_SEEN_EVENT = '650 CLIENTS_SEEN \ +TimeStarted="2008-12-25 23:50:43" \ +CountrySummary=us=16,de=8,uk=8 \ +IPVersions=v4=16,v6=40' + # GUARD events from tor v0.2.1.30. GUARD_NEW = "650 GUARD ENTRY $36B5DBA788246E8369DBAF58577C6BC044A9A374 NEW" @@ -343,6 +350,15 @@ class TestEvents(unittest.TestCase): self.assertEqual(None, event.reason) self.assertEqual(None, event.remote_reason) + def test_clients_seen_event(self): + event = _get_event(CLIENTS_SEEN_EVENT) + + self.assertTrue(isinstance(event, stem.response.events.ClientsSeenEvent)) + self.assertEqual(CLIENTS_SEEN_EVENT.lstrip("650 "), str(event)) + self.assertEqual(datetime.datetime(2008, 12, 25, 23, 50, 43), event.start_time) + self.assertEqual({'us': 16, 'de': 8, 'uk': 8}, event.locales) + self.assertEqual({'v4': 16, 'v6': 40}, event.ip_versions) + def test_descchanged_event(self): # all we can check for is that the event is properly parsed as a # DescChangedEvent instance

1 0

[stem/master] Tor event handling
by atagar＠torproject.org 03 Dec '12

03 Dec '12

commit 42872dd08e81d6b341654ab85969df2ed77a7397 Merge: e1772bb c1e88e4 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 2 18:30:14 2012 -0800 Tor event handling Merging support for tor's asynchronous events. This isn't entirely complete, missing... * STREAM_BW (being added in https://trac.torproject.org/7616) * BUILDTIMEOUT_SET * SIGNAL * CONF_CHANGED * CIRC_MINOR ... but better not to let the perfect be the enemy of good. This branch was partly code reviewed by robinson on... https://trac.torproject.org/7328 docs/api/control.rst | 4 +- docs/api/response.rst | 5 + run_tests.py | 4 + stem/__init__.py | 450 ++++++++++++++++++ stem/control.py | 257 ++++++++++- stem/descriptor/extrainfo_descriptor.py | 2 +- stem/descriptor/server_descriptor.py | 2 +- stem/response/__init__.py | 3 + stem/response/events.py | 684 +++++++++++++++++++++++++++ stem/util/str_tools.py | 36 ++ stem/util/tor_tools.py | 18 + test/integ/control/controller.py | 51 ++ test/unit/__init__.py | 1 + test/unit/control/__init__.py | 6 + test/unit/control/controller.py | 50 ++ test/unit/response/__init__.py | 1 + test/unit/response/events.py | 785 +++++++++++++++++++++++++++++++ test/unit/util/str_tools.py | 31 ++ 18 files changed, 2378 insertions(+), 12 deletions(-)

1 0

[stem/master] Adding event handling support to the Controller
by atagar＠torproject.org 03 Dec '12

03 Dec '12

commit ba280f94da9962e1a2b1bfaf22d5fbd17ffa3103 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Nov 4 15:53:44 2012 -0800 Adding event handling support to the Controller My initial plan was to add event listener support similar to TorCtl but with automated handling of the SETEVENT calls. While working on this meejah suggested accepting functors instead (like txtorcon). On reflection this is both much nicer for our callers and easier for us to support. Adding functions for adding and removing listeners, with a simple integ test. Next up will be the Event classes... --- stem/control.py | 97 ++++++++++++++++++++++++++++++++++++++ test/integ/control/controller.py | 45 +++++++++++++++++ 2 files changed, 142 insertions(+), 0 deletions(-) diff --git a/stem/control.py b/stem/control.py index 1476598..ca3730b 100644 --- a/stem/control.py +++ b/stem/control.py @@ -13,6 +13,8 @@ providing its own for interacting at a higher level. | |- from_port - Provides a Controller based on a port connection. | +- from_socket_file - Provides a Controller based on a socket file connection. | + |- add_event_listener - attaches an event listener to be notified of tor events + |- remove_event_listener - removes a listener so it isn't notified of further events |- is_caching_enabled - true if the controller has enabled caching |- is_geoip_unavailable - true if we've discovered our geoip db to be unavailable |- clear_cache - clears any cached results @@ -73,6 +75,34 @@ import stem.util.log as log State = stem.util.enum.Enum("INIT", "RESET", "CLOSED") +EventType = stem.util.enum.UppercaseEnum( + "CIRC", + "STREAM", + "ORCONN", + "BW", + "DEBUG", + "INFO", + "NOTICE", + "WARN", + "ERR", + "NEWDESC", + "ADDRMAP", + "AUTHDIR_NEWDESCS", + "DESCCHANGED", + "STATUS_GENERAL", + "STATUS_CLIENT", + "STATUS_SERVER", + "GUARD", + "NS", + "STREAM_BW", + "CLIENTS_SEEN", + "NEWCONSENSUS", + "BUILDTIMEOUT_SET", + "SIGNAL", + "CONF_CHANGED", + "CIRC_MINOR", +) + # Constant to indicate an undefined argument default. Usually we'd use None for # this, but users will commonly provide None as the argument so need something # else fairly unique... @@ -508,6 +538,11 @@ class Controller(BaseController): self._is_caching_enabled = enable_caching self._request_cache = {} + # mapping of event types to their listeners + + self._event_listeners = {} + self._event_listeners_lock = threading.RLock() + # number of sequential 'GETINFO ip-to-country/*' lookups that have failed self._geoip_failure_count = 0 self.enabled_features = [] @@ -524,6 +559,57 @@ class Controller(BaseController): super(Controller, self).close() + def add_event_listener(self, listener, *events): + """ + Directs further tor controller events to a given function. The function is + expected to take a single argument, which is a + :class:`~stem.response.events.Event` subclass. + + If a new control connection is initialized then this listener will be + reattached. + + :param functor listener: function to be called when an event is received + :param stem.control.EventType events: event types to be listened for + + :raises: :class:`stem.socket.ControllerError` if unable to set the events + """ + + with self._event_listeners_lock: + for event_type in events: + self._event_listeners.setdefault(event_type, []).append(listener) + + if self.is_alive(): + response = self.msg("SETEVENTS %s" % " ".join(self._event_listeners.keys())) + + if not response.is_ok(): + raise stem.socket.ProtocolError("SETEVENTS received unexpected response\n%s" % response) + + def remove_event_listener(self, listener): + """ + Stops a listener from being notified of further tor events. + + :param stem.control.EventListener listener: listener to be removed + + :raises: :class:`stem.socket.ControllerError` if unable to set the events + """ + + with self._event_listeners_lock: + event_types_changed = False + + for event_type, event_listeners in self._event_listeners.items(): + if listener in event_listeners: + event_listeners.remove(listener) + + if len(event_listeners) == 0: + event_types_changed = True + del self._event_listeners[event_type] + + if event_types_changed: + response = self.msg("SETEVENTS %s" % " ".join(self._event_listeners.keys())) + + if not response.is_ok(): + raise stem.socket.ProtocolError("SETEVENTS received unexpected response\n%s" % response) + def is_caching_enabled(self): """ **True** if caching has been enabled, **False** otherwise. @@ -1320,6 +1406,17 @@ class Controller(BaseController): stem.response.convert("MAPADDRESS", response) return response.entries + + def _handle_event(self, event_message): + # TODO: parse the event_message into a stem.response.events.Event class + + event_message_type = str(event_message).split()[0] + + with self._event_listeners_lock: + for event_type, event_listeners in self._event_listeners.items(): + if event_type == event_message_type: + for listener in event_listeners: + listener(event_message) def _case_insensitive_lookup(entries, key, default = UNDEFINED): """ diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 1ba06bb..e5d7782 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -6,6 +6,7 @@ from __future__ import with_statement import os import re +import time import shutil import socket import unittest @@ -20,6 +21,8 @@ import test.util import stem.descriptor.router_status_entry import stem.descriptor.reader +from stem.control import EventType + class TestController(unittest.TestCase): def test_from_port(self): """ @@ -47,6 +50,48 @@ class TestController(unittest.TestCase): else: self.assertRaises(stem.SocketError, stem.control.Controller.from_socket_file, test.runner.CONTROL_SOCKET_PATH) + def test_event_handling(self): + """ + Add a couple listeners for various events and make sure that they receive + them. Then remove the listeners. + """ + + if test.runner.require_control(self): return + + event_buffer1, event_buffer2 = [], [] + + def listener1(event): + event_buffer1.append(event) + + def listener2(event): + event_buffer2.append(event) + + runner = test.runner.get_runner() + with runner.get_tor_controller() as controller: + controller.add_event_listener(listener1, EventType.BW) + controller.add_event_listener(listener2, EventType.BW, EventType.DEBUG) + + # BW events occure at the rate of one per second, so wait a bit to let + # some accumulate. + + # TODO: check that the type of events in event_buffer1 are BandwidthEvent + # instances when we have proper event types + + time.sleep(3) + + self.assertTrue(len(event_buffer1) >= 2) + self.assertTrue(len(event_buffer2) >= 2) + + # Checking that a listener's no longer called after being removed. + + controller.remove_event_listener(listener2) + + buffer2_size = len(event_buffer2) + time.sleep(2) + + self.assertTrue(len(event_buffer1) >= 4) + self.assertEqual(buffer2_size, len(event_buffer2)) + def test_getinfo(self): """ Exercises GETINFO with valid and invalid queries.

1 0

r25926: {website} Dropping alpha flag from stem Stem is now far enough along t (website/trunk/getinvolved/en)
by Damian Johnson 03 Dec '12

03 Dec '12

Author: atagar Date: 2012-12-03 02:07:53 +0000 (Mon, 03 Dec 2012) New Revision: 25926 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Dropping alpha flag from stem Stem is now far enough along that I should probably stop listing it as being 'alpha'. Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2012-12-03 02:06:41 UTC (rev 25925) +++ website/trunk/getinvolved/en/volunteer.wml 2012-12-03 02:07:53 UTC (rev 25926) @@ -253,7 +253,7 @@ </tr> <tr class="alt"> - <td>*<a href="#project-stem">Stem</a></td> + <td><a href="#project-stem">Stem</a></td> <td>Library</td> <td>Python</td> <td>Heavy</td>

1 0

r25925: {website} Adding Flash Proxy to the projects table Adding Flash Proxy (website/trunk/getinvolved/en)
by Damian Johnson 03 Dec '12

03 Dec '12

Author: atagar Date: 2012-12-03 02:06:41 +0000 (Mon, 03 Dec 2012) New Revision: 25925 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Adding Flash Proxy to the projects table Adding Flash Proxy as per dcf's request on... https://trac.torproject.org/7618 Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2012-12-02 09:28:11 UTC (rev 25924) +++ website/trunk/getinvolved/en/volunteer.wml 2012-12-03 02:06:41 UTC (rev 25925) @@ -213,6 +213,14 @@ </tr> <tr> + <td><a href="#project-flash-proxy">Flash Proxy</a></td> + <td>Client Add-on</td> + <td>Python, JavaScript, Go</td> + <td>Moderate</td> + <td>dcf, aallai, jct</td> + </tr> + + <tr class="alt"> <td>*<a href="#project-thandy">Thandy</a></td> <td>Updater</td> <td>Python</td> @@ -220,7 +228,7 @@ <td>chiiph, Erinn, nickm</td> </tr> - <tr class="alt"> + <tr> <td>*<a href="#project-ooni-probe">Ooni Probe</a></td> <td>Scanner</td> <td>Python</td> @@ -228,7 +236,7 @@ <td>hellais, isis, ioerror</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-shadow">Shadow</a></td> <td>Experimentation</td> <td>C, Python</td> @@ -236,7 +244,7 @@ <td>robgjansen</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-torctl">TorCtl</a></td> <td>Library</td> <td>Python</td> @@ -244,7 +252,7 @@ <td>aagbsn</td> </tr> - <tr> + <tr class="alt"> <td>*<a href="#project-stem">Stem</a></td> <td>Library</td> <td>Python</td> @@ -252,7 +260,7 @@ <td>atagar, neena</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-tlsdate">Tlsdate</a></td> <td>Utility</td> <td>C</td> @@ -260,7 +268,7 @@ <td>ioerror</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-metrics">Metrics</a></td> <td>Client Service</td> <td>Java</td> @@ -268,7 +276,7 @@ <td>karsten</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-atlas">Atlas</a></td> <td>Client Service</td> <td>JavaScript</td> @@ -276,7 +284,7 @@ <td>hellais</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-torstatus">TorStatus</a></td> <td>Client Service</td> <td>Python, Django</td> @@ -284,7 +292,7 @@ <td></td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-compass">Compass</a></td> <td>Client Service</td> <td>Python</td> @@ -292,7 +300,7 @@ <td>gsathya, karsten</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-weather">Weather</a></td> <td>Client Service</td> <td>Python</td> @@ -300,7 +308,7 @@ <td>kaner</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-gettor">GetTor</a></td> <td>Client Service</td> <td>Python</td> @@ -308,7 +316,7 @@ <td>kaner</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-torcheck">TorCheck</a></td> <td>Client Service</td> <td>Python, Perl</td> @@ -316,7 +324,7 @@ <td>ioerror</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-onionoo">Onionoo</a></td> <td>Backend Service</td> <td>Java, Python</td> @@ -324,7 +332,7 @@ <td>karsten, gsathya</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-bridgedb">BridgeDB</a></td> <td>Backend Service</td> <td>Python</td> @@ -332,7 +340,7 @@ <td>kaner, nickm</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-torflow">TorFlow</a></td> <td>Backend Service</td> <td>Python</td> @@ -340,7 +348,7 @@ <td>aagbsn</td> </tr> - <tr> + <tr class="alt"> <td>*<a href="#project-torbel">TorBEL</a></td> <td>Backend Service</td> <td>Python</td> @@ -570,6 +578,17 @@ </p> --> + <a id="project-flash-proxy"></a> + <h3><a href="https://crypto.stanford.edu/flashproxy/">Flash Proxy</a> (<a + href="https://gitweb.torproject.org/flashproxy.git">code</a>, <a + href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug + tracker</a>)</h3> + + <p> + Pluggable transport using proxies running in web browsers to defeat + address-based blocking. + </p> + <a id="project-thandy"></a> <h3>Thandy (<a href="https://gitweb.torproject.org/thandy.git">code</a>)</h3>

1 0

[flashproxy/master] Stop ignoring facilitator.log.
by dcf＠torproject.org 03 Dec '12

03 Dec '12

commit 1b149b94fe8705acfd04c1ce5ea6f56535a2a6d9 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Dec 2 17:01:57 2012 -0800 Stop ignoring facilitator.log. --- .gitignore | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/.gitignore b/.gitignore index 3778530..4ee6b0c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -/facilitator.log *.pyc /dist /pyinstaller-tmp

1 0

[flashproxy/master] Removed line using undefined variable.
by dcf＠torproject.org 03 Dec '12

03 Dec '12

commit 59022683b9c12ab43915318bce50df2f77b0f980 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Thu Nov 15 15:21:24 2012 -0800 Removed line using undefined variable. The previous commit was a modification of another version of the makefile. The modifications introduced some errors, which are now fixed. --- Makefile | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index c195ece..337602d 100644 --- a/Makefile +++ b/Makefile @@ -50,14 +50,14 @@ sign: dist/$(DISTNAME).zip cd dist && gpg --verify $(DISTNAME).zip.asc $(DISTNAME).zip exe: $(CLIENT_BIN) - rm -Rf $(DISTDIR) + rm -rf $(DISTDIR) mkdir -p $(DISTDIR) for file in $(CLIENT_BIN); \ do \ - python $(PYINSTALLER_PATH) --onedir $$file; \ - cp -Rf dist/$$file/* $(DISTDIR); \ - $$(cygpath -aw $$(which pyinstaller.py)); \ - rm -Rf dist/$$file; \ + python $$(cygpath -aw $$(which pyinstaller.py)) --onedir $$file; \ + cp dist/$$file/* $(DISTDIR); \ + mv $(DISTDIR)/$$file.exe $(DISTDIR)/$$file; \ + rm -rf dist/$$file; \ done mv $(DISTDIR)/M2Crypto.__m2crypto.pyd $(DISTDIR)/__m2crypto.pyd

1 0

[flashproxy/master] Adding desc. of steps for Windows deployment.
by dcf＠torproject.org 03 Dec '12

03 Dec '12

commit 45924cf0f36a1ef073380765ed6c1273a5b345af Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Sat Nov 17 13:11:35 2012 -0500 Adding desc. of steps for Windows deployment. Adding windows-deployment-howto.txt, a description of the flashproxy client dependencies and how to bundle them into a standalone executable for Windows deployment. Inspired by the facilitator-howto.txt document. --- doc/windows-deployment-howto.txt | 63 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 63 insertions(+), 0 deletions(-) diff --git a/doc/windows-deployment-howto.txt b/doc/windows-deployment-howto.txt new file mode 100644 index 0000000..0d7e71b --- /dev/null +++ b/doc/windows-deployment-howto.txt @@ -0,0 +1,63 @@ +This document describes the setup required to bundle +the client programs with a Python interpreter, for +deployment on Windows machines without Python installed. + +== Overview + +The client programs are written in Python, an interpreted +language. The Python interpreter does not ship with Windows, +so in order for users to be able to download and run the +programs with no extra setup, it must be included in the +distribution. This is currently done using PyInstaller. +PyInstaller collects the Python interpreter, any libraries +the Python script requires, and converts the script into +a standalone executable. + +The makefile has an "exe" target which automates the +budling process once all the required dependencies are +installed. It should be run in Cygwin. + +== Dependencies + +The client programs use a few libraries, which must +be present on the system in order for PyInstaller to +bundle them. Bundling also requires a Windows Python +installation and PyInstaller. + +1. Python + +The official 2.7.3 Windows binary can be found at +http://www.python.org/download/. + +2. PyInstaller + +The 2.0 release can be found at http://www.pyinstaller.org. +The program is a Python script, there is no installation +required, just extract the archive somehwere. + +3. OpenSSL + +There are no official binary distributions of OpenSSL. +The source is available at http://www.openssl.org/source/. +This page provides links to unofficial binary distributions, +http://www.openssl.org/related/binaries.html. + +4. M2Crypto + +There are no official binary distributions of M2Crypto. +The official source along, with several unofficial +binaries, is available at http://chandlerproject.org/Projects/MeTooCrypto. + +== Bundling + +Once the dependencies are installed, you should be able +to bundle the programs, using the "exe" make target. +Do not install Cygwin Python, make sure you are using the +native Windows version. Add Python and PyInstaller to your +path, then in a Cygwin terminal run: + +$ make exe + +This will create a dist/flashproxy-client-<version> directory +containing the required binaries. If you encounter any +problems, please report them using https://trac.torproject.org/projects/tor.

1 0

[flashproxy/master] Merge branch 'make_exe' of https://github.com/aallai/flashproxy into make_exe
by dcf＠torproject.org 03 Dec '12

03 Dec '12

commit 45a9555ebc91eb145363f5b7ce007e56b30bd2ec Merge: 45924cf 5902268 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Sat Nov 17 13:16:33 2012 -0500 Merge branch 'make_exe' of https://github.com/aallai/flashproxy into make_exe Makefile | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)

1 0