Michel Oosterhof
73aa3dfc86
Merge branch 'master' of https://github.com/micheloosterhof/cowrie
2017-03-16 10:58:19 +04:00
Michel Oosterhof
5133c0e99d
update ssh config
2017-03-16 10:57:53 +04:00
fe7ch
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
Michel Oosterhof
19d4fc782a
add $DAEMONIZE parameter again
2017-03-15 04:44:16 +00:00
lelonek1
a1bf057a71
Use ${PIDFILE} instead of cowrie.pid when using authbind ( #479 )
...
Fixes #477
2017-03-14 13:22:10 -07:00
Michel Oosterhof
dd6034a95c
bytes
2017-03-12 16:37:15 +04:00
Michel Oosterhof
dbf7d62b02
change prompt from string()->bytes()
2017-03-12 16:27:19 +04:00
Michel Oosterhof
d334ae6de1
deprecated warning
2017-03-07 19:19:30 +00:00
Michel Oosterhof
55105582cb
more changes to start/stop
2017-03-07 19:17:30 +00:00
Michel Oosterhof
8f34dd768f
describe new start method
2017-03-07 19:12:02 +00:00
Michel Oosterhof
199cc79fbe
turn idle timeout into time-based timeout
2017-03-07 10:52:31 +04:00
Michel Oosterhof
34de2905e3
remove extra connection lost message
2017-03-07 10:49:41 +04:00
Michel Oosterhof
bc72aa8017
build on travis with python 3.6 for bytes.format support
2017-03-06 12:39:47 +00:00
Michel Oosterhof
9010c33672
more Py2->Py3
2017-03-06 03:26:09 +00:00
Michel Oosterhof
bf2e2ab6d0
start string conversion for py3
2017-03-06 03:19:36 +00:00
Michel Oosterhof
c5b22cbfcd
gracefully fail when command fails to load
2017-03-05 22:33:10 +00:00
Michel Oosterhof
33f9d7fe70
py3 style exceptions
2017-03-05 22:05:54 +00:00
Michel Oosterhof
2bb8523e69
py3 syntax for exception
2017-03-05 22:03:30 +00:00
Michel Oosterhof
2e56ec5ea7
let's give Py3 a try again
2017-03-05 21:51:55 +00:00
Michel Oosterhof
807f457829
virtualenv -> python-virtualenv
2017-03-05 20:24:25 +00:00
Michel Oosterhof
ce2b08bbae
remove double #3 , add authbind dependency
2017-03-05 20:21:32 +00:00
Michel Oosterhof
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
Valentyn Diduryk
68391bdd9f
removed duplicates from requirements.txt ( #468 )
2017-02-22 09:25:46 -08:00
Michel Oosterhof
cfb82829df
Merge branch 'master' of https://github.com/micheloosterhof/cowrie
2017-02-18 23:35:43 +04:00
Michel Oosterhof
9593db4dfe
ttylog switch implementation
2017-02-18 16:58:24 +00:00
Michel Oosterhof
50c1e3d425
update cowrie.cfg.dist
2017-02-18 16:58:24 +00:00
Michal Malik
5e50074c91
Fix #432 and #433 ( #437 )
2017-02-18 20:07:36 +04:00
Will Godsall
e4da268684
Added Graylog Documentation ( #454 )
2017-02-18 19:28:59 +04:00
fe7ch
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
fe7ch
2f2d458fee
Correct TftpClient initialization, close file handle on exception ( #458 )
2017-02-18 19:28:03 +04:00
Michel Oosterhof
a27662efa0
Fix #461
2017-02-16 13:36:59 +00:00
Michel Oosterhof
1cf7e02fe1
rename OSX references to MacOS
2017-02-14 22:16:29 +04:00
Michel Oosterhof
89fc09d1c2
update changelog
2017-02-12 23:22:07 +04:00
Michel Oosterhof
3e87206fbe
new option [ssh] forwarding=false this will disable all ssh forwarding
2017-02-12 23:22:07 +04:00
fe7ch
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
funtimes-ninja
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
Michel Oosterhof
097a7ceb23
remove database_slack
2017-02-07 05:14:01 +00:00
Michel Oosterhof
fb8eb6e095
Merge branch 'master' of https://github.com/micheloosterhof/cowrie
2017-02-07 05:09:12 +00:00
Michel Oosterhof
4d1ac60dbf
seems we need these
2017-02-07 05:08:55 +00:00
fe7ch
53ccf45c7c
Remove redundant [geoip][coordinates] field, since we already have [geoip][location] (added by geoip filter itself) ( #440 )
2017-02-02 18:11:15 +08:00
fe7ch
e2033c36f3
Append redirection support ( #428 )
...
* Add support for '>>' redirection
* Add redir files hashing
* Delete only ">" or ">>" + file name from cmd args
* Update stdin/redir messages to include SHA-256 hash of the file content
* Small style fixes, log if we don't store duplicate
* Bug fixes for wget command
* Use os.path.join instead of string formatting
* Use "with" for hashing a file to prevent handle leakage
* Don't overwrite self.safeoutfile if it was already set in HoneyPotyCommand's init method
* Don't overwrite self.safeoutfile with hash, else it will break stuff in insults.py
* Revert "Delete only ">" or ">>" + file name from cmd args"
This reverts commit f3f8b90cbe
.
* Fix bugged check for presence of safeoutfile attribute.
* Don't overwrite safeoutfile in curl
* Don't store None objects
* Include transportId and sessionId to all safeoutfiles to avoid collisions.
2017-02-01 02:53:31 +08:00
Michel Oosterhof
7f003c2da3
in README.md refer to requirements.txt
2017-01-30 14:33:29 +04:00
fe7ch
8307b86e4d
Remove empty tftp files, double logging fix ( #430 )
...
* Remove empty tftp files, double logging fix
* Remove duplicate of os.symlink() call, add transportID, sessionID to safeoutfile name
* Remove empty file in case of exception
2017-01-28 15:55:14 +08:00
TheHermit
fbf2dbaf3c
Mongo Output ( #413 )
...
* Extend mongo output to use more collections. Matching the style of the other output methods
* Start to update session from other keys
* Logging and endtime in to session
2017-01-27 15:16:11 +08:00
fe7ch
4711b1108a
Remove entries from honeyfs/proc/mounts that does not have corresponding folders. ( #423 )
2017-01-27 14:43:08 +08:00
fe7ch
74916c1d72
Fix paths for egrep/fgrep commands ( #426 )
...
* Support grep/egrep/fgrep without full path
* Fixed path for egrep/fgrep
* There is no grep/egrep/fgrep in /usr/bin in standard cowrie's fs.pickle.
2017-01-27 14:42:07 +08:00
fe7ch
0757e057ae
Prevent cowrie from crashing on invalid host for wget ( #429 )
...
Thanks for submitting this!
2017-01-27 14:40:55 +08:00
Claud Xiao
ce6b996de0
Fixed IndexError caused by intentionally constructed empty cmdstack ( #418 )
...
Thanks!
2017-01-23 11:07:10 +08:00
lelonek1
c58056b01a
Refuse to enable SGA and LINEMODE during authentication ( #415 )
...
Some telnet clients attempt to initiate negotiation about SGA and LINEMODE themselves, but only when a port isn't specified on the command line. If we allow them to enable SGA or LINEMODE, they change from sending a newline character when enter is pressed to sending a carriage return. Cowrie can't handle this properly at the login prompt, which prevents the client from being able to login.
I left the old code commented out so it is easier re-enable once Cowrie/Twisted support the Telnet protocol better.
Fixes #414
2017-01-21 14:30:31 +08:00
Claud Xiao
2152a73cc6
Ignore parentheses in command. Fixed issue #361 ( #416 )
2017-01-21 14:28:50 +08:00