Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-10-14 17:59:29 +02:00
Code Issues Projects Releases Wiki Activity

Socket: drop SSL-related logging from critical to warning / error, and fix spacing

Browse Source
This commit is contained in:
James Lu 2016-02-22 07:09:56 -08:00
parent a7096f8b3e
commit aee7ac3583
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/drivers/Socket.py
View File

@ -280,7 +280,7 @@ class SocketDriver(drivers.IrcDriver, drivers.ServersMixin):
if network_config.ssl(): if network_config.ssl():
self.starttls() self.starttls()
elif not network_config.requireStarttls(): elif not network_config.requireStarttls():
drivers.log.critical(('Connection to network %s' drivers.log.warning(('Connection to network %s '
'does not use SSL/TLS, which makes it vulnerable to ' 'does not use SSL/TLS, which makes it vulnerable to '
'man-in-the-middle attacks and passive eavesdropping. ' 'man-in-the-middle attacks and passive eavesdropping. '
'You should consider upgrading your connection to SSL/TLS ' 'You should consider upgrading your connection to SSL/TLS '
@ -375,7 +375,7 @@ class SocketDriver(drivers.IrcDriver, drivers.ServersMixin):
trusted_fingerprints=network_config.ssl.serverFingerprints(), trusted_fingerprints=network_config.ssl.serverFingerprints(),
) )
except ssl.CertificateError as e: except ssl.CertificateError as e:
drivers.log.critical(('Certificate validation failed when ' drivers.log.error(('Certificate validation failed when '
'connecting to %s: %s\n' 'connecting to %s: %s\n'
'This means someone is doing a man-in-the-middle attack ' 'This means someone is doing a man-in-the-middle attack '
'on your connection, or the server\'s certificate is ' 'on your connection, or the server\'s certificate is '
@ -384,7 +384,7 @@ class SocketDriver(drivers.IrcDriver, drivers.ServersMixin):
raise ssl.SSLError('Aborting because of failed certificate ' raise ssl.SSLError('Aborting because of failed certificate '
'verification.') 'verification.')
except ssl.SSLError as e: except ssl.SSLError as e:
drivers.log.critical(('Certificate validation failed when ' drivers.log.error(('Certificate validation failed when '
'connecting to %s: %s\n' 'connecting to %s: %s\n'
'This means someone is doing a man-in-the-middle attack ' 'This means someone is doing a man-in-the-middle attack '
'on your connection, or because the server\'s ' 'on your connection, or because the server\'s '