Ticket #644: jep70.2.patch

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.

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
@@ -859 +859 @@
                         #Preferences data
                         #http://www.jabber.org/jeps/jep-0049.html
                         #TODO: implement this
-                        pass 
+                        pass
+        
+        def _HttpAuthCB(self, con, iq_obj):
+                opt = gajim.config.get('http_auth')
+                iq = None
+                if opt == 'yes':
+                        iq = iq_obj.buildReply('result')
+                elif opt == 'no':
+                        iq = iq_obj.buildReply('error')
+                        iq.setError('not-authorized', 401)
+                else:
+                        method = iq_obj.getTagAttr('confirm', 'method')
+                        url = iq_obj.getTagAttr('confirm', 'url')
+                        self.dispatch('HTTP_AUTH', (method, url, iq_obj));
+                if iq:
+                        con.send(iq)
+                raise common.xmpp.NodeProcessed
 
         def _ErrorCB(self, con, iq_obj):
                 errmsg = iq_obj.getError()
@@ -989 +1005 @@
                         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)

common/config.py

@@ -154 +154 @@
                         # try for 2 minutes before giving up (aka. timeout after those seconds)
                         'try_connecting_for_foo_secs': [ opt_int, 60 ],
                         'max_stanza_per_sec': [ opt_int, 5],
+                        'http_auth': [opt_str, 'ask'], # yes, no, ask
                 }, {}),
                 'statusmsg': ({
                         'message': [ opt_str, '' ],

gajim.py

@@ -197 +197 @@
                 #('INFORMATION', account, (title_text, section_text))
                 dialogs.InformationDialog(data[0], data[1]).get_response()
 
+        def handle_event_http_auth(self, account, data):
+                #('HTTP_AUTH', account, (method, url, iq_obj))
+                dialog = dialogs.ConfirmationDialog(_('HTTP (%s) Authorization for %s') \
+                        % (array[0], array[1]), _('Do you accept this request?'))
+                if dialog.get_response() == gtk.RESPONSE_OK:
+                        answer = 'yes'
+                else:
+                        answer = 'no'
+                gajim.connections[account].build_http_auth_answer(data[2], answer)
+
         def handle_event_error_answer(self, account, array):
                 id, jid_from, errmsg, errcode = array
                 if str(errcode) in ['403', '406'] and id: