Commit Graph

3142 Commits

Author SHA1 Message Date
65d60d7a9f Merge branch 'master' into pypy-travis 2019-09-12 12:14:34 +01:00
826cddd2cd xenial -> bionic 2019-09-12 15:10:19 +04:00
a01dcd0a7d remove debug line 2019-09-12 12:34:27 +04:00
f330711691 usage 2019-09-12 12:15:17 +04:00
f95d4a6fcb grr 2019-09-12 12:08:40 +04:00
759c6d8210 optimize test 2019-09-12 12:07:36 +04:00
d824bbf7cf remove recommended apt packages 2019-09-12 12:06:39 +04:00
a47cafa2f9 test output 2019-09-12 12:03:08 +04:00
6611094613 2.8->3.8 2019-09-12 11:55:48 +04:00
b76ac0dbe1 circle 2019-09-12 11:53:24 +04:00
1f564c3803 more py versions (#1206)
* py versions
* allow failure for nightly/dev
2019-09-12 08:22:55 +01:00
a33e67fa84 allow failure for nightly/dev 2019-09-12 11:12:46 +04:00
32abedba18 py versions 2019-09-12 11:08:35 +04:00
8526d5d18d more py versions` 2019-09-12 11:01:05 +04:00
5ce37fbf35 Merge branch 'master' of https://github.com/cowrie/cowrie 2019-09-11 22:13:05 +04:00
126d3b34f1 Mysql retry (#1205)
* log message was on wrong branch
2019-09-09 22:22:44 +01:00
b44b907743 remove exceptions (#1204) 2019-09-06 16:52:35 +01:00
60bcf2b0e1 better error (#1203) 2019-09-06 16:39:49 +01:00
cec5ba4c34 Dock (#1202)
* instead use dockerfile in docker-cowrie/ remove this to stop confusion
2019-09-06 15:42:18 +01:00
41077d3664 Crash defaults (#1201)
* change defaults on crash reporter
2019-09-06 15:12:52 +01:00
ca837eda04 Merge branch 'master' of https://github.com/cowrie/cowrie 2019-09-06 15:05:49 +01:00
5db18ff97a Crash (#1200)
* fix
2019-09-06 14:45:18 +01:00
e60cb7088f Crash (#1199)
* update crashreporter
2019-09-06 14:13:20 +01:00
38d7d95d84 Merge branch 'master' of https://github.com/cowrie/cowrie 2019-09-06 14:02:51 +01:00
69ced5431f Add retro-compatibility for Python 2.7 (#1198)
* add retro-compatibility for Python 2.7
2019-09-05 07:49:50 +01:00
a0e1e1251b Tftp exception (#1197)
* remove tftp exceptions
2019-09-04 22:31:27 +01:00
ca1213b4a8 treq as requirement (#1196) 2019-09-04 22:22:49 +01:00
07b25db3dd Merge branch 'master' of https://github.com/cowrie/cowrie 2019-09-04 22:18:26 +01:00
5e2eff567d add __init__ for py2 (#1195) 2019-09-04 16:02:28 +01:00
7a48eda9ec Telemetry (#1194)
* crashreporter uploads crashes to api.cowrie.org
2019-09-04 16:01:48 +01:00
b35b98666d Merge branch 'master' of https://github.com/cowrie/cowrie 2019-09-02 08:14:45 +01:00
58fcb470be Py3 hpfeeds (#1192)
* __next__ for py3
2019-08-30 13:01:29 +04:00
27befe953d Merge branch 'master' of https://github.com/cowrie/cowrie 2019-08-30 12:37:43 +04:00
d4d6453209 Use interactive_timeout in SSH proxy (#1190) 2019-08-27 21:52:35 +01:00
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