From 11d76b11df67fb27633b51e00101b3b023c42914 Mon Sep 17 00:00:00 2001 From: diegolamaral Date: Wed, 9 Oct 2024 15:53:57 +0000 Subject: [PATCH] Fix Provided new config is not array, `NULL` given. in Set Up Session --- core/files/configure_misp.sh | 16 ++++++++-------- core/files/entrypoint.sh | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/core/files/configure_misp.sh b/core/files/configure_misp.sh index 4e2c142..30902e8 100755 --- a/core/files/configure_misp.sh +++ b/core/files/configure_misp.sh @@ -223,15 +223,15 @@ set_up_session() { # Command to modify MISP session configuration sudo -u www-data php /var/www/MISP/tests/modify_config.php modify "{ \"Session\": { - \"timeout\": ${PHP_TIMEOUT}, - \"cookie_timeout\": ${PHP_COOKIE_TIMEOUT}, - \"defaults\": \"${PHP_DEFAULTS}\", - \"autoRegenerate\": ${PHP_AUTO_REGENERATE}, - \"checkAgent\": ${PHP_CHECK_AGENT}, + \"timeout\": ${PHP_SESSION_TIMEOUT}, + \"cookie_timeout\": ${PHP_SESSION_COOKIE_TIMEOUT}, + \"defaults\": \"${PHP_SESSION_DEFAULTS}\", + \"autoRegenerate\": ${PHP_SESSION_AUTO_REGENERATE}, + \"checkAgent\": ${PHP_SESSION_CHECK_AGENT}, \"ini\": { - \"session.cookie_secure\": ${PHP_COOKIE_SECURE}, - \"session.cookie_domain\": \"${PHP_COOKIE_DOMAIN}\", - \"session.cookie_samesite\": \"${PHP_COOKIE_SAMESITE}\" + \"session.cookie_secure\": ${PHP_SESSION_COOKIE_SECURE}, + \"session.cookie_domain\": \"${PHP_SESSION_COOKIE_DOMAIN}\", + \"session.cookie_samesite\": \"${PHP_SESSION_COOKIE_SAMESITE}\" } } }" > /dev/null diff --git a/core/files/entrypoint.sh b/core/files/entrypoint.sh index fda8682..1ab757f 100755 --- a/core/files/entrypoint.sh +++ b/core/files/entrypoint.sh @@ -51,7 +51,7 @@ export PHP_SESSION_DEFAULTS=${PHP_SESSION_DEFAULTS:-php} export PHP_SESSION_AUTO_REGENERATE=${PHP_SESSION_AUTO_REGENERATE:-false} export PHP_SESSION_CHECK_AGENT=${PHP_SESSION_CHECK_AGENT:-false} export PHP_SESSION_COOKIE_SECURE=${PHP_SESSION_COOKIE_SECURE:-true} -export PHP_SESSION_COOKIE_DOMAIN=${PHP_SESSION_COOKIE_DOMAIN:} +export PHP_SESSION_COOKIE_DOMAIN=${PHP_SESSION_COOKIE_DOMAIN} export PHP_SESSION_COOKIE_SAMESITE=${PHP_SESSION_COOKIE_SAMESITE:-Lax} export NGINX_X_FORWARDED_FOR=${NGINX_X_FORWARDED_FOR:-false}