Commit Graph

2558 Commits

Author SHA1 Message Date
d2fe36c44c Add option to configure Qemu machine (#1189) 2019-08-27 20:05:24 +01:00
d325e39487 Remove capture_output parameter for Python 3.6- compatibility (#1188)
* remove capture_output parameter for Python 3.6 compatibility
2019-08-27 18:59:56 +01:00
cdbb2ac2ab Improve docs on backend pool (#1187)
* improve docs on backend pool
2019-08-27 18:40:33 +01:00
934c803015 Fix issue #1185 (#1186) - use lazy import for libvirt
* fix typo in docs

* fix #1185 by lazy importing
2019-08-26 21:04:32 +01:00
f9a82c29d2 Merge branch 'master' of https://github.com/cowrie/cowrie 2019-08-26 16:49:52 +04:00
aeba97b4cc Add a pool of backends for the proxy (#1181)
* add pool configs

* add pool interface from proxy branch

* add support for pool initialisation in plugin

* add pool to telnet

* backend pool as service

* move libvirt backend to own dir

* add NAT settings

* add guest backend config

* check for telnet in nmap if ssh is disabled

* add pool periodic cleanup

* add developer guide for backend pool

* add proxy documentation

* add backend pool docs

* docs on XML configs

* add method to check guest connectivity

* add telnet exec class

* update circle deps

* add tox libvirt dep
2019-08-26 12:11:58 +01:00
7329d26974 dshield py3 (#1184) 2019-08-25 12:26:19 +04:00
a97b1ead51 test new py versions (#1183)
* test new py versions

* 3.9-dev does not exist yet
2019-08-25 11:38:41 +04:00
016878667f dependency upgrade Tue Aug 20 15:53:23 +04 2019 (#1182) 2019-08-20 16:37:00 +04:00
16fac8856d Handle redirection in shell (#1095) 2019-08-20 12:51:00 +04:00
4789223ea0 Update to Buster (#1179)
`virtualenv` needs to be installed additionally as dependency.
2019-08-19 13:14:55 +04:00
f4c1afad37 Fix missing byte type cast for color (#1174) 2019-08-06 17:04:13 +04:00
9f922ed4bc update readme (#1170)
* update readme

* r2
2019-07-29 11:26:07 +04:00
19a9bd2f3f fix (#1167) 2019-07-19 17:29:58 +04:00
bf422e424c don't use format, it leads to implicit decode() depending on OS LANG settings (#1164) 2019-07-05 10:47:31 +04:00
2fc6a47ed8 Fix typo in printf command. (#1162) 2019-07-03 21:59:50 +04:00
34f8464732 Add a Telnet proxy for Cowrie (#1159)
* add telnet proxy
2019-07-01 21:41:03 +04:00
cc7d65adc0 Add an SSH proxy for Cowrie (#1154)
* add SSH proxy
2019-06-29 13:20:26 +04:00
8b7415cb1b Move auth_none and auth_keyboard_interactive_enabled to [ssh] config section (#1153) 2019-06-20 11:33:38 +04:00
571d4f0308 Use command instead of which for checking authbind (#1145) 2019-06-20 11:28:18 +04:00
4ef3d18270 Remove deprecated options from config file (#1151) 2019-06-20 11:27:50 +04:00
5d321950a0 dependency upgrade Thu Jun 20 10:34:24 +04 2019 (#1152) 2019-06-20 11:27:13 +04:00
31ad2c1a54 handle submission if there is no good url (#1144) 2019-06-13 08:34:49 +04:00
8b363c3432 dependency upgrade Sun Jun 9 10:45:35 +04 2019 (#1143) 2019-06-09 13:07:43 +04:00
179166cd63 sleep command accepts 's' 'h' or 'm' (#1141) 2019-05-30 11:11:08 +04:00
4bf5b4a3cc Dependency upgrade 2019 05 29 (#1140)
* python dependency upgrade Wed May 29 05:34:21 +04 2019
2019-05-30 10:36:24 +04:00
d925e23d13 scripts to update and freeze main dependencies (#1139) 2019-05-29 05:17:45 +04:00
efa4df978f Tests on CircleCI
* version one
2019-05-25 11:09:10 +04:00
73fda01b1a travis org->com for icon (#1135) 2019-05-25 10:35:01 +04:00
f551b249f0 Pickle (#1134)
* load pickle from scratch, don't deepcopy
* allow output module `import` without side effects
* set up intersphinx for py3 and twisted
2019-05-21 01:00:49 +04:00
c0217d3ef4 don't use url key for non-urls (#1133) 2019-05-17 21:56:23 +04:00
9e471824fc Rewrite config as a singleton object (#1129)
* config as singleton so that the cowrie code can be imported without running code.
2019-05-17 20:49:45 +04:00
68a15bf93a 'scans' key does not exist if item was submitted but not yet scanned (#1132) 2019-05-17 20:47:54 +04:00
2c39da7684 run with 'allinfo' to get more data (#1130) 2019-05-16 18:12:35 +04:00
af89919b16 Update commands/files (#1128)
* Update commands/files

There were some typo's in the README, these were adjusted and tested.

* Removed StateDirectory & LogsDirectory in .service

Were not required and giving errors:
May 16 12:28:07 debian systemd[1]: [/etc/systemd/system/cowrie.service:16] Unknown lvalue 'StateDirectory' in section 'Service'
May 16 12:28:07 debian systemd[1]: [/etc/systemd/system/cowrie.service:17] Unknown lvalue 'LogsDirectory' in section 'Service'
2019-05-16 18:11:06 +04:00
4a3f3ae30a only submit url if there is a url (#1127) 2019-05-15 12:22:40 +04:00
ec38fd2447 vt fixes (#1126) 2019-05-12 21:50:16 +04:00
888b1ca786 Update rm implementation (#1117)
* Update rm implementation
2019-05-12 21:39:21 +04:00
3c99ed531b more tox (#1125) 2019-05-12 21:38:49 +04:00
a1324ddac0 Tox (#1123)
* tox
2019-05-12 19:40:45 +04:00
4840e586f6 add Michel as copyright owner and RST formatting (#1121) 2019-05-12 19:33:14 +04:00
d3c65ca19e allow wget error message to be utf8 (#1120) 2019-05-12 18:50:09 +04:00
9aa66b05bd virustotal output parsing (#1119) 2019-05-12 18:44:24 +04:00
6157d066bc exclude env dir in flake test (#1115) 2019-05-12 18:20:30 +04:00
b291702b65 get supported versions from twisted (#1114) 2019-05-12 18:00:40 +04:00
cde184ce72 Makefile updates (#1118)
* makefile updates
2019-05-12 17:58:14 +04:00
25eba0aab0 iterator that works on python 2 and 3 (#1111) 2019-05-06 17:00:40 +04:00
d5ca8321e4 add makefile (#1108) 2019-05-04 20:34:16 +04:00
63d697e0bf better handling of non existing users and malformatted passwd files (#1106)
* better handling of non existing users and malformatted passwd files
2019-05-04 11:58:52 +04:00
d55418dcb0 posix parsing (#1105) 2019-05-04 11:16:20 +04:00