Commit Graph

2371 Commits

Author SHA1 Message Date
439ef8499f Fixed PIDFile path in cowrie.service template (#394)
* Updated service template to use the virtual-env and proper PID file location

* Fixed PIDFile path in cowrie.service template

* Revert "Fixed PIDFile path in cowrie.service template"

This reverts commit 022afb7134.

* Revert "Revert "Fixed PIDFile path in cowrie.service template""

This reverts commit 5b01372176.

Revert changes

* Fixed PIDFile path in cowrie.service template
2017-01-04 22:19:25 +04:00
1685f3af79 ignore trial dirs 2017-01-02 14:54:59 +04:00
24c251b405 Improve handling of ImportErrors to notify users that they need to install new dependencies (#389)
* Improve handling of ImportErrors to notify users that they need to install new dependencies

Also added missing dependency to requirements.txt

* Mention installing dependencies in virtualenv if used

* Move requirements used only by output modules to a separate file

* Using a virtualenv is now the only officially supported method

* Handle ImportErrors when loading output plugins so different install instructions can be given

* Cleanup requirements-output.txt
2017-01-01 21:18:59 +04:00
ccbd05746e Updated service template to use the virtual-env and proper PID file location (#387) 2017-01-01 21:17:28 +04:00
a1675e3cea remove interact feature 2016-12-20 11:40:26 +00:00
20e6984793 fix telnet memory leak? 2016-12-20 08:02:08 +00:00
a320ae5145 debug code removed 2016-12-20 07:40:45 +00:00
345e36fab1 remove old dblog plugins 2016-12-20 07:19:50 +00:00
0ad2e65ef7 Merge branch 'master' of https://github.com/micheloosterhof/cowrie
Conflicts:
	start.sh
2016-12-20 07:18:24 +00:00
1a462eafe6 Documentation and start script changes to assist with supervisord usage (#346)
* * Updating start script to run in the foreground when using supervisord.
* Update install documentation to reference use of supervisord and install on OSX

* Updating index of INSTALL.md to with reference to supervisord

* Adding slack output and db

* Restoring start.sh back to default of AUTHBIND_ENABLED=no and DAEMONIZE=no

* Updating with pretty formatting of json dump
2016-12-20 11:15:28 +04:00
83065bcaeb use $PIDFILE instead of fixedname 2016-12-19 06:49:04 +00:00
1a0ed7baa6 Fix exception in connectionLost due to not passing self (#382) 2016-12-19 10:47:34 +04:00
cde3f71d4b fix call 2016-12-18 15:42:10 +00:00
b64d0d3802 set interactive timeout to 3min 2016-12-18 15:10:29 +04:00
95ce0f0fec unset session 2016-12-18 15:07:29 +04:00
ee177d5482 remove circular references 2016-12-18 15:01:38 +04:00
393d770713 remove drive 2016-12-18 14:32:24 +04:00
b134f9d791 clear references on connectionLost 2016-12-18 14:29:11 +04:00
8dc54822cf Added ftpget command. (#379) 2016-12-17 22:43:33 +04:00
115ccd6886 Telnet negotiation errors (#380)
* Telnet option negotiation now chained and handled better to prevent logging expected errors

Also added support for parsing NAWS negotiation and setting windowSize accordingly
This still needs more work to realistically behave like other Telnet servers, but it is limited significantly by Twisted's limited option support and Telnet clients' inconsistent behavior

* While not standard, negotiating these options here does result in better client behavior

* Cleanup old comments and unused code
2016-12-16 11:56:17 +04:00
30d08f6347 Fix Setup Virtual Environment anchor in install doc (#377) 2016-12-15 12:05:29 +04:00
82e3b1fccd remove non-virtual environment from install doc 2016-12-11 15:40:00 +04:00
f785711a1f logDispatch not required here 2016-12-11 15:27:26 +04:00
1c527a5910 style changes tftp 2016-12-11 15:15:24 +04:00
d6b9115ba7 cowrie script needs to be bash 2016-12-11 15:05:00 +04:00
0fda46b933 Remove redundant space, handle double slashes in escape string (#340) 2016-12-11 14:53:44 +04:00
Wes
c0aecda450 re-factored a bit, added telnet support (#375) 2016-12-11 14:52:21 +04:00
2102b1b9e1 Hash files downloaded via tftp (#363) 2016-12-11 02:15:50 +04:00
98b907b26d Merge branch 'master' of https://github.com/micheloosterhof/cowrie
Conflicts:
	cowrie/output/csirtg.py
2016-12-06 17:46:06 +00:00
f4e65f570f remove dblog/texlog. 2016-12-06 17:45:25 +00:00
Wes
b609949e6d problem: csirtg.io plugin outputs too much debug information (#374)
* fixing debugging output for csirtg.io plugin

* fixing default description
2016-12-06 21:44:25 +04:00
Wes
0bd9777f59 adding csirtg.io sdk support (#357) 2016-12-05 14:46:49 +04:00
Wes
98a31b5e76 cef fixes (#360) 2016-12-05 14:42:48 +04:00
376eb846a0 Log tftp download only if it's successful (#362) 2016-12-05 14:40:41 +04:00
b127dc4f7f Fix #369 2016-12-05 14:37:44 +04:00
c007175046 Fix #359 2016-11-21 15:40:16 +04:00
453f508c2c Fix #355 2016-11-20 15:07:05 +04:00
17d7ef138f also add trapsig 2016-11-16 15:45:31 +04:00
68aba6d91d add MODE import 2016-11-16 15:37:31 +04:00
bd85817f2d Revert "move cfg.dist file"
This reverts commit 77d2744403.
2016-11-14 09:24:34 +04:00
77d2744403 move cfg.dist file 2016-11-14 09:19:15 +04:00
b8ce4d381f ignore *env 2016-11-13 13:48:19 +04:00
7c1bd80b33 update text v1.1.0 2016-11-09 22:36:15 +04:00
659319d2c3 update READM 2016-11-09 15:24:59 +04:00
b4f8b8752d sent NAWS instead of ECHO for telnet nego 2016-11-08 21:49:09 +04:00
2328bd5662 Fix #320 2016-11-06 23:00:48 +04:00
6d5deb2119 mysql 2016-11-05 22:40:45 +04:00
628a498421 Add rethinkdb output module (#337)
* add rethinkdb output module

* add timestamp
2016-11-05 19:37:01 +04:00
30b372c878 Add TFTP without path (#338) 2016-11-05 19:36:14 +04:00
a895f0242a Merge branch 'master' of https://github.com/micheloosterhof/cowrie 2016-11-05 14:12:47 +00:00