From 114f03309aa872726d06bd0853910ce9fe71deb5 Mon Sep 17 00:00:00 2001
From: James Shuttleworth <csx239@coventry.ac.uk>
Date: Sun, 13 Sep 2020 12:39:14 +0100
Subject: [PATCH 1/3] Updating repo with bits from knackered laptop

---
 example_out.log |  3 +++
 src/tmp.py      | 25 +++++++++++++++++++++++++
 tmp.log         | 34 ++++++++++++++++++++++++++++++++++
 tmp2            | 31 +++++++++++++++++++++++++++++++
 weboutput.log   | 25 +++++++++++++++++++++++++
 5 files changed, 118 insertions(+)
 create mode 100644 example_out.log
 create mode 100644 src/tmp.py
 create mode 100644 tmp.log
 create mode 100644 tmp2
 create mode 100644 weboutput.log

diff --git a/example_out.log b/example_out.log
new file mode 100644
index 0000000..3eee43c
--- /dev/null
+++ b/example_out.log
@@ -0,0 +1,3 @@
+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/src/tmp.py b/src/tmp.py
new file mode 100644
index 0000000..0d48ac2
--- /dev/null
+++ b/src/tmp.py
@@ -0,0 +1,25 @@
+#!python
+"""Simple program for scanning ports on a given host and acting on results"""
+
+from h_sockets import testPort
+import colored
+
+if __name__=="__main__":
+    target="172.17.0.2"
+
+    for p in range(1,100):
+        message=colored.fg("red")+"Closed"
+        
+        result=testPort(target,p)
+        if not result is None:
+            message=colored.fg("green")+"Open"
+            if len(result)>0:
+                message+=colored.fg("yellow")
+                message+=" - Data recieved"
+                for i in result:
+                    message+="\n"+i
+                message+="\n"
+        message+=colored.attr('reset')
+        print(f"{p}: {message}")
+        
+              
diff --git a/tmp.log b/tmp.log
new file mode 100644
index 0000000..736d510
--- /dev/null
+++ b/tmp.log
@@ -0,0 +1,34 @@
+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
new file mode 100644
index 0000000..b1189af
--- /dev/null
+++ b/tmp2
@@ -0,0 +1,31 @@
+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
new file mode 100644
index 0000000..272f4da
--- /dev/null
+++ b/weboutput.log
@@ -0,0 +1,25 @@
+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
+
+<html>
+  <head><title>Wydah</title></head>
+  <body>
+    <iframe width="560" height="315" src="https://www.youtube.com/embed/TZw4M1yHta8" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture
+81: Closed
+82: Closed
+83: Closed
+84: Closed

From b80e76065e7e652f7c8019cf75286ba845ce1184 Mon Sep 17 00:00:00 2001
From: James Shuttleworth <csx239@coventry.ac.uk>
Date: Tue, 29 Sep 2020 15:03:17 +0100
Subject: [PATCH 2/3] Tidied up a little

---
 Makefile             |  6 +++---
 README.md            | 15 ++-------------
 src/harbourmaster.py |  7 +++++++
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index f913209..c3b8c5b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,18 @@
-INVENV = $(shell pip3 -V | grep 'venv')
+INVENV = $(shell pip3 -V | grep 'harbour_venv')
 current_dir = $(shell pwd)
 
 prereqs: venvcheck FORCE
 	pip install -r requirements.txt
 
 venv: FORCE
-	python3 -m venv venv
+	python3 -m venv harbour_venv
 
 docs:
 	pdoc  --html ./src/*.py --force
 
 venvcheck:
 ifeq ($(INVENV),)
-	$(error You should only run this from within the venv. Use '. ./venv/bin/activate')
+	$(error You should only run this from within the venv. Use '. ./harbour_venv/bin/activate')
 else
 	@echo "venv check passed\n"
 endif
diff --git a/README.md b/README.md
index 6c34c6f..e842a3d 100644
--- a/README.md
+++ b/README.md
@@ -11,20 +11,9 @@ Harbourmaster is a simple port-scanning tool
 
 This is a very simple tool, but it does (or will do) a few useful things.
 
-TODO
-# The Target
-
-TODO
-
-
-# Completing HarbourMaster
-
-TODO:
-
-
+See the requirements for the project here: <https://github.coventry.ac.uk/pages/CUEH/4061CEM/projects/port_scanner/>
 # TODO - things left to do before students get access
 
- - Clear up TODO items
- - Put proper pydoc generation in and fill in all docstrings
+
  - Write bit about cloning repo
 
diff --git a/src/harbourmaster.py b/src/harbourmaster.py
index 0d48ac2..98cc3df 100755
--- a/src/harbourmaster.py
+++ b/src/harbourmaster.py
@@ -8,17 +8,24 @@ if __name__=="__main__":
     target="172.17.0.2"
 
     for p in range(1,100):
+
         message=colored.fg("red")+"Closed"
         
         result=testPort(target,p)
+
         if not result is None:
+
             message=colored.fg("green")+"Open"
+
             if len(result)>0:
                 message+=colored.fg("yellow")
                 message+=" - Data recieved"
+
                 for i in result:
                     message+="\n"+i
+
                 message+="\n"
+                
         message+=colored.attr('reset')
         print(f"{p}: {message}")
         

From 8b03304acdfa2dd4a2009e41283a9d6c7629aa7a Mon Sep 17 00:00:00 2001
From: James Shuttleworth <csx239@coventry.ac.uk>
Date: Tue, 29 Sep 2020 15:03:31 +0100
Subject: [PATCH 3/3] Removed old todo list

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index e842a3d..058c779 100644
--- a/README.md
+++ b/README.md
@@ -12,8 +12,4 @@ Harbourmaster is a simple port-scanning tool
 This is a very simple tool, but it does (or will do) a few useful things.
 
 See the requirements for the project here: <https://github.coventry.ac.uk/pages/CUEH/4061CEM/projects/port_scanner/>
-# TODO - things left to do before students get access
-
-
- - Write bit about cloning repo