[bitnami/suitecrm] fix: SKIP_BOOTSTRAP not working properly with suitecrm 8

bitnami/suitecrm/8/debian-12/rootfs/opt/bitnami/scripts/libsuitecrm.sh

@@ -425,6 +425,29 @@ suitecrm_7_pass_wizard() {
     return "$wizard_exit_code"
 }
 
+########################
+# Encodes a given string
+# Globals:
+#   *
+# Arguments:
+#   None
+# Returns:
+#   Encoded string
+#########################
+urlencode() {
+  local string="${1}"
+  local length="${#string}"
+  local encoded=""
+  for (( i = 0; i < length; i++ )); do
+    local c="${string:$i:1}"
+    case "$c" in
+      [a-zA-Z0-9.~_-]) encoded+="$c" ;;
+      *) printf -v encoded '%s%%%02X' "$encoded" "'$c" ;;
+    esac
+  done
+  echo "$encoded"
+}
+
 ########################
 # Rebuild SuiteCRM's configuration file
 # Globals:
@@ -435,11 +458,36 @@ suitecrm_7_pass_wizard() {
 #   true if succeded, false otherwise
 #########################
 suitecrm_rebuild_files() {
+    encoded_user=$(urlencode "$SUITECRM_DATABASE_USER")
+    encoded_pass=$(urlencode "$SUITECRM_DATABASE_PASSWORD")
+    # Build host:port if port is given
+    if [[ -n "$SUITECRM_DATABASE_PORT_NUMBER" ]]; then
+        host_string="$SUITECRM_DATABASE_HOST:$SUITECRM_DATABASE_PORT_NUMBER"
+    else
+        host_string="$SUITECRM_DATABASE_HOST"
+    fi
+
+    if [[ -n "${SUITECRM_APP_SECRET:-}" ]]; then
+        app_secret=$(openssl rand -hex 16)
+    else
+        app_secret="$SUITECRM_APP_SECRET"
+    fi
+
+    # Build content
+    info "Generating .env.local..."
+    content="DATABASE_URL=\"mysql://$encoded_user:$encoded_pass@$host_string/$db_name\"\n"
+    content+="APP_SECRET=$app_secret\n"
+
+    # Write to .env.local
+    echo -e "$content" > "$SUITECRM_BASE_DIR/.env.local"
+
+    info "Generating legacy config ..."
+
     # The below script executes the code from "Repair > Rebuild Config File" to regenerate the configuration file
     # We prefer to run a script rather than via cURL requests because it would require to login, and could cause
     # issues with SUITECRM_SKIP_BOOTSTRAP
     php_execute <<EOF
-chdir('$SUITECRM_BASE_DIR');
+chdir('$SUITECRM_BASE_DIR/public/legacy');
 define('sugarEntry', true);
 require_once('include/utils.php');
 
@@ -460,6 +508,21 @@ require_once('include/utils/file_utils.php');
 // Rebuild the configuration file
 // Based on the RebuildConfig action in the admin panel
 \$clean_config = loadCleanConfig();
+\$clean_config['unique_key']=empty('$SUITECRM_APP_SECRET') ? md5(create_guid()) : '$SUITECRM_APP_SECRET';
+\$clean_config['default_theme']='suite8';
+\$clean_config['cron']['allowed_cron_users'] = array(0 => 'daemon');
+
+// Add custom override settings from comma-separated list
+// This allows to set allowed http referers, for example a reverse proxy hostname 
+if (!empty('$SUITECRM_REFERERS')) {
+    \$hosts = array_map('trim', explode(',', '$SUITECRM_REFERERS'));
+    foreach (\$hosts as \$host) {
+        if (!empty(\$host)) {
+            \$clean_config['http_referer']['list'][] = \$host;
+        }
+    }
+}
+
 rebuildConfigFile(\$clean_config, \$sugar_version);
 
 // Rebuild the .htaccess file

bitnami/suitecrm/8/debian-12/rootfs/opt/bitnami/scripts/suitecrm/postunpack.sh

@@ -49,7 +49,8 @@ web_server_validate
 # Not moving .htaccess because SuiteCRM generates some of them during installation
 # Backward compatibility with SuiteCRM 7
 if [[ -d "${SUITECRM_BASE_DIR}/public" ]]; then
-    ensure_web_server_app_configuration_exists "suitecrm" --type php --apache-move-htaccess "no" --document-root "${BITNAMI_ROOT_DIR}/suitecrm/public"
+    ensure_web_server_app_configuration_exists "suitecrm" --type php  --document-root "${BITNAMI_ROOT_DIR}/suitecrm/public"
 else
+    # This is executed for SuiteCRM 7
     ensure_web_server_app_configuration_exists "suitecrm" --type php --apache-move-htaccess "no"
 fi