XWIKI-542: The cookie encryption keys should be randomly generated

tmortagne · tmortagne · commit 2ffe16421cde · 2023-10-25T17:33:36.000+02:00
* no need to generate and set the validation and encryption keys anymore
diff --git a/14/mariadb-tomcat/xwiki/docker-entrypoint.sh b/14/mariadb-tomcat/xwiki/docker-entrypoint.sh
@@ -133,10 +133,6 @@ function configure() {
     xwiki_set_cfg "xwiki.db" $DB_DATABASE
   fi
 
-  echo '  Generating authentication validation and encryption keys...'
-  xwiki_set_cfg 'xwiki.authentication.validationKey' "$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
-  xwiki_set_cfg 'xwiki.authentication.encryptionKey' "$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
-
   echo '  Setting permanent directory...'
   xwiki_set_properties 'environment.permanentDirectory' '/usr/local/xwiki/data'
   echo '  Configure libreoffice...'
diff --git a/14/mysql-tomcat/xwiki/docker-entrypoint.sh b/14/mysql-tomcat/xwiki/docker-entrypoint.sh
@@ -133,10 +133,6 @@ function configure() {
     xwiki_set_cfg "xwiki.db" $DB_DATABASE
   fi
 
-  echo '  Generating authentication validation and encryption keys...'
-  xwiki_set_cfg 'xwiki.authentication.validationKey' "$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
-  xwiki_set_cfg 'xwiki.authentication.encryptionKey' "$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
-
   echo '  Setting permanent directory...'
   xwiki_set_properties 'environment.permanentDirectory' '/usr/local/xwiki/data'
   echo '  Configure libreoffice...'
diff --git a/14/postgres-tomcat/xwiki/docker-entrypoint.sh b/14/postgres-tomcat/xwiki/docker-entrypoint.sh
@@ -133,10 +133,6 @@ function configure() {
     xwiki_set_cfg "xwiki.db" $DB_DATABASE
   fi
 
-  echo '  Generating authentication validation and encryption keys...'
-  xwiki_set_cfg 'xwiki.authentication.validationKey' "$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
-  xwiki_set_cfg 'xwiki.authentication.encryptionKey' "$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
-
   echo '  Setting permanent directory...'
   xwiki_set_properties 'environment.permanentDirectory' '/usr/local/xwiki/data'
   echo '  Configure libreoffice...'
diff --git a/15.5/mariadb-tomcat/xwiki/docker-entrypoint.sh b/15.5/mariadb-tomcat/xwiki/docker-entrypoint.sh
@@ -133,10 +133,6 @@ function configure() {
     xwiki_set_cfg "xwiki.db" $DB_DATABASE
   fi
 
-  echo '  Generating authentication validation and encryption keys...'
-  xwiki_set_cfg 'xwiki.authentication.validationKey' "$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
-  xwiki_set_cfg 'xwiki.authentication.encryptionKey' "$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
-
   echo '  Setting permanent directory...'
   xwiki_set_properties 'environment.permanentDirectory' '/usr/local/xwiki/data'
   echo '  Configure libreoffice...'
diff --git a/15.5/mysql-tomcat/xwiki/docker-entrypoint.sh b/15.5/mysql-tomcat/xwiki/docker-entrypoint.sh
@@ -133,10 +133,6 @@ function configure() {
     xwiki_set_cfg "xwiki.db" $DB_DATABASE
   fi
 
-  echo '  Generating authentication validation and encryption keys...'
-  xwiki_set_cfg 'xwiki.authentication.validationKey' "$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
-  xwiki_set_cfg 'xwiki.authentication.encryptionKey' "$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
-
   echo '  Setting permanent directory...'
   xwiki_set_properties 'environment.permanentDirectory' '/usr/local/xwiki/data'
   echo '  Configure libreoffice...'
diff --git a/15.5/postgres-tomcat/xwiki/docker-entrypoint.sh b/15.5/postgres-tomcat/xwiki/docker-entrypoint.sh
@@ -133,10 +133,6 @@ function configure() {
     xwiki_set_cfg "xwiki.db" $DB_DATABASE
   fi
 
-  echo '  Generating authentication validation and encryption keys...'
-  xwiki_set_cfg 'xwiki.authentication.validationKey' "$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
-  xwiki_set_cfg 'xwiki.authentication.encryptionKey' "$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
-
   echo '  Setting permanent directory...'
   xwiki_set_properties 'environment.permanentDirectory' '/usr/local/xwiki/data'
   echo '  Configure libreoffice...'
diff --git a/15/mariadb-tomcat/xwiki/docker-entrypoint.sh b/15/mariadb-tomcat/xwiki/docker-entrypoint.sh
@@ -133,10 +133,6 @@ function configure() {
     xwiki_set_cfg "xwiki.db" $DB_DATABASE
   fi
 
-  echo '  Generating authentication validation and encryption keys...'
-  xwiki_set_cfg 'xwiki.authentication.validationKey' "$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
-  xwiki_set_cfg 'xwiki.authentication.encryptionKey' "$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
-
   echo '  Setting permanent directory...'
   xwiki_set_properties 'environment.permanentDirectory' '/usr/local/xwiki/data'
   echo '  Configure libreoffice...'
diff --git a/15/mysql-tomcat/xwiki/docker-entrypoint.sh b/15/mysql-tomcat/xwiki/docker-entrypoint.sh
@@ -133,10 +133,6 @@ function configure() {
     xwiki_set_cfg "xwiki.db" $DB_DATABASE
   fi
 
-  echo '  Generating authentication validation and encryption keys...'
-  xwiki_set_cfg 'xwiki.authentication.validationKey' "$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
-  xwiki_set_cfg 'xwiki.authentication.encryptionKey' "$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
-
   echo '  Setting permanent directory...'
   xwiki_set_properties 'environment.permanentDirectory' '/usr/local/xwiki/data'
   echo '  Configure libreoffice...'
diff --git a/15/postgres-tomcat/xwiki/docker-entrypoint.sh b/15/postgres-tomcat/xwiki/docker-entrypoint.sh
@@ -133,10 +133,6 @@ function configure() {
     xwiki_set_cfg "xwiki.db" $DB_DATABASE
   fi
 
-  echo '  Generating authentication validation and encryption keys...'
-  xwiki_set_cfg 'xwiki.authentication.validationKey' "$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
-  xwiki_set_cfg 'xwiki.authentication.encryptionKey' "$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
-
   echo '  Setting permanent directory...'
   xwiki_set_properties 'environment.permanentDirectory' '/usr/local/xwiki/data'
   echo '  Configure libreoffice...'
diff --git a/template/xwiki/docker-entrypoint.sh b/template/xwiki/docker-entrypoint.sh
@@ -133,10 +133,6 @@ function configure() {
     xwiki_set_cfg "xwiki.db" \$DB_DATABASE
   fi
 
-  echo '  Generating authentication validation and encryption keys...'
-  xwiki_set_cfg 'xwiki.authentication.validationKey' "\$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
-  xwiki_set_cfg 'xwiki.authentication.encryptionKey' "\$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
-
   echo '  Setting permanent directory...'
   xwiki_set_properties 'environment.permanentDirectory' '/usr/local/xwiki/data'
   echo '  Configure libreoffice...'
