Commit Graph

307 Commits

Author SHA1 Message Date
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 9b8f3d02ca improved ip address regex match in ping 2014-10-05 08:31:26 +00:00
Michel Oosterhof 548a32e935 add changelog message on non-port-80 wget 2014-10-05 08:25:57 +00:00
Michel Oosterhof c9c1792456 remove non-port 80 restriction 2014-10-05 06:43:48 +00:00
Michel Oosterhof 1c1a4e7c2b local changes 2014-10-04 19:38:23 +00:00
Michel Oosterhof c6e495ec20 clearer doc, reverse default behavior to disable exi tjail 2014-10-04 19:33:43 +00:00
Michel Oosterhof 9d5930e109 Fix timestamp issue when gen'ing fs (Issue #83) 2014-10-04 19:22:27 +00:00
Michel Oosterhof 3fbf21dc5c Merge branch 'exitjail' of https://github.com/g0tmi1k/kippo 2014-10-04 19:19: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 6e52ae2ed6 Merge branch 'sftp-support' of https://github.com/micheloosterhof/kippo 2014-09-25 07:23:43 +00:00
Michel Oosterhof 9a5aa847e4 Merge remote-tracking branch 'upstream/master' 2014-09-25 07:21:28 +00:00
desaster 9bce85cbe9 Merge pull request #155 from andrewmichaelsmith/patch-1
Make MakingKippoReachable link work
2014-09-15 18:49:36 +03:00
Andrew Smith 4af57e8bef Make MakingKippoReachable link work 2014-09-14 09:27:51 +01: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
Michel Oosterhof ee68da8664 sftp option added 2014-08-18 14:25:10 +02:00
Michel Oosterhof 70c3d0ac0a make stop.sh executable 2014-08-18 14:18:31 +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 224f104dc5 add virtualenv support to start.sh 2014-08-11 20:39:26 +03:00
Upi Tamminen 355282dac8 add .gitignore based on ikoniaris' pull request #135 2014-08-09 23:57:47 +03:00
Upi Tamminen c3c09adb02 restructuring and cleanup 2014-08-09 23:55:20 +03:00
Upi Tamminen 72a6118849 remove obsolete config entry 2014-08-09 19:19:50 +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 9bd02f780c when using execCommand, ls breaks without windowSize 2014-08-09 15:39:47 +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
Upi Tamminen a0b1f2a138 add bash -c (Closes #104) 2014-08-09 14:49:00 +03:00
desaster acbb5dbb3c Merge pull request #96 from g0tmi1k/protocolmismatch
Fix "protocol mismatch" issue
2014-08-09 13:52:13 +03:00
desaster 5174a7870a Merge pull request #137 from katkad/enhancements
Added several commands
2014-08-01 08:26:56 +03:00
Katarina Durechova 28089ce81e Add php 2014-07-30 17:25:46 +01:00
Katarina Durechova e6ffb9b5fc Add simple free command 2014-07-30 17:25:46 +01:00
Katarina Durechova 9292a1ff19 Add simple killall 2014-07-30 17:25:44 +01:00
Katarina Durechova 23437c08ee Add perl 2014-07-30 17:20:05 +01:00