Compare commits
18 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
62a12ea30b | ||
|
|
6bcba878fd | ||
|
|
231ee9b187 | ||
|
|
d9420c319d | ||
|
|
050f4d8a26 | ||
|
|
e6d1f16b1d | ||
|
|
3991b28ba5 | ||
|
|
467685dee3 | ||
|
|
5a60a8b057 | ||
|
|
c8ed7b7882 | ||
|
|
3b5069dd3e | ||
|
|
bb28b946d2 | ||
|
|
99117698a6 | ||
|
|
b279638c84 | ||
|
|
c9c9259808 | ||
|
|
91b6c529e3 | ||
|
|
d2bfffb179 | ||
|
|
4692c12d60 |
33
CHANGELOG.md
33
CHANGELOG.md
@@ -1325,3 +1325,36 @@
|
||||
* Update synapse to 1.120.2
|
||||
* [Full Changelog](https://github.com/element-hq/synapse/releases/tag/v1.118.0)
|
||||
|
||||
[1.101.0]
|
||||
* Update synapse to 1.121.1
|
||||
* [Full Changelog](https://github.com/element-hq/synapse/releases/tag/v1.121.0)
|
||||
* Support for MSC4190: device management for Application Services. (#17705)
|
||||
* Update MSC4186 Sliding Sync to include invite, ban, kick, targets when $LAZY-loading room members. (#17947)
|
||||
* Use stable M_USER_LOCKED error code for locked accounts, as per Matrix 1.12. (#17965)
|
||||
* MSC4076: Add disable_badge_count to pusher configuration. (#17975)
|
||||
|
||||
|
||||
[1.101.1]
|
||||
* CLOUDRON_OIDC_PROVIDER_NAME implemented
|
||||
|
||||
[1.102.0]
|
||||
* Update synapse to 1.122.0
|
||||
* [Full Changelog](https://github.com/element-hq/synapse/releases/tag/v1.122.0)
|
||||
|
||||
[1.103.0]
|
||||
* Update synapse to 1.123.0
|
||||
* [Full Changelog](https://github.com/element-hq/synapse/releases/tag/v1.123.0)
|
||||
|
||||
[1.104.0]
|
||||
* Update synapse to 1.124.0
|
||||
* [Full Changelog](https://github.com/element-hq/synapse/releases/tag/v1.124.0)
|
||||
|
||||
[1.105.0]
|
||||
* Update synapse to 1.125.0
|
||||
* [Full Changelog](https://github.com/element-hq/synapse/releases/tag/v1.125.0)
|
||||
* Add functionality to be able to use multiple values in SSO feature attribute_requirements. (#17949)
|
||||
* Add experimental config options admin_token_path and client_secret_path for MSC3861. (#18004)
|
||||
* Add get_current_time_msec() method to the module API for sound time comparisons with Synapse. (#18144)
|
||||
* Update the response when a client attempts to add an invalid email address to the user's account from a 500, to a 400 with error text. (#18125)
|
||||
* Fix user directory search when using a legacy module with a check_username_for_spam callback. Broke in v1.122.0. (#18135)
|
||||
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
"description": "file://DESCRIPTION.md",
|
||||
"changelog": "file://CHANGELOG.md",
|
||||
"tagline": "Secure & decentralized communication",
|
||||
"version": "1.100.1",
|
||||
"upstreamVersion": "1.120.2",
|
||||
"version": "1.105.0",
|
||||
"upstreamVersion": "1.125.0",
|
||||
"healthCheckPath": "/",
|
||||
"httpPort": 8008,
|
||||
"memoryLimit": 536870912,
|
||||
|
||||
@@ -10,7 +10,7 @@ ENV VIRTUAL_ENV=/app/code/env
|
||||
ENV PATH="$VIRTUAL_ENV/bin:$PATH"
|
||||
|
||||
# renovate: datasource=github-releases depName=element-hq/synapse versioning=semver extractVersion=^v(?<version>.+)$
|
||||
ARG SYNAPSE_VERSION=1.120.2
|
||||
ARG SYNAPSE_VERSION=1.125.0
|
||||
|
||||
# renovate: datasource=github-releases depName=matrix-org/synapse-s3-storage-provider versioning=semver extractVersion=^v(?<version>.+)$
|
||||
ARG S3PROVIDER_VERSION=1.5.0
|
||||
|
||||
2
start.sh
2
start.sh
@@ -70,7 +70,7 @@ if [[ -n "${CLOUDRON_OIDC_ISSUER:-}" ]]; then
|
||||
yq eval -i "del(.password_providers)" /app/data/configs/homeserver.yaml # remove old ldap config
|
||||
echo " ==> Configuring OIDC auth"
|
||||
yq eval -i ".oidc_providers[0].idp_id=\"cloudron\"" /app/data/configs/homeserver.yaml
|
||||
yq eval -i ".oidc_providers[0].idp_name=\"Cloudron\"" /app/data/configs/homeserver.yaml
|
||||
yq eval -i ".oidc_providers[0].idp_name=\"${CLOUDRON_OIDC_PROVIDER_NAME:-Cloudron}\"" /app/data/configs/homeserver.yaml
|
||||
yq eval -i ".oidc_providers[0].issuer=\"${CLOUDRON_OIDC_ISSUER}\"" /app/data/configs/homeserver.yaml
|
||||
yq eval -i ".oidc_providers[0].client_id=\"${CLOUDRON_OIDC_CLIENT_ID}\"" /app/data/configs/homeserver.yaml
|
||||
yq eval -i ".oidc_providers[0].client_secret=\"${CLOUDRON_OIDC_CLIENT_SECRET}\"" /app/data/configs/homeserver.yaml
|
||||
|
||||
2110
test/package-lock.json
generated
2110
test/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -9,9 +9,9 @@
|
||||
"author": "",
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"chromedriver": "^131.0.1",
|
||||
"chromedriver": "^133.0.2",
|
||||
"expect.js": "^0.3.1",
|
||||
"mocha": "^11.0.1",
|
||||
"selenium-webdriver": "^4.27.0"
|
||||
"mocha": "^11.1.0",
|
||||
"selenium-webdriver": "^4.29.0"
|
||||
}
|
||||
}
|
||||
|
||||
122
test/test.js
122
test/test.js
@@ -91,6 +91,7 @@ describe('Application life cycle test', function () {
|
||||
|
||||
async function updateSynapseConfig() {
|
||||
console.log(`Setting Synapse Matrix server location to "https://${app.fqdn}"`);
|
||||
|
||||
execSync(`cloudron exec --app ${ELEMENT_LOCATION} -- bash -c "jq '.default_server_config[\\"m.homeserver\\"].base_url = \\"https://${app.fqdn}\\"' /app/data/config.json | sponge /app/data/config.json"`);
|
||||
execSync(`cloudron restart --app ${ELEMENT_LOCATION}`);
|
||||
// wait when all services are up and running
|
||||
@@ -106,61 +107,91 @@ describe('Application life cycle test', function () {
|
||||
await browser.get(`https://${elementApp.fqdn}/#/register`);
|
||||
await waitForElement(By.xpath('//input[@label="Username"]'));
|
||||
await browser.findElement(By.xpath('//input[@label="Username"]')).sendKeys(USERNAME);
|
||||
await browser.sleep(2000);
|
||||
await browser.findElement(By.xpath('//input[@label="Password"]')).sendKeys(PASSWORD);
|
||||
await browser.sleep(2000);
|
||||
await browser.findElement(By.xpath('//input[@label="Confirm password"]')).sendKeys(PASSWORD);
|
||||
await browser.sleep(2000);
|
||||
await browser.findElement(By.xpath('//input[@value="Register"]')).click();
|
||||
await browser.sleep(2000);
|
||||
await waitForElement(By.xpath('//h1[text()="You\'re in"]'));
|
||||
await browser.sleep(2000);
|
||||
await browser.findElement(By.xpath('//div[@role="button" and text()="Skip"]')).click();
|
||||
await browser.sleep(2000);
|
||||
|
||||
await waitForElement(By.xpath('//h1[text()="You\'re in"] | //h1[contains(., "Welcome")]'));
|
||||
if (await browser.findElements(By.xpath('//div[@role="button" and text()="Skip"]')).then(found => !!found.length)) {
|
||||
await browser.findElement(By.xpath('//div[@role="button" and text()="Skip"]')).click();
|
||||
}
|
||||
|
||||
await waitForElement(By.xpath(`//h1[contains(., "Welcome")]`));
|
||||
}
|
||||
|
||||
async function loginOIDC(username, password, hasSession, proceedWithReset) {
|
||||
async function loginOIDC(username, password, alreadyAuthenticated, proceedWithReset) {
|
||||
browser.manage().deleteAllCookies();
|
||||
await browser.get(`https://${elementApp.fqdn}/#/login`);
|
||||
await browser.sleep(6000);
|
||||
|
||||
await waitForElement(By.xpath('//div[@role="button" and contains(., "Continue with Cloudron")]'));
|
||||
await browser.findElement(By.xpath('//div[@role="button" and contains(., "Continue with Cloudron")]')).click();
|
||||
await browser.sleep(2000);
|
||||
|
||||
if (!hasSession) {
|
||||
await waitForElement(By.css('.mx_Dropdown_arrow'));
|
||||
await browser.findElement(By.css('.mx_Dropdown_arrow')).click();
|
||||
await waitForElement(By.id('mx_LanguageDropdown__en'));
|
||||
await browser.findElement(By.id('mx_LanguageDropdown__en')).click();
|
||||
await browser.sleep(3000);
|
||||
|
||||
await waitForElement(By.xpath('//div[@role="button" and contains(., "Continue with")]'));
|
||||
await browser.findElement(By.xpath('//div[@role="button" and contains(., "Continue with")]')).click();
|
||||
if (!alreadyAuthenticated) {
|
||||
await waitForElement(By.xpath('//input[@name="username"]'));
|
||||
await browser.findElement(By.xpath('//input[@name="username"]')).sendKeys(username);
|
||||
await browser.findElement(By.xpath('//input[@name="password"]')).sendKeys(password);
|
||||
await browser.sleep(2000);
|
||||
await browser.findElement(By.id('loginSubmitButton')).click();
|
||||
await browser.sleep(2000);
|
||||
}
|
||||
|
||||
await waitForElement(By.xpath('//p[@class="confirm-trust" and contains(., "Continuing will grant ")]'));
|
||||
await browser.findElement(By.xpath('//a[contains(., "Continue")]')).click();
|
||||
await browser.sleep(2000);
|
||||
|
||||
if (proceedWithReset) {
|
||||
await waitForElement(By.xpath('//div[text()="Proceed with reset" or text()="Reset all"]'));
|
||||
|
||||
if (await browser.findElements(By.xpath('//div[text()="Reset all"]')).then(found => !!found.length)) {
|
||||
await browser.findElement(By.xpath('//div[text()="Reset all"]')).click();
|
||||
}
|
||||
|
||||
await waitForElement(By.xpath('//div[text()="Proceed with reset"]'));
|
||||
await browser.findElement(By.xpath('//div[text()="Proceed with reset"]')).click();
|
||||
|
||||
await waitForElement(By.xpath('//button[text()="Continue"]'));
|
||||
await browser.findElement(By.xpath('//button[text()="Continue"]')).click();
|
||||
await waitForElement(By.xpath('//button[@class="mx_Dialog_primary" and text()="Continue"]'));
|
||||
await browser.findElement(By.xpath('//button[@class="mx_Dialog_primary" and text()="Continue"]')).click();
|
||||
|
||||
await waitForElement(By.xpath('//div[text()="Copy"]'));
|
||||
await browser.findElement(By.xpath('//div[text()="Copy"]')).click();
|
||||
|
||||
await browser.sleep(1000);
|
||||
await waitForElement(By.xpath('//button[@class="mx_Dialog_primary" and text()="Continue"]'));
|
||||
await browser.findElement(By.xpath('//button[@class="mx_Dialog_primary" and text()="Continue"]')).click();
|
||||
await waitForElement(By.xpath('//button[text()="Done"] | //div[text()="Single Sign On"]'));
|
||||
|
||||
await waitForElement(By.xpath('//button[text()="Continue"]'));
|
||||
await browser.findElement(By.xpath('//button[text()="Continue"]')).click();
|
||||
if (await browser.findElements(By.xpath('//div[text()="Single Sign On"]')).then(found => !!found.length)) {
|
||||
|
||||
await browser.findElement(By.xpath('//div[text()="Single Sign On"]')).click();
|
||||
|
||||
const originalWindowHandle = await browser.getWindowHandle();
|
||||
await browser.wait(async () => (await browser.getAllWindowHandles()).length === 2, 10000);
|
||||
//Loop through until we find a new window handle
|
||||
const windows = await browser.getAllWindowHandles();
|
||||
windows.forEach(async handle => {
|
||||
if (handle !== originalWindowHandle) {
|
||||
await browser.switchTo().window(handle);
|
||||
}
|
||||
});
|
||||
await waitForElement(By.xpath('//a[contains(., "Continue with")]'));
|
||||
await browser.findElement(By.xpath('//a[contains(., "Continue with")]')).click();
|
||||
|
||||
// switch back to the main window
|
||||
await browser.switchTo().window(originalWindowHandle);
|
||||
|
||||
await waitForElement(By.xpath('//div[text()="Confirm"]'));
|
||||
await browser.findElement(By.xpath('//div[text()="Confirm"]')).click();
|
||||
}
|
||||
|
||||
await waitForElement(By.xpath('//button[text()="Done"]'));
|
||||
await browser.findElement(By.xpath('//button[text()="Done"]')).click();
|
||||
|
||||
await waitForElement(By.xpath('//div[text()="Cancel"]'));
|
||||
await browser.findElement(By.xpath('//div[text()="Cancel"]')).click();
|
||||
await waitForElement(By.xpath('//div[text()="Cancel"] | //h1[contains(., "Welcome")]'));
|
||||
if (await browser.findElements(By.xpath('//div[text()="Cancel"]')).then(found => !!found.length)) {
|
||||
await browser.findElement(By.xpath('//div[text()="Cancel"]')).click();
|
||||
}
|
||||
}
|
||||
|
||||
await browser.sleep(3000);
|
||||
@@ -214,18 +245,23 @@ describe('Application life cycle test', function () {
|
||||
|
||||
async function createRoom() {
|
||||
await browser.get(`https://${elementApp.fqdn}/#/home`);
|
||||
await browser.sleep(4000);
|
||||
await browser.sleep(2000);
|
||||
await waitForElement(By.xpath('//div[@role="button" and @aria-label="Add room"]'));
|
||||
await browser.findElement(By.xpath('//div[@role="button" and @aria-label="Add room"]')).click();
|
||||
await browser.sleep(2000);
|
||||
await browser.sleep(1000);
|
||||
await waitForElement(By.xpath('//li[@role="menuitem" and @aria-label="New room"]'));
|
||||
await browser.findElement(By.xpath('//li[@role="menuitem" and @aria-label="New room"]')).click();
|
||||
await browser.sleep(2000);
|
||||
await browser.sleep(1000);
|
||||
|
||||
await waitForElement(By.xpath('//input[@label="Name"]'));
|
||||
await browser.findElement(By.xpath('//input[@label="Name"]')).sendKeys(ROOM_NAME);
|
||||
await browser.sleep(2000);
|
||||
|
||||
await browser.sleep(1000);
|
||||
|
||||
await waitForElement(By.xpath('//button[text()="Create room"]'));
|
||||
await browser.findElement(By.xpath('//button[text()="Create room"]')).click();
|
||||
await browser.sleep(2000);
|
||||
|
||||
await browser.sleep(1000);
|
||||
|
||||
await waitForElement(By.xpath('//div[@role="button" and @aria-label="Add room"]'));
|
||||
|
||||
@@ -263,6 +299,7 @@ describe('Application life cycle test', function () {
|
||||
|
||||
it('can get Element app info', getElementAppInfo);
|
||||
it('can register new user', registerUser);
|
||||
|
||||
it('create room', createRoom);
|
||||
it('can send message', sendMessage);
|
||||
it('can logout', logout); // from auto-login
|
||||
@@ -285,12 +322,12 @@ describe('Application life cycle test', function () {
|
||||
it('can get Element app info', getElementAppInfo);
|
||||
it('update element-app config', updateSynapseConfig);
|
||||
|
||||
it('can login via OIDC', loginOIDC.bind(null, USERNAME, PASSWORD, false, false /* proceedWithReset */));
|
||||
it('can login via OIDC', loginOIDC.bind(null, USERNAME, PASSWORD, false, false));
|
||||
it('create room', createRoom);
|
||||
it('can send message', sendMessage);
|
||||
it('can get app info', getAppInfo);
|
||||
|
||||
it('can restart app', function () { execSync(`cloudron restart ${app.id}`); });
|
||||
it('can restart app', function () { execSync(`cloudron restart --app ${app.id}`); });
|
||||
|
||||
it('backup app', function () { execSync(`cloudron backup create --app ${app.id}`, EXEC_ARGS); });
|
||||
|
||||
@@ -315,7 +352,8 @@ describe('Application life cycle test', function () {
|
||||
it('can logout', logout);
|
||||
it('can get app info', getAppInfo);
|
||||
|
||||
it('move to different location', async function () {
|
||||
// web ui also throws random errors after changing domain
|
||||
xit('move to different location (skipped since no matrix support)', async function () {
|
||||
browser.manage().deleteAllCookies();
|
||||
await browser.get('about:blank');
|
||||
|
||||
@@ -323,13 +361,11 @@ describe('Application life cycle test', function () {
|
||||
getAppInfo();
|
||||
await browser.sleep(15000);
|
||||
});
|
||||
|
||||
it('update element-app config', updateSynapseConfig);
|
||||
|
||||
it('can get Element app info', getElementAppInfo);
|
||||
it('can login via OIDC', loginOIDC.bind(null, USERNAME, PASSWORD, true, true /* proceedWithReset */));
|
||||
it('check room', checkRoom);
|
||||
it('can send message', sendMessage);
|
||||
xit('update element-app config', updateSynapseConfig);
|
||||
xit('can get Element app info', getElementAppInfo);
|
||||
xit('can login via OIDC', loginOIDC.bind(null, USERNAME, PASSWORD, true, true));
|
||||
xit('check room', checkRoom);
|
||||
xit('can send message', sendMessage);
|
||||
|
||||
it('uninstall app', async function () {
|
||||
await browser.get('about:blank');
|
||||
@@ -347,14 +383,14 @@ describe('Application life cycle test', function () {
|
||||
|
||||
it('can install element-web app (update)', function () { execSync('cloudron install --appstore-id im.riot.cloudronapp --location ' + ELEMENT_LOCATION, EXEC_ARGS); });
|
||||
it('can get Element app info', getElementAppInfo);
|
||||
|
||||
it('update element-app config', updateSynapseConfig);
|
||||
|
||||
it('can login via OIDC', loginOIDC.bind(null, USERNAME, PASSWORD, false, false /* proceedWithReset */));
|
||||
it('can login via OIDC', loginOIDC.bind(null, USERNAME, PASSWORD, false, false));
|
||||
it('is logged in', isLoggedIn);
|
||||
it('create room', createRoom);
|
||||
it('can send message', sendMessage);
|
||||
it('can logout', logout);
|
||||
it('clear cache', clearCache);
|
||||
|
||||
it('can update', async function () {
|
||||
await browser.get('about:blank');
|
||||
@@ -363,9 +399,11 @@ describe('Application life cycle test', function () {
|
||||
});
|
||||
|
||||
it('can get Element app info', getElementAppInfo);
|
||||
it('can login via OIDC', loginOIDC.bind(null, USERNAME, PASSWORD, true, true /* proceedWithReset */));
|
||||
it('can login via OIDC', loginOIDC.bind(null, USERNAME, PASSWORD, false, true));
|
||||
|
||||
it('is logged in', isLoggedIn);
|
||||
it('check room', checkRoom);
|
||||
|
||||
it('can send message', sendMessage);
|
||||
it('can get app info', getAppInfo);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user