Commit Graph

2966 Commits

Author SHA1 Message Date
41bc8b65e4 Switch from uuid1 to uuid4. uuid4 does not leak ip address 2014-11-04 10:42:08 +00:00
818c5c16d4 put file logs in log directory by default, changelog update 2014-11-04 10:37:38 +00:00
43b915f68e added simple unstructured JSON logging 2014-11-04 10:31:26 +00:00
7aa3505adc we need the full re.split for the field limitation 2014-11-02 08:51:52 +00:00
091197d92a split on && and newline 2014-10-31 11:59:23 +00:00
806dfa194d add support for '-c' option. option has no effect 2014-10-26 07:38:20 +00:00
72518cd662 Version 7.0 -> 7 to match real Debian 2014-10-11 11:51:35 +00:00
636b31cd27 last log import 2014-10-05 21:20:06 +00:00
d61ed77be4 more twisted.python.log imports 2014-10-05 21:16:10 +00:00
6c0695ea4c move from implements to @implementer 2014-10-05 21:15:14 +00:00
c4efff1283 add imports for logging, disable logging from fs.py 2014-10-05 21:02:24 +00:00
4ace22db76 convert all 'print' calls to 'log.msg' 2014-10-05 20:54:14 +00:00
9b8f3d02ca improved ip address regex match in ping 2014-10-05 08:31:26 +00:00
548a32e935 add changelog message on non-port-80 wget 2014-10-05 08:25:57 +00:00
c9c1792456 remove non-port 80 restriction 2014-10-05 06:43:48 +00:00
1c1a4e7c2b local changes 2014-10-04 19:38:23 +00:00
c6e495ec20 clearer doc, reverse default behavior to disable exi tjail 2014-10-04 19:33:43 +00:00
9d5930e109 Fix timestamp issue when gen'ing fs (Issue #83) 2014-10-04 19:22:27 +00:00
3fbf21dc5c Merge branch 'exitjail' of https://github.com/g0tmi1k/kippo 2014-10-04 19:19:14 +00:00
e75fed058f only log stdin to separate file when using execcmd 2014-10-04 13:15:06 +00:00
27304ba9d8 log keystrokes in loggingserver, not in protocol 2014-10-04 12:53:40 +00:00
c01ef07be1 log stdin when 2014-10-04 12:43:24 +00:00
a3503afc71 Merge branch 'diffie-hellman-group-exchange-sha1' 2014-10-04 11:03:15 +00:00
721cb7ce8d import primes function 2014-10-04 11:02:50 +00:00
8d95f15202 reorder cipher negotiation to resemble current openssh more 2014-10-04 10:57:19 +00:00
fd4ca2bcf6 load module for diffie-hellman-group-exchange-sha1 2014-10-04 10:53:55 +00:00
c93b2ab586 Merge branch 'direct-tcpip' of https://github.com/micheloosterhof/kippo 2014-09-25 07:28:06 +00:00
6e52ae2ed6 Merge branch 'sftp-support' of https://github.com/micheloosterhof/kippo 2014-09-25 07:23:43 +00:00
9a5aa847e4 Merge remote-tracking branch 'upstream/master' 2014-09-25 07:21:28 +00:00
9bce85cbe9 Merge pull request #155 from andrewmichaelsmith/patch-1
Make MakingKippoReachable link work
2014-09-15 18:49:36 +03:00
4af57e8bef Make MakingKippoReachable link work 2014-09-14 09:27:51 +01:00
44c6fba349 add logging for direct-tcpip connections 2014-08-20 15:24:43 +02:00
c83fd45c87 less verbose logging 2014-08-18 15:14:50 +02:00
1b1f4c4882 less verbose logging at fs level. working imports 2014-08-18 14:53:15 +02:00
c529cb1f84 sftp protocol support 2014-08-18 14:35:35 +02:00
46fc2d3cc7 file system functions to enable sftp support. 2014-08-18 14:29:15 +02:00
ee68da8664 sftp option added 2014-08-18 14:25:10 +02:00
70c3d0ac0a make stop.sh executable 2014-08-18 14:18:31 +02:00
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
dbf0ca7a48 call getPeer() from another transport, fixes #146 2014-08-12 20:21:55 +03:00
224f104dc5 add virtualenv support to start.sh 2014-08-11 20:39:26 +03:00
355282dac8 add .gitignore based on ikoniaris' pull request #135 2014-08-09 23:57:47 +03:00
c3c09adb02 restructuring and cleanup 2014-08-09 23:55:20 +03:00
72a6118849 remove obsolete config entry 2014-08-09 19:19:50 +03:00
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
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
641c08cf7c code style changes 2014-08-09 15:48:33 +03:00
9bd02f780c when using execCommand, ls breaks without windowSize 2014-08-09 15:39:47 +03:00
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
14fd2fec32 cleanup key generation 2014-08-09 15:20:10 +03:00