Merge branch 'add-db-msf-configuration' into 'master'

Add configuration for MSF database

See merge request cryton/cryton-worker!59

.env

@@ -18,3 +18,8 @@ CRYTON_WORKER_EMPIRE_HOST=127.0.0.1
 CRYTON_WORKER_EMPIRE_PORT=1337
 CRYTON_WORKER_EMPIRE_USERNAME=cryton
 CRYTON_WORKER_EMPIRE_PASSWORD=cryton
+CRYTON_WORKER_MSF_DB_HOST=127.0.0.1
+CRYTON_WORKER_MSF_DB_PORT=5432
+CRYTON_WORKER_MSF_DB_NAME=msf
+CRYTON_WORKER_MSF_DB_USERNAME=cryton
+CRYTON_WORKER_MSF_DB_PASSWORD=cryton

docker-compose.dev.yml

 version: '3.9'
 services:
   cryton_worker:
-    restart: always
     image: cryton_worker
-    container_name: cryton-worker
     build:
       context: .
       target: kali
-    network_mode: host
-    env_file:
-      - .env
     volumes:
       - ${CRYTON_WORKER_MODULES_DIR}:${CRYTON_WORKER_MODULES_DIR}
-    depends_on:
-      cryton_empire:
-        condition: service_started
-      cryton_msf:
-        condition: service_started
-
-  cryton_empire:
-    restart: always
-    image: bcsecurity/empire:v4.10.0
-    container_name: cryton-empire
-    network_mode: host
-    env_file:
-      - .env
-    stdin_open: true
-    command: [ "server", "--username", "$CRYTON_WORKER_EMPIRE_USERNAME", "--password", "$CRYTON_WORKER_EMPIRE_PASSWORD" ]
-
-  cryton_msf:
-    restart: always
-    image: registry.gitlab.ics.muni.cz:443/cryton/configurations/metasploit-framework
-    container_name: cryton-msf
-    network_mode: host
-    env_file:
-      - .env
-    environment:
-      MSF_RPC_HOST: $CRYTON_WORKER_MSF_RPC_HOST
-      MSF_RPC_PORT: $CRYTON_WORKER_MSF_RPC_PORT
-      MSF_RPC_SSL: $CRYTON_WORKER_MSF_RPC_SSL
-      MSF_RPC_USERNAME: $CRYTON_WORKER_MSF_RPC_USERNAME
-      MSF_RPC_PASSWORD: $CRYTON_WORKER_MSF_RPC_PASSWORD
-    tty: true

docker-compose.prerequisites.yml

+version: '3.9'
+services:
+  cryton_empire:
+    restart: always
+    image: bcsecurity/empire:v4.10.0
+    container_name: cryton-empire
+    network_mode: host
+    env_file:
+      - .env
+    stdin_open: true
+    command: [ "server", "--username", "$CRYTON_WORKER_EMPIRE_USERNAME", "--password", "$CRYTON_WORKER_EMPIRE_PASSWORD" ]
+
+  cryton_msf:
+    restart: always
+    image: registry.gitlab.ics.muni.cz:443/cryton/configurations/metasploit-framework:0
+    container_name: cryton-msf
+    network_mode: host
+    env_file:
+      - .env
+    environment:
+      MSF_RPC_HOST: $CRYTON_WORKER_MSF_RPC_HOST
+      MSF_RPC_PORT: $CRYTON_WORKER_MSF_RPC_PORT
+      MSF_RPC_SSL: $CRYTON_WORKER_MSF_RPC_SSL
+      MSF_RPC_USERNAME: $CRYTON_WORKER_MSF_RPC_USERNAME
+      MSF_RPC_PASSWORD: $CRYTON_WORKER_MSF_RPC_PASSWORD
+      MSF_DB_HOST: $CRYTON_WORKER_MSF_DB_HOST
+      MSF_DB_PORT: $CRYTON_WORKER_MSF_DB_PORT
+      MSF_DB_NAME: $CRYTON_WORKER_MSF_DB_NAME
+      MSF_DB_USERNAME: $CRYTON_WORKER_MSF_DB_USERNAME
+      MSF_DB_PASSWORD: $CRYTON_WORKER_MSF_DB_PASSWORD
+    tty: true
+    depends_on:
+      cryton_msf_db:
+        condition: service_healthy
+
+  cryton_msf_db:
+    restart: always
+    image: postgres:15
+    container_name: cryton-msf-db
+    env_file:
+      - .env
+    environment:
+      POSTGRES_PASSWORD: $CRYTON_WORKER_MSF_DB_PASSWORD
+      POSTGRES_USER: $CRYTON_WORKER_MSF_DB_USERNAME
+      POSTGRES_DB: $CRYTON_WORKER_MSF_DB_NAME
+      POSTGRES_HOST_AUTH_METHOD: md5
+    volumes:
+      - cryton_msf_db_data:/var/lib/postgresql/data
+    healthcheck:
+      test: /usr/bin/pg_isready -U $$POSTGRES_USER
+      interval: 20s
+      timeout: 10s
+      retries: 5
+    ports:
+      - "127.0.0.1:5432:5432"
+
+volumes:
+  cryton_msf_db_data:

docker-compose.yml

@@ -25,7 +25,7 @@ services:
 
   cryton_msf:
     restart: always
-    image: registry.gitlab.ics.muni.cz:443/cryton/configurations/metasploit-framework
+    image: registry.gitlab.ics.muni.cz:443/cryton/configurations/metasploit-framework:0
     container_name: cryton-msf
     network_mode: host
     env_file:
@@ -36,4 +36,36 @@ services:
       MSF_RPC_SSL: $CRYTON_WORKER_MSF_RPC_SSL
       MSF_RPC_USERNAME: $CRYTON_WORKER_MSF_RPC_USERNAME
       MSF_RPC_PASSWORD: $CRYTON_WORKER_MSF_RPC_PASSWORD
+      MSF_DB_HOST: $CRYTON_WORKER_MSF_DB_HOST
+      MSF_DB_PORT: $CRYTON_WORKER_MSF_DB_PORT
+      MSF_DB_NAME: $CRYTON_WORKER_MSF_DB_NAME
+      MSF_DB_USERNAME: $CRYTON_WORKER_MSF_DB_USERNAME
+      MSF_DB_PASSWORD: $CRYTON_WORKER_MSF_DB_PASSWORD
     tty: true
+    depends_on:
+      cryton_msf_db:
+        condition: service_healthy
+
+  cryton_msf_db:
+    restart: always
+    image: postgres:15
+    container_name: cryton-msf-db
+    env_file:
+      - .env
+    environment:
+      POSTGRES_PASSWORD: $CRYTON_WORKER_MSF_DB_PASSWORD
+      POSTGRES_USER: $CRYTON_WORKER_MSF_DB_USERNAME
+      POSTGRES_DB: $CRYTON_WORKER_MSF_DB_NAME
+      POSTGRES_HOST_AUTH_METHOD: md5
+    volumes:
+      - cryton_msf_db_data:/var/lib/postgresql/data
+    healthcheck:
+      test: /usr/bin/pg_isready -U $$POSTGRES_USER
+      interval: 20s
+      timeout: 10s
+      retries: 5
+    ports:
+      - "127.0.0.1:5432:5432"
+
+volumes:
+  cryton_msf_db_data: