Commit Graph

2558 Commits

Author SHA1 Message Date
9c02409c44 Virustotal save to jsonlog - lower fields (#926)
* VT: lower fields fix
2018-10-24 12:35:42 +04:00
b6a6dd5316 OS libraries needs to branch py2/py3 (#940) 2018-10-24 12:18:40 +04:00
4d548dd57d Issue #725 | Made the free command a lot more dynamic (#934)
* Issue #725 | Made the free command a lot more dynamic

* Issue #725 | Fixed intergration tests
2018-10-23 23:19:12 +04:00
7db8f57b89 Improving honeypot fingerprinting resistance (#938)
* rm on an non-existing file should throw an error

* Return an error on file creation for special pseudo-filesystems

* Redirection errors now python3 compatible

* Special filesystems, `touch` now honors them

* Whitespace fixes for CI
2018-10-23 23:17:23 +04:00
1b8046b578 Fix typo (#936)
You neet to install `acl` not `act`. ;-)
2018-10-23 23:15:17 +04:00
b7ac2c7ec2 clean code for empty files (#932) 2018-10-22 12:01:12 +04:00
5f1198da28 More realistic uname command (#931)
* More realistic uname command
2018-10-20 20:00:38 +04:00
8399023a0b VirusTotal: Save the file scan report and URL scan report to json log (#923)
* VirusTotal: Save the file scan report and URL scan report to json log
* VT: Add field is_new to json log (both url and file scans)
* VT: Don't save to json log when request is already queued in VirusTotal
2018-10-16 17:02:42 +04:00
b7ceb7eca4 userdb.example (#922) 2018-10-13 18:21:16 +04:00
faaf8c9e3e V1.5.1 Release (#921)
* upgrade version to 1.5.1
* changelog
1.5.1
2018-10-13 11:07:02 +04:00
4fb0447e87 Fix #917 (#920) 2018-10-13 11:06:42 +04:00
7653869e1f fix for tab completion on python3 (#918)
Fix #878
2018-10-13 00:58:44 +04:00
4de474ecb3 Vt fixes (#916)
* add url, fix upload
2018-10-10 19:37:27 +04:00
5d88e90566 fixes for format strings (#915) 2018-10-10 19:17:16 +04:00
4f0fc85e02 stop leaking error on python3 because of failing bytes/string conversion (#913) 2018-10-08 15:33:07 +04:00
2333840fb5 startup tweaks for docker (#912) 2018-10-06 16:24:41 +04:00
7c5f19c1ad more text around macos firewall + moving normal SSH (#905) 2018-10-01 17:54:17 +04:00
3edfbee31c updated hassh log message (#904) 2018-09-29 22:16:17 +04:00
b72cbdff0f HASSH fingerprint support (#899) (#900)
Created hassh and hasshAlgorithms based on KEXINIT's kexAlgs, encCS, macCS, and compCS  fields.
Added these fileds to `cowrie.client.kex` log message.
2018-09-28 19:47:35 +04:00
3946dc042c Fix #896 (#897) 2018-09-20 20:12:14 +04:00
fb160f0a09 Fix #856 2018-09-19 21:12:36 +04:00
0d80f9b1e0 Setup (#892)
* Set license, classifiers, packages / run setup build as part of CI workflow.
2018-09-18 23:17:11 +04:00
3b86c0d117 json->jsonlog config entry 2018-09-17 19:03:46 +00:00
33087f5f2d false -> False 2018-09-17 11:33:42 +04:00
7aee48df3f Fabiola busch unix timestamp (#886)
* Add UNIX millisecond epoch time format for logging timestamp by @FabiolaBusch
2018-09-17 11:11:06 +04:00
807c8eeab2 Move py2 dockerfile to docs/docker 2018-09-17 10:54:29 +04:00
ef88ca2d3c Quoting (#885)
* echo shouldn't strip quotes now we use posix shlex + test cases
2018-09-17 10:50:37 +04:00
83cc2c4eee Docker cacheing and python2 (#879)
* Docker caching for devel

Use more caching features of Docker for building the devel image.
Downsite of this is that for users who heavily build the image it will
eat up more disk space then before.
But I think think only developers are affected here and all others will
pull from the registry.
A regular docker cleanup on the machines will solve this problem.

* Upgrade python to python3

The main Dockerfile will build now a python3 based image.
A copy of the old python2 file is still available for further testing.
2018-09-17 10:49:57 +04:00
f5633927ff Fix #883, add ',' to wordchars (#884)
* Fix #883, add ',' to wordchars
2018-09-16 16:46:49 +04:00
cd480394da Setuppy (#876)
* setup.py work in progress. should install library now.
* add incremental for versioning
* Fix 'ls -d' switches (worked wrong way around) and capitalisation in error message.
2018-09-11 12:01:42 +04:00
95e8ac78ba ignore userdb 2018-09-08 10:07:03 +04:00
f59b9513a0 add docker infra 2018-09-08 09:52:01 +04:00
96577bde0d add migrate for userdb.txt 2018-09-08 09:38:15 +04:00
4dd2d71b79 whitespace 2018-09-07 19:04:36 +04:00
65eaeb8287 update log directory 2018-09-07 18:52:05 +04:00
32d345f318 remove data_path, add warning on file not found 2018-09-07 18:49:09 +04:00
30263f102e warning, change data_path, etc 2018-09-07 18:48:40 +04:00
891f5da3b5 Refactor UserDB config files (#874)
The data_path has changed to etc/. I'm not really happy with this but
I didn't had a better idea since we allow configs to be in ., etc/ and
/etc. Maybe we wanna changes this behaviour when we have a stable docker
release.

If the userdb.txt is not found Cowrie will load a default list.
The parser is now also a bit less error prone when parsing this file.
2018-09-07 18:45:13 +04:00
04d516f769 change links 2018-09-07 18:38:11 +04:00
466632aea5 change link 2018-09-07 14:53:40 +04:00
141f9a69bb update links 2018-09-07 14:53:01 +04:00
d923e36d7f ignore dist/ 2018-09-07 14:47:48 +04:00
71774188b2 update with new paths 2018-09-07 14:47:17 +04:00
d0235ef8b9 update wokkel dependency 2018-09-07 14:15:17 +04:00
1ad42e09be Merge branch 'master' of http://www.github.com/micheloosterhof/cowrie 2018-09-07 13:43:18 +04:00
42416a4fb6 Fix permissions inside Docker image (#873)
Some developers have different file permissions in their source
directory. This could lead to unusable Docker images.
We enforce now the correct file permissions during our Docker build.
2018-09-06 19:36:08 +04:00
046bdb9c21 change 775 to a+rX 2018-09-06 17:04:24 +04:00
cd83929ff2 Fix python path (#872) 2018-09-06 16:52:55 +04:00
cf0c3affe9 Docker devel image (#871)
* Docker devel image

TL;DR Providing an docker image for local development.

I wanted to have a container which has all the needed tools installed
while developming (eg flake8, pytest, pydev, etc).

The intermediate container `devel` can now be used by PyCharm as a
Remote Interpreter and for debugging. No need to setup any local test
environments because we can now use a pre-release image.
Build the container with `docker build --target devel -t cowrie:devel
.` from within the project root directory.

While building the container I encountered a bug with the
`python:2-alpine3.8` image and (at least, could be other OS also beeing
affected) the macOS kernel trying to use `socket.SO_REUSEPORT`.
After some testing I found out that the problem is just this image. So I
could have just gone and downgraded to `python:2-alpine3.7` or switched over to
`alpine:latest`. But none of them really convinced me after some
research so I decided to switch the Docker image to
`debian:stable-slim`. The resulting image is now slightly bigger then
our previous image but should give a better experience while
debugging stuff. Bonus point is that we have a functional installation
description for Debian based systems.

* New path for twisteds dropin.cache
2018-09-06 16:35:37 +04:00
bdae37efc1 Fix travis (#868)
* Fix travis flake8 path

flake8 was checking the wrong path inside travis.
Problem here is if the path is not existing flake8 will return 0 and
makes the test pass.
Due to this fakt we have now some flake8 errors which I will handle now.

* Fix flake8 E128
2018-09-02 09:57:53 +04:00