pew
/
phenny
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use new python 3.4 TLS features if possible

master
mutantmonkey 2014-06-01 18:26:00 -07:00
parent 9b05dccf28
commit 0fe637c11e
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
irc.py
View File

@ -85,7 +85,7 @@ class Bot(asynchat.async_chat):
#pass #pass
def run(self, host, port=6667, ssl=False, def run(self, host, port=6667, ssl=False,
ipv6=False, ca_certs='/etc/ssl/certs/ca-certificates.crt'): ipv6=False, ca_certs=None):
self.ca_certs = ca_certs self.ca_certs = ca_certs
self.initiate_connect(host, port, ssl, ipv6) self.initiate_connect(host, port, ssl, ipv6)
@ -97,20 +97,26 @@ class Bot(asynchat.async_chat):
af = socket.AF_INET6 af = socket.AF_INET6
else: else:
af = socket.AF_INET af = socket.AF_INET
self.create_socket(af, socket.SOCK_STREAM, use_ssl) self.create_socket(af, socket.SOCK_STREAM, use_ssl, host)
self.connect((host, port)) self.connect((host, port))
try: asyncore.loop() try: asyncore.loop()
except KeyboardInterrupt: except KeyboardInterrupt:
sys.exit() sys.exit()
def create_socket(self, family, type, use_ssl=False): def create_socket(self, family, type, use_ssl=False, hostname=None):
self.family_and_type = family, type self.family_and_type = family, type
sock = socket.socket(family, type) sock = socket.socket(family, type)
if use_ssl: if use_ssl:
sock = ssl.wrap_socket(sock, ssl_version=ssl.PROTOCOL_TLSv1, # this stuff is all new in python 3.4, so fallback if needed
cert_reqs=ssl.CERT_OPTIONAL, ca_certs=self.ca_certs) try:
# FIXME: ssl module does not appear to work properly with nonblocking sockets context = ssl.create_default_context(
#sock.setblocking(0) purpose=ssl.Purpose.SERVER_AUTH,
cafile=self.ca_certs)
sock = context.wrap_socket(sock, server_hostname=hostname)
except:
sock = ssl.wrap_socket(sock, ssl_version=ssl.PROTOCOL_TLSv1,
cert_reqs=ssl.CERT_OPTIONAL, ca_certs=self.ca_certs)
sock.setblocking(False)
self.set_socket(sock) self.set_socket(sock)
def handle_connect(self): def handle_connect(self):