Merge branch 'main' into copilot/fix-issue-comment-4099645562

Signed-off-by: Zoey <zoey@z0ey.de>
2026-05-31 07:50:08 +00:00 · 2026-04-12 14:01:22 +02:00
parent 3d322e2fe2 d8d54fb9b5
commit 3ef61ade4d
44 changed files with 154 additions and 109 deletions
--- a/php/composer.lock
+++ b/php/composer.lock
@@ -448,16 +448,16 @@
        },
        {
            "name": "laravel/serializable-closure",
-            "version": "v2.0.10",
+            "version": "v2.0.11",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/serializable-closure.git",
-                "reference": "870fc81d2f879903dfc5b60bf8a0f94a1609e669"
+                "reference": "d1af40ac4a6ccc12bd062a7184f63c9995a63bdd"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/870fc81d2f879903dfc5b60bf8a0f94a1609e669",
-                "reference": "870fc81d2f879903dfc5b60bf8a0f94a1609e669",
+                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/d1af40ac4a6ccc12bd062a7184f63c9995a63bdd",
+                "reference": "d1af40ac4a6ccc12bd062a7184f63c9995a63bdd",
                "shasum": ""
            },
            "require": {
@@ -505,7 +505,7 @@
                "issues": "https://github.com/laravel/serializable-closure/issues",
                "source": "https://github.com/laravel/serializable-closure"
            },
-            "time": "2026-02-20T19:59:49+00:00"
+            "time": "2026-04-07T13:32:18+00:00"
        },
        {
            "name": "nikic/fast-route",
@@ -2453,24 +2453,27 @@
        },
        {
            "name": "amphp/serialization",
-            "version": "v1.0.0",
+            "version": "v1.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/amphp/serialization.git",
-                "reference": "693e77b2fb0b266c3c7d622317f881de44ae94a1"
+                "reference": "fdf2834d78cebb0205fb2672676c1b1eb84371f0"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/amphp/serialization/zipball/693e77b2fb0b266c3c7d622317f881de44ae94a1",
-                "reference": "693e77b2fb0b266c3c7d622317f881de44ae94a1",
+                "url": "https://api.github.com/repos/amphp/serialization/zipball/fdf2834d78cebb0205fb2672676c1b1eb84371f0",
+                "reference": "fdf2834d78cebb0205fb2672676c1b1eb84371f0",
                "shasum": ""
            },
            "require": {
-                "php": ">=7.1"
+                "php": ">=7.4"
            },
            "require-dev": {
-                "amphp/php-cs-fixer-config": "dev-master",
-                "phpunit/phpunit": "^9 || ^8 || ^7"
+                "amphp/php-cs-fixer-config": "^2",
+                "ext-json": "*",
+                "ext-zlib": "*",
+                "phpunit/phpunit": "^9",
+                "psalm/phar": "6.16.1"
            },
            "type": "library",
            "autoload": {
@@ -2505,9 +2508,15 @@
            ],
            "support": {
                "issues": "https://github.com/amphp/serialization/issues",
-                "source": "https://github.com/amphp/serialization/tree/master"
+                "source": "https://github.com/amphp/serialization/tree/v1.1.0"
            },
-            "time": "2020-03-25T21:39:07+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/amphp",
+                    "type": "github"
+                }
+            ],
+            "time": "2026-04-05T15:59:53+00:00"
        },
        {
            "name": "amphp/socket",
@@ -3834,16 +3843,16 @@
        },
        {
            "name": "sebastian/diff",
-            "version": "8.0.0",
+            "version": "8.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "a2b6d09d7729ee87d605a439469f9dcc39be5ea3"
+                "reference": "9c957d730257f49c873f3761674559bd90098a7d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/a2b6d09d7729ee87d605a439469f9dcc39be5ea3",
-                "reference": "a2b6d09d7729ee87d605a439469f9dcc39be5ea3",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/9c957d730257f49c873f3761674559bd90098a7d",
+                "reference": "9c957d730257f49c873f3761674559bd90098a7d",
                "shasum": ""
            },
            "require": {
@@ -3856,7 +3865,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "8.0-dev"
+                    "dev-main": "8.1-dev"
                }
            },
            "autoload": {
@@ -3889,7 +3898,7 @@
            "support": {
                "issues": "https://github.com/sebastianbergmann/diff/issues",
                "security": "https://github.com/sebastianbergmann/diff/security/policy",
-                "source": "https://github.com/sebastianbergmann/diff/tree/8.0.0"
+                "source": "https://github.com/sebastianbergmann/diff/tree/8.1.0"
            },
            "funding": [
                {
@@ -3909,7 +3918,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2026-02-06T04:42:27+00:00"
+            "time": "2026-04-05T12:02:33+00:00"
        },
        {
            "name": "spatie/array-to-xml",
@@ -4039,16 +4048,16 @@
        },
        {
            "name": "symfony/console",
-            "version": "v6.4.35",
+            "version": "v6.4.36",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/console.git",
-                "reference": "49257c96304c508223815ee965c251e7c79e614e"
+                "reference": "9f481cfb580db8bcecc9b2d4c63f3e13df022ad5"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/49257c96304c508223815ee965c251e7c79e614e",
-                "reference": "49257c96304c508223815ee965c251e7c79e614e",
+                "url": "https://api.github.com/repos/symfony/console/zipball/9f481cfb580db8bcecc9b2d4c63f3e13df022ad5",
+                "reference": "9f481cfb580db8bcecc9b2d4c63f3e13df022ad5",
                "shasum": ""
            },
            "require": {
@@ -4113,7 +4122,7 @@
                "terminal"
            ],
            "support": {
-                "source": "https://github.com/symfony/console/tree/v6.4.35"
+                "source": "https://github.com/symfony/console/tree/v6.4.36"
            },
            "funding": [
                {
@@ -4133,20 +4142,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2026-03-06T13:31:08+00:00"
+            "time": "2026-03-27T15:30:51+00:00"
        },
        {
            "name": "symfony/filesystem",
-            "version": "v8.0.6",
+            "version": "v8.0.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/filesystem.git",
-                "reference": "7bf9162d7a0dff98d079b72948508fa48018a770"
+                "reference": "66b769ae743ce2d13e435528fbef4af03d623e5a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/7bf9162d7a0dff98d079b72948508fa48018a770",
-                "reference": "7bf9162d7a0dff98d079b72948508fa48018a770",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/66b769ae743ce2d13e435528fbef4af03d623e5a",
+                "reference": "66b769ae743ce2d13e435528fbef4af03d623e5a",
                "shasum": ""
            },
            "require": {
@@ -4183,7 +4192,7 @@
            "description": "Provides basic utilities for the filesystem",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v8.0.6"
+                "source": "https://github.com/symfony/filesystem/tree/v8.0.8"
            },
            "funding": [
                {
@@ -4203,7 +4212,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2026-02-25T16:59:43+00:00"
+            "time": "2026-03-30T15:14:47+00:00"
        },
        {
            "name": "symfony/finder",
@@ -4609,16 +4618,16 @@
        },
        {
            "name": "symfony/string",
-            "version": "v7.4.6",
+            "version": "v7.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/string.git",
-                "reference": "9f209231affa85aa930a5e46e6eb03381424b30b"
+                "reference": "114ac57257d75df748eda23dd003878080b8e688"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/9f209231affa85aa930a5e46e6eb03381424b30b",
-                "reference": "9f209231affa85aa930a5e46e6eb03381424b30b",
+                "url": "https://api.github.com/repos/symfony/string/zipball/114ac57257d75df748eda23dd003878080b8e688",
+                "reference": "114ac57257d75df748eda23dd003878080b8e688",
                "shasum": ""
            },
            "require": {
@@ -4676,7 +4685,7 @@
                "utf8"
            ],
            "support": {
-                "source": "https://github.com/symfony/string/tree/v7.4.6"
+                "source": "https://github.com/symfony/string/tree/v7.4.8"
            },
            "funding": [
                {
@@ -4696,7 +4705,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2026-02-09T09:33:46+00:00"
+            "time": "2026-03-24T13:12:05+00:00"
        },
        {
            "name": "vimeo/psalm",
@@ -4885,16 +4894,16 @@
        },
        {
            "name": "webmozart/assert",
-            "version": "2.1.6",
+            "version": "2.2.0",
            "source": {
                "type": "git",
                "url": "https://github.com/webmozarts/assert.git",
-                "reference": "ff31ad6efc62e66e518fbab1cde3453d389bcdc8"
+                "reference": "1b99650e7ffcad232624a260bc7fbdec2ffc407c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/webmozarts/assert/zipball/ff31ad6efc62e66e518fbab1cde3453d389bcdc8",
-                "reference": "ff31ad6efc62e66e518fbab1cde3453d389bcdc8",
+                "url": "https://api.github.com/repos/webmozarts/assert/zipball/1b99650e7ffcad232624a260bc7fbdec2ffc407c",
+                "reference": "1b99650e7ffcad232624a260bc7fbdec2ffc407c",
                "shasum": ""
            },
            "require": {
@@ -4941,9 +4950,9 @@
            ],
            "support": {
                "issues": "https://github.com/webmozarts/assert/issues",
-                "source": "https://github.com/webmozarts/assert/tree/2.1.6"
+                "source": "https://github.com/webmozarts/assert/tree/2.2.0"
            },
-            "time": "2026-02-27T10:28:38+00:00"
+            "time": "2026-04-09T16:54:47+00:00"
        }
    ],
    "aliases": [],
--- a/php/public/automatic_reload.js
+++ b/php/public/automatic_reload.js
@@ -1,4 +1,4 @@
-document.addEventListener("DOMContentLoaded", function(event) {
+window.addEventListener("load", function(event) {
    if (document.hasFocus()) {
        // hide reload button if the site reloads automatically
        let list = document.getElementsByClassName("reload button");
@@ -9,7 +9,7 @@ document.addEventListener("DOMContentLoaded", function(event) {

        // set timeout for reload
        setTimeout(function(){
-        window.location.reload(1);
+        window.location.reload(true);
        }, 5000);
    } else {
        window.addEventListener("beforeunload", function() {
--- a/php/public/containers-form-submit.js
+++ b/php/public/containers-form-submit.js
@@ -121,10 +121,8 @@ document.addEventListener("DOMContentLoaded", function () {

    function handleDockerSocketProxyWarning() {
        if (document.getElementById("docker-socket-proxy").checked) {
-            // TODO: remove the line below and uncomment the lines further down once https://github.com/nextcloud/app_api/pull/800 is included
-            alert('⚠️ Warning! Enabling this container comes with possible Security problems since you are exposing the docker socket and all its privileges to the Nextcloud container. Enable this only if you are sure what you are doing!');
-            // alert('⚠️ The docker socket proxy container is deprecated. Please use the HaRP (High-availability Reverse Proxy for Nextcloud ExApps) instead!');
-            // document.getElementById("docker-socket-proxy").checked = false
+            alert('⚠️ The docker socket proxy container is deprecated. Please use the HaRP (High-availability Reverse Proxy for Nextcloud ExApps) instead!');
+            document.getElementById("docker-socket-proxy").checked = false
        }
    }

--- a/php/public/forms.js
+++ b/php/public/forms.js
@@ -36,11 +36,11 @@ function showPassword(id) {
      showError("Server error. Please check the mastercontainer logs for details. This page will reload after 10s automatically. Then you can check the mastercontainer logs.");
      // Reload after 10s since it is expected that the updated view is shown (e.g. after starting containers)
      setTimeout(function(){
-        window.location.reload(1);
+        window.location.reload(true);
      }, 10000);
    } else {
      // If the responose is not one of the above, we should reload to show the latest content
-      window.location.reload(1);
+      window.location.reload(true);
    }
  }

@@ -84,7 +84,7 @@ function showPassword(id) {
            document.getElementById('overlay-log')?.classList.add('visible');
            // Reload the page after the response was fully loaded into the iframe.
            document.querySelector('iframe[name="overlay-log"]').addEventListener('load', () => {
-                location.reload();
+                location.reload(true);
            });
        };
    }
--- a/php/public/log-view.js
+++ b/php/public/log-view.js
@@ -96,7 +96,7 @@ class LogViewer {
    }

    scrollToBottom() {
-        window.scrollTo(0, document.body.scrollHeight);
+        this.logElem.scrollTop = this.logElem.scrollHeight;
    }

    initAutoloadingControls() {
--- a/php/src/Auth/AuthManager.php
+++ b/php/src/Auth/AuthManager.php
@@ -26,6 +26,7 @@ readonly class AuthManager {
    public function SetAuthState(bool $isLoggedIn) : void {

        if (!$this->IsAuthenticated() && $isLoggedIn === true) {
+            session_regenerate_id(true);
            $date = new DateTime();
            $dateTime = $date->getTimestamp();
            $_SESSION['date_time'] = $dateTime;
--- a/php/src/Controller/LoginController.php
+++ b/php/src/Controller/LoginController.php
@@ -28,6 +28,9 @@ readonly class LoginController {
            return $response->withHeader('Location', '.')->withStatus(201);
        }

+        // Punish failed auth attempts with a delay, as a very simple means against bots.
+        sleep(5);
+
        $response->getBody()->write("The password is incorrect.");
        return $response->withHeader('Location', '.')->withStatus(422);
    }
@@ -39,6 +42,9 @@ readonly class LoginController {
            return $response->withHeader('Location', '../..')->withStatus(302);
        }

+        // Punish failed auth attempts with a delay, as a very simple means against bots.
+        sleep(5);
+
        return $response->withHeader('Location', '../..')->withStatus(302);
    }

--- a/php/src/Data/ConfigurationManager.php
+++ b/php/src/Data/ConfigurationManager.php
@@ -657,7 +657,7 @@ class ConfigurationManager
            throw new InvalidSettingConfigurationException("Please enter your current password.");
        }

-        if ($currentPassword !== $this->password) {
+        if (!hash_equals($this->password, $currentPassword)) {
            throw new InvalidSettingConfigurationException("The entered current password is not correct.");
        }

--- a/php/templates/containers.twig
+++ b/php/templates/containers.twig
@@ -27,7 +27,7 @@
            <script type="text/javascript" src="timezone.js"></script>

            {# js for optional containers and additional containers forms #}
-            <script type="text/javascript" src="containers-form-submit.js?v6"></script>
+            <script type="text/javascript" src="containers-form-submit.js?v7"></script>
            <script type="text/javascript" src="click-handlers.js?v1"></script>

            {% set hasBackupLocation = borg_backup_host_location or borg_remote_repo %}
@@ -636,7 +636,7 @@
            {% endif %}

        {% if isApacheStarting == true or is_backup_container_running == true or isWatchtowerRunning == true or is_daily_backup_running == true %}
-            <script type="text/javascript" src="automatic_reload.js"></script>
+            <script type="text/javascript" src="automatic_reload.js?v2"></script>
        {% else %}
            <script type="text/javascript" src="before-unload.js"></script>
        {% endif %}
--- a/php/templates/includes/aio-version.twig
+++ b/php/templates/includes/aio-version.twig
@@ -1 +1 @@
-12.9.0
+12.9.2
--- a/php/templates/includes/optional-containers.twig
+++ b/php/templates/includes/optional-containers.twig
@@ -198,7 +198,6 @@
        >
        <label for="docker-socket-proxy">Docker Socket Proxy (needed for <a target="_blank" href="https://github.com/cloud-py-api/app_api#nextcloud-appapi">Nextcloud App API</a>) ⚠️ The docker socket proxy container is deprecated. Please use the HaRP (High-availability Reverse Proxy for Nextcloud ExApps) instead!</label>
    </p>
-{#
    <p>
        <input
            type="checkbox"
@@ -213,7 +212,6 @@
        >
        <label for="harp">HaRP (<a target="_blank" href="https://github.com/nextcloud/HaRP">High-availability Reverse Proxy</a> for Nextcloud ExApps)</label>
    </p>
-#}
    <p>
        <input
            type="checkbox"
--- a/php/templates/layout.twig
+++ b/php/templates/layout.twig
@@ -3,7 +3,7 @@
        <title>AIO</title>
        <link rel="stylesheet" href="style.css?v9" media="all" />
        <link rel="icon" href="img/favicon.png">
-        <script type="text/javascript" src="forms.js?v1"></script>
+        <script type="text/javascript" src="forms.js?v2"></script>
        <script type="text/javascript" src="toggle-dark-mode.js?v1"></script>
    </head>

--- a/php/templates/log.twig
+++ b/php/templates/log.twig
@@ -3,15 +3,25 @@
        <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
        <link rel="stylesheet" href="style.css">
        <style>
-            body {
+            html, body {
+                height: 100%;
+                overflow: hidden;
+                padding: 0;
+                margin: 0;
+            }
+            pre {
+                height: 100%;
+                overflow: auto;
+                margin: 0;
                padding: 1rem;
+                box-sizing: border-box;
            }
            #floating-box {
-                position: sticky;
+                position: fixed;
                top: 1rem;
-                float: right;
                right: 1rem;
-                width: 20rem;
+                max-width: calc(100vw - 2rem);
+                z-index: 10;
                display: flex;
                justify-content: end;
                align-items: center;
@@ -43,7 +53,7 @@
                transition: opacity 1s, display 1s allow-discrete;
            }
        </style>
-        <script src="log-view.js"></script>
+        <script src="log-view.js?v1"></script>
    </head>
    <body data-container-id="{{ id }}">
        <div id="floating-box">
@@ -1 +1 @@
 .9.0
 .9.2