Commit Graph

1431 Commits

Author SHA1 Message Date
Michel Oosterhof
dc6872dafc remove 2016-12-21 12:37:44 +04:00
Michel Oosterhof
fadb9970d1 Merge branch 'develop' of https://github.com/micheloosterhof/cowrie into develop 2016-12-21 12:35:14 +04:00
lelonek1
928f4d02c2 Use $@ instead of $* so quoted parameters are expanded correctly and support specifying alternate venv name in COWRIE_VENV environment variable (#384) 2016-12-21 12:31:26 +04:00
lelonek1
d3f1aaa874 Fix unit tests to work with new directory structure in develop branch (#383)
If tests are running through trial, copy etc directory to _trial_temp so userdb.txt and other files are accessible to the unit tests and don't get modified by the tests
2016-12-21 12:31:26 +04:00
Michel Oosterhof
2ead0c3782 remove more dblog 2016-12-21 12:31:26 +04:00
Michel Oosterhof
01e1bd89b7 remove all dblog 2016-12-21 12:31:26 +04:00
Michel Oosterhof
0cca1eb682 add new path 2016-12-21 12:30:33 +04:00
Michel Oosterhof
02313ac131 ignore all here 2016-12-21 12:30:33 +04:00
Michel Oosterhof
df8b6bd147 ignore trial files 2016-12-21 12:30:33 +04:00
Michel Oosterhof
4172eb858b Add explicit error when config file not found 2016-12-21 12:30:33 +04:00
Michel Oosterhof
9b0be86f20 add proper handling for queued commands 2016-12-21 12:30:33 +04:00
Michel Oosterhof
a8039d17ce rewrite command handling 2016-12-21 12:30:33 +04:00
Michel Oosterhof
2e68242bec command is abstract class 2016-12-21 12:30:33 +04:00
Michel Oosterhof
70fb9d73d3 add restart 2016-12-21 12:30:33 +04:00
Michel Oosterhof
668927eb23 rename chapter in install 2016-12-21 12:30:33 +04:00
Michel Oosterhof
999b514706 doc updates 2016-12-21 12:30:33 +04:00
Michel Oosterhof
4ee90bfd28 start.sh/stop.sh deprecated. use bin/cowrie start|stop 2016-12-21 12:30:33 +04:00
Michel Oosterhof
de28f13c28 more doc updates 2016-12-21 12:30:17 +04:00
Michel Oosterhof
31ababed5b doc updates 2016-12-21 12:30:17 +04:00
Michel Oosterhof
b3a3564f3e remove dl/ 2016-12-21 12:29:24 +04:00
Michel Oosterhof
b1451e95bc gitnore update 2016-12-21 12:29:24 +04:00
Michel Oosterhof
f00bb69152 ignore all files here 2016-12-21 12:29:24 +04:00
Michel Oosterhof
47b5a6b9ee move log/ttylog and download directories 2016-12-21 12:29:24 +04:00
Michel Oosterhof
c95988c9f0 process arguments to 'cowrie start' 2016-12-21 12:29:24 +04:00
Michel Oosterhof
3019a1201c change directory structure 2016-12-21 12:29:24 +04:00
Michel Oosterhof
bb45d566cb add cowrie.cfg.dist 2016-12-21 12:29:23 +04:00
Michel Oosterhof
35332c540d ignore keys 2016-12-21 12:26:48 +04:00
Michel Oosterhof
21f85ecb50 add userdb 2016-12-21 12:26:48 +04:00
Michel Oosterhof
86d96362c5 change directory structure 2016-12-21 12:26:48 +04:00
lelonek1
8cc62fb33d Use $@ instead of $* so quoted parameters are expanded correctly and support specifying alternate venv name in COWRIE_VENV environment variable (#384) 2016-12-21 12:22:32 +04:00
Michel Oosterhof
a1675e3cea remove interact feature 2016-12-20 11:40:26 +00:00
Michel Oosterhof
20e6984793 fix telnet memory leak? 2016-12-20 08:02:08 +00:00
Michel Oosterhof
a320ae5145 debug code removed 2016-12-20 07:40:45 +00:00
lelonek1
b709601de3 Fix unit tests to work with new directory structure in develop branch (#383)
If tests are running through trial, copy etc directory to _trial_temp so userdb.txt and other files are accessible to the unit tests and don't get modified by the tests
2016-12-20 11:21:50 +04:00
Michel Oosterhof
345e36fab1 remove old dblog plugins 2016-12-20 07:19:50 +00:00
Michel Oosterhof
0ad2e65ef7 Merge branch 'master' of https://github.com/micheloosterhof/cowrie
Conflicts:
	start.sh
2016-12-20 07:18:24 +00:00
Simon Whittaker
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
Michel Oosterhof
83065bcaeb use $PIDFILE instead of fixedname 2016-12-19 06:49:04 +00:00
lelonek1
1a0ed7baa6 Fix exception in connectionLost due to not passing self (#382) 2016-12-19 10:47:34 +04:00
Michel Oosterhof
cde3f71d4b fix call 2016-12-18 15:42:10 +00:00
Michel Oosterhof
b64d0d3802 set interactive timeout to 3min 2016-12-18 15:10:29 +04:00
Michel Oosterhof
95ce0f0fec unset session 2016-12-18 15:07:29 +04:00
Michel Oosterhof
ee177d5482 remove circular references 2016-12-18 15:01:38 +04:00
Michel Oosterhof
393d770713 remove drive 2016-12-18 14:32:24 +04:00
Michel Oosterhof
b134f9d791 clear references on connectionLost 2016-12-18 14:29:11 +04:00
Claud Xiao
8dc54822cf Added ftpget command. (#379) 2016-12-17 22:43:33 +04:00
lelonek1
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
rmcintosh
30d08f6347 Fix Setup Virtual Environment anchor in install doc (#377) 2016-12-15 12:05:29 +04:00
Michel Oosterhof
82e3b1fccd remove non-virtual environment from install doc 2016-12-11 15:40:00 +04:00
Michel Oosterhof
f785711a1f logDispatch not required here 2016-12-11 15:27:26 +04:00