From e84b23d1ad7dcb3afa3754ff3b1c1eca27a90548 Mon Sep 17 00:00:00 2001 From: "louiz@4325f9fc-e183-4c21-96ce-0ab188b42d13" Date: Tue, 31 Aug 2010 23:11:02 +0000 Subject: Switch to Sleekxmpp. fixed #1768 --- src/connection.py | 208 ++++-------------------------------------------------- 1 file changed, 15 insertions(+), 193 deletions(-) (limited to 'src/connection.py') diff --git a/src/connection.py b/src/connection.py index 83631da0..9b315539 100644 --- a/src/connection.py +++ b/src/connection.py @@ -24,205 +24,27 @@ from gettext import (bindtextdomain, textdomain, bind_textdomain_codeset, gettext as _) import sys -import threading +import sleekxmpp -import xmpp from config import config -from logging import logger +from logger import logger from handler import Handler from common import jid_get_node, jid_get_domain, is_jid_the_same -class Connection(threading.Thread): +import logging + +class Connection(sleekxmpp.ClientXMPP): """ Receives everything from Jabber and emits the appropriate signals """ - def __init__(self, server, resource): - threading.Thread.__init__(self) - self.handler = Handler() - self.daemon = True # exit the program when this thread exits - if config.get('jid', '') == '': - self.server = server - else: - self.server = jid_get_domain(config.get('jid', '')) - self.resource = resource - self.online = 0 # 1:connected, 2:auth confirmed - self.jid = '' # we don't know our jid yet (anon account) - self.port = config.get('port', 5222) - self.client = xmpp.Client(self.server, debug=[]) - - def run(self): - """ - run in a thread - connect to server - """ - if not self.connect_to_server(self.server, self.port): - self.handler.emit('error', msg='Could not connect to server') - sys.exit(-1) - if not self.authenticate(config.get('jid', '') == ''): - self.handler.emit('error', msg='Could not authenticate to server') - sys.exit(-1) - # TODO, become invisible before sendInitPresence - self.client.sendInitPresence(requestRoster=0) - self.register_handlers() - - self.online = 1 # 2 when confirmation of our auth is received - while 1: - self.process() - - def connect_to_server(self, server, port): - """ - Connect to the server - """ - if config.get('use_proxy','false') == 'true': - return self.client.connect((server, port), - {'host': config.get("proxy_server", ""), - 'port': config.get("proxy_port", 1080), - 'user': config.get("proxy_user", ""), - 'password': config.get("proxy_password", - "") - }) - else: - return self.client.connect((server, port)) - - def authenticate(self, anon=True): - """ - Authenticate to the server - """ - if anon: - try: - self.client.auth(None, "", self.resource) - return True - except TypeError: - self.handler.emit('error', msg=_('Error: Could not authenticate. Please make sure the server you chose (%s) supports anonymous authentication' % (config.get('server', '')))) - return False - else: - password = config.get('password', '') - jid = config.get('jid', '') - auth = self.client.auth(jid_get_node(jid), password, "salut") - return True - - def register_handlers(self): - """ - registers handlers from xmpppy signals - """ - self.client.RegisterHandler('iq', self.on_get_time, typ='get', - ns="urn:xmpp:time") - self.client.RegisterHandler('iq', self.on_get_vcard) - self.client.RegisterHandler('iq', self.on_get_version, typ='get', - ns=xmpp.NS_VERSION) - self.client.RegisterHandler('presence', self.handler_presence) - self.client.RegisterHandler('message', self.handler_message) - - def error_message(self, stanza): - """ - handles the error messages - """ - from_ = stanza.getFrom() - if not from_: - room_name = '' - else: - room_name = from_.getStripped() - self.handler.emit('error-message', room=room_name, - error=stanza.getTag('error'), - msg=stanza.getError()) - raise xmpp.protocol.NodeProcessed - - def handler_presence(self, connection, presence): - """ - check if it's a normal or a muc presence - """ - is_muc = False - tags = presence.getTags('x') - for tag in tags: - if tag.getAttr('xmlns') == 'http://jabber.org/protocol/muc#user': - is_muc = True - if is_muc: - self.handler_muc_presence(connection, presence) - else: - self.handler_normal_presence(connection, presence) - - def handler_normal_presence(self, connection, presence): - """ - handles the non-MUC presences - """ - fro = presence.getFrom() - toj = presence.getAttr('to') - if presence.getType() == 'error': - self.error_message(presence) - return - if not toj or fro == toj: # own presence - self.online = 2 - self.jid = toj - self.handler.emit('on-connected', jid=fro) - - def handler_muc_presence(self, connection, presence): - """ - handles the presence messages - """ - if not connection: - return - self.handler.emit('room-presence', stanza=presence) - raise xmpp.protocol.NodeProcessed - - def handler_delayed_message(self, connection, message): - """ - handles the delayed messages - These are received when we join a muc and we are sent the - recent history - """ - if not connection: - return - self.handler.emit('room-delayed-message', stanza=message) - raise xmpp.protocol.NodeProcessed - - def handler_message(self, connection, message): - """ - handles the common messages - """ - if not connection: - return - if message.getType() == 'error': - self.error_message(message) - return - if message.getType() == 'groupchat': - self.handler.emit('room-message', stanza=message) - else: - self.handler.emit('private-message', stanza=message) - - raise xmpp.protocol.NodeProcessed - - def process(self, timeout=10): - """ - Main connection loop - It just waits for something to process (something is received - or something has to be sent) - """ - if self.online: - self.client.Process(timeout) - else: - logger.warning('disconnecting...') - sys.exit() - - def on_get_version(self, connection, iq): - """ - Handles the iq requesting our software version - """ - if not connection: - return - self.handler.emit('send-version', iq_obj=iq) - - def on_get_time(self, connection, iq): - """ - handles the iq requesting our time - """ - if not connection: - return - self.handler.emit('send-time', iq_obj=iq) - - def on_get_vcard(self, connection, iq): - """ - we received a vcard - """ - from common import debug - debug('\n====\n%s\n\n' % iq) + def __init__(self): + sleekxmpp.ClientXMPP.__init__(self, None, None, ssl=True, + resource=config.get('resource', 'poezio')) + self.registerPlugin('xep_0045') + + def start(self): + # TODO, try multiple servers + if self.connect((config.get('server', 'anon.louiz.org'), + config.get('port', 5222))): + self.process(threaded=True) -- cgit v1.2.3