From 77339d0c7cf8ffae26bff788d684a717decbfdc6 Mon Sep 17 00:00:00 2001
From: Lukian <lulul7018@gmail.com>
Date: Mon, 2 Dec 2024 11:37:48 +0100
Subject: [PATCH] Saataa andagii !

---
 .gitignore                                      |  1 +
 server/docker-compose.yml                       | 11 +++--------
 server/{proxy => proxy-server}/Dockerfile       |  4 ++--
 server/{proxy => proxy-server}/main.py          |  3 ++-
 server/{proxy => proxy-server}/requirements.txt |  0
 5 files changed, 8 insertions(+), 11 deletions(-)
 create mode 100644 .gitignore
 rename server/{proxy => proxy-server}/Dockerfile (61%)
 rename server/{proxy => proxy-server}/main.py (89%)
 rename server/{proxy => proxy-server}/requirements.txt (100%)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..21d0b89
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.venv/
diff --git a/server/docker-compose.yml b/server/docker-compose.yml
index c080f16..262dc45 100644
--- a/server/docker-compose.yml
+++ b/server/docker-compose.yml
@@ -1,22 +1,17 @@
 services:
   proxy-server:
-    build:
-      context: ./proxy
-      dockerfile: Dockerfile 
-      network: host
-    image: proxy-server
+    image: proxy-server:latest
     container_name: proxy-server
     networks:
-        - server
+      - server
     ports:
       - "8080:80"
+
   web-server:
     image: nginx:latest
     container_name: web-server
     networks:
       - server
-    ports:
-      - "80:80"
 
 networks:
   server:
diff --git a/server/proxy/Dockerfile b/server/proxy-server/Dockerfile
similarity index 61%
rename from server/proxy/Dockerfile
rename to server/proxy-server/Dockerfile
index d600f2c..42be8ef 100644
--- a/server/proxy/Dockerfile
+++ b/server/proxy-server/Dockerfile
@@ -1,6 +1,6 @@
-FROM python:slim
+FROM python:alpine
 WORKDIR /app
 COPY . .
 RUN pip install -r requirements.txt
 EXPOSE 80
-CMD ["python", "main.py"]
+CMD python main.py
diff --git a/server/proxy/main.py b/server/proxy-server/main.py
similarity index 89%
rename from server/proxy/main.py
rename to server/proxy-server/main.py
index dc780be..c896b98 100644
--- a/server/proxy/main.py
+++ b/server/proxy-server/main.py
@@ -1,4 +1,5 @@
-from scapy.all import *
+from scapy.layers.http import *
+from scapy.layers.ntlm import *
 
 class Custom_HTTP_Server(HTTP_Server):
     def answer(self, pkt):
diff --git a/server/proxy/requirements.txt b/server/proxy-server/requirements.txt
similarity index 100%
rename from server/proxy/requirements.txt
rename to server/proxy-server/requirements.txt