Commit Graph

2865 Commits

Author SHA1 Message Date
ba74306138 twisted formatting 2015-11-24 12:01:14 +00:00
83693e26c4 twisted formatting 2015-11-24 12:00:17 +00:00
9517c9215c twisted formatting 2015-11-24 11:58:11 +00:00
2c533bf0ff comply with twisted naming 2015-11-24 11:54:25 +00:00
c0fadc0a1a Merge branch 'vaclavbartos-channelid' 2015-11-24 11:52:33 +00:00
2cb8d50d5b Merge branch 'master' of https://github.com/micheloosterhof/cowrie 2015-11-24 11:52:11 +00:00
b67a47b7a3 Merge branch 'channelid' of git://github.com/vaclavbartos/cowrie into vaclavbartos-channelid
Conflicts:
	cowrie/core/protocol.py
2015-11-24 11:51:50 +00:00
10a0ba9035 tabs to spaces 2015-11-23 09:53:56 +00:00
49537fe496 use try/except for cfg. formatting for Twistedchecker 2015-11-23 09:52:44 +00:00
bf48c92d02 2to3 2015-11-22 12:29:36 +04:00
02f181057d use try/except for config statements 2015-11-22 12:19:57 +04:00
38ed9d349a track stdin size and limit it 2015-11-22 12:07:01 +04:00
81d2b3a403 limt download size 2015-11-22 11:10:57 +04:00
beea231bfa remove timeout on disconnection 2015-11-19 14:54:53 +00:00
1dfece37b4 Login timeout now 2 minutes like openssh 2015-11-19 14:46:55 +00:00
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
a0a1de4704 remove filler words 2015-11-19 14:05:45 +00:00
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
3b93cfd1b9 add shasum to log message 2015-11-19 13:51:08 +00:00
4af745d3fd remove unnecesary line 2015-11-19 13:17:29 +00:00
4e2533082d update CHANGELOG 2015-11-19 13:11:41 +00:00
c7110f0197 formatting. empty docstrings 2015-11-19 13:07:09 +00:00
55997d32df unused file 2015-11-19 12:56:05 +00:00
adc28420e0 added FIXME 2015-11-19 12:54:42 +00:00
da770e34bf input during running commands is now added as queued shell commands 2015-11-19 12:49:39 +00:00
7a204e480e don't crash cowrie when dblog/output plugins don't load 2015-11-19 12:15:11 +00:00
14a6a6cd34 formatting 2015-11-19 12:08:23 +00:00
0d7732a8ef formatting 2015-11-19 12:06:49 +00:00
47a33c8450 future needs to be imported first 2015-11-19 12:02:15 +00:00
a7d0c0a1ce formatting for twistedchecker 2015-11-19 11:12:47 +00:00
5a95b295b9 formatting to keep twistedchecker happy 2015-11-19 11:01:17 +00:00
ea4070d0c7 remove trailing spaces 2015-11-19 09:39:44 +00:00
8e052f18d6 reduce KEXINIT logging, formatting 2015-11-19 09:38:41 +00:00
51c1f90314 make 'gid' available in sshsessionforcowrieuser 2015-11-19 09:31:03 +00:00
8cc05310ce more instructions for dshield 2015-11-18 19:28:20 +00:00
d3e79218ab cleanup to make more consistent 2015-11-18 19:22:17 +00:00
96ff7dc00e cleanup, removed some unused codes, reformatted log messages. 2015-11-18 19:18:14 +00:00
101b26ea4f Merge pull request #70 from UnrealAkama/dshield_output
add dshield output support
2015-11-18 22:59:44 +04:00
32f2f7b9b6 fix formating & incorrect doc string 2015-11-18 18:42:57 +01:00
46cf7d417b add dshield output support 2015-11-18 18:38:15 +01:00
0b780a2cd1 handle case of no stdin on exec command 2015-11-18 00:13:37 +04:00
5bc6e344b9 don't write fd == None. Use not fd: 2015-11-17 16:29:39 +00:00
494fd6829b keep pylint happy, add empty top docstring, to fill out later 2015-11-17 16:25:03 +00:00
d9f343fdf3 remove unused imports. rewrite strip() usage 2015-11-17 16:16:26 +00:00
13d8535678 stanza should be with underscore, not dash 2015-11-17 16:03:24 +00:00
ab87921b6c store sha256 checksum for stdinput 2015-11-17 15:53:52 +00:00
959811b67f send eof as ctrl-d to running command 2015-11-17 15:13:36 +00:00
405a3c52c1 cleanup 2015-11-17 14:34:51 +00:00
99c93e8f08 wip 2015-11-17 14:26:52 +00:00
8877497a97 split SSHESSionforConchUser and ConchUser 2015-11-17 14:25:54 +00:00