Changeset 206:a32614b03670

Timestamp:

Oct 3, 2016, 8:49:10 AM (4 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

rebase_source:

61f8edbf0d012a63234c405576ec2f5cdb67bab2

Message:

imported patch py3-server.patch

Location:

wokkel

Files:

• server.py (modified) (9 diffs)
• test/test_server.py (modified) (2 diffs)

wokkel/server.py

@@ -12 +12 @@
 """
 
-# hashlib is new in Python 2.5, try that first.
-try:
-    from hashlib import sha256
-    digestmod = sha256
-except ImportError:
-    import Crypto.Hash.SHA256 as digestmod
-    sha256 = digestmod.new
-
+from __future__ import division, absolute_import
+
+import binascii
+from hashlib import sha256
 import hmac
 
-from zope.interface import implements
+from zope.interface import implementer
 
 from twisted.internet import defer, reactor
 from twisted.names.srvconnect import SRVConnector
 from twisted.python import log, randbytes
+from twisted.python.compat import iteritems, unicode
 from twisted.words.protocols.jabber import error, ijabber, jid, xmlstream
 from twisted.words.xish import domish
@@ -44 +41 @@
     @param secret: the shared secret known to the Originating Server and
                    Authoritive Server.
-    @type secret: C{str}
+    @type secret: L{unicode}
     @param receivingServer: the Receiving Server host name.
-    @type receivingServer: C{str}
+    @type receivingServer: L{unicode}
     @param originatingServer: the Originating Server host name.
-    @type originatingServer: C{str}
+    @type originatingServer: L{unicode}
     @param streamID: the Stream ID as generated by the Receiving Server.
-    @type streamID: C{str}
+    @type streamID: L{unicode}
     @return: hexadecimal digest of the generated key.
     @type: C{str}
@@ -56 +53 @@
 
     hashObject = sha256()
-    hashObject.update(secret)
+    hashObject.update(secret.encode('ascii'))
     hashedSecret = hashObject.hexdigest()
     message = " ".join([receivingServer, originatingServer, streamID])
-    hash = hmac.HMAC(hashedSecret, message, digestmod=digestmod)
+    hash = hmac.HMAC(hashedSecret.encode('ascii'),
+                     message.encode('ascii'),
+                     digestmod=sha256)
     return hash.hexdigest()
 
@@ -78 +77 @@
         try:
             observer(element)
-        except error.StreamError, exc:
+        except error.StreamError as exc:
             xs.sendStreamError(exc)
         except:
@@ -108 +107 @@
 
 
+@implementer(ijabber.IInitiatingInitializer)
 class OriginatingDialbackInitializer(object):
     """
     Server Dialback Initializer for the Orginating Server.
     """
-
-    implements(ijabber.IInitiatingInitializer)
 
     _deferred = None
@@ -161 +159 @@
 
 
+@implementer(ijabber.IInitiatingInitializer)
 class ReceivingDialbackInitializer(object):
     """
     Server Dialback Initializer for the Receiving Server.
     """
-
-    implements(ijabber.IInitiatingInitializer)
 
     _deferred = None
@@ -329 +326 @@
         xmlstream.ListenAuthenticator.streamStarted(self, rootElement)
 
-        # Compatibility fix for pre-8.2 implementations of ListenAuthenticator
-        if not self.xmlstream.sid:
-            self.xmlstream.sid = randbytes.secureRandom(8).encode('hex')
-
         if self.xmlstream.thisEntity:
             targetDomain = self.xmlstream.thisEntity.host
@@ -348 +341 @@
             if xmlstream.NS_STREAMS != rootElement.uri or \
                self.namespace != self.xmlstream.namespace or \
-               ('db', NS_DIALBACK) not in rootElement.localPrefixes.iteritems():
+               ('db', NS_DIALBACK) not in iteritems(rootElement.localPrefixes):
                 raise error.StreamError('invalid-namespace')
 
             if targetDomain and targetDomain not in self.service.domains:
                 raise error.StreamError('host-unknown')
-        except error.StreamError, exc:
+        except error.StreamError as exc:
             prepareStream(self.service.defaultDomain)
             self.xmlstream.sendStreamError(exc)
@@ -576 +569 @@
             self.secret = secret
         else:
-            self.secret = randbytes.secureRandom(16).encode('hex')
+            self.secret = binascii.hexlify(randbytes.secureRandom(16))
 
         self._outgoingStreams = {}

wokkel/test/test_server.py

@@ -6 +6 @@
 """
 
+from __future__ import division, absolute_import
 from twisted.internet import defer
 from twisted.python import failure
@@ -449 +450 @@
 
         self.assertEqual(1, len(errors))
+
+
+    def test_generatedSecret(self):
+        self.router = component.Router()
+        self.service = server.ServerService(self.router,
+                                            domain='example.org')
+        self.assertEqual(32, len(self.service.secret))