added missing PROXY_ENABLE envar to docker-compose.yml

add default value of false is PROXY_ENABLE unset

altered set_up_proxy() in configure_misp.sh to use json-based config system

fixed MISP.ca_path setting to use --force, since doesn't end in .pem

core/files/configure_misp.sh

@@ -13,6 +13,7 @@ source /utilities.sh
 [ -z "$OIDC_ENABLE" ] && OIDC_ENABLE="false"
 [ -z "$LDAP_ENABLE" ] && LDAP_ENABLE="false"
 [ -z "$ENABLE_DB_SETTINGS" ] && ENABLE_DB_SETTINGS="false"
+[ -z "$PROXY_ENABLE" ] && PROXY_ENABLE="false"
 
 # We now use envsubst for safe variable substitution with pseudo-json objects for env var enforcement
 # envsubst won't evaluate anything like $() or conditional variable expansion so lets do that here
@@ -202,18 +203,12 @@ set_up_aad() {
 }
 
 set_up_proxy() {
-    if [[ "$PROXY_ENABLE" != "true" ]]; then
+    if [[ "$PROXY_ENABLE" == "true" ]]; then
+        echo "... configuring proxy settings"
+        init_settings "proxy"
+    else
         echo "... Proxy disabled"
-        return
     fi
-
-    echo "... configuring proxy settings"
-
-    sudo -u www-data /var/www/MISP/app/Console/cake Admin setSetting -q "Proxy.host" "$PROXY_HOST"
-    sudo -u www-data /var/www/MISP/app/Console/cake Admin setSetting -q "Proxy.port" "$PROXY_PORT"
-    sudo -u www-data /var/www/MISP/app/Console/cake Admin setSetting -q "Proxy.method" "$PROXY_METHOD"
-    sudo -u www-data /var/www/MISP/app/Console/cake Admin setSetting -q "Proxy.user" "$PROXY_USER"
-    sudo -u www-data /var/www/MISP/app/Console/cake Admin setSetting -q "Proxy.password" "$PROXY_PASSWORD"
 }
 
 apply_updates() {
@@ -468,4 +463,4 @@ echo "MISP | Set Up AAD ..." && set_up_aad
 echo "MISP | Set Up Proxy ..." && set_up_proxy
 
 echo "MISP | Mark instance live"
-sudo -u www-data /var/www/MISP/app/Console/cake Admin live 1
+sudo -u www-data /var/www/MISP/app/Console/cake Admin live 1

core/files/etc/misp-docker/cli_only.defaults.json

@@ -21,7 +21,8 @@
     "default_value": false
   },
   "MISP.ca_path": {
-    "default_value": "/etc/ssl/certs/ca-certificates.crt"
+    "default_value": "/etc/ssl/certs/ca-certificates.crt",
+    "command_args": "-f"
   },
   "MISP.menu_custom_right_link": {
     "default_value": ""

core/files/etc/misp-docker/proxy.envars.json

@@ -0,0 +1,17 @@
+{
+  "Proxy.host": {
+    "default_value": "${PROXY_HOST}"
+  },
+  "Proxy.port": {
+    "default_value": "${PROXY_PORT}"
+  },
+  "Proxy.method": {
+    "default_value": "${PROXY_METHOD}"
+  },
+  "Proxy.user": {
+    "default_value": "${PROXY_USER}"
+  },
+  "Proxy.password": {
+    "default_value": "${PROXY_PASSWORD}"
+  }
+}

docker-compose.yml

@@ -131,6 +131,7 @@ services:
       - "AAD_MISP_SITEADMIN=${AAD_MISP_SITEADMIN}"
       - "AAD_CHECK_GROUPS=${AAD_CHECK_GROUPS}"
       # Proxy settings
+      - "PROXY_ENABLE=${PROXY_ENABLE}"
       - "PROXY_HOST=${PROXY_HOST}"
       - "PROXY_PORT=${PROXY_PORT}"
       - "PROXY_METHOD=${PROXY_METHOD}"