Commit Graph

1983 Commits

Author SHA1 Message Date
abef07c810 Revert "Fix #230: jsonlog threading corruption (#283)"
This reverts commit aafef68e39.
2016-10-20 17:58:40 +00:00
a703e9f3cc Merge branch 'master' of https://github.com/micheloosterhof/cowrie 2016-10-20 17:15:11 +00:00
3d4f50f004 add dateutil for dshield output 2016-10-19 11:54:55 +04:00
051cc23546 remove excpetions import 2016-10-18 22:41:12 +04:00
dc6f26150d remove twisted<11 workaround 2016-10-18 22:33:16 +04:00
5f0ce75af0 document -p switch 2016-10-18 22:10:31 +04:00
2ab82ba930 doc fix 2016-10-18 22:10:31 +04:00
ca6e9a98e7 initalize tac to None 2016-10-18 22:10:31 +04:00
414569c1ea wip 2016-10-18 22:10:31 +04:00
d65f7ac7aa move loggers to tac file
move
2016-10-18 22:10:31 +04:00
45022b7f0e add service_identity to debian package based install 2016-10-18 05:20:04 +00:00
6aeeb72431 Add pycrypto to requirements.txt (#288)
* Add pycrypto to requirements.txt

* Remove crypto dependency.
2016-10-18 09:17:12 +04:00
8b7fe09f8a Workaround for #287 2016-10-15 15:07:51 +00:00
7fec5be3e2 test: Use absolute imports in test_base_commands.
This fixes the tests on Python 3.
2016-10-13 19:07:55 +04:00
b5e7d4cc14 fs: Return blank contents for zero-size files lacking a realfile.
This allows reading from files newly created by touch without error.
2016-10-13 19:07:55 +04:00
731ec40492 fs: Explore the honeyfs directory for realfile names at init time.
The old method of checking the honeyfs directory whenever a file was
accessed for the first time required that the original path to the file
be known. If the file was renamed, copied, moved to a new directory, or
one of its parent directories was renamed before its first access, its
original path would be completely lost and the real filename would not be
resolved.

This new method ensures that all A_REALFILE attributes are populated
upfront, and the filesystem can be rearranged plenty without breaking
honeyfs.
2016-10-13 19:07:55 +04:00
8efaee6f1a fs: Remove realfile() function (which did nothing interesting) and have file_contents call update_realfile directly instead. 2016-10-13 19:07:55 +04:00
7f301dfc20 fs: Remove symlink-handling logic from file_contents; that's handled by getfile. 2016-10-13 19:07:55 +04:00
6ad3a2ae6b commands: Add > as an alias for touch. Some worms use this as a lazy way to make an empty file. 2016-10-13 19:07:55 +04:00
b38010b01c busybox: Restructure the whole control flow for simplicity. 2016-10-13 19:07:55 +04:00
bffb2e31b7 busybox: Mimic correct "not found" behavior for invalid commands. 2016-10-13 19:07:55 +04:00
aafef68e39 Fix #230: jsonlog threading corruption (#283) 2016-10-10 16:21:40 +04:00
05283b60c3 Fix #226 2016-10-09 06:54:53 +00:00
7f8e98cc51 formatting for errors 2016-10-08 18:36:29 +00:00
54f3ca8378 no arg fix for sudo 2016-10-08 18:06:03 +00:00
5fe9e489db fix for busybox with no arguments 2016-10-08 18:00:52 +00:00
50eada87d4 change file_download to command.input 2016-10-07 17:54:00 +00:00
18af0e48a4 add Python3 compatible "print" statement (#281)
otherwise the CI bot fails ;)
2016-10-06 07:54:35 +04:00
7e5fd6bf01 remove dblog_hpfeeds example 2016-10-03 11:22:59 +04:00
01f6b195b8 Merge branch 'master' of https://github.com/micheloosterhof/cowrie 2016-10-01 21:05:09 +00:00
98ed2b52c2 add crypto explicitly, it's missing for some people 2016-10-01 21:04:37 +00:00
504c56b5b7 typofix 2016-09-29 15:40:29 +04:00
06c8f57c44 respect outAddr for SSL 2016-09-29 15:31:34 +04:00
f5ba33ca7a improve display of wget 2016-09-29 15:08:17 +04:00
f522e29889 wip 2016-09-29 12:24:29 +04:00
3437a9ea8b wip 2016-09-29 12:02:55 +04:00
7f91be37c2 wip 2016-09-29 11:09:59 +04:00
d547da41f6 add output plugin 2016-09-29 11:06:11 +04:00
7dace024c7 wip 2016-09-29 11:06:11 +04:00
c2b8090315 add RSA key workaround 2016-09-28 22:51:34 +04:00
0cce757ba0 don't log stdin as a URL? 2016-09-27 22:49:53 +04:00
3c05bef286 stop tail from crashing 2016-09-27 22:45:48 +04:00
e148e0e241 add bin path to busybox 2016-09-26 09:09:46 +00:00
ccdf54bed1 fix references to urllib 2016-09-26 05:12:38 +00:00
0337ac9674 Revert "Squashed commit of the following:"
This reverts commit e4950e3713.
2016-09-25 20:06:44 +00:00
0863461255 add $SHELL to environment 2016-09-25 19:48:20 +00:00
f8a5c3e595 improve exception to remove error message 2016-09-24 09:51:55 +00:00
e4950e3713 Squashed commit of the following:
commit 16466803b98f1dcbe9ba264346bc12a22215e0c4
Author: Michel Oosterhof <michel@oosterhof.net>
Date:   Sat Sep 24 09:17:06 2016 +0000

    wip

commit e1bbb9bff1b0e69b6300894a858b1fbf8b2215ae
Author: Michel Oosterhof <michel@oosterhof.net>
Date:   Fri Sep 23 20:27:19 2016 +0000

    make copy of env. not original

commit fdddad4fc683ab3c61b9330d553a0efd0bd3bbfa
Author: Michel Oosterhof <michel@oosterhof.net>
Date:   Fri Sep 23 20:26:49 2016 +0000

    simplify more

commit c31b88dd075a01551be006d03539d5fab2e216a9
Author: Michel Oosterhof <michel@oosterhof.net>
Date:   Fri Sep 23 20:17:11 2016 +0000

    simplify command passing

commit 9c7fe9dc0646814e270e06551ffd7c7f69e3acf0
Author: Michel Oosterhof <michel@oosterhof.net>
Date:   Fri Sep 23 19:42:32 2016 +0000

    replace command/args -> argv

commit 3ea6dd00947aeb9b1ebf7d7e61ae5888d02c3276
Author: Michel Oosterhof <michel@oosterhof.net>
Date:   Fri Sep 23 19:11:49 2016 +0000

    rargs -> args

commit 3eb4e77fc056f3458ce22fe4f8177ca95019c938
Author: Michel Oosterhof <michel@oosterhof.net>
Date:   Fri Sep 23 19:06:18 2016 +0000

    rename to CowrieProcess

commit 603c9611d53380163323fc85749970ea323a8582
Author: Michel Oosterhof <michel@oosterhof.net>
Date:   Thu Sep 22 19:13:41 2016 +0000

    wip

commit c253b4031476c7e5f912b9cbeb49887ef97023d0
Author: Michel Oosterhof <michel@oosterhof.net>
Date:   Sun Sep 18 21:08:29 2016 +0000

    formatting

commit 730df305057a19a22754ba6d3883e75db653d235
Author: Michel Oosterhof <michel@oosterhof.net>
Date:   Sun Sep 18 21:03:14 2016 +0000

    formatting

commit 1e167e9a535b7173abb32e07ae5157dac53af08d
Author: Dave Germiquet <davegermiquet@trulycanadian.net>
Date:   Wed Sep 7 10:01:43 2016 -0400

    Fixed bug(missing err_data in stdout)

commit 23150cb25581d27e2efc9b43b2a7655f9cd1fcd8
Author: Dave Germiquet <davegermiquet@trulycanadian.net>
Date:   Sun Sep 4 22:02:00 2016 -0400

    Used Stack to keep track of running commands
    Fixed up LOg out
    Took out debug line
    MAde it more like master, (took out unneeded changes)
    Added check back for length
    Fixed up some trouble issues with passwd/and call backs
    Removed debugging logging statements
    Reformatted for master/merge
    Took out parameter in constructor..which broke everything

    Second Implementation Choice

commit daf0c74db8a3357342ac2d448fc68cfef0fc7a28
Author: Dave Germiquet <davegermiquet@trulycanadian.net>
Date:   Sun Sep 4 04:24:22 2016 -0400

    Fixed up PIPE and ; implemetation
    Fixed up WGET, so now it should show prompt by using when commands have stopped.
2016-09-24 09:19:52 +00:00
12ec797bbb add option to disable ssh 2016-09-23 19:55:34 +00:00
910256686b typo fix, only impacts log message 2016-09-20 18:22:33 +00:00