diff options
| -rw-r--r-- | ansible.yaml | 55 | ||||
| -rw-r--r-- | fast/server.yaml | 6 | ||||
| -rw-r--r-- | fast/submitter.py | 2 | ||||
| -rw-r--r-- | tulip/0002-tulip-services.patch | 29 | ||||
| -rw-r--r-- | tulip/tulip.env | 10 |
5 files changed, 25 insertions, 77 deletions
diff --git a/ansible.yaml b/ansible.yaml index b13c60c..62a2abb 100644 --- a/ansible.yaml +++ b/ansible.yaml @@ -1,58 +1,3 @@ -- name: fast - hosts: 127.0.0.1 - become: yes - tasks: - - name: Install Python Virtualenv - apt: - name: python3-virtualenv - state: present - - - name: Install docker-compose - apt: - name: docker-compose - state: present - - - name: Pull PostgreSQL Docker Image - docker_image: - name: postgres:alpine - source: pull - - - name: Run PostgreSQL Container - docker_container: - name: fastdb - image: postgres:alpine - env: - POSTGRES_DB: fast - POSTGRES_USER: admin - POSTGRES_PASSWORD: admin - ports: - - "5432:5432" - detach: yes - - - name: Create ~/fast directory - file: - path: ~/fast - state: directory - become: yes - - - name: Copy server.yaml and submitter.py to fast directory - copy: - src: "./fast/server.yaml" - dest: ~/fast/server.yaml - become: yes - - - name: Copy file2 to ~/fast - copy: - src: "./fast/submitter.py" - dest: ~/fast/submitter.py - become: yes - - - name: Install fast package in the virtual environment - pip: - name: https://github.com/dusanlazic/fast/releases/download/v1.1.0-czechia/fast-1.1.0-czechia.tar.gz - virtualenv: ~/fast-venv - - - name: tulip hosts: 127.0.0.1 become: yes diff --git a/fast/server.yaml b/fast/server.yaml index 51d8fad..431d4bb 100644 --- a/fast/server.yaml +++ b/fast/server.yaml @@ -1,7 +1,7 @@ game: - tick_duration: 120 - flag_format: [A-Z0-9]{31}= - team_ip: 10.60.24.1 + tick_duration: 60 + flag_format: ENO[A-Za-z0-9+\/=]{48} + team_ip: 10.1.93.1 submitter: interval: 15 diff --git a/fast/submitter.py b/fast/submitter.py index 1c7c21d..1fb67d5 100644 --- a/fast/submitter.py +++ b/fast/submitter.py @@ -6,7 +6,7 @@ TEAM_TOKEN = "0574cec7b21a0cba8f1b2efb5ca8fac5" def submit(flags): accepted_flags, rejected_flags = {}, {} response = requests.put( - "http://10.10.0.1:8080/flags", + "http://10.0.13.37:1337/flags", headers={"X-Team-Token": TEAM_TOKEN}, json=flags, ) diff --git a/tulip/0002-tulip-services.patch b/tulip/0002-tulip-services.patch index f012a8f..adf5b96 100644 --- a/tulip/0002-tulip-services.patch +++ b/tulip/0002-tulip-services.patch @@ -4,29 +4,32 @@ Date: Thu, 4 Jul 2024 09:18:50 +0000 Subject: [PATCH] services --- - services/api/configurations.py | 19 ++++++++++++------- - 1 file changed, 12 insertions(+), 7 deletions(-) + services/api/configurations.py | 22 +++++++++++++++------- + 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/services/api/configurations.py b/services/api/configurations.py index 0dea4f4..032fdb4 100755 --- a/services/api/configurations.py +++ b/services/api/configurations.py -@@ -31,11 +31,16 @@ start_date = os.getenv("TICK_START", "2018-06-27T13:00+02:00") +@@ -31,11 +31,19 @@ start_date = os.getenv("TICK_START", "2018-06-27T13:00+02:00") mongo_host = os.getenv("TULIP_MONGO", "localhost:27017") 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.60.24.1" ++vm_ip = "10.1.93.1" + -+services = [{"ip": vm_ip, "port": 1337, "name": "inlook"}, -+ {"ip": vm_ip, "port": 8000, "name": "extcel"}, -+ {"ip": vm_ip, "port": 3000, "name": "CCForms"}, -+ {"ip": vm_ip, "port": 3001, "name": "CCForms"}, -+ {"ip": vm_ip, "port": 8443, "name": "ccalendar"}, -+ {"ip": vm_ip, "port": 9001, "name": "x"}, -+ {"ip": vm_ip, "port": 9002, "name": "x"}, -+ {"ip": vm_ip, "port": 9003, "name": "x"}, -+ {"ip": vm_ip, "port": 9004, "name": "x"}, ++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"}, + {"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 19e6359..b1350c2 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-03T10:00+02:00" +TICK_START="2024-07-19T14:00+02:00" # Tick length in ms -TICK_LENGTH=120000 +TICK_LENGTH=60000 # The flag format in regex -FLAG_REGEX="[A-Z0-9]{31}=" +FLAG_REGEX="ENO[A-Za-z0-9+\/=]{48}" ############################## # PCAP_OVER_IP CONFIGS @@ -41,5 +41,5 @@ FLAG_REGEX="[A-Z0-9]{31}=" # # Flagid endpoint currently Testendpoint in docker compose # FLAGID_ENDPOINT="http://flagidendpoint:8000/flagids.json" # # VM IP (inside gamenet) -VM_IP="10.60.24.1" -TEAM_ID="10.60.24.1" +VM_IP="10.1.93.1" +TEAM_ID="10.1.93.1" |