Compare commits
27 Commits
Author | SHA1 | Date |
---|---|---|
Johannes Zellner | 9801d5e255 | |
Johannes Zellner | 31b7b66a31 | |
Johannes Zellner | dce1a84d59 | |
Johannes Zellner | f57c6fce92 | |
Johannes Zellner | eb13771fd7 | |
Johannes Zellner | 81d73ad09e | |
Girish Ramakrishnan | 3858cac612 | |
Girish Ramakrishnan | 40d2f5626e | |
Girish Ramakrishnan | e73e316292 | |
Girish Ramakrishnan | f651048574 | |
Girish Ramakrishnan | 6d6ed058f7 | |
Girish Ramakrishnan | df6b2725ad | |
Girish Ramakrishnan | 81277451dc | |
Girish Ramakrishnan | e9a80dddda | |
Girish Ramakrishnan | ba33f68bc8 | |
Girish Ramakrishnan | aa4cdb2de9 | |
Girish Ramakrishnan | 302849a50f | |
Girish Ramakrishnan | d8b6645f14 | |
Girish Ramakrishnan | d6ab9d25ba | |
Girish Ramakrishnan | 4209af8927 | |
Girish Ramakrishnan | 1fabf3766e | |
Girish Ramakrishnan | e276328b3b | |
Girish Ramakrishnan | 15c363a5f7 | |
Girish Ramakrishnan | 575262b21e | |
Vladimir D | 76ed36f766 | |
Johannes Zellner | 4f5c579e4c | |
Johannes Zellner | 687d751dd9 |
49
CHANGELOG
49
CHANGELOG
|
@ -426,3 +426,52 @@
|
||||||
* Update Syncthing to 1.26.1
|
* Update Syncthing to 1.26.1
|
||||||
* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.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")
|
||||||
|
|
||||||
|
[1.26.0]
|
||||||
|
* Add LDAP support
|
||||||
|
|
||||||
|
[1.26.1]
|
||||||
|
* Update Syncthing to 1.27.2
|
||||||
|
* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.27.2)
|
||||||
|
* #9041: cli subcommand does not use STHOMEDIR env var
|
||||||
|
* #9183: Filesystem watching (kqueue) is enabled … with a lot of files
|
||||||
|
* #9274: Missing lock in DeviceStatistics ("fatal error: concurrent map read and map write")
|
||||||
|
* #7406: Add UPnP support for IPv6
|
||||||
|
|
||||||
|
[1.26.2]
|
||||||
|
* Update Syncthing to 1.27.3
|
||||||
|
* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.27.3)
|
||||||
|
* #9039: Sync from Linux to Mac with ownership - Local additions after rescan
|
||||||
|
* #9241: Versions path does not honor tilde (~) shortcut
|
||||||
|
* #8616: Add CLI completion
|
||||||
|
* #9151: Add "stay logged in" checkbox to login dialog
|
||||||
|
|
||||||
|
[1.26.3]
|
||||||
|
* Update Syncthing to 1.27.4
|
||||||
|
* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.27.4)
|
||||||
|
* #9369: Panic in ignore matching on invalid UTF-8 from filesystem watcher
|
||||||
|
* #9435: syncthing should be cgroup aware
|
||||||
|
* #9339: File system watcher should skip ignored directories in more cases
|
||||||
|
|
||||||
|
[1.26.4]
|
||||||
|
* Update Syncthing to 1.27.5
|
||||||
|
* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.27.5)
|
||||||
|
* #8972: Open share settings when clicking 'shared with'
|
||||||
|
* #9470: Show encryption status for devices sharing folder
|
||||||
|
|
||||||
|
[1.26.5]
|
||||||
|
* Update Syncthing to 1.27.6
|
||||||
|
* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.27.6)
|
||||||
|
* lib/db: Drop indexes for outgoing data to force refresh (ref #9496) (#9502)
|
||||||
|
|
||||||
|
[1.26.6]
|
||||||
|
* Update Syncthing to 1.27.7
|
||||||
|
* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.27.7)
|
||||||
|
* #9503: lib/nat: panic: runtime error: index out of range
|
||||||
|
|
||||||
|
|
|
@ -5,12 +5,13 @@
|
||||||
"description": "file://DESCRIPTION.md",
|
"description": "file://DESCRIPTION.md",
|
||||||
"changelog": "file://CHANGELOG",
|
"changelog": "file://CHANGELOG",
|
||||||
"tagline": "Decentralized file synchronization",
|
"tagline": "Decentralized file synchronization",
|
||||||
"version": "1.25.1",
|
"version": "1.26.6",
|
||||||
"upstreamVersion": "1.26.1",
|
"upstreamVersion": "1.27.7",
|
||||||
"healthCheckPath": "/healthcheck",
|
"healthCheckPath": "/healthcheck",
|
||||||
"httpPort": 8000,
|
"httpPort": 8000,
|
||||||
"addons": {
|
"addons": {
|
||||||
"localstorage": {}
|
"localstorage": {},
|
||||||
|
"ldap": {}
|
||||||
},
|
},
|
||||||
"tcpPorts": {
|
"tcpPorts": {
|
||||||
"SYNC_PORT": {
|
"SYNC_PORT": {
|
||||||
|
@ -36,5 +37,6 @@
|
||||||
"https://screenshots.cloudron.io/net.syncthing.cloudronapp2/2.png",
|
"https://screenshots.cloudron.io/net.syncthing.cloudronapp2/2.png",
|
||||||
"https://screenshots.cloudron.io/net.syncthing.cloudronapp2/3.png"
|
"https://screenshots.cloudron.io/net.syncthing.cloudronapp2/3.png"
|
||||||
],
|
],
|
||||||
|
"optionalSso": true,
|
||||||
"postInstallMessage": "file://POSTINSTALL.md"
|
"postInstallMessage": "file://POSTINSTALL.md"
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,7 @@ FROM cloudron/base:4.2.0@sha256:46da2fffb36353ef714f97ae8e962bd2c212ca091108d768
|
||||||
RUN mkdir -p /app/code
|
RUN mkdir -p /app/code
|
||||||
WORKDIR /app/code
|
WORKDIR /app/code
|
||||||
|
|
||||||
ARG VERSION=1.26.1
|
ARG VERSION=1.27.7
|
||||||
|
|
||||||
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
|
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
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,13 @@
|
||||||
This app is pre-setup with an admin account. The initial credentials are:
|
<nosso>
|
||||||
|
This app is pre-setup with an account. The initial credentials are:
|
||||||
|
|
||||||
**Username**: admin<br/>
|
**Username**: admin<br/>
|
||||||
**Password**: changeme<br/>
|
**Password**: changeme<br/>
|
||||||
|
|
||||||
Please change the admin password immediately.
|
Please change the admin password immediately.
|
||||||
|
</nosso>
|
||||||
|
|
||||||
|
<sso>
|
||||||
|
Note that all users manage and synchronize the same set of files.
|
||||||
|
</sso>
|
||||||
|
|
||||||
|
|
13
start.sh
13
start.sh
|
@ -17,8 +17,21 @@ if [[ ! -f /app/data/config/config.xml ]]; then
|
||||||
--update "//configuration/options/defaultFolderPath" -v '/app/data/folders' \
|
--update "//configuration/options/defaultFolderPath" -v '/app/data/folders' \
|
||||||
--update "//configuration/options/urAccepted" -v '-1' \
|
--update "//configuration/options/urAccepted" -v '-1' \
|
||||||
/app/data/config/config.xml
|
/app/data/config/config.xml
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [[ -n ${CLOUDRON_LDAP_HOST:-} ]]; then
|
||||||
|
xmlstarlet ed --inplace \
|
||||||
|
--subnode "//configuration/gui" -t elem -n "authMode" -v "ldap" \
|
||||||
|
--subnode "//configuration/ldap" -t elem -n "address" -v "${CLOUDRON_LDAP_HOST:-}:${CLOUDRON_LDAP_PORT}" \
|
||||||
|
--subnode "//configuration/ldap" -t elem -n "bindDN" -v "${CLOUDRON_LDAP_BIND_DN:-}" \
|
||||||
|
--subnode "//configuration/ldap" -t elem -n "insecureSkipVerify" -v "true" \
|
||||||
|
--subnode "//configuration/ldap" -t elem -n "searchBaseDN" -v "${CLOUDRON_LDAP_USERS_BASE_DN:-}" \
|
||||||
|
--subnode "//configuration/ldap" -t elem -n "searchFilter" -v "(&(objectclass=user)(|(username=%s)(mail=%s)))" \
|
||||||
|
/app/data/config/config.xml
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
# Set the listenAddress and the gui enabled to make sure user doesnt lock themselves out by accident.
|
# Set the listenAddress and the gui enabled to make sure user doesnt lock themselves out by accident.
|
||||||
sed -e "s,<listenAddress>.*</listenAddress>,<listenAddress>tcp://:${SYNC_PORT}</listenAddress>," -i /app/data/config/config.xml
|
sed -e "s,<listenAddress>.*</listenAddress>,<listenAddress>tcp://:${SYNC_PORT}</listenAddress>," -i /app/data/config/config.xml
|
||||||
sed -e 's,<gui .*>,<gui enabled="true" tls="false" debugging="false">,' -i /app/data/config/config.xml
|
sed -e 's,<gui .*>,<gui enabled="true" tls="false" debugging="false">,' -i /app/data/config/config.xml
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -9,10 +9,9 @@
|
||||||
"author": "",
|
"author": "",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"chromedriver": "^119.0.1",
|
"chromedriver": "^124.0.1",
|
||||||
"expect.js": "^0.3.1",
|
"expect.js": "^0.3.1",
|
||||||
"mocha": "^10.2.0",
|
"mocha": "^10.4.0",
|
||||||
"selenium-webdriver": "^4.15.0",
|
"selenium-webdriver": "^4.20.0"
|
||||||
"superagent": "^8.1.2"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
64
test/test.js
64
test/test.js
|
@ -13,12 +13,16 @@ require('chromedriver');
|
||||||
|
|
||||||
const execSync = require('child_process').execSync,
|
const execSync = require('child_process').execSync,
|
||||||
expect = require('expect.js'),
|
expect = require('expect.js'),
|
||||||
superagent = require('superagent'),
|
|
||||||
path = require('path'),
|
path = require('path'),
|
||||||
timers = require('timers/promises'),
|
timers = require('timers/promises'),
|
||||||
{ Builder, By, until } = require('selenium-webdriver'),
|
{ Builder, By, until } = require('selenium-webdriver'),
|
||||||
{ Options } = require('selenium-webdriver/chrome');
|
{ Options } = require('selenium-webdriver/chrome');
|
||||||
|
|
||||||
|
if (!process.env.USERNAME || !process.env.PASSWORD) {
|
||||||
|
console.log('USERNAME and PASSWORD env vars need to be set');
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
describe('Application life cycle test', function () {
|
describe('Application life cycle test', function () {
|
||||||
this.timeout(0);
|
this.timeout(0);
|
||||||
|
|
||||||
|
@ -29,7 +33,9 @@ describe('Application life cycle test', function () {
|
||||||
const EXEC_ARGS = { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' };
|
const EXEC_ARGS = { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' };
|
||||||
|
|
||||||
let browser, app;
|
let browser, app;
|
||||||
const username = 'admin', password = 'changeme';
|
const adminUsername = 'admin', adminPassword = 'changeme';
|
||||||
|
let username = process.env.USERNAME;
|
||||||
|
let password = process.env.PASSWORD;
|
||||||
|
|
||||||
before(function () {
|
before(function () {
|
||||||
browser = new Builder().forBrowser('chrome').setChromeOptions(new Options().windowSize({ width: 1280, height: 1024 })).build();
|
browser = new Builder().forBrowser('chrome').setChromeOptions(new Options().windowSize({ width: 1280, height: 1024 })).build();
|
||||||
|
@ -50,7 +56,7 @@ describe('Application life cycle test', function () {
|
||||||
await browser.wait(until.elementIsVisible(browser.findElement(elem)), TEST_TIMEOUT);
|
await browser.wait(until.elementIsVisible(browser.findElement(elem)), TEST_TIMEOUT);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function login() {
|
async function login(username, password) {
|
||||||
await browser.manage().deleteAllCookies();
|
await browser.manage().deleteAllCookies();
|
||||||
await browser.get('https://' + app.fqdn);
|
await browser.get('https://' + app.fqdn);
|
||||||
await waitForElement(By.id('user'));
|
await waitForElement(By.id('user'));
|
||||||
|
@ -60,6 +66,17 @@ describe('Application life cycle test', function () {
|
||||||
await waitForElement(By.xpath('//span[text()="Actions"]'));
|
await waitForElement(By.xpath('//span[text()="Actions"]'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function logout() {
|
||||||
|
await browser.get('https://' + app.fqdn);
|
||||||
|
await waitForElement(By.xpath('//span[text()="Actions"]'));
|
||||||
|
await browser.findElement(By.xpath('//span[text()="Actions"]')).click();
|
||||||
|
await browser.sleep(4000);
|
||||||
|
await waitForElement(By.xpath('//span[text()="Log Out"]'));
|
||||||
|
await browser.findElement(By.xpath('//span[text()="Log Out"]')).click();
|
||||||
|
await browser.sleep(4000);
|
||||||
|
await waitForElement(By.id('user'));
|
||||||
|
}
|
||||||
|
|
||||||
async function loadPage() {
|
async function loadPage() {
|
||||||
await browser.get('https://' + app.fqdn);
|
await browser.get('https://' + app.fqdn);
|
||||||
await waitForElement(By.xpath('//span[text()="Actions"]'));
|
await waitForElement(By.xpath('//span[text()="Actions"]'));
|
||||||
|
@ -69,12 +86,13 @@ describe('Application life cycle test', function () {
|
||||||
await browser.get('https://' + app.fqdn);
|
await browser.get('https://' + app.fqdn);
|
||||||
await browser.findElement(By.css('[ng-click*=addFolder]')).click();
|
await browser.findElement(By.css('[ng-click*=addFolder]')).click();
|
||||||
await waitForElement(By.id('folderPath'));
|
await waitForElement(By.id('folderPath'));
|
||||||
await browser.sleep(4000); // wait more, not sure why this is needed
|
await browser.sleep(8000); // wait more, not sure why this is needed
|
||||||
await browser.findElement(By.id('folderLabel')).sendKeys(FOLDER);
|
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.sleep(8000); // without this sometimes only part of the folder name gets through
|
||||||
await browser.findElement(By.css('[ng-click*=saveFolder]')).click();
|
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(8000); // without this "stale element"
|
||||||
await browser.sleep(4000);
|
await waitForElement(By.xpath(`//span[contains(text(), '${FOLDER}')]`));
|
||||||
|
await browser.sleep(8000);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function checkFolder() {
|
async function checkFolder() {
|
||||||
|
@ -86,12 +104,28 @@ describe('Application life cycle test', function () {
|
||||||
|
|
||||||
xit('build app', function () { execSync('cloudron build', EXEC_ARGS); });
|
xit('build app', function () { execSync('cloudron build', EXEC_ARGS); });
|
||||||
|
|
||||||
it('install app', function () { execSync('cloudron install --port-bindings SYNC_PORT=' + SYNC_PORT + ' --location ' + LOCATION, EXEC_ARGS); });
|
// NO SSO
|
||||||
|
it('install app (NO SSO)', function () { execSync('cloudron install --no-sso --port-bindings SYNC_PORT=' + SYNC_PORT + ' --location ' + LOCATION, EXEC_ARGS); });
|
||||||
it('can get app information', getAppInfo);
|
it('can get app information', getAppInfo);
|
||||||
|
|
||||||
it('can login', login);
|
it('can admin login', login.bind(null, adminUsername, adminPassword));
|
||||||
it('can load page', loadPage);
|
it('can load page', loadPage);
|
||||||
it('can add folder', addFolder);
|
it('can add folder', addFolder);
|
||||||
|
it('can check folder', checkFolder);
|
||||||
|
|
||||||
|
it('uninstall app', async function () {
|
||||||
|
await browser.get('about:blank');
|
||||||
|
execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS);
|
||||||
|
});
|
||||||
|
|
||||||
|
// SSO
|
||||||
|
it('install app (SSO)', function () { execSync('cloudron install --port-bindings SYNC_PORT=' + SYNC_PORT + ' --location ' + LOCATION, EXEC_ARGS); });
|
||||||
|
it('can get app information', getAppInfo);
|
||||||
|
|
||||||
|
it('can login', login.bind(null, username, password));
|
||||||
|
it('can load page', loadPage);
|
||||||
|
it('can add folder', addFolder);
|
||||||
|
it('can logout', logout);
|
||||||
|
|
||||||
it('backup app', async 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 () {
|
it('restore app', async function () {
|
||||||
|
@ -100,9 +134,10 @@ describe('Application life cycle test', function () {
|
||||||
await timers.setTimeout(5000);
|
await timers.setTimeout(5000);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('can login', login);
|
it('can login', login.bind(null, username, password));
|
||||||
it('can load page', loadPage);
|
it('can load page', loadPage);
|
||||||
it('can check folder', checkFolder);
|
it('can check folder', checkFolder);
|
||||||
|
it('can logout', logout);
|
||||||
|
|
||||||
it('move to different location', async function () {
|
it('move to different location', async function () {
|
||||||
await browser.get('about:blank');
|
await browser.get('about:blank');
|
||||||
|
@ -111,9 +146,10 @@ describe('Application life cycle test', function () {
|
||||||
});
|
});
|
||||||
it('can get app information', getAppInfo);
|
it('can get app information', getAppInfo);
|
||||||
|
|
||||||
it('can login', login);
|
it('can login', login.bind(null, username, password));
|
||||||
it('can load page', loadPage);
|
it('can load page', loadPage);
|
||||||
it('can check folder', checkFolder);
|
it('can check folder', checkFolder);
|
||||||
|
it('can logout', logout);
|
||||||
|
|
||||||
it('uninstall app', async function () {
|
it('uninstall app', async function () {
|
||||||
await browser.get('about:blank');
|
await browser.get('about:blank');
|
||||||
|
@ -126,15 +162,17 @@ describe('Application life cycle test', function () {
|
||||||
await timers.setTimeout(30000);
|
await timers.setTimeout(30000);
|
||||||
});
|
});
|
||||||
it('can get app information', getAppInfo);
|
it('can get app information', getAppInfo);
|
||||||
it('can login', login);
|
it('can login', login.bind(null, username, password));
|
||||||
it('can load page', loadPage);
|
it('can load page', loadPage);
|
||||||
it('can add folder', addFolder);
|
it('can add folder', addFolder);
|
||||||
|
it('can logout', logout);
|
||||||
|
|
||||||
it('can update', async function () {
|
it('can update', async function () {
|
||||||
await browser.get('about:blank');
|
await browser.get('about:blank');
|
||||||
execSync('cloudron update --app ' + LOCATION, EXEC_ARGS);
|
execSync('cloudron update --app ' + LOCATION, EXEC_ARGS);
|
||||||
await timers.setTimeout(30000);
|
await timers.setTimeout(30000);
|
||||||
});
|
});
|
||||||
it('can login', login);
|
it('can login', login.bind(null, username, password));
|
||||||
it('can check folder', checkFolder);
|
it('can check folder', checkFolder);
|
||||||
|
|
||||||
it('uninstall app', async function () {
|
it('uninstall app', async function () {
|
||||||
|
|
Loading…
Reference in New Issue