Changeset 9123 for branches/pep/src/common/connection.py

Timestamp:

12/12/07 09:44:46 (12 months ago)

Author:

asterix

Message:

merge diff from trunk

Files:

• branches/pep/src/common/connection.py (modified) (49 diffs)

branches/pep/src/common/connection.py

@@ -3 +3 @@
 ##
 ## Copyright (C) 2003-2004 Vincent Hanquez <tab@snarc.org>
-## Copyright (C) 2003-2006 Yann Le Boulanger <asterix@lagaule.org>
+## Copyright (C) 2003-2007 Yann Leboulanger <asterix@lagaule.org>
 ## Copyright (C) 2005-2006 Nikos Kouremenos <kourem@gmail.com>
-## Copyright (C) 2005-2006 Dimitur Kirov <dkirov@gmail.com>
-## Copyright (C) 2005-2006 Travis Shirk <travis@pobox.com>
+##                         Dimitur Kirov <dkirov@gmail.com>
+##                         Travis Shirk <travis@pobox.com>
 ## Copyright (C) 2007 Julien Pivotto <roidelapluie@gmail.com>
+##                    Stephan Erb <steve-e@h3c.de>
 ##
-## This program is free software; you can redistribute it and/or modify
+## This file is part of Gajim.
+##
+## Gajim is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published
-## by the Free Software Foundation; version 2 only.
+## by the Free Software Foundation; version 3 only.
 ##
-## This program is distributed in the hope that it will be useful,
+## Gajim is distributed in the hope that it will be useful,
 ## but WITHOUT ANY WARRANTY; without even the implied warranty of
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ## GNU General Public License for more details.
 ##
+## You should have received a copy of the GNU General Public License
+## along with Gajim.  If not, see <http://www.gnu.org/licenses/>.
+##
 
 import os
 import random
 import socket
+
+import time
 
 try:
@@ -51 +59 @@
 import gtkgui_helpers
 
-ssl_error = { 
-2: "Unable to get issuer certificate",
-3: "Unable to get certificate CRL",
-4: "Unable to decrypt certificate's signature",
-5: "Unable to decrypt CRL's signature",
-6: "Unable to decode issuer public key",
-7: "Certificate signature failure",
-8: "CRL signature failure",
-9: "Certificate is not yet valid",
-10: "Certificate has expired",
-11: "CRL is not yet valid",
-12: "CRL has expired",
-13: "Format error in certificate's notBefore field",
-14: "Format error in certificate's notAfter field",
-15: "Format error in CRL's lastUpdate field",
-16: "Format error in CRL's nextUpdate field",
-17: "Out of memory",
-18: "Self signed certificate in certificate chain",
-19: "Unable to get local issuer certificate",
-20: "Unable to verify the first certificate",
-21: "Unable to verify the first certificate",
-22: "Certificate chain too long",
-23: "Certificate revoked",
-24: "Invalid CA certificate",
-25: "Path length constraint exceeded",
-26: "Unsupported certificate purpose",
-27: "Certificate not trusted",
-28: "Certificate rejected",
-29: "Subject issuer mismatch",
-30: "Authority and subject key identifier mismatch",
-31: "Authority and issuer serial number mismatch",
-32: "Key usage does not include certificate signing",
-50: "Application verification failure"
+ssl_error = {
+2: _("Unable to get issuer certificate"),
+3: _("Unable to get certificate CRL"),
+4: _("Unable to decrypt certificate's signature"),
+5: _("Unable to decrypt CRL's signature"),
+6: _("Unable to decode issuer public key"),
+7: _("Certificate signature failure"),
+8: _("CRL signature failure"),
+9: _("Certificate is not yet valid"),
+10: _("Certificate has expired"),
+11: _("CRL is not yet valid"),
+12: _("CRL has expired"),
+13: _("Format error in certificate's notBefore field"),
+14: _("Format error in certificate's notAfter field"),
+15: _("Format error in CRL's lastUpdate field"),
+16: _("Format error in CRL's nextUpdate field"),
+17: _("Out of memory"),
+18: _("Self signed certificate in certificate chain"),
+19: _("Unable to get local issuer certificate"),
+20: _("Unable to verify the first certificate"),
+21: _("Unable to verify the first certificate"),
+22: _("Certificate chain too long"),
+23: _("Certificate revoked"),
+24: _("Invalid CA certificate"),
+25: _("Path length constraint exceeded"),
+26: _("Unsupported certificate purpose"),
+27: _("Certificate not trusted"),
+28: _("Certificate rejected"),
+29: _("Subject issuer mismatch"),
+30: _("Authority and subject key identifier mismatch"),
+31: _("Authority and issuer serial number mismatch"),
+32: _("Key usage does not include certificate signing"),
+50: _("Application verification failure")
 }
 class Connection(ConnectionHandlers):
@@ -100 +108 @@
                 self.is_zeroconf = False
                 self.gpg = None
+                if USE_GPG:
+                        self.gpg = GnuPG.GnuPG(gajim.config.get('use_gpg_agent'))
                 self.status = ''
                 self.priority = gajim.get_priority(name, 'offline')
@@ -110 +120 @@
                 self.last_time_to_reconnect = None
                 self.new_account_info = None
+                self.new_account_form = None
                 self.bookmarks = []
                 self.annotations = {}
@@ -118 +129 @@
                 self.password = passwords.get_password(name)
                 self.server_resource = gajim.config.get_per('accounts', name, 'resource')
-                # All valid resource substitution strings should be added to this hash. 
+                # All valid resource substitution strings should be added to this hash.
                 if self.server_resource:
                         self.server_resource = Template(self.server_resource).safe_substitute({
@@ -132 +143 @@
                 self.blocked_groups = []
                 self.pep_supported = False
-                # Do we continue connection when we get roster (send presence,get vcard...)
+                # Do we continue connection when we get roster (send presence,get vcard..)
                 self.continue_connect_info = None
                 # To know the groupchat jid associated with a sranza ID. Useful to
@@ -138 +149 @@
                 # the fake jid
                 self.groupchat_jids = {} # {ID : groupchat_jid}
-                if USE_GPG:
-                        self.gpg = GnuPG.GnuPG(gajim.config.get('use_gpg_agent'))
-                        gajim.config.set('usegpg', True)
-                else:
-                        gajim.config.set('usegpg', False)
-                
+
                 self.on_connect_success = None
                 self.on_connect_failure = None
@@ -152 +158 @@
                 # server {'icq': ['icq.server.com', 'icq2.server.com'], }
                 self.vcard_supported = True
-                self.metacontacts_supported = True
+                self.private_storage_supported = True
         # END __init__
 
@@ -172 +178 @@
                         self.dispatch('STATUS', 'connecting')
                         self.retrycount += 1
-                        signed = self.get_signed_msg(self.status)
                         self.on_connect_auth = self._init_roster
-                        self.connect_and_init(self.old_show, self.status, signed)
+                        self.connect_and_init(self.old_show, self.status, self.gpg != None)
                 else:
                         # reconnect succeeded
                         self.time_to_reconnect = None
                         self.retrycount = 0
-        
+
         # We are doing disconnect at so many places, better use one function in all
-        def disconnect(self, on_purpose = False):
+        def disconnect(self, on_purpose=False):
                 #FIXME: set the Tune to None before disconnection per account
                 #gajim.interface.roster._music_track_changed(None, None)
@@ -194 +199 @@
                         self.last_connection = None
                         self.connection = None
-        
+
         def _disconnectedReconnCB(self):
                 '''Called when we are disconnected'''
@@ -203 +208 @@
                         self.old_show = STATUS_LIST[self.connected]
                 self.connected = 0
-                self.dispatch('STATUS', 'offline')
                 if not self.on_purpose:
+                        self.dispatch('STATUS', 'offline')
                         self.disconnect()
                         if gajim.config.get_per('accounts', self.name, 'autoreconnect'):
@@ -236 +241 @@
                 self.on_purpose = False
         # END disconenctedReconnCB
-        
+
         def _connection_lost(self):
                 self.disconnect(on_purpose = False)
@@ -258 +263 @@
                                         is_form = data[2]
                                         conf = data[1]
-                                        self.dispatch('NEW_ACC_CONNECTED', (conf, is_form))
+                                        if self.new_account_form:
+                                                def _on_register_result(result):
+                                                        if not common.xmpp.isResultNode(result):
+                                                                self.dispatch('ACC_NOT_OK', (result.getError()))
+                                                                return
+                                                        if USE_GPG:
+                                                                self.gpg = GnuPG.GnuPG(gajim.config.get(
+                                                                        'use_gpg_agent'))
+                                                        self.dispatch('ACC_OK', (self.new_account_info))
+                                                        self.new_account_info = None
+                                                        self.new_account_form = None
+                                                        if self.connection:
+                                                                self.connection.UnregisterDisconnectHandler(
+                                                                        self._on_new_account)
+                                                        self.disconnect(on_purpose=True)
+                                                # it's the second time we get the form, we have info user
+                                                # typed, so send them
+                                                if is_form:
+                                                        #TODO: Check if form has changed
+                                                        iq = common.xmpp.Iq('set', common.xmpp.NS_REGISTER, to=self._hostname)
+                                                        iq.setTag('query').addChild(node=self.new_account_form)
+                                                        self.connection.SendAndCallForResponse(iq,
+                                                                _on_register_result)
+                                                else:
+                                                        if self.new_account_form.keys().sort() != \
+                                                        conf.keys().sort():
+                                                                # requested config has changed since first connection
+                                                                self.dispatch('ACC_NOT_OK', (_(
+                                                                        'Server %s provided a different registration form')\
+                                                                        % data[0]))
+                                                                return
+                                                        common.xmpp.features_nb.register(self.connection,
+                                                                self._hostname, self.new_account_form,
+                                                                _on_register_result)
+                                                return
+                                        try:
+                                                errnum = self.connection.Connection.ssl_errnum
+                                        except AttributeError:
+                                                errnum = -1 # we don't have an errnum
+                                        ssl_msg = ''
+                                        if errnum > 0:
+                                                if errnum in ssl_error:
+                                                        ssl_msg = ssl_error[errnum]
+                                                else:
+                                                        ssl_msg = _('Unknown SSL error: %d') % errnum
+                                        ssl_cert = ''
+                                        if hasattr(self.connection.Connection, 'ssl_cert_pem'):
+                                                ssl_cert = self.connection.Connection.ssl_cert_pem
+                                        ssl_fingerprint = ''
+                                        if hasattr(self.connection.Connection, 'ssl_fingerprint_sha1'):
+                                                ssl_fingerprint = \
+                                                        self.connection.Connection.ssl_fingerprint_sha1
+                                        self.dispatch('NEW_ACC_CONNECTED', (conf, is_form, ssl_msg,
+                                                ssl_cert, ssl_fingerprint))
+                                        self.connection.UnregisterDisconnectHandler(
+                                                self._on_new_account)
+                                        self.disconnect(on_purpose=True)
                                         return
                                 if not data[1]: # wrong answer
@@ -478 +539 @@
                 log.debug(_('Connected to server %s:%s with %s') % (self._current_host['host'],
                         self._current_host['port'], con_type))
-                self._register_handlers(con, con_type)
 
                 name = gajim.config.get_per('accounts', self.name, 'name')
@@ -488 +548 @@
                         errnum = -1 # we don't have an errnum
                 if errnum > 0:
-                        # FIXME: tell the user that the certificat is untrusted, and ask him what to do
-                        try:
-                                log.warning("The authenticity of the "+hostname+" certificate could be unvalid.\nSSL Error: "+ssl_error[errnum])
-                        except KeyError:
-                                log.warning("Unknown SSL error: %d" % errnum)
+                        text = _('The authenticity of the %s certificate could be invalid.') %\
+                                hostname
+                        if errnum in ssl_error:
+                                text += _('\nSSL Error: %s') % ssl_error[errnum]
+                        else:
+                                text += _('\nUnknown SSL error: %d') % errnum
+                        self.dispatch('SSL_ERROR', (text, con.Connection.ssl_cert_pem,
+                                con.Connection.ssl_fingerprint_sha1))
+                        return True
+                if hasattr(con.Connection, 'ssl_fingerprint_sha1'):
+                        saved_fingerprint = gajim.config.get_per('accounts', self.name, 'ssl_fingerprint_sha1')
+                        if saved_fingerprint:
+                                # Check sha1 fingerprint
+                                if con.Connection.ssl_fingerprint_sha1 != saved_fingerprint:
+                                        self.dispatch('FINGERPRINT_ERROR',
+                                                (con.Connection.ssl_fingerprint_sha1,))
+                                        return True
+                self._register_handlers(con, con_type)
                 con.auth(name, self.password, self.server_resource, 1, self.__on_auth)
 
-                return True
+
+        def ssl_certificate_accepted(self):
+                name = gajim.config.get_per('accounts', self.name, 'name')
+                self._register_handlers(self.connection, 'ssl')
+                self.connection.auth(name, self.password, self.server_resource, 1, self.__on_auth)
 
         def _register_handlers(self, con, con_type):
@@ -529 +606 @@
                                 self.on_connect_auth = None
                 else:
-                        # Forget password if needed
-                        if not gajim.config.get_per('accounts', self.name, 'savepass'):
-                                self.password = None
+                        # Forget password, it's wrong
+                        self.password = None
                         gajim.log.debug("Couldn't authenticate to %s" % self._hostname)
                         self.disconnect(on_purpose = True)
                         self.dispatch('STATUS', 'offline')
-                        self.dispatch('ERROR', (_('Authentication failed with "%s"') % self._hostname,
+                        self.dispatch('ERROR', (_('Authentication failed with "%s"') % \
+                                self._hostname,
                                 _('Please check your login and password for correctness.')))
                         if self.on_connect_auth:
@@ -544 +621 @@
         def quit(self, kill_core):
                 if kill_core and gajim.account_is_connected(self.name):
-                        self.disconnect(on_purpose = True)
-        
+                        self.disconnect(on_purpose=True)
+
         def get_privacy_lists(self):
                 if not self.connection:
@@ -571 +648 @@
                         return
                 common.xmpp.features_nb.getActiveAndDefaultPrivacyLists(self.connection)
-        
+
         def del_privacy_list(self, privacy_list):
                 if not self.connection:
@@ -585 +662 @@
                 common.xmpp.features_nb.delPrivacyList(self.connection, privacy_list,
                         _on_del_privacy_list_result)
-        
+
         def get_privacy_list(self, title):
                 if not self.connection:
                         return
                 common.xmpp.features_nb.getPrivacyList(self.connection, title)
-        
+
         def set_privacy_list(self, listname, tags):
                 if not self.connection:
                         return
                 common.xmpp.features_nb.setPrivacyList(self.connection, listname, tags)
-        
+
         def set_active_list(self, listname):
                 if not self.connection:
@@ -605 +682 @@
                         return
                 common.xmpp.features_nb.setDefaultPrivacyList(self.connection, listname)
-        
+
         def build_privacy_rule(self, name, action):
                 '''Build a Privacy rule stanza for invisibility'''
@@ -658 +735 @@
                         #Get bookmarks from private namespace
                         self.get_bookmarks()
-                        
+
                         #Get annotations
                         self.get_annotations()
@@ -666 +743 @@
 
         def test_gpg_passphrase(self, password):
+                if not self.gpg:
+                        return False
                 self.gpg.passphrase = password
                 keyID = gajim.config.get_per('accounts', self.name, 'keyid')
@@ -672 +751 @@
                 return signed != 'BAD_PASSPHRASE'
 
-        def get_signed_msg(self, msg):
+        def get_signed_presence(self, msg, callback = None):
+                if gajim.config.get_per('accounts', self.name, 'gpg_sign_presence'):
+                        return self.get_signed_msg(msg, callback)
+                return ''
+
+        def get_signed_msg(self, msg, callback = None):
+                '''returns the signed message if possible
+                or an empty string if gpg is not used
+                or None if waiting for passphrase.
+                callback is the function to call when user give the passphrase'''
                 signed = ''
                 keyID = gajim.config.get_per('accounts', self.name, 'keyid')
-                if keyID and USE_GPG:
+                if keyID and self.gpg:
                         use_gpg_agent = gajim.config.get('use_gpg_agent')
-                        if self.connected < 2 and self.gpg.passphrase is None and \
-                                not use_gpg_agent:
+                        if self.gpg.passphrase is None and not use_gpg_agent:
                                 # We didn't set a passphrase
-                                self.dispatch('ERROR', (_('OpenPGP passphrase was not given'),
-                                        #%s is the account name here
-                                        _('You will be connected to %s without OpenPGP.') % self.name))
-                        elif self.gpg.passphrase is not None or use_gpg_agent:
+                                return None
+                        if self.gpg.passphrase is not None or use_gpg_agent:
                                 signed = self.gpg.sign(msg, keyID)
                                 if signed == 'BAD_PASSPHRASE':
+                                        self.gpg = None
                                         signed = ''
-                                        if self.connected < 2:
-                                                self.dispatch('BAD_PASSPHRASE', ())
+                                        self.dispatch('BAD_PASSPHRASE', ())
                 return signed
 
@@ -696 +781 @@
                 self.connect()
 
-        def connect_and_init(self, show, msg, signed):
-                self.continue_connect_info = [show, msg, signed]
+        def connect_and_init(self, show, msg, sign_msg):
+                self.continue_connect_info = [show, msg, sign_msg]
                 self.on_connect_auth = self._init_roster
                 self.connect_and_auth()
@@ -703 +788 @@
         def _init_roster(self, con):
                 self.connection = con
-                if self.connection:
-                        con.set_send_timeout(self.keepalives, self.send_keepalive)
-                        self.connection.onreceive(None)
-                        iq = common.xmpp.Iq('get', common.xmpp.NS_PRIVACY, xmlns = '')
-                        id = self.connection.getAnID()
-                        iq.setID(id)
-                        self.awaiting_answers[id] = (PRIVACY_ARRIVED, )
-                        self.connection.send(iq)
+                if not self.connection:
+                        return
+                self.connection.set_send_timeout(self.keepalives, self.send_keepalive)
+                self.connection.onreceive(None)
+                iq = common.xmpp.Iq('get', common.xmpp.NS_PRIVACY, xmlns = '')
+                id = self.connection.getAnID()
+                iq.setID(id)
+                self.awaiting_answers[id] = (PRIVACY_ARRIVED, )
+                self.connection.send(iq)
 
         def send_custom_status(self, show, msg, jid):
@@ -727 +813 @@
                                 p.setStatus(msg)
                 else:
-                        signed = self.get_signed_msg(msg)
+                        signed = self.get_signed_presence(msg)
                         priority = unicode(gajim.get_priority(self.name, sshow))
                         p = common.xmpp.Presence(typ = None, priority = priority, show = sshow,
@@ -745 +831 @@
                         msg = ''
                 keyID = gajim.config.get_per('accounts', self.name, 'keyid')
-                signed = ''
+                sign_msg = False
                 if not auto and not show == 'offline':
-                        signed = self.get_signed_msg(msg)
+                        sign_msg = True
                 self.status = msg
                 if show != 'offline' and not self.connected:
@@ -753 +839 @@
                         # recconect before we auth to server
                         self.old_show = show
-                        self.on_purpose = False 
+                        self.on_purpose = False
                         self.server_resource = gajim.config.get_per('accounts', self.name,
                                 'resource')
@@ -762 +848 @@
                                                 'hostname': socket.gethostname()
                                         })
-                        self.connect_and_init(show, msg, signed)
+                        if USE_GPG:
+                                self.gpg = GnuPG.GnuPG(gajim.config.get('use_gpg_agent'))
+                        self.connect_and_init(show, msg, sign_msg)
 
                 elif show == 'offline':
@@ -786 +874 @@
                         self.connected = STATUS_LIST.index(show)
                         if show == 'invisible':
+                                signed = self.get_signed_presence(msg)
                                 self.send_invisible_presence(msg, signed)
                                 return
@@ -797 +886 @@
                         if msg:
                                 p.setStatus(msg)
+                        signed = self.get_signed_presence(msg)
                         if signed:
                                 p.setTag(common.xmpp.NS_SIGNED + ' x').setData(signed)
@@ -821 +911 @@
                 self.connection.send(msg_iq)
 
-        def send_message(self, jid, msg, keyID, type = 'chat', subject='',
-        chatstate = None, msg_id = None, composing_xep = None, resource = None,
-        user_nick = None, xhtml = None, forward_from = None):
+        def send_message(self, jid, msg, keyID, type='chat', subject='',
+        chatstate=None, msg_id=None, composing_xep=None, resource=None,
+        user_nick=None, xhtml=None, session=None, forward_from=None, form_node=None):
                 if not self.connection:
                         return 1
                 if msg and not xhtml and gajim.config.get('rst_formatting_outgoing_messages'):
                         xhtml = create_xhtml(msg)
-                if not msg and chatstate is None:
+                if not msg and chatstate is None and form_node is None:
   &