Ticket #644: jep70.patch

launch.sh

@@ -1 +1 @@
 cd src
-./gajim.py $@
+./gajim.py --verbose $@

src/common/xmpp/protocol.py

@@ -70 +70 @@
 NS_FILE         ='http://jabber.org/protocol/si/profile/file-transfer' # JEP-0096
 NS_FEATURE      ='http://jabber.org/protocol/feature-neg'
 NS_BYTESTREAM   ='http://jabber.org/protocol/bytestreams' # JEP-0065
-NS_DISCO                ='http://jabber.org/protocol/disco#info' # JEP-0095
-NS_STREAM               ='http://affinix.com/jabber/stream'
+NS_DISCO        ='http://jabber.org/protocol/disco#info' # JEP-0095
+NS_STREAM       ='http://affinix.com/jabber/stream'
+NS_HTTP_AUTH    ='http://jabber.org/protocol/http-auth'         # JEP-0070
 
 xmpp_stream_error_conditions="""
 bad-format --  --  -- The entity has sent XML that cannot be processed.
@@ -324 +325 @@
                 if tag.getName()<>'text': return tag.getName()
             return errtag.getData()
     def getErrorCode(self):
-        """ Return the error code. Obsolette. """
+        """ Return the error code. Obsolete. """
         return self.getTagAttr('error','code')
     def setError(self,error,code=None):
-        """ Set the error code. Obsolette. Use error-conditions instead. """
+        """ Set the error code. Obsolete. Use error-conditions instead. """
         if code:
             if str(code) in _errorcodes.keys(): error=ErrorNode(_errorcodes[str(code)],text=error)
             else: error=ErrorNode(ERR_UNDEFINED_CONDITION,code=code,typ='cancel',text=error)
@@ -449 +450 @@
 
 class Iq(Protocol): 
     """ XMPP Iq object - get/set dialog mechanism. """
-    def __init__(self, typ=None, queryNS=None, attrs={}, to=None, frm=None, payload=[], xmlns=NS_CLIENT, node=None):
+    def __init__(self, typ=None, queryNS=None, attrs={}, to=None, frm=None,
+                 payload=[], xmlns=NS_CLIENT, node=None, iq_child='query'):
         """ Create Iq object. You can specify type, query namespace
-            any additional attributes, recipient of the iq, sender of the iq, any additional payload (f.e. jabber:x:data node) and namespace in one go.
-            Alternatively you can pass in the other XML object as the 'node' parameted to replicate it as an iq. """
-        Protocol.__init__(self, 'iq', to=to, typ=typ, attrs=attrs, frm=frm, xmlns=xmlns, node=node)
+            any additional attributes, recipient of the iq, sender of the iq,
+            any additional payload (f.e. jabber:x:data node) and namespace in
+            one go.  Alternatively you can pass in the other XML object as the
+            'node' parameted to replicate it as an iq.  Many protocols
+            have an inner child named 'query' for the Iq payload, but this is
+            not required. To allow for newer protocols the name of this child
+            can be specified to override the default value 'query'."""
+        Protocol.__init__(self, 'iq', to=to, typ=typ, attrs=attrs, frm=frm,
+                          xmlns=xmlns, node=node)
+        self.iq_child = iq_child or 'query'
         if payload: self.setQueryPayload(payload)
         if queryNS: self.setQueryNS(queryNS)
+    def setIqChildName(self, iq_child):
+        self.iq_child = iq_child or 'query';
     def getQueryNS(self):
-        """ Return the namespace of the 'query' child element."""
-        tag=self.getTag('query')
+        """ Return the namespace of the iq child element."""
+        tag=self.getTag(self.iq_child)
         if tag: return tag.getNamespace()
     def getQuerynode(self):
-        """ Return the 'node' attribute value of the 'query' child element."""
-        return self.getTagAttr('query','node')
+        """ Return the 'node' attribute value of the iq child element."""
+        return self.getTagAttr(self.iq_child,'node')
     def getQueryPayload(self):
-        """ Return the 'query' child element payload."""
-        tag=self.getTag('query')
+        """ Return the iq child element payload."""
+        tag=self.getTag(self.iq_child)
         if tag: return tag.getPayload()
     def getQueryChildren(self):
-        """ Return the 'query' child element child nodes."""
-        tag=self.getTag('query')
+        """ Return the iq child element child nodes."""
+        tag=self.getTag(self.iq_child)
         if tag: return tag.getChildren()
     def setQueryNS(self,namespace):
-        """ Set the namespace of the 'query' child element."""
-        self.setTag('query').setNamespace(namespace)
+        """ Set the namespace of the iq child element."""
+        self.setTag(self.iq_child).setNamespace(namespace)
     def setQueryPayload(self,payload):
-        """ Set the 'query' child element payload."""
-        self.setTag('query').setPayload(payload)
+        """ Set the iq child element payload."""
+        self.setTag(self.iq_child).setPayload(payload)
     def setQuerynode(self,node):
-        """ Set the 'node' attribute value of the 'query' child element."""
-        self.setTagAttr('query','node',node)
+        """ Set the 'node' attribute value of the iq child element."""
+        self.setTagAttr(self.iq_child,'node',node)
     def buildReply(self,typ):
         """ Builds and returns another Iq object of specified type.
-            The to, from and query child node of new Iq are pre-set as reply to this Iq. """
+            The to, from and child node of new Iq are pre-set as reply
+            to this Iq. """
         iq=Iq(typ,to=self.getFrom(),frm=self.getTo(),attrs={'id':self.getID()})
-        if self.getTag('query'): iq.setQueryNS(self.getQueryNS())
+        if self.getTag(self.iq_child): iq.setQueryNS(self.getQueryNS())
         return iq
 
 class ErrorNode(Node):

src/common/connection.py

@@ -127 +127 @@
                         'GC_SUBJECT': [], 'GC_CONFIG': [], 'BAD_PASSPHRASE': [],
                         'ROSTER_INFO': [], 'ERROR_ANSWER': [], 'BOOKMARKS': [], 'CON_TYPE': [],
                         'FILE_REQUEST': [], 'FILE_RCV_COMPLETED': [], 'FILE_PROGRESS': [],
-                        'STANZA_ARRIVED': []
+                        'STANZA_ARRIVED': [], 'HTTP_AUTH': []
                         }
                 self.name = name
                 self.connected = 0 # offline
@@ -861 +861 @@
                         #TODO: implement this
                         pass 
 
+        def _HttpAuthCB(self, con, iq_obj):
+                self.dispatch('HTTP_AUTH', (con, iq_obj));
+                raise common.xmpp.NodeProcessed
+
         def _ErrorCB(self, con, iq_obj):
                 errmsg = iq_obj.getError()
                 errcode = iq_obj.getErrorCode()
@@ -988 +992 @@
                         common.xmpp.NS_ROSTER)
                 con.RegisterHandler('iq', self._PrivateCB, 'result',
                         common.xmpp.NS_PRIVATE)
+                con.RegisterHandler('iq', self._HttpAuthCB, 'get',
+                        common.xmpp.NS_HTTP_AUTH)
                 con.RegisterHandler('iq', self._ErrorCB, 'error')
                 con.RegisterHandler('iq', self._StanzaArrivedCB)
                 con.RegisterHandler('presence', self._StanzaArrivedCB)

src/common/config.py

@@ -122 +122 @@
                 'confirm_close_muc': [opt_bool, True], # confirm closing MUC window
                 'notify_on_file_complete': [opt_bool, True], # notif. on file complete
                 'file_transfers_port': [opt_int, 28011],  # port, used for file transfers
+                'http_auth': [opt_str, 'ask'], # yes, no, ask
         }
 
         __options_per_key = {

src/gajim.py

@@ -197 +197 @@
                 #('INFORMATION', account, (title_text, section_text))
                 dialogs.InformationDialog(data[0], data[1]).get_response()
 
+        def handle_http_auth(self, unused, data):
+                #('HTTP_AUTH', account, (connection, iq))
+                con = data[0]
+                iq = data[1]
+                opt = gajim.config.get('http_auth')
+                if opt == 'yes':
+                        iq = iq.buildReply('result')
+                elif opt == 'no':
+                        iq = iq.buildReply('error')
+                        iq.setError('not-authorized', 401);
+                else:
+                        method = iq.getTagAttr('confirm', 'method')
+                        url = iq.getTagAttr('confirm', 'url')
+                        dialog = dialogs.ConfirmationDialog(\
+                            _('HTTP (%s) Authorization for %s') % (method, url),
+                            _('Accept this request?'))
+                        if dialog.get_response() == gtk.RESPONSE_OK:
+                                iq = iq.buildReply('result');
+                        else:
+                                iq = iq.buildReply('error');
+                                iq.setError('not-authorized', 401);
+                con.send(iq);
+
         def handle_event_error_answer(self, account, array):
                 id, jid_from, errmsg, errcode = array
                 if str(errcode) in ['403', '406'] and id:
@@ -932 +955 @@
                 con.register_handler('CON_TYPE', self.handle_event_con_type)
                 con.register_handler('FILE_REQUEST', self.handle_event_file_request)
                 con.register_handler('STANZA_ARRIVED', self.handle_event_stanza_arrived)
+                con.register_handler('HTTP_AUTH', self.handle_http_auth)
 
         def process_connections(self):
                 try: