Commit Graph

2509 Commits

Author SHA1 Message Date
3b56e4f1a4 grep help goes to stdout not stderr 2018-06-18 06:47:01 +00:00
88dee1336b getopt/line number support for cat. 2018-06-18 06:45:52 +00:00
450e2df348 add slack workspace link 2018-06-10 12:20:27 +04:00
bdc7b34516 Add regex support to the userdb. (#763) 2018-06-09 20:47:51 +04:00
0a03195726 add name of program to replay ttylog 2018-06-06 13:37:18 +04:00
2ff43991fa Merge branch 'master' of http://www.github.com/micheloosterhof/cowrie 2018-06-06 13:36:13 +04:00
1bd1669ab9 WIP: Hpfeeds: Native Twisted, Python 3 support, TLS support + memory leak fix (#766)
* New version of hpfeeds output plugin

* Update requirements-output.txt
2018-06-04 23:32:13 +04:00
3dac1aa2a9 Recommend Slack for questions 2018-06-04 15:18:31 +04:00
77682e636c Merge branch 'master' of http://www.github.com/micheloosterhof/cowrie 2018-06-04 15:16:39 +04:00
d32cb40ce3 Add flake8 to the Travis CI testing (#767)
* Add flake8 to the Travis CI testing

* exceptions.AttributeError —> AttributeError

* notImplementedError —> NotImplementedError

* notImplementedError —> NotImplementedError

* buffer was removed in Python 3

* New Style Exception for Python 3

* file() —> open() for Python 3

__file()__ was removed in Python 3

* from twisted.conch.ssh.common import getNS

__getNS()__ is called on lines 208 and 209 but it is never imported.

* New Style Exception again
2018-06-04 13:58:08 +04:00
0e7b7f8b7a formatting 2018-05-26 11:10:21 +04:00
daaeb84ebd formatting 2018-05-26 11:02:40 +04:00
dde9b848bc formatting 2018-05-26 10:59:43 +04:00
80a6594c46 formatting, cleanup 2018-05-26 10:53:29 +04:00
6f2b3f8438 command_ftpget: fix initial value for out_addr (#758) 2018-05-23 00:07:40 +04:00
ee967310a5 Add 'destfile' key in cowrie.session.file_download (#761)
* Add destfile key

* Add destfile key

* Add destfile key

* Add destfile key

* Add destfile key

* Add destfile key
2018-05-23 00:07:24 +04:00
1e5fe5490d ftpget_command: (#755)
[+] Implement wrapper around ftplib.FTP class in order to bind on address specified in cowrie.cfg (out_addr)
    [+] Save payload as Artifact
    [-] Clean up the code

Conflicts:
	cowrie/commands/ftpget.py
2018-05-16 20:15:13 +04:00
cf03b14824 command_tftp: (#756)
[!] Fix exception in tftpy library due to incorrect type of input parameter

Artifact:
    [+] Add property "closed"

Conflicts:
	cowrie/commands/tftp.py
	cowrie/core/artifact.py
2018-05-16 20:14:12 +04:00
8633cbb7ff Added changed for XMPP (#741)
USE WOKKEL VERSION
Update cowrie.cfg.dist
v1.3.0
2018-05-07 00:35:17 +04:00
1b7e0e490c more explanations 2018-05-06 21:48:59 +04:00
7ea639a060 Py3 compatibility for SFTP 2018-05-06 21:42:31 +04:00
b1b83b0fde make redirect work in Py3 2018-05-06 19:07:40 +04:00
f31937ffd5 catch disconnected session in command exit 2018-05-05 16:32:23 +00:00
3a88cf390b shuffle config sections around. Fix #739 2018-05-03 09:49:16 +04:00
7cb8c8930c working output for py2 and py3. Fix #738 2018-05-02 14:40:02 +04:00
218da10aa8 Comment out all default plugins, so people with existing active plugins get a warning
when enabled is not set
2018-04-27 05:13:38 -05:00
ffddb0538b Fix #736 2018-04-27 05:09:30 -05:00
997c2dc9f6 add arch to test server 2018-04-23 09:44:48 -05:00
9921f9874a throw off TSM 2018-04-20 10:29:56 -05:00
d137d8e4db make control keys work in py3 2018-04-20 09:32:43 -05:00
d550728642 command_busybox: fixed (#698)
* command_busybox; Fix it already

Conflicts:
	cowrie/commands/busybox.py

* Add some comments

* command_busybox: Add method lineReceived

* Revert "command_busybox: Add method lineReceived"

This reverts commit 471e58be99.
2018-04-15 16:44:12 +04:00
82e59e8fa5 remove unused import 2018-04-14 17:39:37 +04:00
4e0a8ff431 make pylint happy 2018-04-14 17:36:14 +04:00
5d1c0f61e5 reset cmdstack to empty array rather than del 2018-04-14 14:37:41 +04:00
8efc24d9ed more ssh key logging 2018-04-10 19:29:44 +04:00
87680bc8a4 wokkel deps 2018-04-09 11:07:55 +04:00
a0ddb1ee49 Merge branch 'master' of http://www.github.com/micheloosterhof/cowrie 2018-04-09 11:06:48 +04:00
1fc9e66a7b new CONFIG method 2018-04-09 11:06:07 +04:00
bdfc109566 Artifact: remove empty files by default (#723) 2018-04-09 10:56:53 +04:00
597a065738 Ignore PyCharm's folder (#724) 2018-04-09 10:56:19 +04:00
b5300c7c49 Missing cowrie.session.params events generator (#721) 2018-04-07 20:07:55 +04:00
0077608d81 Fix comment for default data path in default cfg file (#720) 2018-04-05 23:31:04 +04:00
570b4606de pylint formatting 2018-04-04 22:47:52 +04:00
a2f5c7b846 pylint spacing 2018-04-04 22:44:17 +04:00
202ac39cc1 additional instructions 2018-04-04 22:10:28 +04:00
50e93603f9 remove bsd arch 2018-04-02 01:17:11 +04:00
b861cebef3 Arch handling by @oliveriandrea
commit 916b5bf7fa8cff0eee9623bdd188fa902ea49699
Author: Michel Oosterhof <michel@oosterhof.net>
Date:   Mon Apr 2 00:39:28 2018 +0400

    string handling

commit 1d52bb7a85cace371717e7db1f88cd1eff608e1c
Author: Michel Oosterhof <michel@oosterhof.net>
Date:   Sun Apr 1 22:03:13 2018 +0400

    arch already logged in server.py

commit 2f4fee8bdf3b9f129cf4315bd6c20ef38e44d582
Author: Michel Oosterhof <michel@oosterhof.net>
Date:   Sun Apr 1 22:02:06 2018 +0400

    get binary contents from file system

commit 1043bde0328de9d54c72cdb00a20b5ccd6c3f4cc
Author: Michel Oosterhof <michel@oosterhof.net>
Date:   Sun Apr 1 21:42:34 2018 +0400

    use 'arch' as multi value architecture.

commit 6d86d20acb7e4affa8cc690d45995c40d5f0542f
Merge: 201a923 c9e5a44
Author: Michel Oosterhof <michel@oosterhof.net>
Date:   Sun Apr 1 15:50:57 2018 +0400

    Merge remote-tracking branch 'oliveriandrea/multi_arch' into multi-arch-michel

commit c9e5a44a6a
Author: oliveriandrea <oliveriandrea@gmail.com>
Date:   Wed Mar 28 17:57:52 2018 +0200

    Introduction of self.arch = 'linux-x64-lsb'

commit f54f9ae67d
Author: oliveriandrea <oliveriandrea@gmail.com>
Date:   Wed Mar 28 17:56:59 2018 +0200

    moved to server

commit a22bf01855
Author: oliveriandrea <oliveriandrea@gmail.com>
Date:   Wed Mar 28 17:56:09 2018 +0200

    fake_arch to arch, self.arch -> self.server.arch

commit 1c7ca09449
Author: oliveriandrea <oliveriandrea@gmail.com>
Date:   Wed Mar 28 17:52:51 2018 +0200

    fake_arch to arch

commit f706f6568e
Author: oliveriandrea <oliveriandrea@gmail.com>
Date:   Wed Mar 28 17:51:37 2018 +0200

    fake_arch to arch

commit af95806ceb
Author: oliveriandrea <oliveriandrea@gmail.com>
Date:   Wed Mar 28 12:04:41 2018 +0200

    move fake_arch and archs_emulated under [shell]

commit be72123228
Author: oliveriandrea <oliveriandrea@gmail.com>
Date:   Wed Mar 28 11:55:49 2018 +0200

    fake_arch now is under [shell]

commit 32609bf7ce
Author: oliveriandrea <oliveriandrea@gmail.com>
Date:   Wed Mar 28 11:48:58 2018 +0200

    Move fake arch configuration under [shell]

commit 952e87d0b9
Author: oliveriandrea <oliveriandrea@gmail.com>
Date:   Thu Mar 22 10:48:52 2018 +0100

    Update README

commit 8adde62f33
Author: oliveriandrea <oliveriandrea@gmail.com>
Date:   Thu Mar 22 10:47:17 2018 +0100

    Collection of dummy executables

commit e79c2d77c1
Author: oliveriandrea <oliveriandrea@gmail.com>
Date:   Thu Mar 22 10:45:35 2018 +0100

    Source code of the dummy executables

commit db2ccf5297
Author: oliveriandrea <oliveriandrea@gmail.com>
Date:   Thu Mar 22 10:44:52 2018 +0100

    README for the sources

commit 97d5dc2b3d
Author: oliveriandrea <oliveriandrea@gmail.com>
Date:   Thu Mar 22 10:37:47 2018 +0100

    Patch to cat,head,tail and dd in order to report fake arch

commit 05543a1490
Author: oliveriandrea <oliveriandrea@gmail.com>
Date:   Thu Mar 22 10:36:31 2018 +0100

    Update the configuration in order to support multiarch emulation

commit 81b29f2dd2
Author: oliveriandrea <oliveriandrea@gmail.com>
Date:   Thu Mar 22 10:35:36 2018 +0100

    Added param table in SQL schemas

commit 827c47ff71
Author: oliveriandrea <oliveriandrea@gmail.com>
Date:   Thu Mar 22 10:34:47 2018 +0100

    Added params table

commit fa7b467950
Author: oliveriandrea <oliveriandrea@gmail.com>
Date:   Thu Mar 22 10:27:15 2018 +0100

    Generate random choice for the architecture
2018-04-02 00:44:20 +04:00
201a923bce remove trailing whitespace 2018-03-27 12:15:17 +04:00
3d8c17b144 Merge branch 'master' of http://www.github.com/micheloosterhof/cowrie 2018-03-27 12:12:08 +04:00
c6acdd489d CONNECT TCP tunneling to support proxies like Squid (#708) (#710) 2018-03-27 11:58:32 +04:00