Changeset 74

Timestamp:

05/09/04 18:56:53 (5 years ago)

Author:

jajcus

Message:

- raw channel ("#" conference room) - for debuging
- gateway status accessible selected users (administrators defined in config file) via Disco
- channel leaving implemented
- some fixes

Files:

• trunk/jjigw/channel.py (modified) (4 diffs)
• trunk/jjigw/component.py (modified) (8 diffs)
• trunk/jjigw/ircsession.py (modified) (19 diffs)

trunk/jjigw/channel.py

@@ -26 +26 @@
-from common import channel_re
-from common import normalize,remove_evil_characters,strip_colors
+from ircuser import IRCUser
-
-class Channel:
@@ -44 +45 @@
-            self.encoding=session.default_encoding
-        self.modes={}
-
+self.session.get_user()
-        self.muc=0
-        self.requests=RequestQueue(10)
@@ -90 +91 @@
-            self.debug("Channel %r in the initial state - nothing to do." % (self.name,))
-        else:
-
+not 
-                self.session.send("PART %s" % (self.name,))
-            else:
@@ -99 +100 @@
-        self.session.component.send(p)
-        for u in self.users:
-room
+channel
-        self.state=None
-

trunk/jjigw/component.py

@@ -21 +21 @@
-import signal
-import threading
+import string
-
-import pyxmpp.jabberd
@@ -26 +27 @@
-from pyxmpp.jabber.muc import MUC_ADMIN_NS,MUC_NS
-from pyxmpp.jabber.muc import MucPresence,MucIq,MucAdminQuery
-
+tem,DiscoI
-
-from ircsession import IRCSession
@@ -39 +40 @@
-        signal.signal(signal.SIGINT,self.signal_handler)
-        signal.signal(signal.SIGPIPE,self.signal_handler)
+        signal.signal(signal.SIGHUP,self.signal_handler)
-        signal.signal(signal.SIGTERM,self.signal_handler)
-        self.irc_sessions={}
@@ -48 +50 @@
-
-    def get_session(self,user_jid,component_jid):
-        print `self.irc_sessions`
-        return self.irc_sessions.get((user_jid.as_unicode(),component_jid.domain))
+        
+    def register_session(self,sess):
+        user_jid=sess.jid
+        component_jid=sess.network.jid
+        self.debug("Registering session: %r on %r for %r" % (sess,component_jid,user_jid))
+        self.irc_sessions[user_jid.as_unicode(),component_jid.domain]=sess
+
+    def unregister_session(self,sess):
+        user_jid=sess.jid
+        component_jid=sess.network.jid
+        self.debug("Unregistering session: %r on %r for %r" % (sess,component_jid,user_jid))
+        try:
+            del self.irc_sessions[user_jid.as_unicode(),component_jid.domain]
+        except KeyError:
+            self.debug("Session not found!")
-
-    def signal_handler(self,signum,frame):
@@ -269 +285 @@
-                self.send(p)
-                return 1
-            if to not in sess.used_for:
-                sess.used_for.append(to)
-        else:
-            nick=to.resource
-            if not nick:
-                nick=fr.node
-
-
-
+
+
+
+
+
+
+
+
-        if to.node:
-            sess.join(MucPresence(stanza))
-        else:
-
-
-
-
-
-
-
+
-        return 1
-
@@ -296 +309 @@
-        sess=self.get_session(fr,to)
-        if sess:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-    def presence_control(self,stanza):
@@ -335 +337 @@
-            return iq.make_error_response("recipient-unavailable")
-        if to.node is None and to.resource is None:
-
+
+
-                di.add_feature("jabber:iq:version")
-                di.add_feature("jabber:iq:register")
@@ -344 +347 @@
-                    name="IRC gateway"
-                DiscoIdentity(di,name,"gateway","irc")
-
+
+
+
+
+
+
+
+
+
+
-        return iq.make_error_response("feature-not-implemented")
-
-    def disco_get_items(self,node,iq):
-        to=iq.get_to()
+        fr=iq.get_from()
-        try:
-            network=self.config.get_network(to)
-        except KeyError:
-            return iq.make_error_response("recipient-unavailable")
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-# vi: sts=4 et sw=4

trunk/jjigw/ircsession.py

@@ -24 +24 @@
-import select
-import string
-
-
-Presence
+
+
+Message,Presence,JID
-from pyxmpp.jabber.muc import MucPresence
-
@@ -33 +33 @@
-from common import ConnectionInfo
-from common import node_to_channel,normalize
+from common import remove_evil_characters,strip_colors
-from common import channel_re,numeric_re
-
@@ -60 +61 @@
-        self.used_for=[]
-        self.server=None
+        self.login_requests=[]
-        self.join_requests=[]
-        self.messages_to_channel=[]
@@ -66 +68 @@
-        self.channels={}
-        self.users={}
+        self.raw_channel=0
-        self.user=IRCUser(self,nick)
-        self.thread.start()
@@ -97 +100 @@
-            self.lock.release()
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        nnick=normalize(nick)
-        if self.users.has_key(nnick):
@@ -164 +171 @@
-                    pass
-                self.socket=None
-
-
-
-
+
-        finally:
-            self.lock.release()
@@ -221 +225 @@
-        server=self.servers_left.pop(0)
-        self.debug("Trying to connect to %r" % (server,))
+        if self.raw_channel:
+            self.pass_message_to_raw_channel("Connecting to %s:%s..." % (server.host,server.port))
-        try:
-            self.socket=socket.socket(socket.AF_INET,socket.SOCK_STREAM)
@@ -226 +232 @@
-        except (IOError,OSError,socket.error),err:
-            self.debug("Server connect error: %r" % (err,))
+            if self.raw_channel:
+                self.pass_message_to_raw_channel("Connect error: %r" % (err,))
-            if self.socket:
-                try:
@@ -236 +244 @@
-            self.socket=None
-            return
+        if self.raw_channel:
+            self.pass_message_to_raw_channel("Connected.")
-        self._send("NICK %s" % (self.nick,))
-        user=md5.new(self.jid.bare().as_string()).hexdigest()[:64]
@@ -248 +258 @@
-            self.debug("IRC OUT: %r" % (str,))
-            self.socket.send(str+"\r\n")
+            if self.raw_channel:
+                self.pass_output_to_raw_channel(str)
-        else:
-            self.debug("ignoring out: %r" % (str,))
@@ -284 +296 @@
-            params.append(split[0])
-            split=split[1:]
+        if self.raw_channel:
+            self.pass_input_to_raw_channel(prefix,command,params)
-        if command and numeric_re.match(command):
-            params=params[1:]
@@ -298 +312 @@
-            if f:
-                f(prefix,command,params)
-            else:
-                for u in self.used_for:
-                    if u.bare()==self.network.jid:
-                        self.pass_input_to_user(prefix,command,params)
-                        break
-        finally:
-            self.lock.acquire()
@@ -326 +335 @@
-
-    def irc_message(self,prefix,command,params):
-
+ or not prefix
-            self.debug("ignoring it")
-            return
@@ -347 +356 @@
-        try:
-            if join_condition:
-
++self.login_requests
-                    p=s.make_error_response(join_condition)
-                    self.component.send(p)
@@ -355 +364 @@
-                        pass
-                self.join_requests=[]
+                self.login_requests=[]
-            if message_condition:
-                for s in self.messages_to_user+self.messages_to_channel:
@@ -370 +380 @@
-            self.debug("Connected successfully")
-            self.ready=1
+            for s in self.login_requests:
+                self.login(s)
-            for s in self.join_requests:
-                self.join(s)
@@ -435 +447 @@
-            return
-        user=self.get_user(params[4])
-
-
-
-
+
+
+
+
+
+
+
-
-    def send_error_message(self,source,cond,text):
@@ -457 +472 @@
-        self.component.send(m)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        self.component.send(m)
-
+    def pass_output_to_raw_channel(self,s):
+        body=`s`
+        if body[0] in '"\'':
+            body=body[1:-1]
+        body=unicode(body,self.default_encoding,"replace")
+        nick=unicode(self.nick,self.default_encoding,"replace")
+        fr=JID('#',self.network.jid.domain,nick)
+        m=Message(to=self.jid,fr=fr,body=body,type="groupchat")
+        self.component.send(m)
+
+    def pass_message_to_raw_channel(self,msg):
+        fr=JID('#',self.network.jid.domain,None)
+        m=Message(to=self.jid,fr=fr,body=msg,type="groupchat")
+        self.component.send(m)
+
-    def join(self,stanza):
+        to=stanza.get_to()
+        if to.node=='#':
+            return self.join_raw_channel(stanza)
-        self.cond.acquire()
-        try:
@@ -486 +516 @@
-        finally:
-            self.cond.release()
-
-
+
+
+
+
+
+
-        if self.channels.has_key(normalize(channel)):
-            return
+        if to not in self.used_for:
+            self.used_for.append(to)
-        channel=Channel(self,channel)
-        channel.join(stanza)
-        self.channels[normalize(channel.name)]=channel
+
+    def join_raw_channel(self,stanza):
+        self.raw_channel=1
+        to=stanza.get_to()
+        if to not in self.used_for:
+            self.used_for.append(to)
+        p=Presence(fr=to,to=stanza.get_from())
+        self.component.send(p)
+
+    def leave(self,stanza):
+        to=stanza.get_to()
+        if to.node=='#':
+            return self.leave_raw_channel(stanza)
+        channel=self.get_channel(stanza.get_to())
+        if channel:
+           channel.leave(stanza) 
+           self.logout(stanza,0)
+        else:
+           self.logout(stanza)
+
+    def leave_raw_channel(self,stanza):
+        self.raw_channel=0
+        self.logout(stanza)
+
+    def login(self,stanza):
+        self.cond.acquire()
+        try:
+            if not self.ready:
+                self.login_requests.append(stanza)
+                return
+        finally:
+            self.cond.release()
+        to=stanza.get_to()
+        if to not in self.used_for:
+            self.used_for.append(to)
+        fr=stanza.get_from()
+        p=Presence(to=fr,fr=to,status=stanza.get_status(),show=stanza.get_show())
+        self.component.send(p)
+
+    def logout(self,stanza,send_response=1):
+        to=stanza.get_to()
+        if to not in self.used_for:
+            self.debug("Unavailable presence sent with no matching available presence, ignoring it")
+            return 0
+        try:
+            self.used_for.remove(to)
+        except:
+            pass
+        if send_response:
+            p=Presence(
+                type="unavailable",
+                to=stanza.get_from(),
+                fr=stanza.get_to()
+                );
+            self.component.send(p)
+        if not self.used_for:
+            self.disconnect(stanza.get_status())
+            return 1
+        else:
+            return 0
+
+    def channel_left(self,channel):
+        if not channel.room_jid:
+            return
+        if channel.room_jid not in self.used_for:
+            return
+        try:
+            self.used_for.remove(channel.room_jid)
+        except:
+            pass
+        if not self.used_for:
+            self.disconnect(stanza.get_status())
-
-    def get_channel(self,jid):