Commit Graph

2966 Commits

Author SHA1 Message Date
8877497a97 split SSHESSionforConchUser and ConchUser 2015-11-17 14:25:54 +00:00
42a735da17 log stdin save as structured log on session termination 2015-11-17 14:16:25 +00:00
0a2c83d556 2to3 for jsonlog and splunk 2015-11-17 04:54:30 +00:00
52d65b0ade 2to3 updates 2015-11-17 04:53:36 +00:00
e9461e7ea2 Merge pull request #69 from UnrealAkama/es_support
elasticsearch output support - early release
2015-11-17 08:51:47 +04:00
794d441c66 elasticsearch output support - early release 2015-11-17 01:25:17 +01:00
5b1c90c93d catch exception when running history command in non-interactive session 2015-11-16 19:01:43 +00:00
0e24a1c4cd fix for wget and nostdin issue 2015-11-16 18:17:19 +00:00
d5d0f49f36 Merge pull request #64 from lelonek1/mhn-support
Update Cowrie to support integration with MHN
2015-11-16 15:28:45 +04:00
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
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
d6af172b3a Merge branch 'master' of https://github.com/micheloosterhof/cowrie 2015-11-15 17:57:28 +00:00
5d118967bc Merge pull request #61 from lelonek1/busybox-fix
Corrected package name and mixed tab/spaces indentation
2015-11-14 17:44:53 +04:00
500b614329 Corrected typo in help command and adjusted the maximum line length of the command list so it looks correct in a standard 80 character wide terminal 2015-11-13 17:01:35 -05:00
513934755e Corrected package name and mixed tab/spaces indentation 2015-11-13 16:42:00 -05:00
cf96ab2300 Merge pull request #60 from mak/busybox-cmd
basic support for busybox
2015-11-12 23:22:13 +04:00
mak
ea80d99bfe basic support for busybox 2015-11-12 04:24:30 +01:00
fbbcb60eba check we're still connected in writeln 2015-11-07 19:59:27 +00:00
064c5d9e96 remove debug statement 2015-11-07 19:52:06 +00:00
865390de1b tabs to spaces 2015-11-06 19:37:18 +00:00
c4d583af7e correctly send exit code 0 when command is done 2015-11-06 19:36:36 +00:00
f32da6b20b tabs to spaces. remove timeout on disconnect 2015-11-06 10:09:06 +00:00
53a758a9f7 these still referenced protocol.env 2015-11-06 10:03:38 +00:00
2c922fe1aa getfile can return False 2015-11-06 09:53:39 +00:00
728092f1be update cfg.dist 2015-11-06 09:42:38 +00:00
98c7ac3a14 mysql output plugin works 2015-11-06 09:38:23 +00:00
643033223e only define interactors for interactive sessions 2015-11-05 00:54:33 +04:00
74ab716a4f better comments 2015-11-05 00:34:16 +04:00
d5e4cfef97 file->open. and don't use has_key 2015-11-05 00:05:27 +04:00
c8362680df use with open() 2015-11-04 23:58:09 +04:00
25f7acba42 move open to with open. tabs to spaces 2015-11-04 23:52:32 +04:00
68dc9e4fdd switch from file() to with open() 2015-11-04 23:49:16 +04:00
1387cb878e remove environment. a few other optimizations. better cleanup 2015-11-04 23:32:28 +04:00
629d4da24e exit command is last and does not need to pop stack 2015-11-04 22:15:15 +04:00
15cf45e8ba remove exxxit command 2015-11-04 22:13:04 +04:00
8960054dbe 2to3 check 2015-11-04 19:02:29 +04:00
03597fd5f2 rename variable 'honeypot' to 'protocol'. it is the protocol. 2015-11-04 18:53:05 +04:00
b755563680 unused imports 2015-11-04 17:54:52 +04:00
8f72472942 update copyright server.py 2015-11-04 17:53:02 +04:00
4f9b90967b store server per IP 2015-11-04 17:52:15 +04:00
dd9907922a move realm out of ssh 2015-11-04 17:32:10 +04:00
140b4f427f initial implementation of server concept 2015-11-04 17:27:02 +04:00
2f063b8047 call different writeln() 2015-11-03 13:43:33 +00:00
a78604e11e add timeout feature. 60 seconds for non-interactive, 1800 seconds for shell 2015-11-02 17:14:02 +00:00
29e5f2f310 Merge pull request #54 from hiviah/ping
Tiny fixes for ping command
2015-11-02 19:14:31 +04:00
009839da95 Do not accept non-positive count for ping packets 2015-11-02 15:40:46 +01:00
9f64a20c63 Remove ping test print 2015-11-02 15:40:46 +01:00
e8bb39094d support for ping -c 2015-11-02 08:56:06 +00:00
3056c83294 more standard output for apt-get 2015-10-25 15:50:05 +04:00
6ec4622151 log ssh public key fingerpint in json log 2015-10-17 08:02:21 +00:00