copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move fingerprint check into its own function.

This commit is contained in:
junglecow 2006-12-27 23:25:32 +00:00
parent c16642c838
commit cf291c3c2f
1 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/common/connection.py
View File

@ -434,12 +434,39 @@ class Connection(ConnectionHandlers):
resource = gajim.config.get_per('accounts', self.name, 'resource') resource = gajim.config.get_per('accounts', self.name, 'resource')
self.connection = con self.connection = con
fpr_good = self._check_fingerprint(con, con_type)
if fpr_good == False:
log.error(_("Fingerprint mismatch for %s: Got %s, expected %s"), hostname, got, expected)
self.disconnect(on_purpose = True)
self.dispatch('STATUS', 'offline')
self.dispatch('CONNECTION_LOST',
(_('Security error connecting to "%s"') % self._hostname,
_("The server's key has changed, or someone is trying to hack your connection.")))
if self.on_connect_auth:
self.on_connect_auth(None)
self.on_connect_auth = None
return
if fpr_good == None:
log.warning(_("No fingerprint in database for %s. Connection could be insecure."), hostname)
if fpr_good == True:
log.info("Fingerprint found and matched for %s.", hostname)
con.auth(name, self.password, resource, 1, self.__on_auth)
return True
def _check_fingerprint(self, con, con_type):
fpr_good = None # None: No fpr in database, False: mismatch, True: match
# FIXME: find a more permanent place for loading servers.xml # FIXME: find a more permanent place for loading servers.xml
servers_xml = os.path.join(gajim.DATA_DIR, 'other', 'servers.xml') servers_xml = os.path.join(gajim.DATA_DIR, 'other', 'servers.xml')
servers = gtkgui_helpers.parse_server_xml(servers_xml) servers = gtkgui_helpers.parse_server_xml(servers_xml)
servers = dict(map(lambda e: (e[0], e), servers)) servers = dict(map(lambda e: (e[0], e), servers))
fpr_good = None # None: No fpr in database, False: mismatch, True: match hostname = gajim.config.get_per('accounts', self.name, 'hostname')
try: try:
log.debug("con: %s", con) log.debug("con: %s", con)
log.debug("con.Connection: %s", con.Connection) log.debug("con.Connection: %s", con.Connection)
@ -465,27 +492,7 @@ class Connection(ConnectionHandlers):
else: else:
log.debug("Connection to %s doesn't seem to have a fingerprint:", hostname, exc_info=True) log.debug("Connection to %s doesn't seem to have a fingerprint:", hostname, exc_info=True)
if fpr_good == False: return fpr_good
log.error(_("Fingerprint mismatch for %s: Got %s, expected %s"), hostname, got, expected)
self.disconnect(on_purpose = True)
self.dispatch('STATUS', 'offline')
self.dispatch('CONNECTION_LOST',
(_('Security error connecting to "%s"') % self._hostname,
_("The server's key has changed, or someone is trying to hack your connection.")))
if self.on_connect_auth:
self.on_connect_auth(None)
self.on_connect_auth = None
return
if fpr_good == None:
log.warning(_("No fingerprint in database for %s. Connection could be insecure."), hostname)
if fpr_good == True:
log.info("Fingerprint found and matched for %s.", hostname)
con.auth(name, self.password, resource, 1, self.__on_auth)
return True
def _register_handlers(self, con, con_type): def _register_handlers(self, con, con_type):
self.peerhost = con.get_peerhost() self.peerhost = con.get_peerhost()