fix: tie pm.process_idle_timeout to PHP_MAX_TIME to eliminate hardcoded 300s upload timeout

Agent-Logs-Url: https://github.com/nextcloud/all-in-one/sessions/9fe959e4-b027-4f48-ab9d-8a8674463a51

Co-authored-by: szaimen <42591237+szaimen@users.noreply.github.com>

Containers/nextcloud/Dockerfile

@@ -255,9 +255,13 @@ RUN set -ex; \
 # brief quiet period (e.g. desktop-sync clients polling every few seconds), all
 # workers are reaped and the next request burst must wait for fresh forks.  On
 # a loaded host that spawn latency can push Apache past its FastCGI timeout and
-# produce a 502.  300 s (5 min) keeps a warm pool through normal sync-client
-# polling cycles while still reclaiming memory during genuinely idle periods.
-    sed -i 's/^;*pm.process_idle_timeout\s*=.*/pm.process_idle_timeout = 300s/' /usr/local/etc/php-fpm.d/www.conf; \
+# produce a 502.  Set to PHP_MAX_TIME (default 3600 s / 1 h) so the idle
+# timeout is consistent with the overall upload/execution limit configured via
+# NEXTCLOUD_MAX_TIME: this prevents the rare edge case where a worker handling
+# a very long upload is considered idle and prematurely killed before the
+# request_terminate_timeout can fire, and keeps the warm-pool window aligned
+# with the user-configured upload timeout.
+    sed -i 's/^;*pm.process_idle_timeout\s*=.*/pm.process_idle_timeout = ${PHP_MAX_TIME}s/' /usr/local/etc/php-fpm.d/www.conf; \
 # Set request_terminate_timeout so that PHP-FPM forcibly kills workers that
 # exceed the wall-clock limit.  Without this (default = 0 = disabled) a worker
 # stuck on a slow DB query, a stalled Redis connection, or a hung syscall is

php/public/clean-history.js

@@ -1,26 +0,0 @@
-// This script is loaded after a successful token-based login.
-// It replaces the browser's current history entry (stripping the token from the
-// URL) before navigating to the main AIO page, so the token is never left in
-// the browser history and cannot be accidentally exposed via the back-button.
-//
-// The target URL is passed via the script tag's data-target attribute.
-// document.currentScript is only available during synchronous script execution
-// (not with defer/async), so this script is loaded without those attributes.
-//
-// We replace with location.pathname only (no query string, no hash), which
-// intentionally strips the ?token=… parameter and any hash fragment from the
-// recorded history entry.
-
-// Guard against environments where document.currentScript may be null.
-if (!document.currentScript) {
-    window.location.replace('/');
-} else {
-    const rawTarget = document.currentScript.dataset.target;
-
-    // Only accept the exact relative path we set server-side to prevent any
-    // potential open-redirect via a manipulated data-target value.
-    const target = rawTarget === '../../' ? rawTarget : '/';
-
-    history.replaceState(null, '', location.pathname);
-    window.location.replace(target);
-}

php/public/index.php

@@ -181,7 +181,7 @@ $app->get('/containers', function (Request $request, Response $response, array $
         'community_containers' => $configurationManager->listAvailableCommunityContainers(),
         'community_containers_enabled' => $configurationManager->aioCommunityContainers,
         'bypass_container_update' => $bypass_container_update,
-    ])->withHeader('Cache-Control', 'no-store');
+    ]);
 })->setName('profile');
 $app->get('/login', function (Request $request, Response $response, array $args) use ($container) {
     $view = Twig::fromRequest($request);
@@ -209,7 +209,7 @@ $app->get('/setup', function (Request $request, Response $response, array $args)
         [
             'password' => $setup->Setup(),
         ]
-    )->withHeader('Cache-Control', 'no-store');
+    );
 });
 $app->get('/log', function (Request $request, Response $response, array $args) use ($container) {
     $params = $request->getQueryParams();

php/src/Controller/DockerController.php

@@ -339,7 +339,7 @@ readonly class DockerController {
 
         $body = $nonbufResp->getBody();
         $addToStreamingResponseBody = function (string $message) use ($body) : void {
-            $body->write('<div>' . htmlspecialchars($message, ENT_QUOTES | ENT_HTML5) . '</div>');
+            $body->write("<div>$message</div>");
         };
 
         $this->dockerActionManager->SystemPrune($addToStreamingResponseBody);
@@ -430,7 +430,7 @@ readonly class DockerController {
         // if it'll actually pull an image), but which should not need to know anything about the
         // wanted markup or formatting.
         $addToStreamingResponseBody = function (Container $container, string $message) use ($nonbufResp) : void {
-            $nonbufResp->getBody()->write('<div>' . htmlspecialchars($container->displayName, ENT_QUOTES | ENT_HTML5) . ': ' . htmlspecialchars($message, ENT_QUOTES | ENT_HTML5) . '</div>');
+            $nonbufResp->getBody()->write("<div>{$container->displayName}: {$message}</div>");
         };
 
         return $addToStreamingResponseBody;

php/src/Controller/LoginController.php

@@ -39,19 +39,7 @@ readonly class LoginController {
         $token = $request->getQueryParams()['token'] ?? '';
         if($this->authManager->CheckToken($token)) {
             $this->authManager->SetAuthState(true);
-            // Return a minimal HTML page that uses JavaScript to replace the browser's
-            // current history entry (removing the token from it) before navigating to
-            // the main AIO page.  This prevents the token from remaining in browser history.
-            // The script is served from 'self'; same-origin scripts are already trusted under
-            // the 'script-src-elem self' CSP directive, so no SRI hash is needed here.
-            $response->getBody()->write(
-                '<!DOCTYPE html>' .
-                '<html lang="en">' .
-                '<head><script src="../../clean-history.js" data-target="../../"></script></head>' .
-                '<body></body>' .
-                '</html>'
-            );
-            return $response->withHeader('Content-Type', 'text/html; charset=utf-8')->withStatus(200);
+            return $response->withHeader('Location', '../..')->withStatus(302);
         }
 
         // Punish failed auth attempts with a delay, as a very simple means against bots.