Skip to content

Commit

Permalink
mim working
Browse files Browse the repository at this point in the history
  • Loading branch information
ElNiak committed Jul 11, 2024
1 parent 151d98d commit 61df34e
Show file tree
Hide file tree
Showing 102 changed files with 9,827 additions and 896 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,7 @@ docs_assets/
**/build/*

.VSCodeCounter/
panther/outputs/qlogs/picoquic/545e19122294c793.be00.server.qlog
panther/outputs/qlogs/picoquic/6f934e0c650d2496.7f3d.server.qlog
panther/panther_worker/app/implementations/other/get-pip.py
panther/panther_worker/app/implementations/quic-implementations/quic-go/quic-go/go1.16.linux-amd64.tar.gz
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ clean-docker:
# Force removal of all images
docker rmi $(docker images -a -q)

clean-docker-volume:
# Removes all Docker volumes
docker volume prune -f

# Fully clean Docker environment
clean-docker-full:
# Removes unused Docker images and containers
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# PANTHER :tiger:
<h1 align="center"> PANTHER </h1>

## :tiger: **P**rotocol formal **A**nalysis and formal **N**etwork **T**hreat **E**valuation **R**esources

Expand Down
2 changes: 2 additions & 0 deletions TODO.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

* refactor

* AVOID creating multiple time the same docker volume

* change os.system with subprocess or with python funct

* add barplot progression
Expand Down
1 change: 0 additions & 1 deletion docs/IN_DEV.md

This file was deleted.

32 changes: 18 additions & 14 deletions panther/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ services:
- COLUMNS=100
- FLASK_ENV=development
- LINES=100
- LOG_LEVEL=10
healthcheck:
interval: 1m30s
retries: 3
Expand Down Expand Up @@ -73,6 +74,7 @@ services:
- MPLBACKEND="Agg"
- COLUMNS=100
- LINES=100
- LOG_LEVEL=10
- PYTHONUNBUFFERED=1
- PYTHONPATH=${PYTHONPATH}:/app/implementations/quic-implementations/aioquic/src
hostname: picoquic-panther
Expand Down Expand Up @@ -100,9 +102,9 @@ services:
- ${PWD}/outputs/tls-keys:/app/tls-keys
- ${PWD}/outputs/tickets:/app/tickets
- ${PWD}/outputs/qlogs:/app/qlogs
picoquic-shadow-panther:
ping-pong-panther:
command: bash -c "stty cols 100 rows 100 && python3 panther_client.py"
container_name: picoquic-shadow-panther
container_name: ping-pong-panther
depends_on:
- panther-webapp
deploy:
Expand All @@ -120,15 +122,16 @@ services:
- MPLBACKEND="Agg"
- COLUMNS=100
- LINES=100
- LOG_LEVEL=10
- PYTHONUNBUFFERED=1
- PYTHONPATH=${PYTHONPATH}:/app/implementations/quic-implementations/aioquic/src
hostname: picoquic-shadow-panther
image: picoquic-shadow-panther:latest
hostname: ping-pong-panther
image: ping-pong-panther:latest
networks:
net:
ipv4_address: 172.27.1.14
ipv4_address: 172.27.1.12
ports:
- 49163:80
- 49161:80
privileged: true
restart: always
security_opt:
Expand All @@ -147,35 +150,36 @@ services:
- ${PWD}/outputs/tls-keys:/app/tls-keys
- ${PWD}/outputs/tickets:/app/tickets
- ${PWD}/outputs/qlogs:/app/qlogs
ping-pong-panther:
quant-panther:
command: bash -c "stty cols 100 rows 100 && python3 panther_client.py"
container_name: ping-pong-panther
container_name: quant-panther
depends_on:
- panther-webapp
deploy:
resources:
limits:
cpus: '4'
memory: 2048M
memory: 1024M
reservations:
cpus: '2.0'
memory: 1024.0M
memory: 512.0M
environment:
- DISPLAY=${DISPLAY}
- XAUTHORITY=~/.Xauthority
- ROOT_PATH=${PWD}
- MPLBACKEND="Agg"
- COLUMNS=100
- LINES=100
- LOG_LEVEL=10
- PYTHONUNBUFFERED=1
- PYTHONPATH=${PYTHONPATH}:/app/implementations/quic-implementations/aioquic/src
hostname: ping-pong-panther
image: ping-pong-panther:latest
hostname: quant-panther
image: quant-panther:latest
networks:
net:
ipv4_address: 172.27.1.12
ipv4_address: 172.27.1.14
ports:
- 49161:80
- 49163:80
privileged: true
restart: always
security_opt:
Expand Down
38 changes: 21 additions & 17 deletions panther/docker-compose.yml.bak
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ services:
- COLUMNS=100
- FLASK_ENV=development
- LINES=100
- LOG_LEVEL=10
healthcheck:
interval: 1m30s
retries: 3
Expand Down Expand Up @@ -73,6 +74,7 @@ services:
- MPLBACKEND="Agg"
- COLUMNS=100
- LINES=100
- LOG_LEVEL=10
- PYTHONUNBUFFERED=1
- PYTHONPATH=${PYTHONPATH}:/app/implementations/quic-implementations/aioquic/src
hostname: picoquic-panther
Expand All @@ -88,7 +90,7 @@ services:
- seccomp:unconfined
stdin_open: true
sysctls:
- net.ipv6.conf.all.disable_ipv6=0
- net.ipv6.conf.all.disable_ipv6=1
tty: true
volumes:
- /tmp/.X11-unix:/tmp/.X11-unix
Expand All @@ -100,9 +102,9 @@ services:
- ${PWD}/outputs/tls-keys:/app/tls-keys
- ${PWD}/outputs/tickets:/app/tickets
- ${PWD}/outputs/qlogs:/app/qlogs
picoquic-shadow-panther:
ping-pong-panther:
command: bash -c "stty cols 100 rows 100 && python3 panther_client.py"
container_name: picoquic-shadow-panther
container_name: ping-pong-panther
depends_on:
- panther-webapp
deploy:
Expand All @@ -120,22 +122,23 @@ services:
- MPLBACKEND="Agg"
- COLUMNS=100
- LINES=100
- LOG_LEVEL=10
- PYTHONUNBUFFERED=1
- PYTHONPATH=${PYTHONPATH}:/app/implementations/quic-implementations/aioquic/src
hostname: picoquic-shadow-panther
image: picoquic-shadow-panther:latest
hostname: ping-pong-panther
image: ping-pong-panther:latest
networks:
net:
ipv4_address: 172.27.1.14
ipv4_address: 172.27.1.12
ports:
- 49163:80
- 49161:80
privileged: true
restart: always
security_opt:
- seccomp:unconfined
stdin_open: true
sysctls:
- net.ipv6.conf.all.disable_ipv6=0
- net.ipv6.conf.all.disable_ipv6=1
tty: true
volumes:
- /tmp/.X11-unix:/tmp/.X11-unix
Expand All @@ -147,42 +150,43 @@ services:
- ${PWD}/outputs/tls-keys:/app/tls-keys
- ${PWD}/outputs/tickets:/app/tickets
- ${PWD}/outputs/qlogs:/app/qlogs
ping-pong-panther:
quant-panther:
command: bash -c "stty cols 100 rows 100 && python3 panther_client.py"
container_name: ping-pong-panther
container_name: quant-panther
depends_on:
- panther-webapp
deploy:
resources:
limits:
cpus: '4'
memory: 2048M
memory: 1024M
reservations:
cpus: '2.0'
memory: 1024.0M
memory: 512.0M
environment:
- DISPLAY=${DISPLAY}
- XAUTHORITY=~/.Xauthority
- ROOT_PATH=${PWD}
- MPLBACKEND="Agg"
- COLUMNS=100
- LINES=100
- LOG_LEVEL=10
- PYTHONUNBUFFERED=1
- PYTHONPATH=${PYTHONPATH}:/app/implementations/quic-implementations/aioquic/src
hostname: ping-pong-panther
image: ping-pong-panther:latest
hostname: quant-panther
image: quant-panther:latest
networks:
net:
ipv4_address: 172.27.1.12
ipv4_address: 172.27.1.14
ports:
- 49161:80
- 49163:80
privileged: true
restart: always
security_opt:
- seccomp:unconfined
stdin_open: true
sysctls:
- net.ipv6.conf.all.disable_ipv6=0
- net.ipv6.conf.all.disable_ipv6=1
tty: true
volumes:
- /tmp/.X11-unix:/tmp/.X11-unix
Expand Down
8 changes: 5 additions & 3 deletions panther/install_config.ini
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,12 @@ minip_ping_pong_flaky = False
; QUIC
quic_aioquic = False
quic_lsquic = False
quic_lsquic_vuln = False
quic_mvfst = False
quic_picoquic = True
quic_picoquic_shadow = True
quic_picoquic_vuln = False
quic_quant = False
quic_picoquic_shadow = False
quic_quant = True
quic_quant_vuln = False
quic_quic_go = False
quic_quiche = False
Expand Down Expand Up @@ -65,10 +66,11 @@ coap_libcoap = ("libcoap", "${coap_path}libcoap", "Dockerfile.libcoap")
minip_ping_pong = ("ping-pong", "${minip_path}ping-pong", "Dockerfile.ping-pong")
quic_aioquic = ("aioquic", "${quic_path}aioquic", "Dockerfile.aioquic")
quic_lsquic = ("lsquic", "${quic_path}lsquic", "Dockerfile.lsquic")
quic_lsquic_vuln = ("lsquic-vuln", "${quic_path}lsquic", "Dockerfile.lsquic-vuln")
quic_mvfst = ("mvfst", "${quic_path}mvfst", "Dockerfile.mvfst")
quic_picoquic = ("picoquic", "${quic_path}picoquic", "Dockerfile.picoquic")
quic_picoquic_shadow = ("picoquic-shadow", "${quic_path}picoquic", "Dockerfile.picoquic-shadow")
quic_picoquic_vuln = ("picoquic-shadow", "${quic_path}picoquic", "Dockerfile.picoquic-vuln")
quic_picoquic_vuln = ("picoquic-vuln", "${quic_path}picoquic", "Dockerfile.picoquic-vuln")
quic_quant = ("quant", "${quic_path}quant", "Dockerfile.quant")
quic_quant_vuln = ("quant-vuln", "${quic_path}quant", "Dockerfile.quant-vuln")
quic_quic_go = ("quic-go", "${quic_path}quic-go", "Dockerfile.quic-go")
Expand Down
Loading

0 comments on commit 61df34e

Please sign in to comment.