Rooba
/
cowrie
mirror of https://github.com/cowrie/cowrie.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/micheloosterhof/kippo

This commit is contained in:
Michel Oosterhof 2015-02-19 11:47:01 +00:00
parent 63de6893c8 4c1ddf154d
commit dd2ee20a90
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kippo/core/auth.py
View File

@ -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:

4
kippo/core/dblog.py
View File

@ -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<username>.*)/(?P<password>.*)\] failed',
('^login attempt \[(?P<username>.*)\]/\[(?P<password>.*)\] failed',
self.handleLoginFailed),
('^login attempt \[(?P<username>.*)/(?P<password>.*)\] succeeded',
('^login attempt \[(?P<username>.*)\]/\[(?P<password>.*)\] succeeded',
self.handleLoginSucceeded),
('^Opening TTY log: (?P<logfile>.*)$',
self.handleTTYLogOpened),