libervia-backend: sat.tac comparison

comparison sat.tac @ 16:0a024d5e0cd0

New account creation (in-band registration) - new method "sendAnswer" in bridge for asyncronous result communication

author	Goffi <goffi@goffi.org>
date	Mon, 02 Nov 2009 00:45:03 +0100
parents	218ec9984fa5
children	74a39f40eb6d

comparison

equal deleted inserted replaced

-:218ec9984fa5
+:0a024d5e0cd0
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 client_name = u'SàT (Salut à toi)'
-client_version = '0.0.1'
+client_version = '0.0.1D'   #Please add 'D' at the end for dev versions
 from twisted.application import internet, service
 from twisted.internet import glib2reactor, protocol, task
 glib2reactor.install()
 from twisted.words.xish import domish
 from twisted.internet import reactor
 import pdb
-from wokkel import client, disco, xmppim, generic
+from wokkel import client, disco, xmppim, generic, compat
 from sat_bridge.DBus import DBusBridge
 import logging
 from logging import debug, info, error
 ### logging configuration FIXME: put this elsewhere ###
 logging.basicConfig(level=logging.DEBUG,
 format='%(message)s')
 ###
+sat_id = 0
+def sat_next_id():
+global sat_id
+sat_id+=1
+return "sat_id_"+str(sat_id)
 class SatXMPPClient(client.XMPPClient):
 def __init__(self, jid, password, host=None, port=5222):
 client.XMPPClient.__init__(self, jid, password, host, port)
 def iqFallback(self, iq):
 #pdb.set_trace()
 print "iqFallback: xml = [%s], handled=%s" % (iq.toXml(), "True" if iq.handled else "False")
 generic.FallbackHandler.iqFallback(self, iq)
+class RegisteringAuthenticator(xmlstream.ConnectAuthenticator):
+def __init__(self, host, jabber_host, user_login, user_pass, answer_id):
+xmlstream.ConnectAuthenticator.__init__(self, jabber_host)
+self.host = host
+self.jabber_host = jabber_host
+self.user_login = user_login
+self.user_pass = user_pass
+self.answer_id = answer_id
+def connectionMade(self):
+print "connectionMade"
+self.xmlstream.namespace = "jabber:client"
+self.xmlstream.sendHeader()
+iq = compat.IQ(self.xmlstream, 'set')
+iq["to"] = self.jabber_host
+query = iq.addElement(('jabber:iq:register', 'query'))
+_user = query.addElement('username')
+_user.addContent(self.user_login)
+_pass = query.addElement('password')
+_pass.addContent(self.user_pass)
+reg = iq.send(self.jabber_host).addCallbacks(self.registrationAnswer, self.registrationFailure)
+def registrationAnswer(self, answer):
+debug ("registration answer: %s" % answer.toXml())
+answer_type = "success"
+answer_data={"human":"Registration successfull"}
+self.host.bridge.sendAnswer(answer_type, self.answer_id, answer_data)
+self.xmlstream.sendFooter()
+def registrationFailure(self, error):
+info ("Registration failure: %s" %str(error))
+answer_type = "error"
+answer_data={"human":"Registration failed"}
+if error.value.condition == 'conflict':
+answer_data['reason'] = 'conflict'
+else:
+answer_data['reason'] = 'unknown'
+self.host.bridge.sendAnswer(answer_type, self.answer_id, answer_data)
+self.xmlstream.sendFooter()
 class SAT(service.Service):
 def __init__(self):
 #self.reactor=reactor
 self._waiting_conf = {}  #callback called when a confirmation is received
 self._progress_cb_map = {}  #callback called when a progress is requested (key = progress id)
 self.plugins = {}
 self.bridge=DBusBridge()
+self.bridge.register("registerNewAccount", self.registerNewAccount)
 self.bridge.register("connect", self.connect)
 self.bridge.register("disconnect", self.disconnect)
 self.bridge.register("getContacts", self.memory.getContacts)
 self.bridge.register("getPresenceStatus", self.memory.getPresenceStatus)
 self.bridge.register("sendMessage", self.sendMessage)
 self.bridge.register("isConnected", self.isConnected)
 self.bridge.register("confirmationAnswer", self.confirmationAnswer)
 self.bridge.register("getProgress", self.getProgress)
 self._import_plugins()
-#self.connect()
 def _import_plugins(self):
 """Import all plugins found in plugins directory"""
 #TODO: manage dependencies
 __import__(plug_path)
 mod = sys.modules[plug_path]
 plug_info = mod.PLUGIN_INFO
 info ("importing plugin: %s", plug_info['name'])
 self.plugins[plug_info['import_name']] = getattr(mod, plug_info['main'])(self)
+#TODO: test xmppclient presence and register handler parent
 def connect(self):
+"""Connect to jabber server"""
 if (self.isConnected()):
 info("already connected !")
 return
 print "connecting..."
 self.me = jid.JID(self.memory.getParamV("JabberID", "Connection"))
 debug ("setting plugins parents")
 for plugin in self.plugins.iteritems():
 if isinstance(plugin[1], XMPPHandler):
 plugin[1].setHandlerParent(self.xmppclient)
 self.xmppclient.startService()
 def disconnect(self):
+"""disconnect from jabber server"""
 if (not self.isConnected()):
 info("not connected !")
 return
 info("Disconnecting...")
 self.xmppclient.stopService()
 self.roster.requestRoster()
 self.presence.available()
 self.disco.requestInfo(jid.JID(self.memory.getParamV("Server", "Connection"))).addCallback(self.serverDisco)
+## Misc methods ##
+def registerNewAccount(self, login, password, server, port = 5222):
+"""Connect to a server and create a new account using in-band registration"""
+next_id = sat_next_id()  #the id is used to send server's answer
+serverRegistrer = xmlstream.XmlStreamFactory(RegisteringAuthenticator(self, server, login, password, next_id))
+connector = reactor.connectTCP(server, port, serverRegistrer)
+serverRegistrer.clientConnectionLost = lambda conn, reason: connector.disconnect()
+return next_id
+## Client management ##
+def setParam(self, name, value, namespace):
+"""set wanted paramater and notice observers"""
+info ("setting param: %s=%s in namespace %s", name, value, namespace)
+self.memory.setParam(name, value, namespace)
+self.bridge.paramUpdate(name, value, namespace)
+def failed(self,xmlstream):
+debug("failed: %s", xmlstream.getErrorMessage())
+debug("failed: %s", dir(xmlstream))
+def isConnected(self):
+try:
+if self.xmppclient.isConnected():
+return True
+except AttributeError:
+#xmppclient not available
+pass
+return False
+## jabber methods ##
 def sendMessage(self,to,msg,type='chat'):
 #FIXME: check validity of recipient
 debug("Sending jabber message to %s...", to)
 message = domish.Element(('jabber:client','message'))
 message["to"] = jid.JID(to).full()
 message.addElement("body", "jabber:client", msg)
 self.xmlstream.send(message)
 self.memory.addToHistory(self.me, self.me, jid.JID(to), message["type"], unicode(msg))
 self.bridge.newMessage(message['from'], unicode(msg), to=message['to']) #We send back the message, so all clients are aware of it
-def setParam(self, name, value, namespace):
-"""set wanted paramater and notice observers"""
-info ("setting param: %s=%s in namespace %s", name, value, namespace)
-self.memory.setParam(name, value, namespace)
-self.bridge.paramUpdate(name, value, namespace)
-def failed(self,xmlstream):
-debug("failed: %s", xmlstream.getErrorMessage())
-debug("failed: %s", dir(xmlstream))
-def isConnected(self):
-try:
-if self.xmppclient.isConnected():
-return True
-except AttributeError:
-#xmppclient not available
-pass
-return False
-## jabber methods ##
 def setPresence(self, to="", type="", show="", status="", priority=0):
 """Send our presence information"""
 if not type in ["", "unavailable", "subscribed", "subscribe",
 "unsubscribe", "unsubscribed", "prob", "error"]:

Mercurial > libervia-backend

comparison sat.tac @ 16:0a024d5e0cd0