fix(restore): keep session upload progress off after restoring an older backup

src/helper/Site_Backup_Restore.php

@@ -1693,6 +1693,54 @@ private function restore_php_conf( $backup_dir ) {
 			$restore_command = sprintf( 'rsync -a %s/php/php/conf.d/custom.ini %s/config/php/php/conf.d/custom.ini', $backup_dir, EE_ROOT_DIR . '/sites/' . $this->site_data['site_url'] );
 			EE::exec( $restore_command );
 		}
+
+		$this->keep_session_upload_progress_off();
+	}
+
+	/**
+	 * A backup taken before v4.13.3 brings back a custom.ini without `session.upload_progress.enabled = Off`, so add it
+	 * again unless the restored file sets the directive itself. The site reload at the end of the restore applies it.
+	 */
+	private function keep_session_upload_progress_off() {
+		$site_url = $this->site_data['site_url'];
+		$conf_dir = EE_ROOT_DIR . '/sites/' . $site_url . '/config/php/php/conf.d';
+		$file     = $conf_dir . '/custom.ini';
+		$manual   = "Add 'session.upload_progress.enabled = Off' to $file and run: ee site reload $site_url";
+
+		$created = ! file_exists( $file ) && ! is_link( $file );
+		if ( is_link( $file ) || ( ! $created && ! is_file( $file ) ) || ( $created && ! is_dir( $conf_dir ) ) ) {
+			EE::warning( "Could not check session.upload_progress in the restored custom.ini: it is not a regular file or its directory is missing. $manual" );
+
+			return;
+		}
+
+		$content = $created ? '' : @file_get_contents( $file );
+		if ( false === $content ) {
+			EE::warning( "Could not read the restored custom.ini to check session.upload_progress. $manual" );
+
+			return;
+		}
+
+		$new_content = \EE\Site\Utils\add_session_upload_progress_off( $content );
+		if ( null === $new_content ) {
+			return;
+		}
+
+		// Written in place: keeps owner, mode and inode (macOS bind-mounts this single file).
+		$written = @file_put_contents( $file, $new_content );
+		clearstatcache( true, $file );
+		if ( strlen( $new_content ) !== $written ) {
+			EE::warning( "Could not turn off session.upload_progress in the restored custom.ini. $manual" );
+
+			return;
+		}
+		if ( $created ) {
+			@chmod( $file, 0644 );
+			@chown( $file, fileowner( $conf_dir ) );
+			@chgrp( $file, filegroup( $conf_dir ) );
+		}
+
+		EE::log( 'The restored custom.ini did not set session.upload_progress.enabled, so it was set to Off again. Set it to On there only if your app needs it.' );
 	}
 
 	/**

src/helper/site-utils.php

@@ -1623,3 +1623,89 @@ function get_wp_core_download_command( string $path, array $args = [] ) {
 	// docker_compose_exec() wraps the command in bash -c "...".
 	return addcslashes( $script, '"$`\\' );
 }
+
+/**
+ * Add `session.upload_progress.enabled = Off` to a site's custom.ini content, unless the content already sets it globally.
+ *
+ * Same rule as the v4.13.3 upload-progress migrations: an effective global line, On or Off, is the user's choice and is kept.
+ *
+ * @param string $content custom.ini content.
+ *
+ * @return string|null The new content, or null when it already sets the directive.
+ */
+function add_session_upload_progress_off( string $content ) {
+
+	$bom = '';
+	if ( 0 === strpos( $content, "\xEF\xBB\xBF" ) ) {
+		$bom     = "\xEF\xBB\xBF";
+		$content = substr( $content, 3 );
+	}
+
+	if ( ini_sets_globally( $content, 'session.upload_progress.enabled' ) ) {
+		return null;
+	}
+
+	$eol = false !== strpos( $content, "\r\n" ) ? "\r\n" : ( false === strpos( $content, "\n" ) && false !== strpos( $content, "\r" ) ? "\r" : "\n" );
+	$lines = '; Session upload progress is off for security; set it to On only if your app needs it.' . $eol . 'session.upload_progress.enabled = Off' . $eol;
+
+	if ( '' === trim( $content ) ) {
+		return $bom . $lines;
+	}
+
+	// At the very top, so neither a [PATH=]/[HOST=] section nor a multi-line quoted value can capture it.
+	return $bom . $lines . $eol . $content;
+}
+
+/**
+ * Whether ini content sets a directive outside any [PATH=]/[HOST=] section, read the way PHP reads php.ini.
+ *
+ * @param string $content ini content without BOM.
+ * @param string $key     Directive name (case-sensitive, like PHP).
+ *
+ * @return bool
+ */
+function ini_sets_globally( string $content, string $key ) {
+
+	$global = ini_global_part( $content );
+	// Without sections, entries of ordinary sections are global and `foo[key] = x` stays an array, so it can't match.
+	$ini = @parse_ini_string( $global, false, INI_SCANNER_NORMAL );
+	// PHP applies the lines above a syntax error, so only that part counts.
+	for ( $lines = preg_split( '/(?<=\n)|(?<=\r)(?!\n)/', $global ), $n = count( $lines ) - 1; false === $ini && $n > 0; $n-- ) {
+		$ini = @parse_ini_string( implode( '', array_slice( $lines, 0, $n ) ), false, INI_SCANNER_NORMAL );
+	}
+
+	return false !== $ini && array_key_exists( $key, $ini ) && ! is_array( $ini[ $key ] );
+}
+
+/**
+ * The part of ini content before the first section whose name starts with PATH or HOST.
+ *
+ * PHP scopes every entry after such a header to it, even under later ordinary headers. The parser decides where each
+ * header ends and what it is called, so any line ending, quoted names and several headers on one line are handled.
+ *
+ * @param string $content ini content without BOM.
+ *
+ * @return string
+ */
+function ini_global_part( string $content ) {
+
+	for ( $open = strpos( $content, '[' ); false !== $open; $open = strpos( $content, '[', $open + 1 ) ) {
+		// A '[' inside a quoted value (or after a syntax error, where PHP stops anyway) starts no header.
+		if ( false === @parse_ini_string( substr( $content, 0, $open ), true, INI_SCANNER_NORMAL ) ) {
+			continue;
+		}
+		// A quoted name may contain ']', so try each one until the text up to it parses.
+		for ( $close = strpos( $content, ']', $open ); false !== $close; $close = strpos( $content, ']', $close + 1 ) ) {
+			$ini = @parse_ini_string( substr( $content, 0, $close + 1 ), true, INI_SCANNER_NORMAL );
+			if ( false === $ini ) {
+				continue;
+			}
+			if ( is_array( end( $ini ) ) && preg_match( '/^(PATH|HOST)/i', (string) key( $ini ) ) ) {
+				return substr( $content, 0, $open );
+			}
+			break;
+		}
+	}
+
+	return $content;
+}