Commit Graph

137 Commits

Author SHA1 Message Date
Michel Oosterhof 8e8882c5c1 redo imports 2014-12-09 13:50:22 +04:00
Michel Oosterhof 2e9a3ac1d7 disable password authentication method. This leaves keyboard-interactive available 2014-12-09 13:25:31 +04:00
Michel Oosterhof a3f3866f9e remove unused imports 2014-12-07 17:56:38 +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 6b07bb2784 update comments in publickey function 2014-11-12 15:47:41 +04:00
Michel Oosterhof 5bd541d677 accept and log and fail publickey authentication 2014-11-12 15:04:21 +04: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 0fa0825231 rename 'honeypot' parameter to 'protocol', the conch term 2014-11-11 21:21:18 +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
Michel Oosterhof d3bfeca331 fix copy imports 2014-11-09 17:33:29 +04:00
Michel Oosterhof ad91243658 move fscopy out of sftp/protocol into avatar. rename user to avatar 2014-11-09 17:28:06 +04:00
Michel Oosterhof 4cfa58e73d support additional emacs ctrl keys (c-a, c-b, c-f, c-p, c-n, c-e) 2014-11-09 16:26:09 +04:00
Michel Oosterhof 376015c6b0 catch and log full X11 request and catch agent requests. 2014-11-05 11:34:56 +04:00
Michel Oosterhof 3b79c6e861 friendly logging of request_env 2014-11-05 11:10:16 +04:00
Michel Oosterhof 8b8651822f check for existence of /etc/ssh/moduli before using it 2014-11-05 10:43:39 +04:00
Michel Oosterhof bd557ade12 better logging direct-tcp, shuffle imports. 2014-11-04 14:16:35 +00:00
Michel Oosterhof 7aa3505adc we need the full re.split for the field limitation 2014-11-02 08:51:52 +00:00
Michel Oosterhof 091197d92a split on && and newline 2014-10-31 11:59:23 +00:00
Michel Oosterhof 6c0695ea4c move from implements to @implementer 2014-10-05 21:15:14 +00:00
Michel Oosterhof c4efff1283 add imports for logging, disable logging from fs.py 2014-10-05 21:02:24 +00:00
Michel Oosterhof 4ace22db76 convert all 'print' calls to 'log.msg' 2014-10-05 20:54:14 +00:00
Michel Oosterhof e75fed058f only log stdin to separate file when using execcmd 2014-10-04 13:15:06 +00:00
Michel Oosterhof 27304ba9d8 log keystrokes in loggingserver, not in protocol 2014-10-04 12:53:40 +00:00
Michel Oosterhof c01ef07be1 log stdin when 2014-10-04 12:43:24 +00:00
Michel Oosterhof a3503afc71 Merge branch 'diffie-hellman-group-exchange-sha1' 2014-10-04 11:03:15 +00:00
Michel Oosterhof 721cb7ce8d import primes function 2014-10-04 11:02:50 +00:00
Michel Oosterhof 8d95f15202 reorder cipher negotiation to resemble current openssh more 2014-10-04 10:57:19 +00:00
Michel Oosterhof fd4ca2bcf6 load module for diffie-hellman-group-exchange-sha1 2014-10-04 10:53:55 +00:00
Michel Oosterhof c93b2ab586 Merge branch 'direct-tcpip' of https://github.com/micheloosterhof/kippo 2014-09-25 07:28:06 +00:00
Michel Oosterhof 44c6fba349 add logging for direct-tcpip connections 2014-08-20 15:24:43 +02:00
Michel Oosterhof c83fd45c87 less verbose logging 2014-08-18 15:14:50 +02:00
Michel Oosterhof 1b1f4c4882 less verbose logging at fs level. working imports 2014-08-18 14:53:15 +02:00
Michel Oosterhof c529cb1f84 sftp protocol support 2014-08-18 14:35:35 +02:00
Michel Oosterhof 46fc2d3cc7 file system functions to enable sftp support. 2014-08-18 14:29:15 +02:00
Upi Tamminen b321ef1098 quick fixes:
- txtcmd broken since HoneyPotCommand wasn't found (fixes #147)
- tab completion broken since os wasn't imported
2014-08-13 08:19:51 +03:00
Upi Tamminen dbf0ca7a48 call getPeer() from another transport, fixes #146 2014-08-12 20:21:55 +03:00
Upi Tamminen c3c09adb02 restructuring and cleanup 2014-08-09 23:55:20 +03:00
Upi Tamminen 6c8596930e change exec handling so the command is allowed to run long enough for wget to
work
2014-08-09 19:19:05 +03:00
Upi Tamminen e1e3acb850 we don't need recvline.HistoricRecvLine for execCommand,
so branch off the protocol into two protocols
2014-08-09 18:29:17 +03:00
Upi Tamminen 641c08cf7c code style changes 2014-08-09 15:48:33 +03:00
Upi Tamminen 4e8ad9c92c Merge branch 'pr/111' into review-pr-111
Conflicts:
	kippo.cfg.dist
	kippo/core/honeypot.py
2014-08-09 15:37:58 +03:00
Upi Tamminen 14fd2fec32 cleanup key generation 2014-08-09 15:20:10 +03:00
Upi Tamminen 6e6a8aa4c1 [i] does not generally mean anything in kippo 2014-08-09 15:01:58 +03:00
Upi Tamminen baeda78839 Merge branch 'pr/108' into review-pr-108 2014-08-09 15:00:38 +03:00
desaster acbb5dbb3c Merge pull request #96 from g0tmi1k/protocolmismatch
Fix "protocol mismatch" issue
2014-08-09 13:52:13 +03:00