GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2025-01-25 19:54:25 +01:00
Code Issues Projects Releases Wiki Activity

clientbot: require SSL for SASL external, better grammar in SASL misconfiguration errors

Browse Source
This commit is contained in:
James Lu 2016-12-17 15:47:15 -08:00
parent a6b889c469
commit 9cc817d544
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
protocols/clientbot.py
View File

@ -417,20 +417,25 @@ class ClientbotWrapperProtocol(Protocol):
return return
sasl_mech = self.irc.serverdata.get('sasl_mech') sasl_mech = self.irc.serverdata.get('sasl_mech')
sasl_user = self.irc.serverdata.get('sasl_username') if sasl_mech:
ssl_cert = self.irc.serverdata.get('ssl_certfile') sasl_user = self.irc.serverdata.get('sasl_username')
ssl_key = self.irc.serverdata.get('ssl_keyfile')
if sasl_user and sasl_mech:
sasl_pass = self.irc.serverdata.get('sasl_password') sasl_pass = self.irc.serverdata.get('sasl_password')
ssl_cert = self.irc.serverdata.get('ssl_certfile')
ssl_key = self.irc.serverdata.get('ssl_keyfile')
ssl = self.irc.serverdata.get('ssl')
if sasl_mech == 'PLAIN' and not (sasl_user and sasl_pass): if sasl_mech == 'PLAIN' and not (sasl_user and sasl_pass):
log.warning("(%s) Not attempting PLAIN authentication; either sasl_username or " log.warning("(%s) Not attempting PLAIN authentication; sasl_username and/or "
"sasl_password aren't correctly set.", self.irc.name) "sasl_password aren't correctly set.", self.irc.name)
return False return False
elif sasl_mech == 'EXTERNAL' and not (ssl_cert and ssl_key): elif sasl_mech == 'EXTERNAL' and not (ssl_cert and ssl_key):
log.warning("(%s) Not attempting EXTERNAL authentication; either ssl_certfile or " log.warning("(%s) Not attempting EXTERNAL authentication; ssl_certfile and/or "
"ssl_keyfile aren't correctly set.", self.irc.name) "ssl_keyfile aren't correctly set.", self.irc.name)
return False return False
elif sasl_mech == 'EXTERNAL' and not ssl:
log.warning("(%s) Not attempting EXTERNAL authentication; SASL external requires "
"SSL, but it isn't enabled.", self.irc.name)
return False
self.irc.send('AUTHENTICATE %s' % sasl_mech, queue=False) self.irc.send('AUTHENTICATE %s' % sasl_mech, queue=False)
return True return True
return False return False