Changeset 11:8294ad7253bd in ralphm-patches

Timestamp:

Apr 10, 2009, 3:39:02 PM (13 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Allow no default domain, generate a secret if not provided.

File:

• s2s.patch (modified) (7 diffs)

s2s.patch

@@ -1 +1 @@
 diff -r 313d45b505a7 wokkel/server.py
 --- /dev/null   Thu Jan 01 00:00:00 1970 +0000
-+++ b/wokkel/server.py  Thu Apr 09 14:47:05 2009 +0200
-@@ -0,0 +1,702 @@
++++ b/wokkel/server.py  Fri Apr 10 09:38:01 2009 +0200
+@@ -0,0 +1,709 @@
 +# -*- test-case-name: wokkel.test.test_server -*-
 +#
@@ -31 +31 @@
 +from twisted.internet import defer, reactor
 +from twisted.names.srvconnect import SRVConnector
-+from twisted.python import log
++from twisted.python import log, randbytes
 +from twisted.words.protocols.jabber import error, ijabber, jid, xmlstream
 +from twisted.words.xish import domish
@@ -337 +337 @@
 +        # Compatibility fix for pre-8.2 implementations of ListenAuthenticator
 +        if not self.xmlstream.sid:
-+            from twisted.python import randbytes
 +            self.xmlstream.sid = randbytes.secureRandom(8).encode('hex')
 +
@@ -349 +348 @@
 +            self.xmlstream.prefixes = {xmlstream.NS_STREAMS: 'stream',
 +                                       NS_DIALBACK: 'db'}
-+            self.xmlstream.thisEntity = jid.internJID(domain)
++            if domain:
++                self.xmlstream.thisEntity = jid.internJID(domain)
 +
 +        try:
@@ -357 +357 @@
 +                raise error.StreamError('invalid-namespace')
 +
-+            if targetDomain not in self.service.domains:
++            if not targetDomain or targetDomain not in self.service.domains:
 +                raise error.StreamError('host-unknown')
 +        except error.StreamError, exc:
@@ -569 +569 @@
 +    logTraffic = False
 +
-+    def __init__(self, router, secret, domain):
++    def __init__(self, router, domain=None, secret=None):
 +        self.router = router
-+        self.secret = secret
++
 +        self.defaultDomain = domain
-+        self.domains = set([domain])
++        self.domains = set()
++        if self.defaultDomain:
++            self.domains.add(self.defaultDomain)
++
++        if secret is not None:
++            self.secret = secret
++        else:
++            self.secret = randbytes.secureRandom(16).encode('hex')
 +
 +        self._outgoingStreams = {}
@@ -707 +714 @@
 diff -r 313d45b505a7 wokkel/test/test_server.py
 --- /dev/null   Thu Jan 01 00:00:00 1970 +0000
-+++ b/wokkel/test/test_server.py        Thu Apr 09 14:47:05 2009 +0200
++++ b/wokkel/test/test_server.py        Fri Apr 10 09:38:01 2009 +0200
 @@ -0,0 +1,450 @@
 +# Copyright (c) 2003-2008 Ralph Meijer