From 9f0101b1c3dd43dab9b62ddd6e2b00ff131969d0 Mon Sep 17 00:00:00 2001 From: Lukian Date: Tue, 17 Dec 2024 15:47:57 +0100 Subject: [PATCH] Changed the web server to be on the same program than the scapy program --- server/{proxy-server => }/.gitignore | 0 server/{proxy-server => }/Dockerfile | 0 server/docker-compose.yml | 25 +++------------------- server/index.html | 11 ++++++++++ server/main.py | 22 +++++++++++++++++++ server/proxy-server/main.py | 10 --------- server/{proxy-server => }/requirements.txt | 0 server/style.css | 6 ++++++ 8 files changed, 42 insertions(+), 32 deletions(-) rename server/{proxy-server => }/.gitignore (100%) rename server/{proxy-server => }/Dockerfile (100%) create mode 100644 server/index.html create mode 100644 server/main.py delete mode 100644 server/proxy-server/main.py rename server/{proxy-server => }/requirements.txt (100%) create mode 100644 server/style.css diff --git a/server/proxy-server/.gitignore b/server/.gitignore similarity index 100% rename from server/proxy-server/.gitignore rename to server/.gitignore diff --git a/server/proxy-server/Dockerfile b/server/Dockerfile similarity index 100% rename from server/proxy-server/Dockerfile rename to server/Dockerfile diff --git a/server/docker-compose.yml b/server/docker-compose.yml index 0e1f7ab..8324e76 100644 --- a/server/docker-compose.yml +++ b/server/docker-compose.yml @@ -1,28 +1,9 @@ services: - proxy-server: + web: build: - context: ./proxy-server + context: . dockerfile: Dockerfile - container_name: proxy-server - networks: - server: - ipv4_address: 172.16.150.100 - ports: - - 8080:80 - - web-server: - image: nginx:latest - container_name: web-server - networks: - server: - ipv4_address: 172.16.150.101 + container_name: web ports: - 80:80 -networks: - server: - ipam: - driver: default - config: - - subnet: 172.16.150.0/24 - diff --git a/server/index.html b/server/index.html new file mode 100644 index 0000000..449deab --- /dev/null +++ b/server/index.html @@ -0,0 +1,11 @@ + + + + Basic web server + + + +

Hello, world!

+ + + diff --git a/server/main.py b/server/main.py new file mode 100644 index 0000000..efab81e --- /dev/null +++ b/server/main.py @@ -0,0 +1,22 @@ +from scapy.all import * +import http.server +import socketserver +import threading + +PORT = 80 + +Handler = http.server.SimpleHTTPRequestHandler +http = socketserver.TCPServer(("", PORT), Handler) + +def handler(pkt): + print(pkt) + +def sniff_packets(): + sniff(filter=f"tcp port {PORT}", prn=handler) + +if __name__ == "__main__": + sniffer = threading.Thread(target=sniff_packets) + sniffer.start() + http.serve_forever() + print("serving at port", PORT) + diff --git a/server/proxy-server/main.py b/server/proxy-server/main.py deleted file mode 100644 index 02097cb..0000000 --- a/server/proxy-server/main.py +++ /dev/null @@ -1,10 +0,0 @@ -from scapy.all import * - -PORT = 80 - -def handler(pkt): - print(pkt) - -if __name__ == "__main__": - sniff(filter=f"tcp port {PORT}", prn=handler) - diff --git a/server/proxy-server/requirements.txt b/server/requirements.txt similarity index 100% rename from server/proxy-server/requirements.txt rename to server/requirements.txt diff --git a/server/style.css b/server/style.css new file mode 100644 index 0000000..e282abf --- /dev/null +++ b/server/style.css @@ -0,0 +1,6 @@ +body { + background-color: black; + color: white; + font-family: "Comic Sans MS"; + text-align: center; +}