feat: add shared fetch_wp_salts() with retry/validation; use in both vhost-install and vhost-import

Copilot · PDowney · web-flow · commit 68e4f3699b45 · 2026-04-11T00:40:06.000Z
Agent-Logs-Url: https://github.com/EngineScript/EngineScript/sessions/29220c6a-26cb-4309-8b44-e054afd721f5 Co-authored-by: PDowney <11467177+PDowney@users.noreply.github.com>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,8 +11,9 @@ Changes are organized by date, with the most recent changes listed first.
 - Updated the single-zip database file detection in `scripts/functions/vhost/vhost-import.sh` to search for both `*.sql` and `*.sql.gz` patterns, so compressed database dumps are correctly found and imported instead of failing silently.
 - Removed the duplicate `URL_VALIDATION_REGEX` argument from the `prompt_input` call for the Site URL field; validation is now handled exclusively by the subsequent `validate_url` function call, eliminating redundant logic.
 - Added `DB_CHARSET="${DB_CHARSET_VALIDATED}"` after the charset `case` statement so `DB_CHARSET` is always the validated, lowercase value when used in the `wp-config.php` `sed` replacement, preventing a potential mismatch if the user supplies a mixed-case charset.
-- Improved the WordPress salt fetch error message to also suggest retrying the import later if the WordPress.org API is temporarily unavailable, rather than only mentioning local network/firewall issues.
 - Simplified `run_url_search_replace_if_present` to run `wp search-replace` directly with `--report-changed-only`, removing the preliminary `wp db search` pre-check that unnecessarily doubled full-table scans on large databases.
+- Extracted WordPress salt generation into a new shared `fetch_wp_salts()` function in `scripts/functions/shared/enginescript-shared-vhost.sh`, replacing the divergent inline implementations in both `vhost-install.sh` and `vhost-import.sh`.
+- `fetch_wp_salts()` retries up to 5 times with a 15-second delay between attempts, validates each response contains the expected `define(` content, and only hard-fails with a clear error message after all attempts are exhausted—preventing a transient WordPress.org API outage from permanently breaking a new install or import.
 
 ## 2026-04-10
 
diff --git a/scripts/functions/shared/enginescript-shared-vhost.sh b/scripts/functions/shared/enginescript-shared-vhost.sh
@@ -717,6 +717,38 @@ configure_wpconfig_settings() {
 }
 
 
+#----------------------------------------------------------------------------------
+# Fetch WordPress salts from api.wordpress.org and apply them to wp-config.php.
+# Retries up to 5 times with a 15-second delay between attempts so that a
+# transient WordPress.org API outage does not permanently break the install.
+fetch_wp_salts() {
+  local wp_config_path="$1"
+  local max_attempts=5
+  local retry_delay=15
+  local salt=""
+  local attempt
+
+  echo "Generating new WordPress salts..."
+  for (( attempt=1; attempt<=max_attempts; attempt++ )); do
+    salt=$(curl --fail --silent --show-error --location --connect-timeout 10 --max-time 30 \
+      "https://api.wordpress.org/secret-key/1.1/salt/" 2>/dev/null)
+    if [[ -n "${salt}" ]] && printf '%s' "${salt}" | grep -q "define("; then
+      local string='put your unique phrase here'
+      printf '%s\n' "g/${string}/d" a "${salt}" . w | ed -s "${wp_config_path}"
+      echo "WordPress salts applied successfully."
+      return 0
+    fi
+    if [[ ${attempt} -lt ${max_attempts} ]]; then
+      echo "Warning: Failed to fetch valid WordPress salts (attempt ${attempt}/${max_attempts}). Retrying in ${retry_delay} seconds..." >&2
+      sleep "${retry_delay}"
+    fi
+  done
+
+  echo "Error: Failed to fetch valid WordPress salts from api.wordpress.org after ${max_attempts} attempts. Please check your internet connection and DNS/firewall/proxy settings. If the issue persists, the WordPress.org API may be temporarily unavailable—please retry the import later." >&2
+  exit 1
+}
+
+
 #----------------------------------------------------------------------------------
 # Create robots.txt file
 create_robots_txt() {
diff --git a/scripts/functions/vhost/vhost-import.sh b/scripts/functions/vhost/vhost-import.sh
@@ -556,19 +556,7 @@ sed -i \
 configure_redis "${SITE_URL}" "${TARGET_WP_PATH}/wp-config.php"
 
 # WP Salt Creation (Generate new salts)
-echo "Generating new WordPress salts..."
-SALT=$(curl --fail --silent --show-error --location --retry 3 --connect-timeout 10 --max-time 30 "https://api.wordpress.org/secret-key/1.1/salt/") || {
-    echo "Error: Failed to fetch WordPress salts from api.wordpress.org. Please check your internet connection and DNS/firewall/proxy settings. If the issue persists, the WordPress.org API may be temporarily unavailable—please retry the import later." >&2
-    exit 1
-}
-
-if [ -z "${SALT}" ] || ! printf '%s' "${SALT}" | grep -q "define("; then
-    echo "Error: Retrieved invalid WordPress salts content" >&2
-    exit 1
-fi
-
-STRING='put your unique phrase here'
-printf '%s\n' "g/$STRING/d" a "$SALT" . w | ed -s "${TARGET_WP_PATH}/wp-config.php"
+fetch_wp_salts "${TARGET_WP_PATH}/wp-config.php"
 
 # Configure wp-config.php settings
 configure_wpconfig_settings "${SITE_URL}" "${TARGET_WP_PATH}/wp-config.php"
diff --git a/scripts/functions/vhost/vhost-install.sh b/scripts/functions/vhost/vhost-install.sh
@@ -195,9 +195,7 @@ if [[ "${INSTALL_WORDPRESS}" == "1" ]]; then
   configure_redis "${SITE_URL}" "/var/www/sites/${SITE_URL}/html/wp-config.php"
 
   # WP Salt Creation
-  SALT=$(curl -L https://api.wordpress.org/secret-key/1.1/salt/)
-  STRING='put your unique phrase here'
-  printf '%s\n' "g/$STRING/d" a "$SALT" . w | ed -s "/var/www/sites/${SITE_URL}/html/wp-config.php"
+  fetch_wp_salts "/var/www/sites/${SITE_URL}/html/wp-config.php"
 
   # Configure wp-config.php settings
   configure_wpconfig_settings "${SITE_URL}" "/var/www/sites/${SITE_URL}/html/wp-config.php"
