Small fixes

.gitignore

@@ -1,5 +1,5 @@
 experiments/pages/**
-experiments/resources/**
+experiments/res/**
 
 # Created by https://www.toptal.com/developers/gitignore/api/macos,pycharm,flask,python
 # Edit at https://www.toptal.com/developers/gitignore?templates=macos,pycharm,flask,python

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   web:
-    image: "registry.gitlab.kuleuven.be/distrinet/research/bughog/experiment-server:latest"
+    image: "bughog/web"
     pull_policy: never
     container_name: bh_web
     build: .
@@ -10,4 +10,4 @@ services:
       - "443:443"
     volumes:
       - ./experiments/pages:/experiments/pages
-      - ./experiments/resources:/app/static/resources
+      - ./experiments/res:/app/static/res

experiments/README.md

@@ -16,13 +16,13 @@ experiments
 |   |   |-- ...
 |   |-- [project 2]
 |   |-- ...
-|-- resources
+|-- res
 ```
 
 - Experiments are grouped within projects inside the `pages` folder, representing sets of related experiments.
 
-- The `resources` folder is intended to host resources that are used by multiple experiments and/or projects (e.g., scripts, images, videos)
-Every resource is hosted on supported domains.
+- The `res` folder is intended to host resources that are used by multiple experiments and/or projects (e.g., scripts, images, videos)
+Every resource is hosted on all supported domains.
 
 
 ## Experiments
@@ -122,10 +122,10 @@ Detecting unvisited sanity check URLs can help identify failed experiments and p
 
 ## Resources
 
-The `resources` folder is intended to host resources shared between projects (e.g., images, videos, scripts).
+The `res` folder is intended to host resources shared between projects (e.g., images, videos, scripts).
 All resources are hosted on each supported domain.
 
-The example resource `experiments/resources/example.html` is hosted at the endpoints `https://[domain]/resources/example.html`, where `[domain]` can be any supported domain.
+The example resource `experiments/res/example.html` is hosted at the endpoints `https://[domain]/res/example.html`, where `[domain]` can be any supported domain.
 
 
 ## Additional help

flask/experiments.py

@@ -64,7 +64,8 @@ def report_leak():
     try:
         requests.post(
             f"http://{remote_ip}:5001/report/",
-            json=response_data
+            json=response_data,
+            timeout=5
         )
     except requests.exceptions.ConnectionError:
         print(f'WARNING: Could not propagate request to collector at {remote_ip}:5000')
@@ -116,9 +117,9 @@ def report_leak_if_contains(expected_header_name: str, expected_header_value: st
         return "Redirect", 307, {"Location": "https://adition.com/report/", "Allow-CSP-From": "*"}
 
 
-@exp_bp.route("/resources/<path:path>")
+@exp_bp.route("/res/<path:path>")
 def resources(path):
-    file_path = os.path.join("/app/static/resources/", path)
+    file_path = os.path.join("/app/static/res/", path)
     if not os.path.isfile(file_path):
         return "Resource not found", 404
     if path.endswith(".swf"):