Changeset 453

Timestamp:

02/25/03 17:58:01 (6 years ago)

Author:

sholloway

Message:

*** empty log message ***

Files:

• trunk/RBFoundation/RBFoundation/XMLNamespaceMap.py (modified) (1 diff)
• trunk/RBFoundation/RBFoundation/XMLNode.py (modified) (7 diffs)
• trunk/RBTelepathy/RBTelepathy/Handlers/__init__.py (modified) (2 diffs)
• trunk/RBTelepathy/RBTelepathy/Packet/Elements.py (modified) (5 diffs)
• trunk/RBTelepathy/RBTelepathy/Routing/KeylistRouterBase.py (modified) (2 diffs)
• trunk/RBTelepathy/RBTelepathy/Routing/RouterBase.py (modified) (2 diffs)
• trunk/RBTelepathy/demo/simple/client/AuthenticationHandler.py (modified) (7 diffs)
• trunk/RBTelepathy/demo/simple/client/ErrorHandler.py (modified) (1 diff)
• trunk/RBTelepathy/demo/simple/client/MessageHandler.py (modified) (4 diffs)
• trunk/RBTelepathy/demo/simple/client/TestClient.py (modified) (2 diffs)
• trunk/RBTelepathy/demo/simple/host/AuthenticationHandler.py (modified) (6 diffs)
• trunk/RBTelepathy/demo/simple/host/ErrorHandler.py (modified) (1 diff)
• trunk/RBTelepathy/demo/simple/host/MessageHandler.py (modified) (4 diffs)
• trunk/RBTelepathy/demo/simple/host/TestServer.py (modified) (1 diff)

trunk/RBFoundation/RBFoundation/XMLNamespaceMap.py

@@ -58 +58 @@
-    def __contains__(self, key):
-        return key in self.xmlnsmap
+
+    def __len__(self):
+        return len(self.xmlnsmap)
-
-    def __getitem__(self, key):

trunk/RBFoundation/RBFoundation/XMLNode.py

@@ -263 +263 @@
-
-    def deldata(self, *args, **kw):
+        kw['idxonly'] = 1
-        dellist = [x for x in self.enumdata(*args, **kw)]
-        dellist.reverse()
@@ -278 +279 @@
-    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-node=_any, namespace=_any, prefix=_any, idxonly=True
+*args, **kw
-        """Returns a generator to iterate through the matching child node indicies of xmlnode.
-        obj.enumnodes(node=_any, namespace=_any, prefix=_any)"""
@@ -311 +312 @@
-    def delnodes(self, *args, **kw):
-        """Removes all matching child nodes of xmlnode"""
+        kw['idxonly'] = 1
-        dellist = [x for x in self.enumnodes(*args, **kw)]
-        dellist.reverse()
@@ -414 +416 @@
-        return ''.join(result)  
-
-    def toXML(self, *args, **kw): 
-        """See toxml."""
-        return self.toxml(*args, **kw)
-
-    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    #~ Protected Methods 
-    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    def _toXML(self, *args, **kw):
-        """See toxml."""
-        return self.toxml(*args, **kw)
-
-    def _getnodefactory(self, *args, **kw):
@@ -489 +483 @@
-        def __init__(self, owner, parent, node, attributes, namespacemap):
-            prefix = namespacemap.prefix(node[0])
-
-    nodename, xmlns = node[1], node[0]
-nodename, xmlns = node[1], None
+ xmlns, nodename = node
+elif namespacemap.nextmap is None: xmlns, nodename = node
+xmlns, nodename = None, node[1]
-            xmlnode.__init__(self, nodename, xmlns, prefix, default_namespaces=namespacemap)
-
@@ -512 +506 @@
-        def _toXML(self, *args, **kw):
-            return self.toxml()
+        def _toXML(self, *args, **kw):
+            """See toxml."""
+            return self.toxml(*args, **kw)
-
-    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -522 +519 @@
-        def __init__(self, owner, parent, node, attributes, namespacemap, nodebuilder=xmlnode):
-            prefix = namespacemap.prefix(node[0])
- or not namespacemap.nextmap:
-    nodename, xmlns = node[1], node[0]
-nodename, xmlns = node[1], None
+: xmlns, nodename = node
+elif namespacemap.nextmap is None: xmlns, nodename = node
+xmlns, nodename = None, node[1]
-            nodebuilder = nodebuilder or self.nodebuilder
-            self.result = nodebuilder(nodename, xmlns, prefix, default_namespaces=namespacemap)

trunk/RBTelepathy/RBTelepathy/Handlers/__init__.py

@@ -79 +79 @@
-
-from RBMessaging import ErrorTypes
-from RBMessaging import ErrorTypes
-from RBMessaging.Packet import *
-from RBMessaging.Packet.RBMBuilder import *
@@ -114 +113 @@
-        raise NotImplementedError
-
+    def SendPacket(self, *args, **kw):
+        return self.connection.SendPacket(*args, **kw)
+

trunk/RBTelepathy/RBTelepathy/Packet/Elements.py

@@ -54 +54 @@
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Child
+
-    pass
-
@@ -158 +158 @@
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-
-
-
-
-
+
+
-    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    #~ Constants / Variables / Etc. 
@@ -175 +171 @@
-
-    def __init__(self, owner, *args, **kw):
-
+_Node
-        self.owner = owner
-
@@ -184 +180 @@
-        except AttributeError: 
-            pass
-
+_Node
-
-    def _xmlInitComplete(self): 
@@ -192 +188 @@
-        except AttributeError: 
-            pass
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-    __slots__ = []
-
-
+
+
+
+
+
+
+

trunk/RBTelepathy/RBTelepathy/Routing/KeylistRouterBase.py

@@ -32 +32 @@
-
-class KeylistRouterBase(RouterBase):
-OnRouted
+Route
-        """Template method for generalized packet routing.
-
@@ -71 +71 @@
-        elif isinstance(destination, RouterBase):
-            # Chained router -- delegate to allow extension of command results
-On
+
-        else:
-            # Standard result -- just wrap it in a command

trunk/RBTelepathy/RBTelepathy/Routing/RouterBase.py

@@ -40 +40 @@
-class RouterBase(object):
-    def RoutePacket(self, *args, **kw):
-        """Synonym for OnRoutedPacket"""
-        return self.OnRoutedPacket(*args, **kw)
-
-    def OnRoutedPacket(self, packet, *args, **kw):
-        """Entry point for generalized packet routing.
-
@@ -91 +87 @@
-
-    def Commit(self):
-.OnRoutedPacket
+
-

trunk/RBTelepathy/demo/simple/client/AuthenticationHandler.py

@@ -36 +36 @@
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
+class method(RBME.PacketElement, XMLClassBuilderObjectMixin):
+    __slots__ = []
+    NamespaceSynonyms = {None: DefaultNamespace}
+    DefaultNamespace = NamespaceSynonyms[None]
+    ElementFactories = ElementFactorySet({
+            (DefaultNamespace, 'response'): RBME.Factory(RBME.PacketElement),
+            (DefaultNamespace, 'challenge'): RBME.Factory(RBME.PacketElement),
+        })
+
+    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    #~ Properties 
+    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    def _get_challenge(self):
+        challenge = self['challenge',]
+        if len(challenge) > 1:
+            raise ErrorTypes.AuthenticationError, '"%s" expected a single "challenge" element' % (self.node,)
+        elif len(challenge) == 1:
+            challenge = ''.join(map(str, challenge[0].iterdata()))
+        else: challenge = 'password'
+        return challenge
+    def _set_challenge(self, challenge):
+        self.delnodes('challenge')
+        self.addnode('challenge').adddata(challenge)
+    def _del_challenge(self, challenge):
+        self.delnodes('challenge')
+    challenge = property(_get_challenge, _set_challenge, _del_challenge)
+
+    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    def _get_response(self):
+        response = self['response',]
+        if len(response) != 1:
+            raise ErrorTypes.AuthenticationError, '"%s" expected a single "response" child element' % (self.node,)
+        else: response = ''.join(map(str, response[0].iterdata()))
+        return response
+    def _set_response(self, response):
+        self.delnodes('response')
+        self.addnode('response').adddata(response)
+    def _del_response(self, response):
+        self.delnodes('response')
+    response = property(_get_response, _set_response, _del_response)
+
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
-class authentication(RBME.RootElementBase, XMLClassBuilderObjectMixin):
-    __slots__ = []
@@ -42 +87 @@
-    ElementFactories = ElementFactorySet({
-            (DefaultNamespace, 'as'): RBME.Factory(RBME.URIAddressElement),
-): RBME.Factory(RBME.PacketChildElement
+'method'): RBME.Factory(method
-        })
-
@@ -73 +118 @@
-            raise ErrorTypes.AuthenticationError('Sequence type not specified')
-
+        print
+        print "AuthRecving:", packet.toxml(True)
+        print
+
-        try: OnAuthType = self._CallOnAuthType(AuthType)
-        except AttributeError:
@@ -78 +127 @@
-        else: return OnAuthType(packet, *args, **kw)
-
-
+, bShort=True
-        self.loginaddr = URIAddress.URIAddress(loginaddr)
-
-
+
+
+
+
+
+
+
+
-
-    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -95 +150 @@
-        packet += 'as',
-        packet[-1].attrs['addr'] = str(self.loginaddr)
-connection.
+
-
-    def _type_options(self, packet, *args, **kw):
@@ -105 +160 @@
-        packet += 'as',
-        packet[-1].attrs['addr'] = str(self.loginaddr)
-'method',
+method()
-        packet[-1].attrs['type'] = 'plaintext'
-connection.
+
-
-    def _type_challenge(self, packet, *args, **kw):
@@ -113 +168 @@
-
-    def _reply_response(self, packet, *args, **kw):
-
+namespace=DefaultNamespace
-        packet.attrs['type'] = 'response'
-        packet += 'as',
-        packet[-1].attrs['addr'] = str(self.loginaddr)
-
-
-
+
+
-        packet[-1] += 'challenge',
-        packet[-1][-1] += 'password'
-        packet[-1] += 'response',
-
-
+
+
+
-
-    def _type_success(self, packet, *args, **kw):

trunk/RBTelepathy/demo/simple/client/ErrorHandler.py

@@ -41 +41 @@
-    DefaultNamespace = NamespaceSynonyms[None]
-    ElementFactories = ElementFactorySet({
-Child
+
-        })
-

trunk/RBTelepathy/demo/simple/client/MessageHandler.py

@@ -49 +49 @@
-            (DefaultNamespace, 'from'): RBME.Factory(RBME.URIAddressElement),
-            (DefaultNamespace, 'stream'): RBMStream.StreamFormatFactory(),
-Child
-Child
+
+
-        })
-    default_namespaces = RBME.StreamRootElement.default_namespaces .copy()
@@ -66 +66 @@
-    def SetAddresses(self, addresses, nodename='to'):
-        print "XXX: RouteableRootElement.SetAddresses needs work"
-
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-class HostMessageHandler(PacketHandler):
-    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    #~ Constants / Variables / Etc. 
-    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    ElementFactories = {(DefaultNamespace, 'message'): RBME.RootFactory(message)}
-    StreamPacketHandlers = ElementFactories.keys()
-
-    log = logging.getLogger('HostMessageHandler')
-
-    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    #~ Public Methods 
-    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    def __init__(self, connection):
-        self.connection = connection
-        self.router = connection.model().GetRouter((DefaultNamespace, 'message'))
-        if self.router:
-            key = connection.loginaddr.authority
-            self.log.info('Registering %r with router', key)
-            self.router.AuthorityRoutes[key] = [self]
-
-    def OnRoutedPacket(self, packet, addresses):
-        # Copy the root level packet, so we can adjust it's addresses
-        #packet = copy.copy(packet)
-        # Change the address lists in the packet
-        packet.SetAddresses(addresses)
-        self.log.debug('Sending routed packet to protocol')
-        self.connection.SendPacket(packet)
-
-    def OnStreamPacket(self, packet):
-        # TODO: Flush out
-        #fromlist = packet.GetAddresses('from')
-        #if fromlist: 
-        #    raise ValueError, '"from" element not allowed on a user connection'
-        tolist = packet.GetAddresses('to')
-
-        self.log.info('Sending "%s" packet to Router', packet.node)
-        if not self.router:
-            raise ErrorTypes.RoutingError, 'No router available'
-        routecommands = self.router.RoutePacket(packet, tolist)
-        if routecommands:
-            self.log.debug('Sending routed packet "%s" to destination', packet.node)
-            return [routecmd() for routecmd in routecommands]
-        else: return ()
-
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -137 +89 @@
-    def OnRoutedPacket(self, packet, addresses):
-        print 'OnRoutedPacket:'
-_toXML
+toxml
-        print
-        for stream in packet.datastreams:
@@ -145 +97 @@
-    def OnStreamPacket(self, packet):
-        print 'OnStreamPacket:'
-_toXML
+toxml
-        print
-        for stream in packet.datastreams:

trunk/RBTelepathy/demo/simple/client/TestClient.py

@@ -123 +123 @@
-
-logging.basicConfig()
-
-#
+if 1: 
+else: 
-
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -134 +134 @@
-        model = TestModel()
-        send = model.Connect('send', None)
+        while not getattr(send, 'loginaddr', None):
+            model.Process(0.1)
-        recv = model.Connect('recv', None)
-send, 'loginaddr', None) or not getattr(
+
-            model.Process(0.1)
-        send.Message('recv', 'Some text for recv!')

trunk/RBTelepathy/demo/simple/host/AuthenticationHandler.py

@@ -36 +36 @@
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
+class AuthBaseMethod(RBME.PacketElement, XMLClassBuilderObjectMixin):
+    __slots__ = []
+    NamespaceSynonyms = {None: DefaultNamespace}
+    DefaultNamespace = NamespaceSynonyms[None]
+    ElementFactories = ElementFactorySet({
+            (DefaultNamespace, 'response'): RBME.Factory(RBME.PacketElement),
+            (DefaultNamespace, 'challenge'): RBME.Factory(RBME.PacketElement),
+        })
+
+    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    #~ Properties 
+    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    def _get_challenge(self):
+        challenge = self['challenge',]
+        if len(challenge) > 1:
+            raise ErrorTypes.AuthenticationError, '"%s" expected a single "challenge" element' % (self.node,)
+        elif len(challenge) == 1:
+            challenge = ''.join(map(str, challenge[0].iterdata()))
+        else: challenge = 'password'
+        return challenge
+    def _set_challenge(self, challenge):
+        self.delnodes('challenge')
+        self.addnode('challenge').adddata(challenge)
+    def _del_challenge(self, challenge):
+        self.delnodes('challenge')
+    challenge = property(_get_challenge, _set_challenge, _del_challenge)
+
+    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    def _get_response(self):
+        response = self['response',]
+        if len(response) != 1:
+            raise ErrorTypes.AuthenticationError, '"%s" expected a single "response" child element' % (self.node,)
+        else: response = ''.join(map(str, response[0].iterdata()))
+        return response
+    def _set_response(self, response):
+        self.delnodes('response')
+        self.addnode('response').adddata(response)
+    def _del_response(self, response):
+        self.delnodes('response')
+    response = property(_get_response, _set_response, _del_response)
+
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+class AuthPlaintext(AuthBaseMethod):
+    AuthDB = { ('send', 'password'): 'secret', ('recv', 'password'): 'secret' }
+    def Authenticate(self, handler, asaddr):
+        correct = self.AuthDB[asaddr.account, self.challenge] 
+        return self.response == correct
+
+class AuthMD5(AuthBaseMethod):
+    AuthDB = { 'send': 'secret', 'recv': 'secret' }
+    def Authenticate(self, handler, asaddr):
+        import md5
+        correct = md5.new(self.AuthDB[asaddr.account] + self.challenge).hexdigest()
+        return self.response == correct
+
+class AuthSHA(AuthBaseMethod):
+    AuthDB = { 'send': 'secret', 'recv': 'secret' }
+    def Authenticate(self, handler, asaddr):
+        import sha
+        correct = sha.new(self.AuthDB[asaddr.account] + self.challenge).hexdigest()
+        return self.response == correct
+
+class AuthPublickey(AuthBaseMethod):
+    AuthDB = { 'send': 'secret', 'recv': 'secret' }
+    def Authenticate(self, handler, asaddr):
+        import sha
+        correct = sha.new(self.AuthDB[asaddr.account] + self.challenge).hexdigest()
+        return self.response == correct
+
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+DefaultAuthMethod = AuthSHA # XXX:XXX:XXX:XXX
-class authentication(RBME.RootElementBase, XMLClassBuilderObjectMixin):
-    __slots__ = []
@@ -42 +117 @@
-    ElementFactories = ElementFactorySet({
-            (DefaultNamespace, 'as'): RBME.Factory(RBME.URIAddressElement),
-): RBME.Factory(RBME.PacketChildElement
+'method'): RBME.Factory(DefaultAuthMethod
-        })
-
@@ -90 +165 @@
-    def _reply_options(self, packet, *args, **kw):
-        packet.attrs['type'] = 'options'
-
-
-
+
+
+
+
-
-    def _type_select(self, packet, *args, **kw):
@@ -99 +175 @@
-    def _reply_challenge(self, packet, *args, **kw):
-        packet.attrs['type'] = 'challenge'
-connection.
+
-
-    def _type_response(self, packet, *args, **kw):
@@ -109 +185 @@
-            raise ErrorTypes.AuthenticationError('Did not find response "method" element')
-
-
-
+
-            self.connection.OnAuthenticated(True, as_.addr)
-            self._reply_success(packet, *args, **kw)
@@ -116 +191 @@
-            self.connection.OnAuthenticated(False, as_.addr)
-            self._reply_failure(packet, *args, **kw)
+            raise ErrorTypes.AuthenticationError('Invalid authentication')
-
-    def _reply_success(self, packet, *args, **kw):
+        packet.delnodes('method')
-        packet.attrs['type'] = 'success'
-connection.
+
-
-    def _reply_failure(self, packet, *args, **kw):
+        packet.delnodes('method')
-        packet.attrs['type'] = 'failure'
-
-
-
+
+

trunk/RBTelepathy/demo/simple/host/ErrorHandler.py

@@ -41 +41 @@
-    DefaultNamespace = NamespaceSynonyms[None]
-    ElementFactories = ElementFactorySet({
-Child
+
-        })
-

trunk/RBTelepathy/demo/simple/host/MessageHandler.py

@@ -49 +49 @@
-            (DefaultNamespace, 'from'): RBME.Factory(RBME.URIAddressElement),
-            (DefaultNamespace, 'stream'): RBMStream.StreamFormatFactory(),
-Child
-Child
+
+
-        })
-    default_namespaces = RBME.StreamRootElement.default_namespaces .copy()
@@ -60 +60 @@
-
-    def GetAddresses(self, nodename='to'):
-, DefaultNamespace
+
-        result = [each.addr for each in existing]
-        return result
@@ -89 +89 @@
-            key = connection.loginaddr.authority
-            self.log.info('Registering %r with router', key)
-
+.OnRoutedPacket
-
-    def OnRoutedPacket(self, packet, addresses):
@@ -97 +97 @@
-        packet.SetAddresses(addresses)
-        self.log.debug('Sending routed packet to protocol')
-connection.
+
-
-    def OnStreamPacket(self, packet):
-        # TODO: Flush out
-        #fromlist = packet.GetAddresses('from')
-
-
+
-        tolist = packet.GetAddresses('to')
-
-        self.log.info('Sending "%s" packet to Router', packet.node)
-        if not self.router:
-
+
+
+
-        routecommands = self.router.RoutePacket(packet, tolist)
-        if routecommands:

trunk/RBTelepathy/demo/simple/host/TestServer.py

@@ -87 +87 @@
-
-logging.basicConfig()
-
-#
+if 1: 
+else: 
-
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~