notify-push: fix startup on ipv6 disabled servers (#8188 )

server.config.php: downstream sync serverid upstream change (#8187 )
notify-push: fix startup on ipv6 disabled servers
2026-05-21 10:50:10 +00:00 · 2026-05-21 12:06:28 +02:00 · 2026-05-21 12:01:49 +02:00 · 2026-05-21 10:53:49 +02:00 · 2026-05-21 10:48:37 +02:00 · 2026-05-21 10:40:41 +02:00
16 changed files with 109 additions and 83 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -0,0 +1,20 @@
+# https://editorconfig.org
+
+# Tip: to find files violating the rules set out here, run `docker run --rm --volume=$PWD:/check mstruebing/editorconfig-checker`
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.yaml]
+indent_size = 2
+
+
+[*.yml]
+indent_size = 2
--- a/Containers/mastercontainer/Dockerfile
+++ b/Containers/mastercontainer/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:latest
 # Docker CLI is a requirement
-FROM docker:29.5.0-cli AS docker
+FROM docker:29.5.1-cli AS docker

 ARG CADDY_REMOTE_HOST_HASH=e80a9931765a8dbcbb47db415863387f0df0e1b3

--- a/Containers/mastercontainer/supervisord.conf
+++ b/Containers/mastercontainer/supervisord.conf
@@ -54,7 +54,7 @@ stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
 command=/session-deduplicator.sh
-user=root
+user=www-data

 [program:domain-validator]
 # Logging is disabled as otherwise all attempts will be logged which spams the logs
--- a/Containers/nextcloud/config/server.config.php
+++ b/Containers/nextcloud/config/server.config.php
@@ -1,4 +1,4 @@
 <?php
 $CONFIG = array (
-  'serverid' => crc32(gethostname()) % 512,
+  'serverid' => hexdec(hash('xxh32', gethostname()) & 0x1FF,
 );
--- a/Containers/notify-push/start.sh
+++ b/Containers/notify-push/start.sh
@@ -42,6 +42,15 @@ if ! [ -f /var/www/html/custom_apps/notify_push/bin/"$CPU_ARCH"/notify_push ] &&
    exit 1
 fi

+# Logic for ipv6 disabled servers
+BIND="::"
+if grep -q "1" /sys/module/ipv6/parameters/disable \
+|| grep -q "1" /proc/sys/net/ipv6/conf/all/disable_ipv6 \
+|| grep -q "1" /proc/sys/net/ipv6/conf/default/disable_ipv6; then
+    BIND="0.0.0.0"
+fi
+export BIND
+
 echo "notify-push was started"


--- a/Containers/talk/Dockerfile
+++ b/Containers/talk/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:latest
-FROM nats:2.14.0-scratch AS nats
+FROM nats:2.14.1-scratch AS nats
 FROM eturnal/eturnal:1.12.2-alpine AS eturnal
 FROM strukturag/nextcloud-spreed-signaling:2.1.1 AS signaling
 FROM alpine:3.23.4 AS janus
--- a/app/.editorconfig
+++ b/app/.editorconfig
@@ -1,19 +1,12 @@
 # https://editorconfig.org

+# note: the files in ./composer actually use 4 spaces instead of tabs
+
 root = true

 [*]
 charset = utf-8
 end_of_line = lf
-indent_size = 4
 indent_style = tab
 insert_final_newline = true
 trim_trailing_whitespace = true
-
-[*.feature]
-indent_size = 2
-indent_style = space
-
-[*.yml]
-indent_size = 2
-indent_style = space
--- a/app/readme.md
+++ b/app/readme.md
@@ -1,7 +1,10 @@
+# AIO app for Nextcloud
+
+This folder contains a Nextcloud app, which will be automatically installed within the Nextcloud instance.
+It adds a link to the admin settings page that gives access to the AIO interface.
+
 ## How to develop the app?

-Please note that in order to check if an app is already downloaded
-Nextcloud will look for a folder with the same name as the app.
+Please note that in order to check if an app is already downloaded Nextcloud will look for a folder with the same name as the app.

-Therefore you need to add the app to one of the app directories
-naming the directory `nextcloud-aio`.
+Therefore you need to add the app to one of the app directories naming the directory `nextcloud-aio`.
--- a/php/composer.lock
+++ b/php/composer.lock
@@ -64,16 +64,16 @@
        },
        {
            "name": "guzzlehttp/guzzle",
-            "version": "7.10.0",
+            "version": "7.10.2",
            "source": {
                "type": "git",
                "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4"
+                "reference": "aed36fd5fb4844f284252a999d9abf35d3a9a1ae"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b51ac707cfa420b7bfd4e4d5e510ba8008e822b4",
-                "reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/aed36fd5fb4844f284252a999d9abf35d3a9a1ae",
+                "reference": "aed36fd5fb4844f284252a999d9abf35d3a9a1ae",
                "shasum": ""
            },
            "require": {
@@ -91,8 +91,9 @@
                "bamarni/composer-bin-plugin": "^1.8.2",
                "ext-curl": "*",
                "guzzle/client-integration-tests": "3.0.2",
+                "guzzlehttp/test-server": "^0.3.2",
                "php-http/message-factory": "^1.1",
-                "phpunit/phpunit": "^8.5.39 || ^9.6.20",
+                "phpunit/phpunit": "^8.5.52 || ^9.6.34",
                "psr/log": "^1.1 || ^2.0 || ^3.0"
            },
            "suggest": {
@@ -170,7 +171,7 @@
            ],
            "support": {
                "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/7.10.0"
+                "source": "https://github.com/guzzle/guzzle/tree/7.10.2"
            },
            "funding": [
                {
@@ -186,20 +187,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-08-23T22:36:01+00:00"
+            "time": "2026-05-20T11:58:52+00:00"
        },
        {
            "name": "guzzlehttp/promises",
-            "version": "2.3.0",
+            "version": "2.3.1",
            "source": {
                "type": "git",
                "url": "https://github.com/guzzle/promises.git",
-                "reference": "481557b130ef3790cf82b713667b43030dc9c957"
+                "reference": "d2d8dfae4757f384d630fdffc2d8d6618d8f4c5e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/481557b130ef3790cf82b713667b43030dc9c957",
-                "reference": "481557b130ef3790cf82b713667b43030dc9c957",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/d2d8dfae4757f384d630fdffc2d8d6618d8f4c5e",
+                "reference": "d2d8dfae4757f384d630fdffc2d8d6618d8f4c5e",
                "shasum": ""
            },
            "require": {
@@ -207,7 +208,7 @@
            },
            "require-dev": {
                "bamarni/composer-bin-plugin": "^1.8.2",
-                "phpunit/phpunit": "^8.5.44 || ^9.6.25"
+                "phpunit/phpunit": "^8.5.52 || ^9.6.34"
            },
            "type": "library",
            "extra": {
@@ -253,7 +254,7 @@
            ],
            "support": {
                "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/2.3.0"
+                "source": "https://github.com/guzzle/promises/tree/2.3.1"
            },
            "funding": [
                {
@@ -269,20 +270,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-08-22T14:34:08+00:00"
+            "time": "2026-05-19T18:30:48+00:00"
        },
        {
            "name": "guzzlehttp/psr7",
-            "version": "2.9.0",
+            "version": "2.10.1",
            "source": {
                "type": "git",
                "url": "https://github.com/guzzle/psr7.git",
-                "reference": "7d0ed42f28e42d61352a7a79de682e5e67fec884"
+                "reference": "73ab136360b5dfd858006eae9795e8fe43c80361"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/7d0ed42f28e42d61352a7a79de682e5e67fec884",
-                "reference": "7d0ed42f28e42d61352a7a79de682e5e67fec884",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/73ab136360b5dfd858006eae9795e8fe43c80361",
+                "reference": "73ab136360b5dfd858006eae9795e8fe43c80361",
                "shasum": ""
            },
            "require": {
@@ -297,9 +298,9 @@
            },
            "require-dev": {
                "bamarni/composer-bin-plugin": "^1.8.2",
-                "http-interop/http-factory-tests": "0.9.0",
+                "http-interop/http-factory-tests": "1.1.0",
                "jshttp/mime-db": "1.54.0.1",
-                "phpunit/phpunit": "^8.5.44 || ^9.6.25"
+                "phpunit/phpunit": "^8.5.52 || ^9.6.34"
            },
            "suggest": {
                "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
@@ -370,7 +371,7 @@
            ],
            "support": {
                "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.9.0"
+                "source": "https://github.com/guzzle/psr7/tree/2.10.1"
            },
            "funding": [
                {
@@ -386,7 +387,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2026-03-10T16:41:02+00:00"
+            "time": "2026-05-20T09:27:36+00:00"
        },
        {
            "name": "http-interop/http-factory-guzzle",
@@ -1784,16 +1785,16 @@
        },
        {
            "name": "twig/twig",
-            "version": "v3.25.0",
+            "version": "v3.26.0",
            "source": {
                "type": "git",
                "url": "https://github.com/twigphp/Twig.git",
-                "reference": "0dade995be754556af4dcbf8721d45cb3271f9b4"
+                "reference": "1fcae487b180d78e6351f4e0afa91f9eab96a2bc"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/0dade995be754556af4dcbf8721d45cb3271f9b4",
-                "reference": "0dade995be754556af4dcbf8721d45cb3271f9b4",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/1fcae487b180d78e6351f4e0afa91f9eab96a2bc",
+                "reference": "1fcae487b180d78e6351f4e0afa91f9eab96a2bc",
                "shasum": ""
            },
            "require": {
@@ -1848,7 +1849,7 @@
            ],
            "support": {
                "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v3.25.0"
+                "source": "https://github.com/twigphp/Twig/tree/v3.26.0"
            },
            "funding": [
                {
@@ -1860,7 +1861,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2026-05-17T07:41:26+00:00"
+            "time": "2026-05-20T07:31:59+00:00"
        }
    ],
    "packages-dev": [
@@ -4898,16 +4899,16 @@
        },
        {
            "name": "webmozart/assert",
-            "version": "2.3.0",
+            "version": "2.4.0",
            "source": {
                "type": "git",
                "url": "https://github.com/webmozarts/assert.git",
-                "reference": "eb0d790f735ba6cff25c683a85a1da0eadeff9e4"
+                "reference": "9007ea6f45ecf352a9422b36644e4bfc039b9155"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/webmozarts/assert/zipball/eb0d790f735ba6cff25c683a85a1da0eadeff9e4",
-                "reference": "eb0d790f735ba6cff25c683a85a1da0eadeff9e4",
+                "url": "https://api.github.com/repos/webmozarts/assert/zipball/9007ea6f45ecf352a9422b36644e4bfc039b9155",
+                "reference": "9007ea6f45ecf352a9422b36644e4bfc039b9155",
                "shasum": ""
            },
            "require": {
@@ -4923,7 +4924,11 @@
            },
            "type": "library",
            "extra": {
+                "psalm": {
+                    "pluginClass": "Webmozart\\Assert\\PsalmPlugin"
+                },
                "branch-alias": {
+                    "dev-master": "2.0-dev",
                    "dev-feature/2-0": "2.0-dev"
                }
            },
@@ -4954,9 +4959,9 @@
            ],
            "support": {
                "issues": "https://github.com/webmozarts/assert/issues",
-                "source": "https://github.com/webmozarts/assert/tree/2.3.0"
+                "source": "https://github.com/webmozarts/assert/tree/2.4.0"
            },
-            "time": "2026-04-11T10:33:05+00:00"
+            "time": "2026-05-20T13:07:01+00:00"
        }
    ],
    "aliases": [],
--- a/php/psalm.xml
+++ b/php/psalm.xml
@@ -1,29 +1,29 @@
 <?xml version="1.0"?>
 <psalm
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns="https://getpsalm.org/schema/config"
-	xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
-	errorBaseline="psalm-baseline.xml"
-	findUnusedBaselineEntry="true"
-	findUnusedCode="false"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    errorBaseline="psalm-baseline.xml"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
 >
-	<projectFiles>
-		<directory name="templates"/>
-		<directory name="src"/>
-		<file name="public/index.php"/>
-		<ignoreFiles>
-			<directory name="vendor" />
-		</ignoreFiles>
-	</projectFiles>
-	<extraFiles>
-		<directory name="vendor" />
-	</extraFiles>
-	<issueHandlers>
-  		<ClassMustBeFinal errorLevel="suppress" />
+    <projectFiles>
+        <directory name="templates"/>
+        <directory name="src"/>
+        <file name="public/index.php"/>
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
+    </projectFiles>
+    <extraFiles>
+        <directory name="vendor" />
+    </extraFiles>
+    <issueHandlers>
+        <ClassMustBeFinal errorLevel="suppress" />
        <MissingConstructor>
            <errorLevel type="suppress">
                <file name="src/Data/ConfigurationManager.php" />  <!-- We're using property hooks with virtual properties in that file, which Psalm wrongly complains about. See <https://github.com/vimeo/psalm/issues/11435>.  -->
            </errorLevel>
        </MissingConstructor>
-	</issueHandlers>
+    </issueHandlers>
 </psalm>
--- a/php/public/logs.css
+++ b/php/public/logs.css
@@ -10,7 +10,6 @@ pre {
    margin: 0;
    padding: 1rem;
    box-sizing: border-box;
-    font-family: system-ui, -apple-system, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, Ubuntu, 'Helvetica Neue', 'Noto Sans', 'Liberation Sans', Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
 }
 #floating-box {
    position: fixed;
@@ -27,8 +26,7 @@ pre {
    gap: 0.5rem;
    font-size: large;
    border: solid thin gray;
-    background-color: var(--color-main-background);
-    color: var(--color-main-text);
+    background-color: #f9f9f9;
    width: 10rem;
    padding: 0.5rem 1rem;
    margin: 0 0 0 1rem;
--- a/php/public/style.css
+++ b/php/public/style.css
@@ -483,8 +483,8 @@ input[type="checkbox"]:disabled:not(:checked) + label {
    visibility: hidden;
    opacity: 0;
    align-self: start;
-    width: min(700px, calc(100vw - 4rem));
-    height: min(400px, calc(100vh - 14rem));
+    width: 300px;
+    height: 200px;
    border-radius: var(--border-radius-large);
    border: solid thin rgb(192, 192, 192);
 }
--- a/php/public/toggle-dark-mode.js
+++ b/php/public/toggle-dark-mode.js
@@ -35,6 +35,4 @@ setThemeToDOM(getSavedTheme());
 document.addEventListener('DOMContentLoaded', () => {
    setThemeIcon(getSavedTheme())
    document.querySelector('button#theme-toggle')?.addEventListener('click', () => toggleTheme());
-    // Re-apply theme when the overlay-log iframe navigates (e.g. after a form submission).
-    document.querySelector('iframe#overlay-log')?.addEventListener('load', () => setThemeToDOM(getSavedTheme()));
 });
--- a/php/src/Controller/DockerController.php
+++ b/php/src/Controller/DockerController.php
@@ -401,7 +401,7 @@ readonly class DockerController {
        <!DOCTYPE html>
        <html lang="en" class="overlay-iframe">
            <head>
-                <link rel="stylesheet" href="../../style.css?v9" media="all" />
+                <link rel="stylesheet" href="../../style.css?v8" media="all" />
                <script type="text/javascript" src="../../scroll-into-view.js"></script>
            </head>
            <body>
--- a/php/templates/layout.twig
+++ b/php/templates/layout.twig
@@ -2,10 +2,10 @@
 <html lang="en">
    <head>
        <title>AIO</title>
-        <link rel="stylesheet" href="style.css?v10" media="all" />
+        <link rel="stylesheet" href="style.css?v9" media="all" />
        <link rel="icon" href="img/favicon.png">
        <script type="text/javascript" src="forms.js?v2"></script>
-        <script type="text/javascript" src="toggle-dark-mode.js?v2"></script>
+        <script type="text/javascript" src="toggle-dark-mode.js?v1"></script>
        <script type="text/javascript" src="click-handlers.js?v2"></script>
    </head>

--- a/php/templates/log.twig
+++ b/php/templates/log.twig
@@ -2,8 +2,8 @@
    <head>
        <title>AIO</title>
        <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-        <link rel="stylesheet" href="style.css?v1">
-        <link rel="stylesheet" href="logs.css?v1">
+        <link rel="stylesheet" href="style.css">
+        <link rel="stylesheet" href="logs.css">
        <link rel="icon" href="img/favicon.png">
        <script src="log-load.js?v1"></script>
    </head>
Author	SHA1	Message	Date
Simon L.	5a474d92d9	notify-push: fix startup on ipv6 disabled servers (#8188 )	2026-05-21 12:06:28 +02:00
Simon L.	795baf903b	server.config.php: downstream sync serverid upstream change (#8187 )	2026-05-21 12:01:49 +02:00
Simon L.	b4c0266461	notify-push: fix startup on ipv6 disabled servers Signed-off-by: Simon L. <szaimen@e.mail.de>	2026-05-21 10:53:49 +02:00
Simon L.	3a988938b2	server.config.php: downstream sync serverid upstream change Signed-off-by: Simon L. <szaimen@e.mail.de>	2026-05-21 10:48:37 +02:00
Simon L.	7c0df4f701	build(deps): bump nats from 2.14.0-scratch to 2.14.1-scratch in /Containers/talk (#8185 )	2026-05-21 10:40:41 +02:00
dependabot[bot]	1d27e165e6	build(deps): bump nats in /Containers/talk Bumps nats from 2.14.0-scratch to 2.14.1-scratch. --- updated-dependencies: - dependency-name: nats dependency-version: 2.14.1-scratch dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2026-05-21 04:23:15 +00:00
Simon L.	a75d1c48bf	Small improvements to /app/readme (#8179 )	2026-05-20 17:15:51 +02:00
Simon L.	74b98b369e	PHP dependency updates (#8180 )	2026-05-20 16:36:42 +02:00
Simon L.	74dee77fac	Add top-level .editorconfig; improve app/.editorconfig (#8178 )	2026-05-20 15:54:33 +02:00
szaimen	70100ba5ef	php dependency updates Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2026-05-20 13:42:43 +00:00
Gaetano Giunta	de72608519	Use proper name for AIP and Nextcloud in readme file Signed-off-by: Gaetano Giunta <giunta.gaetano@gmail.com>	2026-05-20 11:12:51 +00:00
Gaetano Giunta	02c9a7475b	Small improvements to /app/readme Signed-off-by: Gaetano Giunta <giunta.gaetano@gmail.com>	2026-05-20 11:02:14 +00:00
Gaetano Giunta	c2e48d3524	add a comment to .editorconfig Signed-off-by: Gaetano Giunta <giunta.gaetano@gmail.com>	2026-05-20 10:56:10 +00:00
Gaetano Giunta	b615acf413	tabs to spaces for php/psalm.xml Signed-off-by: Gaetano Giunta <giunta.gaetano@gmail.com>	2026-05-20 10:55:39 +00:00
Gaetano Giunta	379b3d9e5a	add top-level .editorconfig; improve app/.editorconfig Signed-off-by: Gaetano Giunta <giunta.gaetano@gmail.com>	2026-05-20 10:46:15 +00:00
Simon L.	abbe6a85cf	build(deps): bump docker from 29.5.0-cli to 29.5.1-cli in /Containers/mastercontainer (#8177 )	2026-05-20 10:50:58 +02:00
dependabot[bot]	20835baa0c	build(deps): bump docker in /Containers/mastercontainer Bumps docker from 29.5.0-cli to 29.5.1-cli. --- updated-dependencies: - dependency-name: docker dependency-version: 29.5.1-cli dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2026-05-20 08:36:32 +00:00
Simon L.	a32568cc9c	mastercontainer: run session-deduplicator as www-data (#8175 )	2026-05-20 10:20:56 +02:00
Dimas D. Angga	c6748dc450	fix(mastercontainer): run session-deduplicator as www-data The session-deduplicator only touches files under /mnt/docker-aio-config/session/, which is already owned by www-data, so running it as root grants more privilege than it needs. Dropping to www-data reduces the number of root-owned processes in the mastercontainer and follows least-privilege for the supervisord program set.	2026-05-20 09:32:49 +07:00