Commit Graph

1405 Commits

Author SHA1 Message Date
Michel Oosterhof
02f181057d use try/except for config statements 2015-11-22 12:19:57 +04:00
Michel Oosterhof
38ed9d349a track stdin size and limit it 2015-11-22 12:07:01 +04:00
Michel Oosterhof
81d2b3a403 limt download size 2015-11-22 11:10:57 +04:00
Michel Oosterhof
beea231bfa remove timeout on disconnection 2015-11-19 14:54:53 +00:00
Michel Oosterhof
1dfece37b4 Login timeout now 2 minutes like openssh 2015-11-19 14:46:55 +00:00
Vaclav Bartos
31e80a9528 Add Session ID to names of ttylog and stdinlog files
Also add 'i' or 'e' for 'interactive'/'execcmd' types of sessions.
2015-11-19 14:15:50 +00:00
Michel Oosterhof
a0a1de4704 remove filler words 2015-11-19 14:05:45 +00:00
Michel Oosterhof
83590ff798 create symlink to stdin. remove noLog parameter. log input either to ttylog or stdinlog, not both 2015-11-19 14:02:21 +00:00
Michel Oosterhof
3b93cfd1b9 add shasum to log message 2015-11-19 13:51:08 +00:00
Michel Oosterhof
4af745d3fd remove unnecesary line 2015-11-19 13:17:29 +00:00
Michel Oosterhof
4e2533082d update CHANGELOG 2015-11-19 13:11:41 +00:00
Michel Oosterhof
c7110f0197 formatting. empty docstrings 2015-11-19 13:07:09 +00:00
Michel Oosterhof
55997d32df unused file 2015-11-19 12:56:05 +00:00
Michel Oosterhof
adc28420e0 added FIXME 2015-11-19 12:54:42 +00:00
Michel Oosterhof
da770e34bf input during running commands is now added as queued shell commands 2015-11-19 12:49:39 +00:00
Michel Oosterhof
7a204e480e don't crash cowrie when dblog/output plugins don't load 2015-11-19 12:15:11 +00:00
Michel Oosterhof
14a6a6cd34 formatting 2015-11-19 12:08:23 +00:00
Michel Oosterhof
0d7732a8ef formatting 2015-11-19 12:06:49 +00:00
Michel Oosterhof
47a33c8450 future needs to be imported first 2015-11-19 12:02:15 +00:00
Michel Oosterhof
a7d0c0a1ce formatting for twistedchecker 2015-11-19 11:12:47 +00:00
Michel Oosterhof
5a95b295b9 formatting to keep twistedchecker happy 2015-11-19 11:01:17 +00:00
Michel Oosterhof
ea4070d0c7 remove trailing spaces 2015-11-19 09:39:44 +00:00
Michel Oosterhof
8e052f18d6 reduce KEXINIT logging, formatting 2015-11-19 09:38:41 +00:00
Michel Oosterhof
51c1f90314 make 'gid' available in sshsessionforcowrieuser 2015-11-19 09:31:03 +00:00
Michel Oosterhof
8cc05310ce more instructions for dshield 2015-11-18 19:28:20 +00:00
Michel Oosterhof
d3e79218ab cleanup to make more consistent 2015-11-18 19:22:17 +00:00
Michel Oosterhof
96ff7dc00e cleanup, removed some unused codes, reformatted log messages. 2015-11-18 19:18:14 +00:00
Michel Oosterhof
101b26ea4f Merge pull request #70 from UnrealAkama/dshield_output
add dshield output support
2015-11-18 22:59:44 +04:00
Adam Ringwood
32f2f7b9b6 fix formating & incorrect doc string 2015-11-18 18:42:57 +01:00
Adam Ringwood
46cf7d417b add dshield output support 2015-11-18 18:38:15 +01:00
Michel Oosterhof
0b780a2cd1 handle case of no stdin on exec command 2015-11-18 00:13:37 +04:00
Michel Oosterhof
5bc6e344b9 don't write fd == None. Use not fd: 2015-11-17 16:29:39 +00:00
Michel Oosterhof
494fd6829b keep pylint happy, add empty top docstring, to fill out later 2015-11-17 16:25:03 +00:00
Michel Oosterhof
d9f343fdf3 remove unused imports. rewrite strip() usage 2015-11-17 16:16:26 +00:00
Michel Oosterhof
13d8535678 stanza should be with underscore, not dash 2015-11-17 16:03:24 +00:00
Michel Oosterhof
ab87921b6c store sha256 checksum for stdinput 2015-11-17 15:53:52 +00:00
Michel Oosterhof
959811b67f send eof as ctrl-d to running command 2015-11-17 15:13:36 +00:00
Michel Oosterhof
405a3c52c1 cleanup 2015-11-17 14:34:51 +00:00
Michel Oosterhof
99c93e8f08 wip 2015-11-17 14:26:52 +00:00
Michel Oosterhof
8877497a97 split SSHESSionforConchUser and ConchUser 2015-11-17 14:25:54 +00:00
Michel Oosterhof
42a735da17 log stdin save as structured log on session termination 2015-11-17 14:16:25 +00:00
Michel Oosterhof
0a2c83d556 2to3 for jsonlog and splunk 2015-11-17 04:54:30 +00:00
Michel Oosterhof
52d65b0ade 2to3 updates 2015-11-17 04:53:36 +00:00
Michel Oosterhof
e9461e7ea2 Merge pull request #69 from UnrealAkama/es_support
elasticsearch output support - early release
2015-11-17 08:51:47 +04:00
Adam Ringwood
794d441c66 elasticsearch output support - early release 2015-11-17 01:25:17 +01:00
Michel Oosterhof
5b1c90c93d catch exception when running history command in non-interactive session 2015-11-16 19:01:43 +00:00
Michel Oosterhof
0e24a1c4cd fix for wget and nostdin issue 2015-11-16 18:17:19 +00:00
Michel Oosterhof
d5d0f49f36 Merge pull request #64 from lelonek1/mhn-support
Update Cowrie to support integration with MHN
2015-11-16 15:28:45 +04:00
lelonek1
aa3ebbdcef Add support for overriding the reported SSH port and for reporting the public IP of the honeypot
These changes are adapted from ThreatStream's version of Kippo at https://github.com/threatstream/kippo/ (specifically commits ac2d7c0e907a75c1ee9d677d7a0badd925c6339a and 634d08bad8b1e9ae984487b8108a3d06f018043d).

Both options are disabled by default to preserve the current behavior of Cowrie.
2015-11-15 23:54:47 -05:00
lelonek1
7b5c9d792d Try to reconnect to the hpfeeds server if the connection is down when we are trying to send data. This way we recover from temporary network problems.
(cherry picked from commit e7dec5620100257fa56cec2a1858cbb4864a12a5 in threatstream/kippo)
2015-11-15 23:34:43 -05:00