remove OnionRoutedAgent and OnionRoutedTCPEndpoint

Author: aagbsn

bwscanner/attacher.py

@@ -6,93 +6,6 @@
 from bwscanner.logger import log
 
 
-@implementer(IStreamAttacher)
-class SOCKSClientStreamAttacher(CircuitListenerMixin, StreamListenerMixin):
-    """
-    An attacher that builds a chosen path for a client identified by
-    its source port and ip address.
-    """
-
-    def __init__(self, state):
-        """
-        Instantiates a SOCKSClientStreamAttacher with a
-        txtorcon.torstate.TorState instance.
-        """
-        self.state = state
-        self.waiting_circuits = {}
-        self.expected_streams = {}
-        self.state.add_stream_listener(self)
-        self.state.add_circuit_listener(self)
-
-    def create_circuit(self, host, port, path, using_guards=False):
-        """
-        Specify the path for streams created on a specific client
-        SOCKS connection.
-
-        Returns a deferred that calls back with the constructed circuit
-        or errs back with a failure instance.
-        """
-        circ_deferred = defer.Deferred()
-        key = (str(host), int(port))
-        self.expected_streams[key] = circ_deferred
-
-        def add_to_waiting(circ):
-            self.waiting_circuits[circ.id] = (circ, circ_deferred)
-            return circ
-
-        circuit_build = self.state.build_circuit(
-            path, using_guards=using_guards)
-        circuit_build.addCallback(add_to_waiting)
-        return circ_deferred
-
-    def attach_stream(self, stream, _):
-        """
-        Attaches a NEW stream to the circuit created for it by matching the
-        source address and source port of the SOCKS client connection to the
-        corresponding circuit in the expected_streams dictionary.
-
-        Returns a deferred that calls back with the appropriate circuit,
-        or None if there is no matching entry.
-
-        Note, Tor can be configured to leave streams unattached by setting
-        the "__LeaveStreamsUnattached" torrc option to "1".
-        """
-        try:
-            key = (str(stream.source_addr), int(stream.source_port))
-            return self.expected_streams.pop(key)
-        except KeyError:
-            # We didn't expect this stream, so let Tor handle it
-            return None
-
-    def circuit_built(self, circuit):
-        """
-        Calls back the deferred awaiting the circuit build with the
-        circuit object.
-        """
-        if circuit.purpose != "GENERAL":
-            return
-        try:
-            (_, circ_deferred) = self.waiting_circuits.pop(circuit.id)
-            circ_deferred.callback(circuit)
-        except KeyError:
-            pass
-
-    def circuit_failed(self, circuit, **kw):
-        """
-        Calls the errback of the deferred waiting the circuit build if the
-        circuit build failed. The failure reason is contained in the circuit
-        object. The corresponding state in waiting_circuits is removed.
-
-        If the circuit failure did not correspond to a circuit requested
-        by create_circuit, it is ignored.
-        """
-        try:
-            (circ, circ_deferred) = self.waiting_circuits.pop(circuit.id)
-            circ_deferred.errback(circ)
-        except KeyError:
-            pass
-
-
 class StreamClosedListener(StreamListenerMixin):
     """
     Closes the contained circuit if the listened stream closes.

test/template.py

@@ -5,7 +5,7 @@
 from twisted.trial import unittest
 
 from bwscanner import circuit
-from bwscanner.attacher import SOCKSClientStreamAttacher, connect_to_tor
+from bwscanner.attacher import connect_to_tor
 
 
 class TorTestCase(unittest.TestCase):
@@ -18,9 +18,6 @@ def setUp(self):
                 circuit_build_timeout=30,
         )
 
-        self.attacher = SOCKSClientStreamAttacher(self.tor_state)
-        yield self.tor_state.set_attacher(self.attacher, reactor)
-
     @property
     def routers(self):
         return list(set(self.tor_state.routers.values()))
@@ -35,7 +32,6 @@ def random_path(self):
 
     @defer.inlineCallbacks
     def tearDown(self):
-        yield self.tor_state.set_attacher(None, reactor)
         yield self.tor_state.protocol.quit()
         # seems to leave dirty reactor otherwise?
         yield self.tor_state.protocol.transport.loseConnection()

test/test_attacher.py

@@ -50,6 +50,8 @@ def listen(self, _):
 
 
 class TestSOCKSClientStreamAttacher(TorTestCase):
+    skip = "deprecated"
+
     @defer.inlineCallbacks
     def setUp(self):
         yield super(TestSOCKSClientStreamAttacher, self).setUp()

test/test_fetcher.py

@@ -37,7 +37,8 @@ def setUp(self):
     @defer.inlineCallbacks
     def test_circuit_lifecycle(self):
         path = self.random_path()
-        circ = yield self.attacher.create_circuit('127.0.0.1', 1234, path)
+        circ = yield self.tor_state.build_circuit(path)
+        yield circ.when_built()
         self.assertIsInstance(circ, Circuit)
         self.assertEqual(circ.path, path)
         circuit_lifecycle = self.circuit_event_listener.circuits[circ]