From fd635f2972ecf0e3d449e790d87bed61dd85b4ce Mon Sep 17 00:00:00 2001 From: James Shuttleworth Date: Wed, 30 Sep 2020 10:51:36 +0100 Subject: [PATCH] Tidied up stuff committed just to rescue from dead laptop --- .gitignore | 1 + Makefile | 4 ---- example_out.log | 3 --- tests/test_hm.py | 6 ------ tmp.log | 34 ---------------------------------- tmp2 | 31 ------------------------------- weboutput.log | 25 ------------------------- 7 files changed, 1 insertion(+), 103 deletions(-) delete mode 100644 example_out.log delete mode 100644 tests/test_hm.py delete mode 100644 tmp.log delete mode 100644 tmp2 delete mode 100644 weboutput.log diff --git a/.gitignore b/.gitignore index 6e86e21..af48945 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /html/ __pycache__ /venv/ +/harbour_venv/ diff --git a/Makefile b/Makefile index c3b8c5b..8af1fe7 100644 --- a/Makefile +++ b/Makefile @@ -18,10 +18,6 @@ else endif -test: FORCE venvcheck - py.test -v tests/ - - start_target: -docker kill harbourmaster_target -docker rm harbourmaster_target diff --git a/example_out.log b/example_out.log deleted file mode 100644 index 3eee43c..0000000 --- a/example_out.log +++ /dev/null @@ -1,3 +0,0 @@ -22: Open: non-Wydah (SSH-2.0-OpenSSH_7.6p1 Ubuntu-4ubuntu0.3) -80: Open: non-Wydah -37816: WYDAH MALWARE DETECTED (57 65 6c 63 6f 6d 65 20 74 6f 20 57 79 64 61 68) diff --git a/tests/test_hm.py b/tests/test_hm.py deleted file mode 100644 index e33b041..0000000 --- a/tests/test_hm.py +++ /dev/null @@ -1,6 +0,0 @@ -import pytest -import sys -sys.path.append("./src/") -import harbourmaster - -#TODO: write tests diff --git a/tmp.log b/tmp.log deleted file mode 100644 index 736d510..0000000 --- a/tmp.log +++ /dev/null @@ -1,34 +0,0 @@ -1: Closed -2: Closed -3: Closed -4: Closed -5: Closed - -... - -20: Closed -21: Closed -22: Open - Data recieved -SSH-2.0-OpenSSH_7.6p1 Ubuntu-4ubuntu0.3 - - -23: Closed -24: Closed -25: Closed -26: Closed -27: Closed - -... - -76: Closed -77: Closed -78: Closed -79: Closed -80: Open -81: Closed -82: Closed -83: Closed -96: Closed -97: Closed -98: Closed -99: Closed diff --git a/tmp2 b/tmp2 deleted file mode 100644 index b1189af..0000000 --- a/tmp2 +++ /dev/null @@ -1,31 +0,0 @@ -total 160 -drwxr-xr-x 26 root root 4096 Apr 3 15:43 . -drwxr-xr-x 26 root root 4096 Apr 3 15:43 .. -drwxr-xr-x 2 root root 12288 May 23 2019 bin -drwxr-xr-x 3 root root 4096 Apr 15 2019 boot -drwxrwxr-x 2 root root 4096 Aug 3 2015 cdrom -drwxrwxrwx 2 root root 4096 Jul 1 12:05 cloudsql -drwxr-xr-x 2 root root 4096 Feb 28 2018 DEBIAN -drwxr-xr-x 18 root root 4060 Jul 6 12:27 dev -drwxr-xr-x 196 root root 12288 Aug 4 12:36 etc -drwxr-xr-x 5 root root 4096 Jul 15 07:42 home -lrwxrwxrwx 1 root root 33 Apr 15 2019 initrd.img -> boot/initrd.img-4.15.0-47-generic -lrwxrwxrwx 1 root root 33 Apr 15 2019 initrd.img.old -> boot/initrd.img-4.13.0-46-generic -drwxr-xr-x 25 root root 4096 Apr 15 2019 lib -drwxr-xr-x 2 root root 4096 Apr 14 2019 lib64 -drwx------ 2 root root 16384 Aug 3 2015 lost+found -drwxr-xr-x 4 root root 4096 Feb 17 2016 media -drwxr-xr-x 5 root root 4096 Dec 6 2019 mnt -drwxr-xr-x 8 root root 4096 Aug 4 12:36 opt -dr-xr-xr-x 320 root root 0 Jul 6 12:27 proc -drwx------ 15 root root 4096 Feb 14 17:11 root -drwxr-xr-x 41 root root 1220 Aug 8 2020 run -drwxr-xr-x 2 root root 12288 Apr 15 2019 sbin -drwxr-xr-x 7 root root 4096 Jul 15 07:29 snap -drwxr-xr-x 3 root root 4096 Jan 28 2020 srv -dr-xr-xr-x 13 root root 0 Jul 29 19:08 sys -drwxrwxrwt 25 root root 36864 Aug 8 17:36 tmp -drwxr-xr-x 10 root root 4096 Jan 2 2018 usr -drwxr-xr-x 15 root root 4096 Sep 18 2016 var -lrwxrwxrwx 1 root root 30 Apr 15 2019 vmlinuz -> boot/vmlinuz-4.15.0-47-generic -lrwxrwxrwx 1 root root 30 Apr 15 2019 vmlinuz.old -> boot/vmlinuz-4.13.0-46-generic diff --git a/weboutput.log b/weboutput.log deleted file mode 100644 index 272f4da..0000000 --- a/weboutput.log +++ /dev/null @@ -1,25 +0,0 @@ -75: Closed -76: Closed -77: Closed -78: Closed -79: Closed -80: Open: (response follows) -HTTP/1.1 200 OK -Date: Sat, 08 Aug 2020 18:07:27 GMT -Server: Apache/2.4.29 (Ubuntu) -Last-Modified: Thu, 30 Jul 2020 13:07:29 GMT -ETag: "19b-5aba85ac0e640" -Accept-Ranges: bytes -Content-Length: 411 -Vary: Accept-Encoding -Connection: close -Content-Type: text/html - - - Wydah - -