Merge pull request #175 from david415/174.add_null_control_auth.0

Add support for NULL control port authentication

docs/releases.rst

@@ -11,6 +11,8 @@ unreleased
 
 `git master <https://github.com/meejah/txtorcon>`_ *will likely become v0.15.0*
 
+ * added support for NULL control-port-authentication which is often
+   appropriate when used with a UNIX domain socket
  * switched to `ipaddress
    <https://docs.python.org/3/library/ipaddress.html>`_ instead of
    Google's ``ipaddr``; the API should be the same from a user

test/test_torcontrolprotocol.py

@@ -104,6 +104,17 @@ def test_authenticate_password(self):
 
         self.assertEqual(self.transport.value(), 'AUTHENTICATE %s\r\n' % "foo".encode("hex"))
 
+    def test_authenticate_null(self):
+        self.protocol.makeConnection(self.transport)
+        self.assertEqual(self.transport.value(), 'PROTOCOLINFO 1\r\n')
+        self.transport.clear()
+        self.send('250-PROTOCOLINFO 1')
+        self.send('250-AUTH METHODS=NULL')
+        self.send('250-VERSION Tor="0.2.2.34"')
+        self.send('250 OK')
+
+        self.assertEqual(self.transport.value(), 'AUTHENTICATE\r\n')
+
     def test_authenticate_password_deferred(self):
         d = defer.Deferred()
         self.protocol.password_function = lambda: d

txtorcon/torcontrolprotocol.py

@@ -749,6 +749,12 @@ def _do_authenticate(self, protoinfo):
             d.addErrback(self._auth_failed)
             return
 
+        if 'NULL' in methods:
+            d = self.queue_command('AUTHENTICATE')
+            d.addCallback(self._bootstrap)
+            d.addErrback(self._auth_failed)
+            return
+
         raise RuntimeError(
             "The Tor I connected to doesn't support SAFECOOKIE nor COOKIE"
             " authentication and I have no password_function specified."