diff --git a/kippo/core/auth.py b/kippo/core/auth.py index 3bb2a79a..19e587de 100644 --- a/kippo/core/auth.py +++ b/kippo/core/auth.py @@ -158,10 +158,10 @@ class HoneypotPasswordChecker: def checkUserPass(self, username, password): if UserDB().checklogin(username, password): - log.msg( 'login attempt [%s/%s] succeeded' % (username, password) ) + log.msg( 'login attempt [%s]/[%s] succeeded' % (username, password) ) return True else: - log.msg( 'login attempt [%s/%s] failed' % (username, password) ) + log.msg( 'login attempt [%s]/[%s] failed' % (username, password) ) return False # vim: set sw=4 et: diff --git a/kippo/core/dblog.py b/kippo/core/dblog.py index 7908618c..b1aa54d1 100644 --- a/kippo/core/dblog.py +++ b/kippo/core/dblog.py @@ -21,9 +21,9 @@ class DBLogger(object): self.re_map = [(re.compile(x[0]), x[1]) for x in ( ('^connection lost$', self._connectionLost), - ('^login attempt \[(?P.*)/(?P.*)\] failed', + ('^login attempt \[(?P.*)\]/\[(?P.*)\] failed', self.handleLoginFailed), - ('^login attempt \[(?P.*)/(?P.*)\] succeeded', + ('^login attempt \[(?P.*)\]/\[(?P.*)\] succeeded', self.handleLoginSucceeded), ('^Opening TTY log: (?P.*)$', self.handleTTYLogOpened),