From ad9470ed58f5d775608edbbba95f9b8d33514280 Mon Sep 17 00:00:00 2001 From: merspieler Date: Thu, 15 Mar 2018 11:52:32 +0100 Subject: [PATCH] Fixed ssl useage Signed-off-by: merspieler --- __init__.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/__init__.py b/__init__.py index 4c21ed5..cd1f8cc 100644 --- a/__init__.py +++ b/__init__.py @@ -241,22 +241,14 @@ class IRCSkill(MycroftSkill): self.speak("Please connect to a server and join a channel first") def _irc_connect(self, server, port, ssl_req, server_password, user, password): - if ssl_req: - if self.settings['debug']: - self.speak("Use SSL") - irc_C = socket.socket(socket.AF_INET, socket.SOCK_STREAM) #defines the socket - irc = ssl.wrap_socket(irc_C, cert_reqs=ssl.CERT_NONE) - else: - if self.settings['debug']: - self.speak("Connect without ssl") - irc = socket.socket(socket.AF_INET, socket.SOCK_STREAM) #defines the socket + irc = socket.socket(socket.AF_INET, socket.SOCK_STREAM) #defines the socket # Connect try: if self.settings['debug']: self.speak("Server: " + server) self.speak("Port: " + str(port)) - irc.settimeout(60) + irc.settimeout(15) irc.connect((server, port)) except Exception as e: self.speak("Unable to connect to server.") @@ -264,6 +256,11 @@ class IRCSkill(MycroftSkill): self.speak("Error: " + str(e)) return False, irc + if ssl_req: + if self.settings['debug']: + self.speak("Use SSL") + irc = ssl.wrap_socket(irc) + irc.setblocking(0) if server_password != "": irc.send("PASS %s\n" % (password))