diff --git a/.gitignore b/.gitignore index 21d0b89..8b13789 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -.venv/ + diff --git a/server/docker-compose.yml b/server/docker-compose.yml index 262dc45..0e1f7ab 100644 --- a/server/docker-compose.yml +++ b/server/docker-compose.yml @@ -1,19 +1,28 @@ services: proxy-server: - image: proxy-server:latest + build: + context: ./proxy-server + dockerfile: Dockerfile container_name: proxy-server networks: - - server + server: + ipv4_address: 172.16.150.100 ports: - - "8080:80" + - 8080:80 web-server: image: nginx:latest container_name: web-server networks: - - server + server: + ipv4_address: 172.16.150.101 + ports: + - 80:80 networks: server: - external: false - name: server + ipam: + driver: default + config: + - subnet: 172.16.150.0/24 + diff --git a/server/proxy-server/.gitignore b/server/proxy-server/.gitignore new file mode 100644 index 0000000..21d0b89 --- /dev/null +++ b/server/proxy-server/.gitignore @@ -0,0 +1 @@ +.venv/ diff --git a/server/proxy-server/Dockerfile b/server/proxy-server/Dockerfile index 42be8ef..7490563 100644 --- a/server/proxy-server/Dockerfile +++ b/server/proxy-server/Dockerfile @@ -1,6 +1,7 @@ FROM python:alpine WORKDIR /app COPY . . -RUN pip install -r requirements.txt +RUN apk add libpcap bash && pip install -r requirements.txt EXPOSE 80 -CMD python main.py +CMD ["python", "-u", "main.py"] + diff --git a/server/proxy-server/main.py b/server/proxy-server/main.py index c896b98..02097cb 100644 --- a/server/proxy-server/main.py +++ b/server/proxy-server/main.py @@ -1,21 +1,10 @@ -from scapy.layers.http import * -from scapy.layers.ntlm import * +from scapy.all import * -class Custom_HTTP_Server(HTTP_Server): - def answer(self, pkt): - if pkt.Path == b"/": - return HTTPResponse() / ( - "