Commit Graph

67 Commits

Author SHA1 Message Date
Michel Oosterhof
8ef41d6d23 typo fix 2015-04-30 20:34:38 +00:00
Michel Oosterhof
0b4d67a75b fix bad indentation 2015-04-30 16:24:31 +00:00
Michel Oosterhof
2dc1c773e9 remove trailing whitespace 2015-04-30 16:22:15 +00:00
Michel Oosterhof
39309ac870 remove unused imports 2015-04-30 16:02:34 +00:00
Michel Oosterhof
5aa81d77d8 fix pylint bad-whitespace warnings 2015-04-30 15:57:16 +00:00
Michel Oosterhof
0e0784fc3d working for Poderosa, openssh and PuTTY 2015-04-18 22:32:37 +00:00
Michel Oosterhof
6f6d81fd66 Fix for https://github.com/micheloosterhof/kippo/issues/32 2015-04-18 14:05:07 +00:00
Michel Oosterhof
40e654017e fix https://github.com/micheloosterhof/kippo/issues/31 2015-04-17 09:10:28 +00:00
Michel Oosterhof
5099f50872 store env var request and put in json log 2015-04-16 14:23:31 +00:00
Michel Oosterhof
82a1f12937 replacing fstat call with stat 2015-04-10 07:33:18 +00:00
Michel Oosterhof
347056a03d after commands, close channel, don't kill session directly 2015-03-31 12:11:50 +00:00
honigbij
db22e63bc3 Use self.transport.transport instead of self.transport 2015-03-19 10:24:48 +01:00
honigbij
cb1ba514a6 Also set src_ip directly in auth_password 2015-03-18 19:03:09 +01:00
HonigBij
b2794b1aed formatting 2015-03-18 15:47:09 +01:00
HonigBij
2957d00bd8 Retrieve client IP address (src_ip) directly in HoneyPotSSHUserAuthServer 2015-03-18 15:44:13 +01:00
HonigBij
4c78039143 Additions for IP address in credentials 2015-03-17 23:02:22 +01:00
Michel Oosterhof
f39e5d6491 stop logging exec cmd, already logged before 2015-03-11 15:33:09 +00:00
Michel Oosterhof
8733cca515 updates to logging to fix race condition 2015-03-11 13:46:14 +00:00
Michel Oosterhof
60932db100 update lastlog based on shell close, not on transport close
also don't keep lastlog for exec commands, as unix does
2015-03-11 12:45:03 +00:00
Michel Oosterhof
613e277832 correct newlines onissue file. also doesn't need ^M. 2015-03-10 14:10:08 +00:00
Michel Oosterhof
85b3f0dcbf Merge branch 'master' into output-plugin 2015-03-10 09:22:12 +00:00
Michel Oosterhof
f1bcd95bf2 updated exception syntax 2015-02-26 11:46:55 +00:00
Michel Oosterhof
2dd5910889 basics working 2015-02-25 19:27:15 +00:00
Michel Oosterhof
d4d3bdbe0e Merge branch 'master' into output-plugin
Conflicts:
	kippo/core/ssh.py
2015-02-25 17:59:41 +00:00
Michel Oosterhof
9e3ef8ffd6 Merge branch 'master' into logging-2
Conflicts:
	kippo/core/protocol.py
	kippo/core/ssh.py
2015-02-20 09:19:06 +00:00
Michel Oosterhof
c8824e94d8 ttylog handling is done from logtransport only now.
reliably call logtransport on disconnect
2015-02-19 19:47:40 +00:00
Michel Oosterhof
f6cff3216a wip 2015-02-19 14:10:37 +00:00
Michel Oosterhof
5a885c4f00 Merge branch 'master' of https://github.com/micheloosterhof/kippo into logging-2
Conflicts:
	kippo/core/auth.py
	kippo/core/dblog.py
	kippo/core/ssh.py
	kippo/dblog/jsonlog.py
2015-02-19 12:36:26 +00:00
Michel Oosterhof
d4a562a55a they're instance variables, not class variables 2015-02-19 12:27:30 +00:00
Michel Oosterhof
687870c45c use relative style imports instead of absolute paths 2015-02-19 12:01:07 +00:00
Michel Oosterhof
a9feff2741 whitespace 2015-02-19 05:48:57 +00:00
Michel Oosterhof
09146d7d75 also log dispatch 2015-02-18 14:22:55 +00:00
Michel Oosterhof
cfd09dcdfb output plugins wip 2015-02-18 14:22:16 +00:00
Michel Oosterhof
41dc0d0ca4 better exception handling moduli file 2015-02-18 13:28:24 +00:00
Michel Oosterhof
25466f1df0 consistent sessionno var name use. now works with wget 2015-02-10 09:36:43 +00:00
Michel Oosterhof
e12b76b206 formatted log messages. not completely working yet withdispach 2015-02-03 16:18:26 +00:00
Michel Oosterhof
dfc6174122 dblog : work in progress : formatted log messages 2015-02-03 10:50:21 +00:00
Michel Oosterhof
8546df235d banner_file is now '/etc/issue.net' in honeyfs by default
add default Debian motd file
2015-02-01 07:47:08 +00:00
Michel Oosterhof
d2915488d4 Always send an exit-status '0' for the SSH session. 2015-01-27 06:42:04 +00:00
Michel Oosterhof
b05ceac704 log full protocol exchange details. to fingerprint clients 2015-01-21 09:53:06 +00:00
Michel Oosterhof
5286a8e85b Fix kippo sandbox detecting, taken from
https://code.google.com/p/honssh/source/detail?r=10ffd2ccf076305af2d5eba8a0aa0317b0d9e7ec
thanks to Thomas Nicholson
2015-01-21 08:48:32 +00:00
Michel Oosterhof
9e47327216 indenting && add logging of input for direct-tcpip 2014-12-17 09:54:27 +00:00
Michel Oosterhof
cb74f2f3ca use short 8 character uuid for log/ttylog 2014-11-28 17:08:23 +00:00
Michel Oosterhof
92222f5d41 comment fix 2014-11-28 16:49:52 +00:00
Michel Oosterhof
981e4b1b3c updated changelog/ fix for sftp issue 2014-11-13 07:01:02 +00:00
Michel Oosterhof
b4902823e8 Merge branch 'master' of https://github.com/micheloosterhof/kippo 2014-11-12 13:19:21 +04:00
raphaj
0d2ae7153a fix import copy bug 2014-11-11 22:03:00 +01:00
Michel Oosterhof
f480b985d3 cosmetic changes to imports 2014-11-11 21:27:06 +04:00
Michel Oosterhof
79ac8ca29f move hostname setting to avatar. general direction to move settings to avatar 2014-11-11 20:56:52 +04:00
Michel Oosterhof
6cf639af74 fix copy imports 2014-11-09 17:19:27 +00:00