Commit Graph

2493 Commits

Author SHA1 Message Date
5b5545924a Use twisted endpoints for listening on ports/addresses (#499)
* Use twisted endpoints for listening on ports/addresses

* Add examples of endpoints
2017-04-30 16:30:59 +04:00
821c14093d logic around pid file mgmt for status command 2017-04-29 19:26:04 +04:00
5ee61e2d1c update stop command for stale pid 2017-04-20 21:46:22 +04:00
f21ecf6e24 start->stop 2017-04-20 21:31:41 +04:00
dcabed5e6e Added 'socketlog' output plugin for writing to a socket. (#496) 2017-04-13 18:16:22 +04:00
28dfaa3369 Update cowrie (#494)
Calling by default activate_venv forces the use of virtual environments on everyone.
If one does not use virtual environments, the systemd service script will fail giving a reason that has nothing to do with this.

I have noticed this problem when i have replaced the systemd service script to deprecate the use of start/stop scripts.

The use of a conditional statements solves this for me.

While investigating this issue, I have also noticed the folllwing:

1-there are two pid files declared:
PIDFILE in cowrie
PIDFile in service.cowrie

2-if you run "bin/cowrie start" as the cowrie user and then you run "service cowrie stop" as root, the execstop command will not be run (this could be the normal behaviour of systemd though).
2017-04-10 07:39:41 +04:00
cba7b27189 Update cowrie.service (#495) 2017-04-10 07:38:40 +04:00
fe5c003c30 Fix #487 2017-03-21 14:44:51 +00:00
3ca23b67e6 Merge branch 'master' of https://github.com/micheloosterhof/cowrie 2017-03-19 18:44:54 +04:00
0d3c752f1e ip field in MySQL may contain hostname (#486)
* Update mysql.sql

IP field may contain hostname

* Create update11.sql
2017-03-18 10:28:49 -07:00
5eb5ec452b Fix a bug in a portable relative paths resolver (#483)
It turns out that this `|` was a typo. (See https://unix.stackexchange.com/questions/24293/converting-relative-path-to-absolute-path/24342?noredirect=1#comment623203_24342)
2017-03-16 21:45:57 -07:00
3bf182224b remove 'port' parameter, no longer makes sense since we also run telnet 2017-03-16 17:47:50 +04:00
73aa3dfc86 Merge branch 'master' of https://github.com/micheloosterhof/cowrie 2017-03-16 10:58:19 +04:00
5133c0e99d update ssh config 2017-03-16 10:57:53 +04:00
56da64d593 Fix quotes stripping (#480)
* Fix quotes stripping

* Update 'echo' tests

* Revert "Update 'echo' tests"

This reverts commit 88577794b1.
2017-03-15 23:43:35 -07:00
19d4fc782a add $DAEMONIZE parameter again 2017-03-15 04:44:16 +00:00
a1bf057a71 Use ${PIDFILE} instead of cowrie.pid when using authbind (#479)
Fixes #477
2017-03-14 13:22:10 -07:00
dd6034a95c bytes 2017-03-12 16:37:15 +04:00
dbf7d62b02 change prompt from string()->bytes() 2017-03-12 16:27:19 +04:00
d334ae6de1 deprecated warning 2017-03-07 19:19:30 +00:00
55105582cb more changes to start/stop 2017-03-07 19:17:30 +00:00
8f34dd768f describe new start method 2017-03-07 19:12:02 +00:00
199cc79fbe turn idle timeout into time-based timeout 2017-03-07 10:52:31 +04:00
34de2905e3 remove extra connection lost message 2017-03-07 10:49:41 +04:00
bc72aa8017 build on travis with python 3.6 for bytes.format support 2017-03-06 12:39:47 +00:00
9010c33672 more Py2->Py3 2017-03-06 03:26:09 +00:00
bf2e2ab6d0 start string conversion for py3 2017-03-06 03:19:36 +00:00
c5b22cbfcd gracefully fail when command fails to load 2017-03-05 22:33:10 +00:00
33f9d7fe70 py3 style exceptions 2017-03-05 22:05:54 +00:00
2bb8523e69 py3 syntax for exception 2017-03-05 22:03:30 +00:00
2e56ec5ea7 let's give Py3 a try again 2017-03-05 21:51:55 +00:00
807f457829 virtualenv -> python-virtualenv 2017-03-05 20:24:25 +00:00
ce2b08bbae remove double #3, add authbind dependency 2017-03-05 20:21:32 +00:00
db5100f837 Squashed commit of the following:
commit 9593db4dfe
Author: Michel Oosterhof <michel@oosterhof.net>
Date:   Sat Feb 18 15:58:55 2017 +0000

    ttylog switch implementation

commit 50c1e3d425
Author: Michel Oosterhof <michel@oosterhof.net>
Date:   Sat Feb 18 15:50:00 2017 +0000

    update cowrie.cfg.dist
2017-03-05 20:12:39 +00:00
68391bdd9f removed duplicates from requirements.txt (#468) 2017-02-22 09:25:46 -08:00
cfb82829df Merge branch 'master' of https://github.com/micheloosterhof/cowrie 2017-02-18 23:35:43 +04:00
9593db4dfe ttylog switch implementation 2017-02-18 16:58:24 +00:00
50c1e3d425 update cowrie.cfg.dist 2017-02-18 16:58:24 +00:00
5e50074c91 Fix #432 and #433 (#437) 2017-02-18 20:07:36 +04:00
e4da268684 Added Graylog Documentation (#454) 2017-02-18 19:28:59 +04:00
bf17c379fd Log standardization of the commands wget/curl/ftpget/tftp. (#456)
* Log standardization of the commands wget/curl/ftpget/tftp.

* Bring back call of self.protocol.logDispatch().
2017-02-18 19:28:41 +04:00
2f2d458fee Correct TftpClient initialization, close file handle on exception (#458) 2017-02-18 19:28:03 +04:00
a27662efa0 Fix #461 2017-02-16 13:36:59 +00:00
1cf7e02fe1 rename OSX references to MacOS 2017-02-14 22:16:29 +04:00
89fc09d1c2 update changelog 2017-02-12 23:22:07 +04:00
3e87206fbe new option [ssh] forwarding=false this will disable all ssh forwarding 2017-02-12 23:22:07 +04:00
741710ac68 Put tftp usage into 'with' statement, refactored code (#439)
* Put tftp usage into with statement, refactored code

* Report full url instead of just file name
2017-02-08 16:51:37 +08:00
21bbe7fd75 Update busybox.py (#448)
As per commit from @fe7ch

https://github.com/fe7ch/cowrie/commit/9b33509
2017-02-08 16:50:58 +08:00
097a7ceb23 remove database_slack 2017-02-07 05:14:01 +00:00
fb8eb6e095 Merge branch 'master' of https://github.com/micheloosterhof/cowrie 2017-02-07 05:09:12 +00:00