Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-12-28 05:32:51 +01:00
Code Issues Projects Releases Wiki Activity

Add SSL support for Socket driver

Browse Source
This commit is contained in:
Valentin Lorentz 2010-12-09 19:33:35 +01:00
parent c5974046c6
commit 96ea659030
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/drivers/Socket.py
View File

@ -37,6 +37,10 @@ from __future__ import division
import time
import select
import socket
try:
import ssl
except:
pass
import supybot.log as log
import supybot.conf as conf
@ -61,10 +65,11 @@ class SocketDriver(drivers.IrcDriver, drivers.ServersMixin):
self.writeCheckTime = None
self.nextReconnectTime = None
self.resetDelay()
# Only connect to non-SSL servers
if self.networkGroup.get('ssl').value:
if self.networkGroup.get('ssl').value and not globals().has_key('ssl'):
drivers.log.error('The Socket driver can not connect to SSL '
'servers. Try the Twisted driver instead.')
'servers for your Python version. Try the '
'Twisted driver instead, or install a Python'
'version that supports SSL (2.6 and greater).')
else:
self.connect()
@ -139,6 +144,12 @@ class SocketDriver(drivers.IrcDriver, drivers.ServersMixin):
self.irc.feedMsg(msg)
except socket.timeout:
pass
except ssl.SSLError as e:
if e.args[0] == 'The read operation timed out':
pass
else:
self._handleSocketError(e)
return
except socket.error, e:
self._handleSocketError(e)
return
@ -175,6 +186,9 @@ class SocketDriver(drivers.IrcDriver, drivers.ServersMixin):
try:
self.conn.connect(server)
self.conn.settimeout(conf.supybot.drivers.poll())
if getattr(conf.supybot.networks, self.irc.network).ssl():
assert globals().has_key('ssl')
self.conn = ssl.wrap_socket(self.conn)
self.connected = True
self.resetDelay()
except socket.error, e: