Commit Graph

116 Commits

Author SHA1 Message Date
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
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
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
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
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
c3c09adb02 restructuring and cleanup 2014-08-09 23:55:20 +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
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
6e6a8aa4c1 [i] does not generally mean anything in kippo 2014-08-09 15:01:58 +03:00
baeda78839 Merge branch 'pr/108' into review-pr-108 2014-08-09 15:00:38 +03:00
acbb5dbb3c Merge pull request #96 from g0tmi1k/protocolmismatch
Fix "protocol mismatch" issue
2014-08-09 13:52:13 +03:00
36f2bc43b6 don't let user set password to '*' 2014-06-13 18:15:51 +03:00
4b4ae526d5 Accept "any" (*) password if desired
Credit: https://github.com/micheloosterhof/kippo
2014-06-13 18:13:41 +03:00
e4d4ea4b2e Merge branch 'bash' of https://github.com/g0tmi1k/kippo into g0tmi1k-bash 2014-06-13 18:07:41 +03:00
7791dd2821 Updated some bash error output 2014-06-01 14:27:51 +01:00
5b3482b356 Changed default hostname
...You may wish to alter this again (decrease chance of detection)
2014-06-01 14:16:48 +01:00
52d3984755 Added "execCommand" support
Credit: https://github.com/micheloosterhof/kippo/
2014-06-01 11:30:26 +01:00
2e0c2cd4d0 Add DSA support, move location & increase key size
Credit: https://github.com/micheloosterhof/kippo/
Add DSA SSH key support
Move from: “./public.key” to “./data/ssh_host_rsa_key.pub“
Increase key size from 1024 to 2048 bits
2014-05-30 05:19:23 +01:00
19d3fa1349 Updated "shell prompt" (to give a Debian feel)
Looks more like Debian/Ubuntu (which is the default base OS).
Check comments for CentOS version.
2014-05-29 08:38:43 +01:00
40b65278c3 Fix "protocol mismatch" issue
Credit: http://kbyte.snowpenguin.org/portal/2013/04/30/kippo-protocol-mismatch-workaround/
2014-05-28 19:06:19 +01:00
9737a8fdb6 Fixed formatting issues 2014-05-28 05:26:13 +01:00
74d5cb0825 Removed all trailing spaces 2014-05-28 05:13:55 +01:00
5359da0ab7 limit shell input a bit
git-svn-id: https://kippo.googlecode.com/svn/trunk@248 951d7100-d841-11de-b865-b3884708a8e2
2014-05-18 16:53:32 +00:00
42585c44c9 Make ourVersionString configurable (Resolves issue #54)
git-svn-id: https://kippo.googlecode.com/svn/trunk@247 951d7100-d841-11de-b865-b3884708a8e2
2014-02-16 09:50:41 +00:00
372f8fc52f fix syntax on the latest fix
git-svn-id: https://kippo.googlecode.com/svn/trunk@237 951d7100-d841-11de-b865-b3884708a8e2
2013-03-28 23:00:48 +00:00
5715a915c7 fix disastrous mysql logging breakage introduced in r229
git-svn-id: https://kippo.googlecode.com/svn/trunk@236 951d7100-d841-11de-b865-b3884708a8e2
2013-03-28 22:55:25 +00:00
248dd56ed7 fix twisted version comparision for premature key exchange fix
git-svn-id: https://kippo.googlecode.com/svn/trunk@234 951d7100-d841-11de-b865-b3884708a8e2
2013-02-04 17:10:09 +00:00
8e9fe0605c Workaround so the premature key exchange workaround works on twisted >= 11
git-svn-id: https://kippo.googlecode.com/svn/trunk@233 951d7100-d841-11de-b865-b3884708a8e2
2013-02-04 11:44:42 +00:00
3912ffb603 Remove connection limit support for now, since adding a protocol wrapper
changes the logging in newer twisted versions, and breaks dblog.



git-svn-id: https://kippo.googlecode.com/svn/trunk@232 951d7100-d841-11de-b865-b3884708a8e2
2013-01-21 12:41:41 +00:00
9378c6ba22 Limit total number of concurrent connections. Configurable with
connection_limit (default 50).

Also fix logging downloads.



git-svn-id: https://kippo.googlecode.com/svn/trunk@229 951d7100-d841-11de-b865-b3884708a8e2
2013-01-08 21:40:19 +00:00
d0ed22736d Limit number of new files on a filesystem to 10000
git-svn-id: https://kippo.googlecode.com/svn/trunk@228 951d7100-d841-11de-b865-b3884708a8e2
2013-01-08 20:01:25 +00:00
bff1829e3c further fixing on issue 55 - do not set the initial cwd if the path doesn't exist
git-svn-id: https://kippo.googlecode.com/svn/trunk@226 951d7100-d841-11de-b865-b3884708a8e2
2013-01-08 17:52:21 +00:00