Compare commits
20 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f2efa0ace4 | ||
|
|
3efa89f92b | ||
|
|
fe51b493d4 | ||
|
|
85186e353f | ||
|
|
d294beaf99 | ||
|
|
40c4dfc7af | ||
|
|
2bc7648a68 | ||
|
|
1a2af0e566 | ||
|
|
62a12ea30b | ||
|
|
6bcba878fd | ||
|
|
231ee9b187 | ||
|
|
d9420c319d | ||
|
|
050f4d8a26 | ||
|
|
e6d1f16b1d | ||
|
|
3991b28ba5 | ||
|
|
467685dee3 | ||
|
|
5a60a8b057 | ||
|
|
c8ed7b7882 | ||
|
|
3b5069dd3e | ||
|
|
bb28b946d2 |
52
CHANGELOG.md
52
CHANGELOG.md
@@ -1334,3 +1334,55 @@
|
||||
* 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)
|
||||
|
||||
[1.106.0]
|
||||
* Update synapse to 1.126.0
|
||||
* [Full Changelog](https://github.com/element-hq/synapse/releases/tag/v1.126.0)
|
||||
* Define ratelimit configuration for delayed event management. (#18019)
|
||||
* Add form_secret_path config option. (#18090)
|
||||
* Add the --no-secrets-in-config command line option. (#18092)
|
||||
* Add background job to clear unreferenced state groups. (#18154)
|
||||
* Add support for specifying/overriding id_token_signing_alg_values_supported for an OpenID identity provider. (#18177)
|
||||
* Add worker_replication_secret_path config option. (#18191)
|
||||
* Add support for specifying/overriding redirect_uri in the authorization and token requests against an OpenID identity provider. (#18197)
|
||||
|
||||
[1.107.0]
|
||||
* Update base image to 5.0.0
|
||||
|
||||
[1.108.0]
|
||||
* Update synapse to 1.127.0
|
||||
* [Full Changelog](https://github.com/element-hq/synapse/releases/tag/v1.127.0)
|
||||
* Update MSC4140 implementation to no longer cancel a user's own delayed state events with an event type & state key that match a more recent state event sent by that user. (#17810)
|
||||
* Fixed a minor typo in the Synapse documentation. Contributed by @karuto12. (#18224)
|
||||
* Remove undocumented SYNAPSE_USE_FROZEN_DICTS environment variable. (#18123)
|
||||
* Fix detection of workflow failures in the release script. (#18211)
|
||||
* Add caching support to media endpoints. (#18235)
|
||||
|
||||
[1.108.1]
|
||||
* Update synapse to 1.127.1
|
||||
* [Full Changelog](https://github.com/element-hq/synapse/releases/tag/v1.127.1)
|
||||
* Fix CVE-2025-30355 / GHSA-v56r-hwv5-mxg6. High severity vulnerability affecting federation. The vulnerability has been exploited in the wild.
|
||||
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
"description": "file://DESCRIPTION.md",
|
||||
"changelog": "file://CHANGELOG.md",
|
||||
"tagline": "Secure & decentralized communication",
|
||||
"version": "1.101.0",
|
||||
"upstreamVersion": "1.121.1",
|
||||
"version": "1.108.1",
|
||||
"upstreamVersion": "1.127.1",
|
||||
"healthCheckPath": "/",
|
||||
"httpPort": 8008,
|
||||
"memoryLimit": 536870912,
|
||||
|
||||
19
Dockerfile
19
Dockerfile
@@ -1,30 +1,27 @@
|
||||
FROM cloudron/base:4.2.0@sha256:46da2fffb36353ef714f97ae8e962bd2c212ca091108d768ba473078319a47f4
|
||||
FROM cloudron/base:5.0.0@sha256:04fd70dbd8ad6149c19de39e35718e024417c3e01dc9c6637eaf4a41ec4e596c
|
||||
|
||||
RUN mkdir -p /app/pkg
|
||||
|
||||
WORKDIR /app/code
|
||||
|
||||
# https://pythonspeed.com/articles/activate-virtualenv-dockerfile/
|
||||
RUN virtualenv -p python3 /app/code/env
|
||||
ENV VIRTUAL_ENV=/app/code/env
|
||||
ENV PATH="$VIRTUAL_ENV/bin:$PATH"
|
||||
# https://github.com/element-hq/synapse/blob/master/docs/setup/installation.md?plain=1#L202
|
||||
RUN python3 -m venv /app/code/env
|
||||
|
||||
# renovate: datasource=github-releases depName=element-hq/synapse versioning=semver extractVersion=^v(?<version>.+)$
|
||||
ARG SYNAPSE_VERSION=1.121.1
|
||||
ARG SYNAPSE_VERSION=1.127.1
|
||||
|
||||
# renovate: datasource=github-releases depName=matrix-org/synapse-s3-storage-provider versioning=semver extractVersion=^v(?<version>.+)$
|
||||
ARG S3PROVIDER_VERSION=1.5.0
|
||||
|
||||
# Synapse (https://github.com/matrix-org/synapse/blob/master/INSTALL.md)
|
||||
# lxml - required for previews
|
||||
RUN pip install --upgrade pip && \
|
||||
pip install --upgrade setuptools && \
|
||||
pip install matrix-synapse==v${SYNAPSE_VERSION} psycopg2-binary python-ldap matrix-synapse-ldap3 lxml publicsuffix2 git+https://github.com/matrix-org/synapse-s3-storage-provider.git@v${S3PROVIDER_VERSION} matrix-synapse[oidc]
|
||||
RUN source /app/code/env/bin/activate && \
|
||||
pip3 install --no-cache-dir matrix-synapse==v${SYNAPSE_VERSION} psycopg2-binary python-ldap matrix-synapse-ldap3 lxml publicsuffix2 git+https://github.com/matrix-org/synapse-s3-storage-provider.git@v${S3PROVIDER_VERSION} matrix-synapse[oidc]
|
||||
|
||||
# Updated suffix list
|
||||
RUN curl -L https://publicsuffix.org/list/public_suffix_list.dat -o /app/code/env/lib/python3.10/site-packages/publicsuffix2/public_suffix_list.dat
|
||||
RUN curl -L https://publicsuffix.org/list/public_suffix_list.dat -o /app/code/env/lib/python3.12/site-packages/publicsuffix2/public_suffix_list.dat
|
||||
|
||||
RUN ln -sf /app/data/index.html /app/code/env/lib/python3.10/site-packages/synapse/static/index.html
|
||||
RUN ln -sf /app/data/index.html /app/code/env/lib/python3.12/site-packages/synapse/static/index.html
|
||||
|
||||
RUN chown -R cloudron.cloudron /app/code
|
||||
|
||||
|
||||
6
start.sh
6
start.sh
@@ -4,6 +4,8 @@ set -eu
|
||||
|
||||
mkdir -p /app/data/data /app/data/configs /run/synapse
|
||||
|
||||
source /app/code/env/bin/activate
|
||||
|
||||
if [[ ! -f /app/data/configs/homeserver.yaml ]]; then
|
||||
echo "==> Detected first run"
|
||||
|
||||
@@ -70,7 +72,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
|
||||
@@ -103,4 +105,4 @@ echo "==> Fixing permissions"
|
||||
chown -R cloudron.cloudron /app/data /run/synapse
|
||||
|
||||
echo "==> Starting synapse"
|
||||
gosu cloudron:cloudron python3 -m synapse.app.homeserver --config-path /app/data/configs/homeserver.yaml -n
|
||||
exec gosu cloudron:cloudron python3 -m synapse.app.homeserver --config-path /app/data/configs/homeserver.yaml -n
|
||||
|
||||
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.4",
|
||||
"chromedriver": "^134.0.5",
|
||||
"expect.js": "^0.3.1",
|
||||
"mocha": "^11.0.1",
|
||||
"selenium-webdriver": "^4.27.0"
|
||||
"mocha": "^11.1.0",
|
||||
"selenium-webdriver": "^4.30.0"
|
||||
}
|
||||
}
|
||||
|
||||
104
test/test.js
104
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,62 +107,92 @@ 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 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 browser.sleep(2000);
|
||||
}
|
||||
|
||||
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 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);
|
||||
await waitForElement(By.xpath(`//h1[contains(., "Welcome")]`));
|
||||
@@ -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); });
|
||||
|
||||
@@ -326,7 +363,7 @@ describe('Application life cycle test', function () {
|
||||
});
|
||||
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 /* proceedWithReset */));
|
||||
xit('can login via OIDC', loginOIDC.bind(null, USERNAME, PASSWORD, true, true));
|
||||
xit('check room', checkRoom);
|
||||
xit('can send message', sendMessage);
|
||||
|
||||
@@ -346,10 +383,9 @@ 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);
|
||||
@@ -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, false, 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