saarctf

2 files changed, 48 insertions, 2 deletions

diff --git a/tulip/0002-tulip-services.patch b/tulip/0002-tulip-services.patch
new file mode 100644
index 0000000..887c3ff
--- /dev/null
+++ b/tulip/0002-tulip-services.patch
@@ -0,0 +1,46 @@
+From da7f3fbc8c99cb123a0e62bf7c102c1735dfaf56 Mon Sep 17 00:00:00 2001
+From: Aleksa Vuckovic <aleksa@vuckovic.cc>
+Date: Sat, 18 Nov 2023 14:28:29 +0000
+Subject: [PATCH] tulip patch
+
+---
+ services/api/configurations.py | 24 +++++++++++++++++-------
+ 1 file changed, 17 insertions(+), 7 deletions(-)
+
+diff --git a/services/api/configurations.py b/services/api/configurations.py
+index a39a800..ae37f0c 100755
+--- a/services/api/configurations.py
++++ b/services/api/configurations.py
+@@ -30,11 +30,21 @@ tick_length = os.getenv("TICK_LENGTH", 2*60*1000)
+ start_date = os.getenv("TICK_START", "2018-06-27T13:00+02:00")
+ mongo_host = os.getenv("TULIP_MONGO", "localhost:27017")
+ mongo_server = f'mongodb://{mongo_host}/'
+-vm_ip = "10.10.3.1"
++vm_ip = "10.32.160.2"
+
+-services = [{"ip": vm_ip, "port": 9876, "name": "cc_market"},
+-            {"ip": vm_ip, "port": 80, "name": "maze"},
+-            {"ip": vm_ip, "port": 8080, "name": "scadent"},
+-            {"ip": vm_ip, "port": 5000, "name": "starchaser"},
+-            {"ip": vm_ip, "port": 1883, "name": "scadnet_bin"},
+-            {"ip": vm_ip, "port": -1, "name": "other"}]
+\ No newline at end of file
++services = [{"ip": vm_ip, "port": 2080, "name": "turingmachines"},
++            {"ip": vm_ip, "port": 8000, "name": "DjangoBells"},
++            {"ip": vm_ip, "port": 16379, "name": "redisbbq"},
++            {"ip": vm_ip, "port": 8080, "name": "pasteable"},
++            {"ip": vm_ip, "port": 30000, "name": "telework"},
++            {"ip": vm_ip, "port": 24929, "name": "saassaassaassaas"},
++            {"ip": vm_ip, "port": -1, "name": "other"},
++            {"ip": vm_ip, "port": -1, "name": "other"},
++            {"ip": vm_ip, "port": -1, "name": "other"},
++            {"ip": vm_ip, "port": -1, "name": "other"},
++            {"ip": vm_ip, "port": -1, "name": "other"},
++            {"ip": vm_ip, "port": -1, "name": "other"},
++            {"ip": vm_ip, "port": -1, "name": "other"},
++            {"ip": vm_ip, "port": -1, "name": "other"},
++            {"ip": vm_ip, "port": -1, "name": "other"},
++            {"ip": vm_ip, "port": -1, "name": "other"}]
+--
+2.34.1
+
diff --git a/tulip/tulip.env b/tulip/tulip.env
index 619c9e7..27a1dcd 100644
--- a/tulip/tulip.env
+++ b/tulip/tulip.env
@@ -1,8 +1,8 @@
-FLAG_REGEX="[A-Z0-9]{31}="
+FLAG_REGEX="SAAR\{[A-Za-z0-9-_]{32}\}"
 TULIP_MONGO="mongo:27017"
 
 # The location of your pcaps as seen by the host
-TRAFFIC_DIR_HOST=./services/test_pcap
+TRAFFIC_DIR_HOST=/traffic
 
 # The location of your pcaps (and eve.json), as seen by the container
 TRAFFIC_DIR_DOCKER=/traffic