Changeset 45

Timestamp:

02/11/04 22:48:18 (5 years ago)

Author:

jajcus

Message:

- working ident support

Files:

• trunk/TODO (modified) (1 diff)
• trunk/jjigw.dtd (modified) (2 diffs)
• trunk/jjigw.py (modified) (11 diffs)
• trunk/spidentd.py (modified) (1 diff)

trunk/TODO

@@ -3 +3 @@
-  which is not yet supported by PyXMPP, but with jabber:component:accept could
-  also be done).
-- simple ident server with "uplink" capability
-- channel list browsing (using Service Discovery)
-- more IRC stream error handling
+- remove unneeded debuging code

trunk/jjigw.dtd

@@ -1 +1 @@
-
-
+spidentd?,
-
-<!ELEMENT connect       (host,port,secret) >
@@ -6 +6 @@
-<!ELEMENT port          (#PCDATA) >
-<!ELEMENT secret        (#PCDATA) >
+
+<!ELEMENT spidentd      (socket) >
+<!ELEMENT socket        (#PCDATA) >
-
-<!ELEMENT network       (server+,channel*) >

trunk/jjigw.py

@@ -12 +12 @@
-import random
-import signal
+import Queue
+import time
-
-from pyxmpp import ClientStream,JID,Iq,Presence,Message,StreamError
@@ -91 +93 @@
-        self.port=int(node.xpathEval("port")[0].getContent())
-        self.secret=node.xpathEval("secret")[0].getContent()
+
+class SPIdentDConfig:
+    def __init__(self,node):
+        node=node.xpathEval("socket")[0]
+        self.socket=node.getContent()
-
-class ServerConfig:
@@ -152 +159 @@
-        self.connect=ConnectConfig(self.doc.xpathEval("jjigw/connect")[0])
-        self.network=NetworkConfig(self.doc.xpathEval("jjigw/network")[0])
+        spidentd=self.doc.xpathEval("jjigw/spidentd")
+        if spidentd:
+            self.spidentd=SPIdentDConfig(spidentd[0])
+        else:
+            self.spidentd=None
-    def __del__(self):
-        if self.doc:
@@ -581 +593 @@
-        self.network=config.network
-        self.default_encoding=self.network.default_encoding
+        self.conninfo=None
-        nick=nick.encode(self.default_encoding,"strict")
-        if not self.network.valid_nick(nick):
@@ -722 +735 @@
-                self.socket.close()
-                self.socket=None
+            if self.conninfo:
+                self.component.unregister_connection(self.conninfo)
+                self.conninfo=None
-        finally:
-            self.lock.release()
@@ -730 +746 @@
-            self.exit="No servers left, quitting"
-            return
+        if self.conninfo:
+            self.component.unregister_connection(self.conninfo)
+            self.conninfo=None
-        if self.socket:
-            self.socket.close()
@@ -743 +762 @@
-                try:
-                    self.socket.close()
+                    if self.conninfo:
+                        self.component.unregister_connection(self.conninfo)
+                        self.conninfo=None
-                except:
-                    pass
@@ -748 +770 @@
-            return
-        self._send("NICK %s" % (self.nick,))
-
+
+
+
-        self._send("USER %s 0 * :JJIGW User %s" % (user,user))
-        self.server=server
@@ -1053 +1077 @@
-        self.component.print_exception()
-
+class ConnectionInfo:
+    def __init__(self,socket,user):
+        self.localip,self.localport=socket.getsockname()
+        self.remoteip,self.remoteport=socket.getpeername()
+        self.user=user
+
+class SPIdentD:
+    def __init__(self,component,config):
+        self.socket_path=config.socket
+        self.component=component
+        self.socket=None
+        self.queue=Queue.Queue(100)
+        self.thread=threading.Thread(target=self.run_thread)
+        self.thread.setDaemon(1)
+        self.thread.start()
+
+    def run_thread(self):
+        while not self.component.shutdown:
+            self.socket=socket.socket(socket.AF_UNIX)
+            try:
+                try:
+                    self.socket.connect(self.socket_path)
+                    self.loop()
+                except socket.error:
+                    self.print_exception()
+                    pass
+            finally:
+                try:
+                    self.socket.close()
+                except:
+                    pass
+                self.socket=None
+                if not self.component.shutdown:
+                    print >>sys.stderr,"Waiting before spidentd connection restart..."
+                    time.sleep(10)
+
+    def loop(self):
+        while not self.component.shutdown:
+            try:
+                item=self.queue.get(1,1)
+            except Queue.Empty:
+                continue
+            while item:
+                try:
+                    if item[0]=="add":
+                        ci=item[1]
+                        self.socket.send("add %s:%i %s:%i %s\n" % (
+                            ci.localip,ci.localport,ci.remoteip,ci.remoteport,ci.user))
+                    elif item[0]=="remove":
+                        ci=item[1]
+                        self.socket.send("remove %s:%i %s:%i\n" % (
+                            ci.localip,ci.localport,ci.remoteip,ci.remoteport))
+                except socket.error:
+                    self.queue.put(item)
+                    raise
+                try:
+                    item=self.queue.get(0)
+                except Queue.Empty:
+                    break
+
+    def register_connection(self,conninfo):
+        self.queue.put(("add",conninfo))
+
+    def unregister_connection(self,conninfo):
+        self.queue.put(("remove",conninfo))
+
+    def debug(self,msg):
+        self.component.debug(msg)
+    
+    def print_exception(self):
+        self.component.print_exception()
+
-class Component(pyxmpp.jabberd.Component):
-    def __init__(self,config):
@@ -1064 +1160 @@
-        self.irc_sessions={}
-        self.config=config
+        if config.spidentd:
+            self.ident_handler=SPIdentD(self,config.spidentd)
+        else:
+            self.ident_handler=None
-
-    def signal_handler(self,signum,frame):
@@ -1281 +1381 @@
-        return 1
-
+    def register_connection(self,conninfo):
+        if self.ident_handler:
+            self.ident_handler.register_connection(conninfo)
+
+    def unregister_connection(self,conninfo):
+        if self.ident_handler:
+            self.ident_handler.unregister_connection(conninfo)
+
-try:
-    config=Config("jjigw.xml")

trunk/spidentd.py

@@ -130 +130 @@
-                                return line
-                        if len(self.buf)>1024:
-"
+: %r" % (self.buf,)
-                                return None
-                        r=self.socket.recv(1024)