diff options
| -rw-r--r-- | fast/server.yaml | 10 | ||||
| -rw-r--r-- | fast/submitter.py | 21 | ||||
| -rw-r--r-- | nginx/ctf.rs.conf | 2 | ||||
| -rw-r--r-- | tulip/0002-tulip-services.patch | 26 | ||||
| -rw-r--r-- | tulip/tulip.env | 10 |
5 files changed, 19 insertions, 50 deletions
diff --git a/fast/server.yaml b/fast/server.yaml deleted file mode 100644 index 431d4bb..0000000 --- a/fast/server.yaml +++ /dev/null @@ -1,10 +0,0 @@ -game: - tick_duration: 60 - flag_format: ENO[A-Za-z0-9+\/=]{48} - team_ip: 10.1.93.1 - -submitter: - interval: 15 - -server: - password: sifra diff --git a/fast/submitter.py b/fast/submitter.py deleted file mode 100644 index 1fb67d5..0000000 --- a/fast/submitter.py +++ /dev/null @@ -1,21 +0,0 @@ -import requests - -TEAM_TOKEN = "0574cec7b21a0cba8f1b2efb5ca8fac5" - - -def submit(flags): - accepted_flags, rejected_flags = {}, {} - response = requests.put( - "http://10.0.13.37:1337/flags", - headers={"X-Team-Token": TEAM_TOKEN}, - json=flags, - ) - - responses = response.json() - - for flag in responses: - if flag["status"]: - accepted_flags[flag["flag"]] = flag["msg"] - else: - rejected_flags[flag["flag"]] = flag["msg"] - return accepted_flags, rejected_flags diff --git a/nginx/ctf.rs.conf b/nginx/ctf.rs.conf index 3e6ea2d..b1e7731 100644 --- a/nginx/ctf.rs.conf +++ b/nginx/ctf.rs.conf @@ -17,7 +17,7 @@ server { server_name fast.s1.ctf.rs; location / { - proxy_pass http://127.0.0.1:2023; + proxy_pass http://127.0.0.1:2024; include proxy_params; } } diff --git a/tulip/0002-tulip-services.patch b/tulip/0002-tulip-services.patch index adf5b96..1e0564f 100644 --- a/tulip/0002-tulip-services.patch +++ b/tulip/0002-tulip-services.patch @@ -16,20 +16,20 @@ index 0dea4f4..032fdb4 100755 flag_regex = os.getenv("FLAG_REGEX", "[A-Z0-9]{31}=") mongo_server = f'mongodb://{mongo_host}/' -vm_ip = os.getenv("VM_IP", "10.10.3.1") -+vm_ip = "10.1.93.1" ++vm_ip = "10.100.2.1" + -+services = [{"ip": vm_ip, "port": 8080, "name": "imagidate"}, -+ {"ip": vm_ip, "port": 5000, "name": "imagidate"}, -+ {"ip": vm_ip, "port": 6060, "name": "notify24"}, -+ {"ip": vm_ip, "port": 6061, "name": "notify24"}, -+ {"ip": vm_ip, "port": 1080, "name": "onlyflags"}, -+ {"ip": vm_ip, "port": 9145, "name": "onlyflags"}, -+ {"ip": vm_ip, "port": 4444, "name": "piratesay"}, -+ {"ip": vm_ip, "port": 6969, "name": "replme"}, -+ {"ip": vm_ip, "port": 6222, "name": "scamfinder24"}, -+ {"ip": vm_ip, "port": 8008, "name": "sceam"}, -+ {"ip": vm_ip, "port": 9696, "name": "whatscam"}, -+ {"ip": vm_ip, "port": 2027, "name": "wonki"}, ++services = [{"ip": vm_ip, "port": 5000, "name": "contractual_service1"}, ++ {"ip": vm_ip, "port": 1337, "name": "tpm_service2"}, ++ {"ip": vm_ip, "port": 3000, "name": "todo_service3"}, ++ {"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"}] -services = [{"ip": vm_ip, "port": 9876, "name": "cc_market"}, diff --git a/tulip/tulip.env b/tulip/tulip.env index b1350c2..c853c57 100644 --- a/tulip/tulip.env +++ b/tulip/tulip.env @@ -14,11 +14,11 @@ TRAFFIC_DIR_DOCKER=/traffic ############################## # Start time of the CTF (or network open if you prefer) -TICK_START="2024-07-19T14:00+02:00" +TICK_START="2024-08-31T10:00+02:00" # Tick length in ms -TICK_LENGTH=60000 +TICK_LENGTH=120000 # The flag format in regex -FLAG_REGEX="ENO[A-Za-z0-9+\/=]{48}" +FLAG_REGEX="[A-Z0-9]{31}=" ############################## # PCAP_OVER_IP CONFIGS @@ -41,5 +41,5 @@ FLAG_REGEX="ENO[A-Za-z0-9+\/=]{48}" # # Flagid endpoint currently Testendpoint in docker compose # FLAGID_ENDPOINT="http://flagidendpoint:8000/flagids.json" # # VM IP (inside gamenet) -VM_IP="10.1.93.1" -TEAM_ID="10.1.93.1" +VM_IP="10.100.2.1" +TEAM_ID="10.100.2.1" |