Bump version

CHANGELOG

@@ -412,3 +412,13 @@
 [1.24.0]
 * Update base image to 4.2.0
 
+[1.25.0]
+* Update Syncthing to 1.26.0
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.26.0)
+* #9106: Posting config with invalid versioner type causes panic
+* #9120: Deduplicated files on Windows aren't treated as regular files any more (Go 1.21)
+* #9133: Syncthing Docker container fails to start if underlying filesystem doesn't support chown
+* #9143: traefik no longer url escape X-Forwarded-Tls-Client-Cert header
+* #9149: Favicon is stuck in notify state
+* #4137: Use a real login screen + sessions instead of HTTP basic auth
+

CloudronManifest.json

@@ -5,8 +5,8 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "Decentralized file synchronization",
-  "version": "1.24.0",
-  "upstreamVersion": "1.25.0",
+  "version": "1.25.0",
+  "upstreamVersion": "1.26.0",
   "healthCheckPath": "/healthcheck",
   "httpPort": 8000,
   "addons": {

Dockerfile

@@ -3,7 +3,7 @@ FROM cloudron/base:4.2.0@sha256:46da2fffb36353ef714f97ae8e962bd2c212ca091108d768
 RUN mkdir -p /app/code
 WORKDIR /app/code
 
-ARG VERSION=1.25.0
+ARG VERSION=1.26.0
 
 RUN wget https://github.com/syncthing/syncthing/releases/download/v${VERSION}/syncthing-linux-amd64-v${VERSION}.tar.gz -O - | tar -xz -C /app/code --strip-components=1
 

test/package-lock.json

@@ -9,17 +9,17 @@
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
-        "chromedriver": "^117.0.3",
+        "chromedriver": "^119.0.1",
         "expect.js": "^0.3.1",
         "mocha": "^10.2.0",
-        "selenium-webdriver": "^4.14.0",
+        "selenium-webdriver": "^4.15.0",
         "superagent": "^8.1.2"
       }
     },
     "node_modules/@testim/chrome-version": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@testim/chrome-version/-/chrome-version-1.1.3.tgz",
-      "integrity": "sha512-g697J3WxV/Zytemz8aTuKjTGYtta9+02kva3C1xc7KXB8GdbfE1akGJIsZLyY/FSh2QrnE+fiB7vmWU3XNcb6A=="
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@testim/chrome-version/-/chrome-version-1.1.4.tgz",
+      "integrity": "sha512-kIhULpw9TrGYnHp/8VfdcneIcxKnLixmADtukQRtJUmsVlMg0niMkwV0xZmi8hqa57xqilIHjWFA0GKvEjVU5g=="
     },
     "node_modules/@types/node": {
       "version": "16.11.6",
@@ -105,9 +105,9 @@
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "node_modules/axios": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.4.0.tgz",
-      "integrity": "sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==",
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.1.tgz",
+      "integrity": "sha512-vfBmhDpKafglh0EldBEbVuoe7DyAavGSLWhuSm5ZSEKQnHhBf0xAAwybbNH1IkrJNGnS/VG4I5yxig1pCEXE4g==",
       "dependencies": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -236,18 +236,18 @@
       }
     },
     "node_modules/chromedriver": {
-      "version": "117.0.3",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-117.0.3.tgz",
-      "integrity": "sha512-c2rk2eGK5zZFBJMdviUlAJfQEBuPNIKfal4+rTFVYAmrWbMPYAqPozB+rIkc1lDP/Ryw44lPiqKglrI01ILhTQ==",
+      "version": "119.0.1",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-119.0.1.tgz",
+      "integrity": "sha512-lpCFFLaXPpvElTaUOWKdP74pFb/sJhWtWqMjn7Ju1YriWn8dT5JBk84BGXMPvZQs70WfCYWecxdMmwfIu1Mupg==",
       "hasInstallScript": true,
       "dependencies": {
-        "@testim/chrome-version": "^1.1.3",
-        "axios": "^1.4.0",
-        "compare-versions": "^6.0.0",
+        "@testim/chrome-version": "^1.1.4",
+        "axios": "^1.6.0",
+        "compare-versions": "^6.1.0",
         "extract-zip": "^2.0.1",
         "https-proxy-agent": "^5.0.1",
         "proxy-from-env": "^1.1.0",
-        "tcp-port-used": "^1.0.1"
+        "tcp-port-used": "^1.0.2"
       },
       "bin": {
         "chromedriver": "bin/chromedriver"
@@ -479,9 +479,9 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+      "version": "1.15.3",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz",
+      "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==",
       "funding": [
         {
           "type": "individual",
@@ -1166,9 +1166,9 @@
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
     "node_modules/selenium-webdriver": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.14.0.tgz",
-      "integrity": "sha512-637rs8anqMKHbWxcBZpyG3Gcs+rBUtAUiqk0O/knUqH4Paj3MFUZrz88/pVGOLNryEVy2z92fZomT8p1ENl1gA==",
+      "version": "4.15.0",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.15.0.tgz",
+      "integrity": "sha512-BNG1bq+KWiBGHcJ/wULi0eKY0yaDqFIbEmtbsYJmfaEghdCkXBsx1akgOorhNwjBipOr0uwpvNXqT6/nzl+zjg==",
       "dependencies": {
         "jszip": "^3.10.1",
         "tmp": "^0.2.1",
@@ -1468,9 +1468,9 @@
   },
   "dependencies": {
     "@testim/chrome-version": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@testim/chrome-version/-/chrome-version-1.1.3.tgz",
-      "integrity": "sha512-g697J3WxV/Zytemz8aTuKjTGYtta9+02kva3C1xc7KXB8GdbfE1akGJIsZLyY/FSh2QrnE+fiB7vmWU3XNcb6A=="
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@testim/chrome-version/-/chrome-version-1.1.4.tgz",
+      "integrity": "sha512-kIhULpw9TrGYnHp/8VfdcneIcxKnLixmADtukQRtJUmsVlMg0niMkwV0xZmi8hqa57xqilIHjWFA0GKvEjVU5g=="
     },
     "@types/node": {
       "version": "16.11.6",
@@ -1538,9 +1538,9 @@
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "axios": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.4.0.tgz",
-      "integrity": "sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==",
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.1.tgz",
+      "integrity": "sha512-vfBmhDpKafglh0EldBEbVuoe7DyAavGSLWhuSm5ZSEKQnHhBf0xAAwybbNH1IkrJNGnS/VG4I5yxig1pCEXE4g==",
       "requires": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -1633,17 +1633,17 @@
       }
     },
     "chromedriver": {
-      "version": "117.0.3",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-117.0.3.tgz",
-      "integrity": "sha512-c2rk2eGK5zZFBJMdviUlAJfQEBuPNIKfal4+rTFVYAmrWbMPYAqPozB+rIkc1lDP/Ryw44lPiqKglrI01ILhTQ==",
+      "version": "119.0.1",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-119.0.1.tgz",
+      "integrity": "sha512-lpCFFLaXPpvElTaUOWKdP74pFb/sJhWtWqMjn7Ju1YriWn8dT5JBk84BGXMPvZQs70WfCYWecxdMmwfIu1Mupg==",
       "requires": {
-        "@testim/chrome-version": "^1.1.3",
-        "axios": "^1.4.0",
-        "compare-versions": "^6.0.0",
+        "@testim/chrome-version": "^1.1.4",
+        "axios": "^1.6.0",
+        "compare-versions": "^6.1.0",
         "extract-zip": "^2.0.1",
         "https-proxy-agent": "^5.0.1",
         "proxy-from-env": "^1.1.0",
-        "tcp-port-used": "^1.0.1"
+        "tcp-port-used": "^1.0.2"
       }
     },
     "cliui": {
@@ -1814,9 +1814,9 @@
       "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ=="
     },
     "follow-redirects": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="
+      "version": "1.15.3",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz",
+      "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q=="
     },
     "form-data": {
       "version": "4.0.0",
@@ -2300,9 +2300,9 @@
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
     "selenium-webdriver": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.14.0.tgz",
-      "integrity": "sha512-637rs8anqMKHbWxcBZpyG3Gcs+rBUtAUiqk0O/knUqH4Paj3MFUZrz88/pVGOLNryEVy2z92fZomT8p1ENl1gA==",
+      "version": "4.15.0",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.15.0.tgz",
+      "integrity": "sha512-BNG1bq+KWiBGHcJ/wULi0eKY0yaDqFIbEmtbsYJmfaEghdCkXBsx1akgOorhNwjBipOr0uwpvNXqT6/nzl+zjg==",
       "requires": {
         "jszip": "^3.10.1",
         "tmp": "^0.2.1",

test/package.json

@@ -9,10 +9,10 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "chromedriver": "^117.0.3",
+    "chromedriver": "^119.0.1",
     "expect.js": "^0.3.1",
     "mocha": "^10.2.0",
-    "selenium-webdriver": "^4.14.0",
+    "selenium-webdriver": "^4.15.0",
     "superagent": "^8.1.2"
   }
 }

test/test.js

@@ -5,6 +5,7 @@
 /* global before */
 /* global after */
 /* global it */
+/* global xit */
 
 'use strict';
 
@@ -15,7 +16,7 @@ const execSync = require('child_process').execSync,
     superagent = require('superagent'),
     path = require('path'),
     timers = require('timers/promises'),
-    { Builder, By, Key, until } = require('selenium-webdriver'),
+    { Builder, By, until } = require('selenium-webdriver'),
     { Options } = require('selenium-webdriver/chrome');
 
 describe('Application life cycle test', function () {
@@ -44,131 +45,79 @@ describe('Application life cycle test', function () {
         expect(app).to.be.an('object');
     }
 
-    function waitForElement(elem) {
-        return browser.wait(until.elementLocated(elem), TEST_TIMEOUT).then(function () {
-            return browser.wait(until.elementIsVisible(browser.findElement(elem)), TEST_TIMEOUT);
-        });
+    async function waitForElement(elem) {
+        await browser.wait(until.elementLocated(elem), TEST_TIMEOUT);
+        await browser.wait(until.elementIsVisible(browser.findElement(elem)), TEST_TIMEOUT);
     }
 
-    function invalidPassword(callback) {
-        superagent.get('https://' + app.fqdn).auth(username, password + 'x').end(function (error, result) {
-            expect(result.status).to.eql(401);
-
-            callback();
-        });
+    async function login() {
+        await browser.manage().deleteAllCookies();
+        await browser.get('https://' + app.fqdn);
+        await waitForElement(By.id('user'));
+        await browser.findElement(By.id('user')).sendKeys(username);
+        await browser.findElement(By.id('password')).sendKeys(password);
+        await browser.findElement(By.xpath('//button[@type="submit"]')).click();
+        await waitForElement(By.xpath('//span[text()="Actions"]'));
     }
 
-    function loadPage(callback) {
-        browser.manage().deleteAllCookies().then(function () {
-            return browser.sleep(5000);
-        }).then(function() {
-            return browser.get('https://' + username + ':' + encodeURIComponent(password) + '@' + app.fqdn).then(function () {
-                return browser.get('https://' + app.fqdn);
-            });
-        }).then(function () {
-            return browser.sleep(5000);
-        }).then(function () {
-            return browser.get('https://' + app.fqdn);
-        }).then(function () {
-            return waitForElement(By.xpath('//span[text()="Actions"]'));
-        }).then(function () {
-            callback();
-        });
+    async function loadPage() {
+        await browser.get('https://' + app.fqdn);
+        await waitForElement(By.xpath('//span[text()="Actions"]'));
     }
 
-    function addFolder(callback) {
-        browser.get('https://' + app.fqdn).then(function () {
-            return browser.findElement(By.css('[ng-click*=addFolder]')).click();
-        }).then(function () {
-            return waitForElement(By.id('folderPath'));
-        }).then(function () {
-            return browser.sleep(4000); // wait more, not sure why this is needed
-        }).then(function() {
-            return browser.findElement(By.id('folderLabel')).sendKeys(FOLDER);
-        }).then(function () {
-            return browser.sleep(4000); // without this sometimes only part of the folder name gets through
-        }).then(function() {
-            return browser.findElement(By.css('[ng-click*=saveFolder]')).click();
-        }).then(function() {
-            return browser.wait(until.elementLocated(By.css('#folders .panel-status span[ng-switch-when=unshared]')), TEST_TIMEOUT);
-        }).then(function () {
-            return browser.sleep(4000);
-        }).then(function() {
-            callback();
-        });
+    async function addFolder() {
+        await browser.get('https://' + app.fqdn);
+        await browser.findElement(By.css('[ng-click*=addFolder]')).click();
+        await waitForElement(By.id('folderPath'));
+        await browser.sleep(4000); // wait more, not sure why this is needed
+        await browser.findElement(By.id('folderLabel')).sendKeys(FOLDER);
+        await browser.sleep(4000); // without this sometimes only part of the folder name gets through
+        await browser.findElement(By.css('[ng-click*=saveFolder]')).click();
+        await browser.wait(until.elementLocated(By.css('#folders .panel-status span[ng-switch-when=unshared]')), TEST_TIMEOUT);
+        await browser.sleep(4000);
     }
 
-    function checkFolder(callback) {
-        browser.get('https://' + app.fqdn).then(function () {
-            return browser.sleep(5000);
-        }).then(function () {
-            return browser.get('https://' + app.fqdn);
-        }).then(function () {
-            return browser.wait(until.elementLocated(By.xpath(`//span[text()="${FOLDER}"]`)), TEST_TIMEOUT);
-        }).then(function () {
-            callback();
-        });
-    }
-
-    function removeFolder(callback) {
-        browser.get('https://' + app.fqdn).then(function () {
-            return waitForElement(By.xpath('//span[text()="Actions"]'));
-        }).then(function() {
-            return browser.findElement(By.css('#folders button')).click();
-        }).then(function () {
-            return browser.sleep(3000); //No way to check for visibility of angular-js components
-        }).then(function () {
-            return browser.findElement(By.css('#folder-0 button[ng-click*=editFolder]')).click();
-        }).then(function () {
-            return browser.sleep(3000); //No way to check for visibility of angular-js components
-        }).then(function () {
-            return browser.findElement(By.xpath('//button[@data-target="#remove-folder-confirmation"]')).click();
-        }).then(function () {
-            return browser.sleep(3000); //No way to check for visibility of angular-js components
-        }).then(function () {
-            return browser.findElement(By.css('[ng-click*=deleteFolder]')).click();
-        }).then(function () {
-            return browser.sleep(3000); //This needs to run for some time
-        }).then(function () {
-            callback();
-        });
+    async function checkFolder() {
+        await browser.get('https://' + app.fqdn);
+        await browser.sleep(5000);
+        await browser.get('https://' + app.fqdn);
+        await browser.wait(until.elementLocated(By.xpath(`//span[text()="${FOLDER}"]`)), TEST_TIMEOUT);
     }
 
     xit('build app', function () { execSync('cloudron build', EXEC_ARGS); });
 
-    it('install app', async function () {
-        execSync('cloudron install --port-bindings SYNC_PORT=' + SYNC_PORT + ' --location ' + LOCATION, EXEC_ARGS);
-        await timers.setTimeout(30000);
-    });
+    it('install app', function () { execSync('cloudron install --port-bindings SYNC_PORT=' + SYNC_PORT + ' --location ' + LOCATION, EXEC_ARGS); });
+        // await timers.setTimeout(30000);
     it('can get app information', getAppInfo);
 
-    it('fails with invalid password', invalidPassword);
+    it('can login', login);
     it('can load page', loadPage);
     it('can add folder', addFolder);
 
     it('backup app', async function () {
         execSync('cloudron backup create --app ' + app.id, EXEC_ARGS);
-        await timers.setTimeout(30000);
+        // await timers.setTimeout(30000);
     });
     it('restore app', async function () {
         await browser.get('about:blank');
         execSync('cloudron restore --app ' + app.id, EXEC_ARGS);
-        await timers.setTimeout(30000);
+        await timers.setTimeout(5000);
     });
 
+    it('can login', login);
     it('can load page', loadPage);
     it('can check folder', checkFolder);
 
     it('move to different location', async function () {
         await browser.get('about:blank');
         execSync(`cloudron configure --location ${LOCATION}2 --app ${app.id}`, EXEC_ARGS);
-        await timers.setTimeout(30000);
+        await timers.setTimeout(5000);
     });
     it('can get app information', getAppInfo);
 
+    it('can login', login);
     it('can load page', loadPage);
     it('can check folder', checkFolder);
-    it('can remove folder', removeFolder);
 
     it('uninstall app', async function () {
         await browser.get('about:blank');
@@ -181,6 +130,7 @@ describe('Application life cycle test', function () {
         await timers.setTimeout(30000);
     });
     it('can get app information', getAppInfo);
+    it('can login', login);
     it('can load page', loadPage);
     it('can add folder', addFolder);
     it('can update', async function () {