Update test deps

CHANGELOG

@@ -288,3 +288,148 @@
 * [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.19.2)
 * Make error message upon reaching the free space quota more clear
 
+[1.20.0]
+* Update Syncthing to 1.20.0
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.20.0)
+* #7855: Watching for changes using too many system resources on BSDs (kqueue)
+* #8020: Dangling symlink prevents filesystem watcher on Solaris
+* #8232: Missing include file endlessly spams log
+* #8258: The latest version does not support go1.18 compilation!!
+* #8261: TypeError: Cannot read properties of null (reading 'status') in the GUI after killing Syncthing
+* #8202: Indicate folders / devices where the remote end has not accepted sharing.
+* #8282: Change default log format to include date
+
+[1.20.1]
+* Update Syncthing to 1.20.1
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.20.1)
+* #8320: Spurious failure of new connections ("unknown (newer?) version of the protocol" etc)
+
+[1.20.2]
+* Update Syncthing to 1.20.2
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.20.2)
+* Fix use of old, renamed function in edit folder sharing tab.
+
+[1.20.3]
+* Update Syncthing to 1.20.3
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.20.3)
+* #8369: Shared device names are missing from "Edit Folder -> Sharing"
+* #8376: Chrome Autofill Breaks Authentication
+* #8386: Ignore patterns with wildcard and non-ASCII characters don't work as expected
+* #8393: Warn if two devices are introducers to each other
+
+[1.20.4]
+* Update Syncthing to 1.20.4
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.20.4)
+* #7458: Syncthing announces address of interface which is down
+* #8479: Panic in failure reporting
+* #8007: Support listing the discovered devices using the cli
+
+[1.21.0]
+* Update Syncthing to 1.22.0
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.22.0)
+* #2698: Sync extended file attributes on supported file systems
+* #7603: WebUI tooltip inconsistencies
+* #8506: macOS Monterey 12.5.1 aliases break after sync
+
+[1.21.1]
+* Update Syncthing to 1.22.1
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.22.1)
+* #8084: Scope ID should be filtered out of IPv6 addresses when using Remote GUI
+* #8569: Periodic connection losses to webui because docker image doesn't support upgrade
+* #8594: Extended attributes are only synced one way
+
+[1.21.2]
+* Update base image to 4.0.0
+
+[1.22.0]
+* Update Syncthing to 1.23.0
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.23.0)
+* #8572: Incorrect rescan interval on auto accepted encrypted folder
+* #8646: Perhaps the list of devices contains empty elements
+* #8686: Properly indicate whether a connection is "LAN" or not in the GUI
+
+[1.22.1]
+* Update Syncthing to 1.23.1
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.23.1)
+* #8325: "accept: function not implemented" after upgrading to syncthing v1.20.1
+
+[1.22.2]
+* Update Syncthing to 1.23.2
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.23.2)
+* #8749: Relay listener does not restart sometimes
+* #8660: GUI editor for xattr filter patterns
+* #8781: gui: Remove duplicate Spanish translation
+
+[1.22.3]
+* Update Syncthing to 1.23.3
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.23.3)
+* #5408: Selection of time in versions GUI not possible without editing the string inside the textfield
+* #8277: Mutual encrypted sharing doesn't work (both sides with password)
+* #8556: Increased file size when sharing between encrypted devices
+* #8599: Key generation at connect time is slow for encrypted connections
+* #7859: Allow sub-second watcher delay (use case: remote development)
+* #8828: cmd/stdiscosrv: TestDatabaseGetSet flake
+
+[1.22.4]
+* Update Syncthing to 1.23.4
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.23.4)
+* lib/syncthing: Handle successful global migration (fixes #8851) (#8852)
+* lib/syncthing: Handle successfull global migration (fixes #8851)
+
+[1.22.5]
+* Update Syncthing to 1.23.5
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.23.5)
+* gui: Avoid code generating HTML (#8923)
+
+[1.22.6]
+* Update Syncthing to 1.23.6
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.23.6)
+
+[1.22.7]
+* Update Syncthing to 1.23.7
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.23.7)
+* #6597: setLowPriority should not increase process priority when already lower (in Windows)
+* #7698: ursrv: unrealistic uptime data, likely due to unset RTC (1970-01-01)
+* #8958: Extended attribute filter editor should be enabled when "send extended attributes" is checked
+* #8967: Shared With list ends with comma on 1 device
+* #9001: relaysrv crash after some weeks of operation
+* #8890: Do not autoexpand tilde sign (~) to an absolute home directory path
+* #8957: Add environment variables for --home, --conf, and --data
+* #8968: Error for Windows invalid file names should indicate the invalid character or name part
+* #8983: Integrate govulncheck
+
+[1.23.0]
+* Update Syncthing to 1.24.0
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.25.0)
+* #8274: Usage report transport type is wrong for QUIC
+* #8482: Discovery server keeps duplicate entries
+* #9019: Web GUI loses config changes when doing multiple modifications (e.g. on slow hardware or remotely)
+* #9112: panic: counter cannot decrease in value
+* #9123: Hashed passwords via API are hashed again
+* #141: Use multiple simultaneous TCP connections
+* #5607: Move footer links to header
+
+[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
+
+[1.25.1]
+* Update Syncthing to 1.26.1
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.26.1)
+
+[1.25.2]
+* Update Syncthing to 1.27.1
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.27.1)
+* #9253: Permission error on folder causes "connection error" dialog when opening folder editor
+* #9269: panic: nil pointer dereference in (*indexHandlerRegistry).startLocked
+* #9274: Missing lock in DeviceStatistics ("fatal error: concurrent map read and map write")
+

CloudronManifest.json

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

Dockerfile

@@ -1,9 +1,9 @@
-FROM cloudron/base:3.2.0@sha256:ba1d566164a67c266782545ea9809dc611c4152e27686fd14060332dd88263ea
+FROM cloudron/base:4.2.0@sha256:46da2fffb36353ef714f97ae8e962bd2c212ca091108d768ba473078319a47f4
 
 RUN mkdir -p /app/code
 WORKDIR /app/code
 
-ARG VERSION=1.19.2
+ARG VERSION=1.27.1
 
 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.json

@@ -9,10 +9,10 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "chromedriver": "^101.0.0",
+    "chromedriver": "^119.0.1",
     "expect.js": "^0.3.1",
-    "mocha": "^10.0.0",
+    "mocha": "^10.2.0",
-    "selenium-webdriver": "^4.1.2",
+    "selenium-webdriver": "^4.16.0",
-    "superagent": "^7.1.3"
+    "superagent": "^8.1.2"
   }
 }

test/test.js

@@ -5,30 +5,31 @@
 /* global before */
 /* global after */
 /* global it */
+/* global xit */
 
 'use strict';
 
 require('chromedriver');
 
-var execSync = require('child_process').execSync,
+const execSync = require('child_process').execSync,
     expect = require('expect.js'),
     superagent = require('superagent'),
     path = require('path'),
-    { Builder, By, Key, until } = require('selenium-webdriver'),
+    timers = require('timers/promises'),
+    { Builder, By, until } = require('selenium-webdriver'),
     { Options } = require('selenium-webdriver/chrome');
 
 describe('Application life cycle test', function () {
     this.timeout(0);
 
-    var LOCATION = 'test';
+    const LOCATION = 'test';
-    var TEST_TIMEOUT = 30000;
+    const TEST_TIMEOUT = 30000;
-    var FOLDER = 'xmf'; // keep this small. long folder names fail in automation, not sure why
+    const FOLDER = 'xmf'; // keep this small. long folder names fail in automation, not sure why
-    var SYNC_PORT = 22001;
+    const SYNC_PORT = 22001;
-    var EXEC_ARGS = { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' };
+    const EXEC_ARGS = { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' };
 
-    var browser;
+    let browser, app;
-    var app;
+    const username = 'admin', password = 'changeme';
-    var username = 'admin', password = 'changeme';
 
     before(function () {
         browser = new Builder().forBrowser('chrome').setChromeOptions(new Options().windowSize({ width: 1280, height: 1024 })).build();
@@ -39,103 +40,48 @@ describe('Application life cycle test', function () {
     });
 
     function getAppInfo() {
-        var inspect = JSON.parse(execSync('cloudron inspect'));
+        const inspect = JSON.parse(execSync('cloudron inspect'));
         app = inspect.apps.filter(function (a) { return a.location.indexOf(LOCATION) === 0; })[0];
         expect(app).to.be.an('object');
     }
 
-    function waitForElement(elem) {
+    async function waitForElement(elem) {
-        return browser.wait(until.elementLocated(elem), TEST_TIMEOUT).then(function () {
+        await browser.wait(until.elementLocated(elem), TEST_TIMEOUT);
-            return browser.wait(until.elementIsVisible(browser.findElement(elem)), TEST_TIMEOUT);
+        await browser.wait(until.elementIsVisible(browser.findElement(elem)), TEST_TIMEOUT);
-        });
     }
 
-    function invalidPassword(callback) {
+    async function login() {
-        superagent.get('https://' + app.fqdn).auth(username, password + 'x').end(function (error, result) {
+        await browser.manage().deleteAllCookies();
-            expect(result.status).to.eql(401);
+        await browser.get('https://' + app.fqdn);
-
+        await waitForElement(By.id('user'));
-            callback();
+        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) {
+    async function loadPage() {
-        browser.manage().deleteAllCookies().then(function () {
+        await browser.get('https://' + app.fqdn);
-            return browser.sleep(5000);
+        await waitForElement(By.xpath('//span[text()="Actions"]'));
-        }).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();
-        });
     }
 
-    function addFolder(callback) {
+    async function addFolder() {
-        browser.get('https://' + app.fqdn).then(function () {
+        await browser.get('https://' + app.fqdn);
-            return browser.findElement(By.css('[ng-click*=addFolder]')).click();
+        await browser.findElement(By.css('[ng-click*=addFolder]')).click();
-        }).then(function () {
+        await waitForElement(By.id('folderPath'));
-            return waitForElement(By.id('folderPath'));
+        await browser.sleep(4000); // wait more, not sure why this is needed
-        }).then(function () {
+        await browser.findElement(By.id('folderLabel')).sendKeys(FOLDER);
-            return browser.sleep(4000); // wait more, not sure why this is needed
+        await browser.sleep(4000); // without this sometimes only part of the folder name gets through
-        }).then(function() {
+        await browser.findElement(By.css('[ng-click*=saveFolder]')).click();
-            return browser.findElement(By.id('folderLabel')).sendKeys(FOLDER);
+        await browser.wait(until.elementLocated(By.css('#folders .panel-status span[ng-switch-when=unshared]')), TEST_TIMEOUT);
-        }).then(function () {
+        await browser.sleep(4000);
-            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();
-        });
     }
 
-    function checkFolder(callback) {
+    async function checkFolder() {
-        browser.get('https://' + app.fqdn).then(function () {
+        await browser.get('https://' + app.fqdn);
-            return browser.sleep(5000);
+        await browser.sleep(5000);
-        }).then(function () {
+        await browser.get('https://' + app.fqdn);
-            return browser.get('https://' + app.fqdn);
+        await browser.wait(until.elementLocated(By.xpath(`//span[text()="${FOLDER}"]`)), TEST_TIMEOUT);
-        }).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();
-        });
-    }
-
-    function wait (done) {
-        setTimeout(done, 10000);
     }
 
     xit('build app', function () { execSync('cloudron build', EXEC_ARGS); });
@@ -143,34 +89,31 @@ describe('Application life cycle test', function () {
     it('install app', function () { execSync('cloudron install --port-bindings SYNC_PORT=' + SYNC_PORT + ' --location ' + LOCATION, EXEC_ARGS); });
     it('can get app information', getAppInfo);
 
-    it('wait', wait);
+    it('can login', login);
-
-    it('fails with invalid password', invalidPassword);
     it('can load page', loadPage);
     it('can add folder', addFolder);
 
-    it('backup app', function () { execSync('cloudron backup create --app ' + app.id, EXEC_ARGS); });
+    it('backup app', async function () { execSync('cloudron backup create --app ' + app.id, EXEC_ARGS); });
     it('restore app', async function () {
         await browser.get('about:blank');
         execSync('cloudron restore --app ' + app.id, EXEC_ARGS);
+        await timers.setTimeout(5000);
     });
 
-    it('wait', wait);
+    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(5000);
     });
     it('can get app information', getAppInfo);
 
-    it('wait', wait);
+    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');
@@ -178,16 +121,20 @@ describe('Application life cycle test', function () {
     });
 
     // test update
-    it('can install app', function () { execSync('cloudron install --port-bindings SYNC_PORT=' + SYNC_PORT + ' --appstore-id net.syncthing.cloudronapp2 --location ' + LOCATION, EXEC_ARGS); });
+    it('can install app', async function () {
+        execSync('cloudron install --port-bindings SYNC_PORT=' + SYNC_PORT + ' --appstore-id net.syncthing.cloudronapp2 --location ' + LOCATION, EXEC_ARGS);
+        await timers.setTimeout(30000);
+    });
     it('can get app information', getAppInfo);
-    it('wait', wait);
+    it('can login', login);
     it('can load page', loadPage);
     it('can add folder', addFolder);
     it('can update', async function () {
         await browser.get('about:blank');
         execSync('cloudron update --app ' + LOCATION, EXEC_ARGS);
+        await timers.setTimeout(30000);
     });
-    it('wait', wait);
+    it('can login', login);
     it('can check folder', checkFolder);
 
     it('uninstall app', async function () {