Compare commits
51 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b03fa43028 | ||
|
|
02c27e3230 | ||
|
|
a646b717a8 | ||
|
|
98c8dd38fc | ||
|
|
3ea7e30812 | ||
|
|
62360cca09 | ||
|
|
64c1afc544 | ||
|
|
b8917a4805 | ||
|
|
68d09734ca | ||
|
|
6cfdea8b6d | ||
|
|
25f398eda9 | ||
|
|
c6be4b9e11 | ||
|
|
f2efa0ace4 | ||
|
|
3efa89f92b | ||
|
|
fe51b493d4 | ||
|
|
85186e353f | ||
|
|
d294beaf99 | ||
|
|
40c4dfc7af | ||
|
|
2bc7648a68 | ||
|
|
1a2af0e566 | ||
|
|
62a12ea30b | ||
|
|
6bcba878fd | ||
|
|
231ee9b187 | ||
|
|
d9420c319d | ||
|
|
050f4d8a26 | ||
|
|
e6d1f16b1d | ||
|
|
3991b28ba5 | ||
|
|
467685dee3 | ||
|
|
5a60a8b057 | ||
|
|
c8ed7b7882 | ||
|
|
3b5069dd3e | ||
|
|
bb28b946d2 | ||
|
|
99117698a6 | ||
|
|
b279638c84 | ||
|
|
c9c9259808 | ||
|
|
91b6c529e3 | ||
|
|
d2bfffb179 | ||
|
|
4692c12d60 | ||
|
|
6bcfb0a0c6 | ||
|
|
f6997147c6 | ||
|
|
e4a405a5f1 | ||
|
|
e475e1ec34 | ||
|
|
5f17b33dbc | ||
|
|
0a64acf236 | ||
|
|
1b20ba1a1a | ||
|
|
16414ae13c | ||
|
|
55935f194f | ||
|
|
7cbe157dbd | ||
|
|
46f25d776d | ||
|
|
1e9400ab2e | ||
|
|
c8b81a87b3 |
@@ -1,5 +0,0 @@
|
||||
include:
|
||||
- project: devops/pipeline-components
|
||||
ref: main
|
||||
file: cloudron-app.gitlab-ci.yml
|
||||
|
||||
120
CHANGELOG.md
120
CHANGELOG.md
@@ -1283,3 +1283,123 @@
|
||||
* Update Synapse to 1.116.0
|
||||
* [Full changelog](https://github.com/element-hq/synapse/releases/tag/v1.116.0)
|
||||
|
||||
[1.98.0]
|
||||
* Update Synapse to 1.118.0
|
||||
* [Full changelog](https://github.com/element-hq/synapse/releases/tag/v1.118.0)
|
||||
|
||||
[1.98.1]
|
||||
* Update S3 Storage Provider to 1.5.0
|
||||
[1.99.0]
|
||||
* Update synapse to 1.119.0
|
||||
* [Full Changelog](https://github.com/element-hq/synapse/releases/tag/v1.118.0)
|
||||
* Support [MSC4151](https://github.com/matrix-org/matrix-spec-proposals/pull/4151)'s stable report room API. ([#​17374](https://github.com/element-hq/synapse/issues/17374))
|
||||
* Add experimental support for [MSC4222](https://github.com/matrix-org/matrix-spec-proposals/pull/4222) (Adding `state_after` to sync v2). ([#​17888](https://github.com/element-hq/synapse/issues/17888))
|
||||
* Fix bug with sliding sync where `$LAZY`-loading room members would not return `required_state` membership in incremental syncs. ([#​17809](https://github.com/element-hq/synapse/issues/17809))
|
||||
* Check if user has membership in a room before tagging it. Contributed by Lama Alosaimi. ([#​17839](https://github.com/element-hq/synapse/issues/17839))
|
||||
* Fix a bug in the admin redact endpoint where the background task would not run if a worker was specified in
|
||||
* Fix bug where some presence and typing timeouts can expire early. ([#​17850](https://github.com/element-hq/synapse/issues/17850))
|
||||
* Fix detection when the built Rust library was outdated when using source installations. ([#​17861](https://github.com/element-hq/synapse/issues/17861))
|
||||
* Fix a long-standing bug in Synapse which could cause one-time keys to be issued in the incorrect order, causing message decryption failures. ([#​17903](https://github.com/element-hq/synapse/pull/17903))
|
||||
* Fix experimental support for [MSC4222](https://github.com/matrix-org/matrix-spec-proposals/pull/4222) (Adding `state_after` to sync v2) where we would return the full state on incremental syncs when using lazy loaded members and there were no new events in the timeline. ([#​17915](https://github.com/element-hq/synapse/pull/17915))
|
||||
* Remove support for python 3.8. ([#​17908](https://github.com/element-hq/synapse/issues/17908))
|
||||
* Add a test for downloading and thumbnailing a CMYK JPEG. ([#​17786](https://github.com/element-hq/synapse/issues/17786))
|
||||
* Refactor database calls to remove `Generator` usage. ([#​17813](https://github.com/element-hq/synapse/issues/17813), [#​17814](https://github.com/element-hq/synapse/issues/17814), [#​17815](https://github.com/element-hq/synapse/issues/17815), [#​17816](https://github.com/element-hq/synapse/issues/17816), [#​17817](https://github.com/element-hq/synapse/issues/17817), [#​17818](https://github.com/element-hq/synapse/issues/17818), [#​17890](https://github.com/element-hq/synapse/issues/17890))
|
||||
* Include the destination in the error of 'Destination mismatch' on federation requests. ([#​17830](https://github.com/element-hq/synapse/issues/17830))
|
||||
* The nix flake inside the repository no longer tracks nixpkgs/master to not catch the latest bugs from a MR merged 5 minutes ago. ([#​17852](https://github.com/element-hq/synapse/issues/17852))
|
||||
* Minor speed-up of sliding sync by computing extensions results in parallel. ([#​17884](https://github.com/element-hq/synapse/issues/17884))
|
||||
* Bump the default Python version in the Synapse Dockerfile from 3.11 -> 3.12. ([#​17887](https://github.com/element-hq/synapse/issues/17887))
|
||||
* Remove usage of internal header encoding API. ([#​17894](https://github.com/element-hq/synapse/issues/17894))
|
||||
* Use unique name for each os.arch variant when uploading Wheel artifacts. ([#​17905](https://github.com/element-hq/synapse/issues/17905))
|
||||
* Fix tests to run with latest Twisted. ([#​17906](https://github.com/element-hq/synapse/pull/17906), [#​17907](https://github.com/element-hq/synapse/pull/17907), [#​17911](https://github.com/element-hq/synapse/pull/17911))
|
||||
* Update version constraint to allow the latest poetry-core 1.9.1. ([#​17902](https://github.com/element-hq/synapse/pull/17902))
|
||||
* Update the portdb CI to use Python 3.13 and Postgres 17 as latest dependencies. ([#​17909](https://github.com/element-hq/synapse/pull/17909))
|
||||
* Add an index to `current_state_delta_stream` table. ([#​17912](https://github.com/element-hq/synapse/issues/17912))
|
||||
* Fix building and attaching release artifacts during the release process. ([#​17921](https://github.com/element-hq/synapse/issues/17921))
|
||||
|
||||
[1.100.0]
|
||||
* Update synapse to 1.120.0
|
||||
* [Full Changelog](https://github.com/element-hq/synapse/releases/tag/v1.118.0)
|
||||
* Fix a bug introduced in Synapse v1.120rc1 which would cause the newly-introduced `delete_old_otks` job to fail in worker-mode deployments. ([#​17960](https://github.com/element-hq/synapse/issues/17960))
|
||||
|
||||
[1.100.1]
|
||||
* 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)
|
||||
|
||||
[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.
|
||||
|
||||
[1.109.0]
|
||||
* Update synapse to 1.128.0
|
||||
* [Full Changelog](https://github.com/element-hq/synapse/releases/tag/v1.128.0)
|
||||
* Add an access token introspection cache to make Matrix Authentication Service integration (MSC3861) more efficient. (#18231)
|
||||
* Add background job to clear unreferenced state groups. (#18254)
|
||||
* Hashes of media files are now tracked by Synapse. Media quarantines will now apply to all files with the same hash. (#18277, #18302, #18296)
|
||||
|
||||
[1.110.0]
|
||||
* Update synapse to 1.129.0
|
||||
* [Full Changelog](https://github.com/element-hq/synapse/releases/tag/v1.129.0)
|
||||
|
||||
[1.111.0]
|
||||
* Update synapse to 1.130.0
|
||||
* [Full Changelog](https://github.com/element-hq/synapse/releases/tag/v1.130.0)
|
||||
* Fix startup being blocked on creating a new index that was introduced in v1.130.0rc1. ([#​18439](https://github.com/element-hq/synapse/issues/18439))
|
||||
* Fix the ordering of local messages in rooms that were affected by [GHSA-v56r-hwv5-mxg6](https://github.com/advisories/GHSA-v56r-hwv5-mxg6). ([#​18447](https://github.com/element-hq/synapse/issues/18447))
|
||||
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
"description": "file://DESCRIPTION.md",
|
||||
"changelog": "file://CHANGELOG.md",
|
||||
"tagline": "Secure & decentralized communication",
|
||||
"version": "1.97.6",
|
||||
"upstreamVersion": "1.117.0",
|
||||
"version": "1.111.0",
|
||||
"upstreamVersion": "1.130.0",
|
||||
"healthCheckPath": "/",
|
||||
"httpPort": 8008,
|
||||
"memoryLimit": 536870912,
|
||||
@@ -44,8 +44,17 @@
|
||||
"https://screenshots.cloudron.io/org.matrix.synapse/2.png",
|
||||
"https://screenshots.cloudron.io/org.matrix.synapse/3.png"
|
||||
],
|
||||
"checklist": {
|
||||
"configure-federation": {
|
||||
"message": "For federation to work, the delegation URI `https://$CLOUDRON-APP-DOMAIN/.well-known/matrix/server` must be configured. See the [docs](https://docs.cloudron.io/apps/synapse/#post-installation) on how to do this."
|
||||
},
|
||||
"registration-enabled-without-verification": {
|
||||
"message": "Registration is enabled but verification is disabled. See [docs](https://element-hq.github.io/synapse/latest/usage/configuration/config_documentation.html?highlight=registration_require#enable_registration) for more information",
|
||||
"sso": false
|
||||
}
|
||||
},
|
||||
"postInstallMessage": "file://POSTINSTALL.md",
|
||||
"minBoxVersion": "7.5.1",
|
||||
"minBoxVersion": "8.2.0",
|
||||
"forumUrl": "https://forum.cloudron.io/category/50/matrix-synapse-riot",
|
||||
"documentationUrl": "https://docs.cloudron.io/apps/synapse/",
|
||||
"optionalSso": true
|
||||
|
||||
23
Dockerfile
23
Dockerfile
@@ -1,32 +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.117.0
|
||||
ARG SYNAPSE_VERSION=1.130.0
|
||||
|
||||
# renovate: datasource=github-releases depName=matrix-org/synapse-s3-storage-provider versioning=semver extractVersion=^v(?<version>.+)$
|
||||
ARG S3PROVIDER_VERSION=1.4.0
|
||||
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 chown -R cloudron.cloudron /app/code
|
||||
RUN ln -sf /app/data/index.html /app/code/env/lib/python3.12/site-packages/synapse/static/index.html
|
||||
|
||||
ADD index.html homeserver.yaml.template start.sh /app/pkg/
|
||||
|
||||
|
||||
@@ -1,6 +1,2 @@
|
||||
Account ids are created with the username and the second level domain under which the
|
||||
app is installed e.g. `@$CLOUDRON-USERNAME:$CLOUDRON-APP-DOMAIN`.
|
||||
|
||||
For federation to work, the delegation URI `https://$CLOUDRON-APP-DOMAIN/.well-known/matrix/server`
|
||||
must be configured. See the [docs](https://docs.cloudron.io/apps/synapse/#post-installation) on how to do this.
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# https://github.com/matrix-org/synapse/blob/master/docs/sample_config.yaml
|
||||
# https://github.com/element-hq/synapse/blob/master/docs/sample_config.yaml
|
||||
|
||||
# if you change this, change the auto_join_rooms below as well
|
||||
server_name: "example.com"
|
||||
@@ -13,7 +13,6 @@ listeners:
|
||||
type: http
|
||||
x_forwarded: true
|
||||
bind_addresses: ['0.0.0.0']
|
||||
|
||||
resources:
|
||||
- names: [client,federation]
|
||||
compress: false
|
||||
@@ -21,7 +20,6 @@ listeners:
|
||||
database:
|
||||
name: "psycopg2"
|
||||
args:
|
||||
# Path to the database
|
||||
user: ${POSTGRESQL_USERNAME}
|
||||
password: ${POSTGRESQL_PASSWORD}
|
||||
database: ${POSTGRESQL_DATABASE}
|
||||
@@ -29,6 +27,17 @@ database:
|
||||
cp_min: 5
|
||||
cp_max: 10
|
||||
|
||||
log_config: "/app/data/configs/log.config"
|
||||
media_store_path: "/app/data/data/media_store"
|
||||
registration_shared_secret: "some_shared_secret"
|
||||
report_stats: false
|
||||
macaroon_secret_key: "some_macaroon_secret"
|
||||
form_secret: "some_form_secret"
|
||||
signing_key_path: "/app/data/configs/signing.key"
|
||||
trusted_key_servers:
|
||||
- server_name: "matrix.org"
|
||||
|
||||
## Cloudron packaging
|
||||
email:
|
||||
smtp_host: mail.server
|
||||
smtp_port: 587
|
||||
@@ -40,74 +49,37 @@ email:
|
||||
enable_notifs: true
|
||||
notif_for_new_users: true
|
||||
|
||||
password_providers:
|
||||
- module: "synapse.util.ldap_auth_provider.LdapAuthProvider"
|
||||
config:
|
||||
enabled: true
|
||||
uri: "ldap://ldap.example.com:389"
|
||||
start_tls: true
|
||||
base: "ou=users,dc=example,dc=com"
|
||||
attributes:
|
||||
uid: "username"
|
||||
mail: "mail"
|
||||
name: "username"
|
||||
bind_dn: "ou=users,dc=cloudron"
|
||||
bind_password: "password"
|
||||
filter: "(objectClass=posixAccount)"
|
||||
|
||||
# turn
|
||||
turn_uris: []
|
||||
turn_shared_secret: "sharedsecret"
|
||||
turn_allow_guests: true
|
||||
|
||||
federation_ip_range_blacklist:
|
||||
- '127.0.0.0/8'
|
||||
- '10.0.0.0/8'
|
||||
- '172.16.0.0/12'
|
||||
- '192.168.0.0/16'
|
||||
- '100.64.0.0/10'
|
||||
- '169.254.0.0/16'
|
||||
- '::1/128'
|
||||
- 'fe80::/64'
|
||||
- 'fc00::/7'
|
||||
|
||||
# sso (https://element-hq.github.io/synapse/latest/usage/configuration/config_documentation.html#single-sign-on-integration)
|
||||
enable_registration: false
|
||||
# without this, registration requires one of email/captcha/token verification
|
||||
enable_registration_without_verification: true
|
||||
registration_shared_secret: "somesecret"
|
||||
allow_guest_access: false
|
||||
|
||||
enable_group_creation: true
|
||||
|
||||
report_stats: False
|
||||
|
||||
signing_key_path: "/app/data/configs/signing.key"
|
||||
|
||||
url_preview_enabled: true
|
||||
url_preview_ip_range_blacklist:
|
||||
- '127.0.0.0/8'
|
||||
- '10.0.0.0/8'
|
||||
- '172.16.0.0/12'
|
||||
- '192.168.0.0/16'
|
||||
- '100.64.0.0/10'
|
||||
- '169.254.0.0/16'
|
||||
- '::1/128'
|
||||
- 'fe80::/64'
|
||||
- 'fc00::/7'
|
||||
|
||||
media_store_path: "/app/data/data/media_store"
|
||||
max_upload_size: 200M
|
||||
max_image_pixels: "32M"
|
||||
dynamic_thumbnails: false
|
||||
|
||||
autocreate_auto_join_rooms: true
|
||||
auto_join_rooms:
|
||||
- "#discuss:example.com"
|
||||
|
||||
trusted_key_servers:
|
||||
- server_name: "matrix.org"
|
||||
suppress_key_server_warning: true
|
||||
oidc_providers:
|
||||
- idp_id: cloudron
|
||||
idp_name: "CLOUDRON_OIDC_PROVIDER_NAME"
|
||||
issuer: "CLOUDRON_OIDC_ISSUER"
|
||||
client_id: "CLOUDRON_OIDC_CLIENT_ID"
|
||||
client_secret: "CLOUDRON_OIDC_CLIENT_SECRET"
|
||||
scopes: ["openid", "profile", "email"]
|
||||
authorization_endpoint: "CLOUDRON_OIDC_AUTH_ENDPOINT"
|
||||
token_endpoint: "CLOUDRON_OIDC_TOKEN_ENDPOINT"
|
||||
userinfo_endpoint: "CLOUDRON_OIDC_AUTH_ENDPOINT"
|
||||
allow_existing_users: true
|
||||
enable_registration: true
|
||||
backchannel_logout_enabled: false
|
||||
user_mapping_provider:
|
||||
config:
|
||||
localpart_template: "{{ user.sub }}"
|
||||
display_name_template: "{{ user.name }}"
|
||||
email_template: "{{ user.email }}"
|
||||
|
||||
password_config:
|
||||
enabled: true
|
||||
enabled: false
|
||||
localdb_enabled: false
|
||||
pepper: "some_pepper_secret"
|
||||
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
{
|
||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
||||
"extends": [
|
||||
"local>devops/renovator//config/app/default.json5"
|
||||
]
|
||||
}
|
||||
4
renovate.json5
Normal file
4
renovate.json5
Normal file
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
||||
"extends": ["local>devops/renovator//default.renovate.json5"]
|
||||
}
|
||||
22
start.sh
22
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"
|
||||
|
||||
@@ -31,14 +33,14 @@ if [[ ! -f /app/data/configs/homeserver.yaml ]]; then
|
||||
|
||||
yq eval -i ".server_name=\"${server_name}\"" /app/data/configs/homeserver.yaml
|
||||
yq eval -i ".registration_shared_secret=\"$(pwgen -1s 64)\"" /app/data/configs/homeserver.yaml
|
||||
|
||||
yq eval -i ".auto_join_rooms=[]" /app/data/configs/homeserver.yaml
|
||||
yq eval -i ".auto_join_rooms[0]=\"#discuss:${server_name}\"" /app/data/configs/homeserver.yaml
|
||||
yq eval -i ".macaroon_secret_key=\"$(pwgen -1s 64)\"" /app/data/configs/homeserver.yaml
|
||||
yq eval -i ".form_secret=\"$(pwgen -1s 64)\"" /app/data/configs/homeserver.yaml
|
||||
|
||||
if [[ -z "${CLOUDRON_OIDC_ISSUER:-}" ]]; then
|
||||
yq eval -i ".enable_registration=true" /app/data/configs/homeserver.yaml
|
||||
# just setting enabled to false is not enough. see https://github.com/matrix-org/matrix-synapse-ldap3/issues/123
|
||||
yq eval -i "del(.password_providers)" /app/data/configs/homeserver.yaml
|
||||
yq eval -i ".password_config.enabled=true" /app/data/configs/homeserver.yaml
|
||||
yq eval -i ".password_config.localdb_enabled=true" /app/data/configs/homeserver.yaml
|
||||
yq eval -i "del(.oidc_providers)" /app/data/configs/homeserver.yaml
|
||||
fi
|
||||
yq eval -i ".password_config.pepper=\"$(pwgen -1s 12)\"" /app/data/configs/homeserver.yaml # always set this so that users can enable password login if needed
|
||||
fi
|
||||
@@ -67,10 +69,9 @@ yq eval -i ".email.notif_from=\"${CLOUDRON_MAIL_FROM_DISPLAY_NAME:-Matrix} <${CL
|
||||
|
||||
# oidc
|
||||
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
|
||||
@@ -84,10 +85,9 @@ if [[ -n "${CLOUDRON_OIDC_ISSUER:-}" ]]; then
|
||||
yq eval -i ".oidc_providers[0].skip_verification=true" /app/data/configs/homeserver.yaml
|
||||
yq eval -i ".oidc_providers[0].user_mapping_provider.config.localpart_template=\"{{ user.sub }}\"" /app/data/configs/homeserver.yaml
|
||||
yq eval -i ".oidc_providers[0].user_mapping_provider.config.display_name_template=\"{{ user.name }}\"" /app/data/configs/homeserver.yaml
|
||||
yq eval -i ".oidc_providers[0].user_mapping_provider.config.email_template=\"{{ user.email }}\"" /app/data/configs/homeserver.yaml
|
||||
else
|
||||
yq eval -i ".password_config.localdb_enabled=true" /app/data/configs/homeserver.yaml
|
||||
# just setting enabled to false is not enough. see https://github.com/matrix-org/matrix-synapse-ldap3/issues/123
|
||||
yq eval -i "del(.password_providers)" /app/data/configs/homeserver.yaml
|
||||
fi
|
||||
|
||||
# turn (https://github.com/matrix-org/synapse/blob/master/docs/turn-howto.md#synapse-setup)
|
||||
@@ -100,7 +100,7 @@ fi
|
||||
|
||||
# fix permissions
|
||||
echo "==> Fixing permissions"
|
||||
chown -R cloudron.cloudron /app/data /run/synapse
|
||||
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
|
||||
|
||||
2254
test/package-lock.json
generated
2254
test/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -9,9 +9,9 @@
|
||||
"author": "",
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"chromedriver": "^129.0.2",
|
||||
"chromedriver": "^136.0.3",
|
||||
"expect.js": "^0.3.1",
|
||||
"mocha": "^10.7.3",
|
||||
"selenium-webdriver": "^4.25.0"
|
||||
"mocha": "^11.5.0",
|
||||
"selenium-webdriver": "^4.33.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,62 +107,85 @@ 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) {
|
||||
browser.manage().deleteAllCookies();
|
||||
async function loginOIDC(username, password, alreadyAuthenticated, proceedWithReset) {
|
||||
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"] | //div[@class="mx_EncryptionCard_buttons"]/button[@data-kind="primary"]'));
|
||||
await browser.findElement(By.xpath('//button[@class="mx_Dialog_primary" and text()="Continue"] | //div[@class="mx_EncryptionCard_buttons"]/button[@data-kind="primary"]')).click();
|
||||
|
||||
await waitForElement(By.xpath('//div[text()="Copy"]'));
|
||||
await browser.findElement(By.xpath('//div[text()="Copy"]')).click();
|
||||
await waitForElement(By.xpath('//button[@class="mx_Dialog_primary" and text()="Continue"] | //div[@class="mx_EncryptionCard_buttons"]/button[@data-kind="primary"]'));
|
||||
await browser.findElement(By.xpath('//button[@class="mx_Dialog_primary" and text()="Continue"] | //div[@class="mx_EncryptionCard_buttons"]/button[@data-kind="primary"]')).click();
|
||||
await waitForElement(By.xpath('//button[text()="Done"] | //div[text()="Single Sign On"]'));
|
||||
|
||||
await browser.sleep(1000);
|
||||
if (await browser.findElements(By.xpath('//div[text()="Single Sign On"]')).then(found => !!found.length)) {
|
||||
|
||||
await waitForElement(By.xpath('//button[text()="Continue"]'));
|
||||
await browser.findElement(By.xpath('//button[text()="Continue"]')).click();
|
||||
await browser.findElement(By.xpath('//div[text()="Single Sign On"]')).click();
|
||||
|
||||
await waitForElement(By.xpath('//button[text()="Done"]'));
|
||||
await browser.findElement(By.xpath('//button[text()="Done"]')).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();
|
||||
|
||||
await waitForElement(By.xpath('//div[text()="Cancel"]'));
|
||||
// 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('//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 +238,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 +292,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 +315,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 +345,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 +354,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 +376,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,11 +392,12 @@ 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);
|
||||
|
||||
it('uninstall app', async function () {
|
||||
await browser.get('about:blank');
|
||||
|
||||
Reference in New Issue
Block a user