From 43471dcf035240d7fc2698c0ea7139af0dd72fe1 Mon Sep 17 00:00:00 2001 From: Ryan Schmidt Date: Fri, 13 Jul 2018 22:34:05 -0700 Subject: [PATCH] Redact passwords that we send to NickServ from logs We redacted PASS and SASL but neglected to redact messages to NickServ. whoops. --- oyoyo/client.py | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/oyoyo/client.py b/oyoyo/client.py index 9beba0e..9b7be61 100644 --- a/oyoyo/client.py +++ b/oyoyo/client.py @@ -353,16 +353,28 @@ class IRCClient: self.send("WHO {0}".format(" ".join(args))) def ns_identify(self, account, passwd, nickserv, command): if command: - self.msg(nickserv, command.format(account=account, password=passwd)) + cmdtext = command.format(account=account, password=passwd) + logtext = command.format(account=account, password="[redacted]") + msg = "PRIVMSG {0} :{1}" + self.send(msg.format(nickserv, cmdtext), log=msg.format(nickserv, logtext)) def ns_ghost(self, nick, password, nickserv, command): if command: - self.msg(nickserv, command.format(nick=nick, password=password)) + cmdtext = command.format(nick=nick, password=passwd) + logtext = command.format(nick=nick, password="[redacted]") + msg = "PRIVMSG {0} :{1}" + self.send(msg.format(nickserv, cmdtext), log=msg.format(nickserv, logtext)) def ns_release(self, nick, password, nickserv="NickServ", command="RELEASE {nick}"): if command: - self.msg(nickserv, command.format(nick=nick, password=password)) + cmdtext = command.format(nick=nick, password=passwd) + logtext = command.format(nick=nick, password="[redacted]") + msg = "PRIVMSG {0} :{1}" + self.send(msg.format(nickserv, cmdtext), log=msg.format(nickserv, logtext)) def ns_regain(self, nick, password, nickserv="NickServ", command="REGAIN {nick}"): if command: - self.msg(nickserv, command.format(nick=nick, password=password)) + cmdtext = command.format(nick=nick, password=passwd) + logtext = command.format(nick=nick, password="[redacted]") + msg = "PRIVMSG {0} :{1}" + self.send(msg.format(nickserv, cmdtext), log=msg.format(nickserv, logtext)) def user(self, ident, rname): self.send("USER", ident, self.host, self.host, ":{0}".format(rname or ident)) def mainLoop(self):