Compare commits
14 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cff6bc14bd | ||
|
|
ff0d46ee4b | ||
|
|
479ad654fa | ||
|
|
a772670867 | ||
|
|
a4171db41b | ||
|
|
c5e85aff41 | ||
|
|
f524394443 | ||
|
|
b03fa43028 | ||
|
|
02c27e3230 | ||
|
|
a646b717a8 | ||
|
|
98c8dd38fc | ||
|
|
3ea7e30812 | ||
|
|
62360cca09 | ||
|
|
64c1afc544 |
21
CHANGELOG.md
21
CHANGELOG.md
@@ -1397,3 +1397,24 @@
|
|||||||
* Update synapse to 1.129.0
|
* Update synapse to 1.129.0
|
||||||
* [Full Changelog](https://github.com/element-hq/synapse/releases/tag/v1.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))
|
||||||
|
|
||||||
|
[1.112.0]
|
||||||
|
* Update synapse to 1.131.0
|
||||||
|
* [Full Changelog](https://github.com/element-hq/synapse/releases/tag/v1.131.0)
|
||||||
|
|
||||||
|
[1.113.0]
|
||||||
|
* Update synapse to 1.132.0
|
||||||
|
* [Full Changelog](https://github.com/element-hq/synapse/releases/tag/v1.132.0)
|
||||||
|
|
||||||
|
[1.114.0]
|
||||||
|
* Update synapse to 1.133.0
|
||||||
|
* [Full Changelog](https://github.com/element-hq/synapse/releases/tag/v1.133.0)
|
||||||
|
* Pre-built wheels are now built using the manylinux\_2\_28 base, which is expected to be compatible with distros using glibc 2.28 or later, including:
|
||||||
|
* Previously, wheels were built using the manylinux2014 base, which was expected to be compatible with distros using glibc 2.17 or later.
|
||||||
|
* Bump `cibuildwheel` to 3.0.0 to fix the `manylinux` wheel builds. ([#​18615](https://github.com/element-hq/synapse/issues/18615))
|
||||||
|
|
||||||
|
|||||||
@@ -5,8 +5,8 @@
|
|||||||
"description": "file://DESCRIPTION.md",
|
"description": "file://DESCRIPTION.md",
|
||||||
"changelog": "file://CHANGELOG.md",
|
"changelog": "file://CHANGELOG.md",
|
||||||
"tagline": "Secure & decentralized communication",
|
"tagline": "Secure & decentralized communication",
|
||||||
"version": "1.110.0",
|
"version": "1.114.0",
|
||||||
"upstreamVersion": "1.129.0",
|
"upstreamVersion": "1.133.0",
|
||||||
"healthCheckPath": "/",
|
"healthCheckPath": "/",
|
||||||
"httpPort": 8008,
|
"httpPort": 8008,
|
||||||
"memoryLimit": 536870912,
|
"memoryLimit": 536870912,
|
||||||
@@ -44,9 +44,18 @@
|
|||||||
"https://screenshots.cloudron.io/org.matrix.synapse/2.png",
|
"https://screenshots.cloudron.io/org.matrix.synapse/2.png",
|
||||||
"https://screenshots.cloudron.io/org.matrix.synapse/3.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",
|
"postInstallMessage": "file://POSTINSTALL.md",
|
||||||
"minBoxVersion": "7.5.1",
|
"minBoxVersion": "8.2.0",
|
||||||
"forumUrl": "https://forum.cloudron.io/category/50/matrix-synapse-riot",
|
"forumUrl": "https://forum.cloudron.io/category/50/matrix-synapse-riot",
|
||||||
"documentationUrl": "https://docs.cloudron.io/apps/synapse/",
|
"documentationUrl": "https://docs.cloudron.io/packages/synapse/",
|
||||||
"optionalSso": true
|
"optionalSso": true
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ WORKDIR /app/code
|
|||||||
RUN python3 -m venv /app/code/env
|
RUN python3 -m venv /app/code/env
|
||||||
|
|
||||||
# renovate: datasource=github-releases depName=element-hq/synapse versioning=semver extractVersion=^v(?<version>.+)$
|
# renovate: datasource=github-releases depName=element-hq/synapse versioning=semver extractVersion=^v(?<version>.+)$
|
||||||
ARG SYNAPSE_VERSION=1.129.0
|
ARG SYNAPSE_VERSION=1.133.0
|
||||||
|
|
||||||
# renovate: datasource=github-releases depName=matrix-org/synapse-s3-storage-provider versioning=semver extractVersion=^v(?<version>.+)$
|
# renovate: datasource=github-releases depName=matrix-org/synapse-s3-storage-provider versioning=semver extractVersion=^v(?<version>.+)$
|
||||||
ARG S3PROVIDER_VERSION=1.5.0
|
ARG S3PROVIDER_VERSION=1.5.0
|
||||||
@@ -23,8 +23,6 @@ RUN curl -L https://publicsuffix.org/list/public_suffix_list.dat -o /app/code/en
|
|||||||
|
|
||||||
RUN ln -sf /app/data/index.html /app/code/env/lib/python3.12/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
|
|
||||||
|
|
||||||
ADD index.html homeserver.yaml.template start.sh /app/pkg/
|
ADD index.html homeserver.yaml.template start.sh /app/pkg/
|
||||||
|
|
||||||
CMD [ "/app/pkg/start.sh" ]
|
CMD [ "/app/pkg/start.sh" ]
|
||||||
|
|||||||
@@ -1,6 +1,2 @@
|
|||||||
Account ids are created with the username and the second level domain under which the
|
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`.
|
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
|
# if you change this, change the auto_join_rooms below as well
|
||||||
server_name: "example.com"
|
server_name: "example.com"
|
||||||
@@ -13,7 +13,6 @@ listeners:
|
|||||||
type: http
|
type: http
|
||||||
x_forwarded: true
|
x_forwarded: true
|
||||||
bind_addresses: ['0.0.0.0']
|
bind_addresses: ['0.0.0.0']
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
- names: [client,federation]
|
- names: [client,federation]
|
||||||
compress: false
|
compress: false
|
||||||
@@ -21,7 +20,6 @@ listeners:
|
|||||||
database:
|
database:
|
||||||
name: "psycopg2"
|
name: "psycopg2"
|
||||||
args:
|
args:
|
||||||
# Path to the database
|
|
||||||
user: ${POSTGRESQL_USERNAME}
|
user: ${POSTGRESQL_USERNAME}
|
||||||
password: ${POSTGRESQL_PASSWORD}
|
password: ${POSTGRESQL_PASSWORD}
|
||||||
database: ${POSTGRESQL_DATABASE}
|
database: ${POSTGRESQL_DATABASE}
|
||||||
@@ -29,6 +27,17 @@ database:
|
|||||||
cp_min: 5
|
cp_min: 5
|
||||||
cp_max: 10
|
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:
|
email:
|
||||||
smtp_host: mail.server
|
smtp_host: mail.server
|
||||||
smtp_port: 587
|
smtp_port: 587
|
||||||
@@ -40,74 +49,37 @@ email:
|
|||||||
enable_notifs: true
|
enable_notifs: true
|
||||||
notif_for_new_users: 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
|
||||||
turn_uris: []
|
turn_uris: []
|
||||||
turn_shared_secret: "sharedsecret"
|
turn_shared_secret: "sharedsecret"
|
||||||
turn_allow_guests: true
|
turn_allow_guests: true
|
||||||
|
|
||||||
federation_ip_range_blacklist:
|
# sso (https://element-hq.github.io/synapse/latest/usage/configuration/config_documentation.html#single-sign-on-integration)
|
||||||
- '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'
|
|
||||||
|
|
||||||
enable_registration: false
|
enable_registration: false
|
||||||
|
# without this, registration requires one of email/captcha/token verification
|
||||||
enable_registration_without_verification: true
|
enable_registration_without_verification: true
|
||||||
registration_shared_secret: "somesecret"
|
|
||||||
allow_guest_access: false
|
|
||||||
|
|
||||||
enable_group_creation: true
|
oidc_providers:
|
||||||
|
- idp_id: cloudron
|
||||||
report_stats: False
|
idp_name: "CLOUDRON_OIDC_PROVIDER_NAME"
|
||||||
|
issuer: "CLOUDRON_OIDC_ISSUER"
|
||||||
signing_key_path: "/app/data/configs/signing.key"
|
client_id: "CLOUDRON_OIDC_CLIENT_ID"
|
||||||
|
client_secret: "CLOUDRON_OIDC_CLIENT_SECRET"
|
||||||
url_preview_enabled: true
|
scopes: ["openid", "profile", "email"]
|
||||||
url_preview_ip_range_blacklist:
|
authorization_endpoint: "CLOUDRON_OIDC_AUTH_ENDPOINT"
|
||||||
- '127.0.0.0/8'
|
token_endpoint: "CLOUDRON_OIDC_TOKEN_ENDPOINT"
|
||||||
- '10.0.0.0/8'
|
userinfo_endpoint: "CLOUDRON_OIDC_AUTH_ENDPOINT"
|
||||||
- '172.16.0.0/12'
|
allow_existing_users: true
|
||||||
- '192.168.0.0/16'
|
enable_registration: true
|
||||||
- '100.64.0.0/10'
|
backchannel_logout_enabled: false
|
||||||
- '169.254.0.0/16'
|
user_mapping_provider:
|
||||||
- '::1/128'
|
config:
|
||||||
- 'fe80::/64'
|
localpart_template: "{{ user.sub }}"
|
||||||
- 'fc00::/7'
|
display_name_template: "{{ user.name }}"
|
||||||
|
email_template: "{{ user.email }}"
|
||||||
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
|
|
||||||
|
|
||||||
password_config:
|
password_config:
|
||||||
enabled: true
|
enabled: false
|
||||||
localdb_enabled: false
|
localdb_enabled: false
|
||||||
|
pepper: "some_pepper_secret"
|
||||||
|
|
||||||
|
|||||||
14
start.sh
14
start.sh
@@ -33,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 ".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 ".registration_shared_secret=\"$(pwgen -1s 64)\"" /app/data/configs/homeserver.yaml
|
||||||
|
yq eval -i ".macaroon_secret_key=\"$(pwgen -1s 64)\"" /app/data/configs/homeserver.yaml
|
||||||
yq eval -i ".auto_join_rooms=[]" /app/data/configs/homeserver.yaml
|
yq eval -i ".form_secret=\"$(pwgen -1s 64)\"" /app/data/configs/homeserver.yaml
|
||||||
yq eval -i ".auto_join_rooms[0]=\"#discuss:${server_name}\"" /app/data/configs/homeserver.yaml
|
|
||||||
|
|
||||||
if [[ -z "${CLOUDRON_OIDC_ISSUER:-}" ]]; then
|
if [[ -z "${CLOUDRON_OIDC_ISSUER:-}" ]]; then
|
||||||
yq eval -i ".enable_registration=true" /app/data/configs/homeserver.yaml
|
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 ".password_config.enabled=true" /app/data/configs/homeserver.yaml
|
||||||
yq eval -i "del(.password_providers)" /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
|
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
|
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
|
fi
|
||||||
@@ -69,7 +69,6 @@ yq eval -i ".email.notif_from=\"${CLOUDRON_MAIL_FROM_DISPLAY_NAME:-Matrix} <${CL
|
|||||||
|
|
||||||
# oidc
|
# oidc
|
||||||
if [[ -n "${CLOUDRON_OIDC_ISSUER:-}" ]]; then
|
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"
|
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_id=\"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].idp_name=\"${CLOUDRON_OIDC_PROVIDER_NAME:-Cloudron}\"" /app/data/configs/homeserver.yaml
|
||||||
@@ -86,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].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.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.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
|
else
|
||||||
yq eval -i ".password_config.localdb_enabled=true" /app/data/configs/homeserver.yaml
|
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
|
fi
|
||||||
|
|
||||||
# turn (https://github.com/matrix-org/synapse/blob/master/docs/turn-howto.md#synapse-setup)
|
# turn (https://github.com/matrix-org/synapse/blob/master/docs/turn-howto.md#synapse-setup)
|
||||||
|
|||||||
80
test/package-lock.json
generated
80
test/package-lock.json
generated
@@ -9,10 +9,10 @@
|
|||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"chromedriver": "^136.0.0",
|
"chromedriver": "^138.0.1",
|
||||||
"expect.js": "^0.3.1",
|
"expect.js": "^0.3.1",
|
||||||
"mocha": "^11.2.2",
|
"mocha": "^11.7.1",
|
||||||
"selenium-webdriver": "^4.32.0"
|
"selenium-webdriver": "^4.34.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@bazel/runfiles": {
|
"node_modules/@bazel/runfiles": {
|
||||||
@@ -246,9 +246,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/chromedriver": {
|
"node_modules/chromedriver": {
|
||||||
"version": "136.0.0",
|
"version": "138.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-136.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-138.0.1.tgz",
|
||||||
"integrity": "sha512-21LxtGIqRLkafi0aOLKxIyQ3uRklgdmhuihzAkoL3Er5QtC74UDuu2OeTDdh58LM7WDbiuTXjdoIQARUekL8DA==",
|
"integrity": "sha512-QS/Z1qB2OpKsPUlJjkfKmpf9lGw6ObB0dX5+dP3M0gdtbu80TUnS+EjXbtu6YkbMfr2/Qt8IfOONrawNW1GwhA==",
|
||||||
"hasInstallScript": true,
|
"hasInstallScript": true,
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -264,7 +264,7 @@
|
|||||||
"chromedriver": "bin/chromedriver"
|
"chromedriver": "bin/chromedriver"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=18"
|
"node": ">=20"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/cliui": {
|
"node_modules/cliui": {
|
||||||
@@ -463,9 +463,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/diff": {
|
"node_modules/diff": {
|
||||||
"version": "5.2.0",
|
"version": "7.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/diff/-/diff-7.0.0.tgz",
|
||||||
"integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==",
|
"integrity": "sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==",
|
||||||
"license": "BSD-3-Clause",
|
"license": "BSD-3-Clause",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=0.3.1"
|
"node": ">=0.3.1"
|
||||||
@@ -732,21 +732,6 @@
|
|||||||
"url": "https://github.com/sponsors/isaacs"
|
"url": "https://github.com/sponsors/isaacs"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/glob/node_modules/minimatch": {
|
|
||||||
"version": "9.0.5",
|
|
||||||
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
|
|
||||||
"integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
|
|
||||||
"license": "ISC",
|
|
||||||
"dependencies": {
|
|
||||||
"brace-expansion": "^2.0.1"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=16 || 14 >=14.17"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/sponsors/isaacs"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/has-flag": {
|
"node_modules/has-flag": {
|
||||||
"version": "4.0.0",
|
"version": "4.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
|
||||||
@@ -1000,15 +985,18 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/minimatch": {
|
"node_modules/minimatch": {
|
||||||
"version": "5.1.6",
|
"version": "9.0.5",
|
||||||
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
|
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
|
||||||
"integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
|
"integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"brace-expansion": "^2.0.1"
|
"brace-expansion": "^2.0.1"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=10"
|
"node": ">=16 || 14 >=14.17"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://github.com/sponsors/isaacs"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/minipass": {
|
"node_modules/minipass": {
|
||||||
@@ -1021,28 +1009,28 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/mocha": {
|
"node_modules/mocha": {
|
||||||
"version": "11.2.2",
|
"version": "11.7.1",
|
||||||
"resolved": "https://registry.npmjs.org/mocha/-/mocha-11.2.2.tgz",
|
"resolved": "https://registry.npmjs.org/mocha/-/mocha-11.7.1.tgz",
|
||||||
"integrity": "sha512-VlSBxrPYHK4YNOEbFdkCxHQbZMoNzBkoPprqtZRW6311EUF/DlSxoycE2e/2NtRk4WKkIXzyrXDTrlikJMWgbw==",
|
"integrity": "sha512-5EK+Cty6KheMS/YLPPMJC64g5V61gIR25KsRItHw6x4hEKT6Njp1n9LOlH4gpevuwMVS66SXaBBpg+RWZkza4A==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"browser-stdout": "^1.3.1",
|
"browser-stdout": "^1.3.1",
|
||||||
"chokidar": "^4.0.1",
|
"chokidar": "^4.0.1",
|
||||||
"debug": "^4.3.5",
|
"debug": "^4.3.5",
|
||||||
"diff": "^5.2.0",
|
"diff": "^7.0.0",
|
||||||
"escape-string-regexp": "^4.0.0",
|
"escape-string-regexp": "^4.0.0",
|
||||||
"find-up": "^5.0.0",
|
"find-up": "^5.0.0",
|
||||||
"glob": "^10.4.5",
|
"glob": "^10.4.5",
|
||||||
"he": "^1.2.0",
|
"he": "^1.2.0",
|
||||||
"js-yaml": "^4.1.0",
|
"js-yaml": "^4.1.0",
|
||||||
"log-symbols": "^4.1.0",
|
"log-symbols": "^4.1.0",
|
||||||
"minimatch": "^5.1.6",
|
"minimatch": "^9.0.5",
|
||||||
"ms": "^2.1.3",
|
"ms": "^2.1.3",
|
||||||
"picocolors": "^1.1.1",
|
"picocolors": "^1.1.1",
|
||||||
"serialize-javascript": "^6.0.2",
|
"serialize-javascript": "^6.0.2",
|
||||||
"strip-json-comments": "^3.1.1",
|
"strip-json-comments": "^3.1.1",
|
||||||
"supports-color": "^8.1.1",
|
"supports-color": "^8.1.1",
|
||||||
"workerpool": "^6.5.1",
|
"workerpool": "^9.2.0",
|
||||||
"yargs": "^17.7.2",
|
"yargs": "^17.7.2",
|
||||||
"yargs-parser": "^21.1.1",
|
"yargs-parser": "^21.1.1",
|
||||||
"yargs-unparser": "^2.0.0"
|
"yargs-unparser": "^2.0.0"
|
||||||
@@ -1302,9 +1290,9 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/selenium-webdriver": {
|
"node_modules/selenium-webdriver": {
|
||||||
"version": "4.32.0",
|
"version": "4.34.0",
|
||||||
"resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.32.0.tgz",
|
"resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.34.0.tgz",
|
||||||
"integrity": "sha512-dG48JJnB96Aea1iVaZOKGmd6yT6aemeI1heWI/i8DtfD3pDX7uIlwpDBoGauNhtXAaFaamP+U4hIab8zZkg3Ag==",
|
"integrity": "sha512-zGfQFcsASAv3KrYzYh+iw4fFqB7iZAgHW7BU6rRz7isK1i1X4x3LvjmZad4bUUgHDwTnAhlqTzDh21byB+zHMg==",
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
"type": "github",
|
"type": "github",
|
||||||
@@ -1320,10 +1308,10 @@
|
|||||||
"@bazel/runfiles": "^6.3.1",
|
"@bazel/runfiles": "^6.3.1",
|
||||||
"jszip": "^3.10.1",
|
"jszip": "^3.10.1",
|
||||||
"tmp": "^0.2.3",
|
"tmp": "^0.2.3",
|
||||||
"ws": "^8.18.0"
|
"ws": "^8.18.2"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">= 18.20.5"
|
"node": ">= 20.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/serialize-javascript": {
|
"node_modules/serialize-javascript": {
|
||||||
@@ -1637,9 +1625,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/workerpool": {
|
"node_modules/workerpool": {
|
||||||
"version": "6.5.1",
|
"version": "9.3.2",
|
||||||
"resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz",
|
"resolved": "https://registry.npmjs.org/workerpool/-/workerpool-9.3.2.tgz",
|
||||||
"integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==",
|
"integrity": "sha512-Xz4Nm9c+LiBHhDR5bDLnNzmj6+5F+cyEAWPMkbs2awq/dYazR/efelZzUAjB/y3kNHL+uzkHvxVVpaOfGCPV7A==",
|
||||||
"license": "Apache-2.0"
|
"license": "Apache-2.0"
|
||||||
},
|
},
|
||||||
"node_modules/wrap-ansi": {
|
"node_modules/wrap-ansi": {
|
||||||
@@ -1737,9 +1725,9 @@
|
|||||||
"license": "ISC"
|
"license": "ISC"
|
||||||
},
|
},
|
||||||
"node_modules/ws": {
|
"node_modules/ws": {
|
||||||
"version": "8.18.0",
|
"version": "8.18.3",
|
||||||
"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
|
"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
|
||||||
"integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
|
"integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=10.0.0"
|
"node": ">=10.0.0"
|
||||||
|
|||||||
@@ -9,9 +9,9 @@
|
|||||||
"author": "",
|
"author": "",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"chromedriver": "^136.0.0",
|
"chromedriver": "^138.0.1",
|
||||||
"expect.js": "^0.3.1",
|
"expect.js": "^0.3.1",
|
||||||
"mocha": "^11.2.2",
|
"mocha": "^11.7.1",
|
||||||
"selenium-webdriver": "^4.32.0"
|
"selenium-webdriver": "^4.34.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
16
test/test.js
16
test/test.js
@@ -120,7 +120,6 @@ describe('Application life cycle test', function () {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function loginOIDC(username, password, alreadyAuthenticated, proceedWithReset) {
|
async function loginOIDC(username, password, alreadyAuthenticated, proceedWithReset) {
|
||||||
browser.manage().deleteAllCookies();
|
|
||||||
await browser.get(`https://${elementApp.fqdn}/#/login`);
|
await browser.get(`https://${elementApp.fqdn}/#/login`);
|
||||||
await browser.sleep(2000);
|
await browser.sleep(2000);
|
||||||
|
|
||||||
@@ -152,14 +151,11 @@ describe('Application life cycle test', function () {
|
|||||||
await waitForElement(By.xpath('//div[text()="Proceed with reset"]'));
|
await waitForElement(By.xpath('//div[text()="Proceed with reset"]'));
|
||||||
await browser.findElement(By.xpath('//div[text()="Proceed with reset"]')).click();
|
await browser.findElement(By.xpath('//div[text()="Proceed with reset"]')).click();
|
||||||
|
|
||||||
await waitForElement(By.xpath('//button[@class="mx_Dialog_primary" and text()="Continue"]'));
|
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"]')).click();
|
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 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('//div[text()="Copy"]')).click();
|
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[@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()="Done"] | //div[text()="Single Sign On"]'));
|
||||||
|
|
||||||
if (await browser.findElements(By.xpath('//div[text()="Single Sign On"]')).then(found => !!found.length)) {
|
if (await browser.findElements(By.xpath('//div[text()="Single Sign On"]')).then(found => !!found.length)) {
|
||||||
@@ -185,9 +181,6 @@ describe('Application life cycle test', function () {
|
|||||||
await browser.findElement(By.xpath('//div[text()="Confirm"]')).click();
|
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"] | //h1[contains(., "Welcome")]'));
|
await waitForElement(By.xpath('//div[text()="Cancel"] | //h1[contains(., "Welcome")]'));
|
||||||
if (await browser.findElements(By.xpath('//div[text()="Cancel"]')).then(found => !!found.length)) {
|
if (await browser.findElements(By.xpath('//div[text()="Cancel"]')).then(found => !!found.length)) {
|
||||||
await browser.findElement(By.xpath('//div[text()="Cancel"]')).click();
|
await browser.findElement(By.xpath('//div[text()="Cancel"]')).click();
|
||||||
@@ -405,7 +398,6 @@ describe('Application life cycle test', function () {
|
|||||||
it('check room', checkRoom);
|
it('check room', checkRoom);
|
||||||
|
|
||||||
it('can send message', sendMessage);
|
it('can send message', sendMessage);
|
||||||
it('can get app info', getAppInfo);
|
|
||||||
|
|
||||||
it('uninstall app', async function () {
|
it('uninstall app', async function () {
|
||||||
await browser.get('about:blank');
|
await browser.get('about:blank');
|
||||||
|
|||||||
Reference in New Issue
Block a user