This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 828
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add support for device dehydration v2 (#12316)
* rehydrate/dehydrate device if configured in well-known * add handling for dehydrated devices * some fixes * schedule dehydration * improve display of own dehydrated device * created dehydrated device when creating or resetting SSSS * some UI tweaks * reorder strings * lint * remove statement for testing * add playwright test * lint and fix broken test * update to new dehydration API * some fixes from review * try to fix test error * remove unneeded debug line * apply changes from review * add Jest tests * fix typo Co-authored-by: Richard van der Hoff <[email protected]> * don't need Object.assign Co-authored-by: Richard van der Hoff <[email protected]> --------- Co-authored-by: Richard van der Hoff <[email protected]>
- Loading branch information
Showing
18 changed files
with
823 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,114 @@ | ||
/* | ||
Copyright 2024 The Matrix.org Foundation C.I.C. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
import { Locator, type Page } from "@playwright/test"; | ||
|
||
import { test as base, expect } from "../../element-web-test"; | ||
import { viewRoomSummaryByName } from "../right-panel/utils"; | ||
import { isDendrite } from "../../plugins/homeserver/dendrite"; | ||
|
||
const test = base.extend({ | ||
// eslint-disable-next-line no-empty-pattern | ||
startHomeserverOpts: async ({}, use) => { | ||
await use("dehydration"); | ||
}, | ||
config: async ({ homeserver, context }, use) => { | ||
const wellKnown = { | ||
"m.homeserver": { | ||
base_url: homeserver.config.baseUrl, | ||
}, | ||
"org.matrix.msc3814": true, | ||
}; | ||
|
||
await context.route("https://localhost/.well-known/matrix/client", async (route) => { | ||
await route.fulfill({ json: wellKnown }); | ||
}); | ||
|
||
await use({ | ||
default_server_config: wellKnown, | ||
}); | ||
}, | ||
}); | ||
|
||
const ROOM_NAME = "Test room"; | ||
const NAME = "Alice"; | ||
|
||
function getMemberTileByName(page: Page, name: string): Locator { | ||
return page.locator(`.mx_EntityTile, [title="${name}"]`); | ||
} | ||
|
||
test.describe("Dehydration", () => { | ||
test.skip(isDendrite, "does not yet support dehydration v2"); | ||
|
||
test.use({ | ||
displayName: NAME, | ||
}); | ||
|
||
test("Create dehydrated device", async ({ page, user, app }, workerInfo) => { | ||
test.skip(workerInfo.project.name === "Legacy Crypto", "This test only works with Rust crypto."); | ||
|
||
// Create a backup (which will create SSSS, and dehydrated device) | ||
|
||
const securityTab = await app.settings.openUserSettings("Security & Privacy"); | ||
|
||
await expect(securityTab.getByRole("heading", { name: "Secure Backup" })).toBeVisible(); | ||
await expect(securityTab.getByText("Offline device enabled")).not.toBeVisible(); | ||
await securityTab.getByRole("button", { name: "Set up", exact: true }).click(); | ||
|
||
const currentDialogLocator = page.locator(".mx_Dialog"); | ||
|
||
// It's the first time and secure storage is not set up, so it will create one | ||
await expect(currentDialogLocator.getByRole("heading", { name: "Set up Secure Backup" })).toBeVisible(); | ||
await currentDialogLocator.getByRole("button", { name: "Continue", exact: true }).click(); | ||
await expect(currentDialogLocator.getByRole("heading", { name: "Save your Security Key" })).toBeVisible(); | ||
await currentDialogLocator.getByRole("button", { name: "Copy", exact: true }).click(); | ||
await currentDialogLocator.getByRole("button", { name: "Continue", exact: true }).click(); | ||
|
||
await expect(currentDialogLocator.getByRole("heading", { name: "Secure Backup successful" })).toBeVisible(); | ||
await currentDialogLocator.getByRole("button", { name: "Done", exact: true }).click(); | ||
|
||
// Open the settings again | ||
await app.settings.openUserSettings("Security & Privacy"); | ||
|
||
// The Security tab should indicate that there is a dehydrated device present | ||
await expect(securityTab.getByText("Offline device enabled")).toBeVisible(); | ||
|
||
await app.settings.closeDialog(); | ||
|
||
// the dehydrated device gets created with the name "Dehydrated | ||
// device". We want to make sure that it is not visible as a normal | ||
// device. | ||
const sessionsTab = await app.settings.openUserSettings("Sessions"); | ||
await expect(sessionsTab.getByText("Dehydrated device")).not.toBeVisible(); | ||
|
||
await app.settings.closeDialog(); | ||
|
||
// now check that the user info right-panel shows the dehydrated device | ||
// as a feature rather than as a normal device | ||
await app.client.createRoom({ name: ROOM_NAME }); | ||
|
||
await viewRoomSummaryByName(page, app, ROOM_NAME); | ||
|
||
await page.getByRole("menuitem", { name: "People" }).click(); | ||
await expect(page.locator(".mx_MemberList")).toBeVisible(); | ||
|
||
await getMemberTileByName(page, NAME).click(); | ||
await page.locator(".mx_UserInfo_devices .mx_UserInfo_expand").click(); | ||
|
||
await expect(page.locator(".mx_UserInfo_devices").getByText("Offline device enabled")).toBeVisible(); | ||
await expect(page.locator(".mx_UserInfo_devices").getByText("Dehydrated device")).not.toBeVisible(); | ||
}); | ||
}); |
1 change: 1 addition & 0 deletions
1
playwright/plugins/homeserver/synapse/templates/dehydration/README.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
A synapse configured with device dehydration v2 enabled |
102 changes: 102 additions & 0 deletions
102
playwright/plugins/homeserver/synapse/templates/dehydration/homeserver.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,102 @@ | ||
server_name: "localhost" | ||
pid_file: /data/homeserver.pid | ||
public_baseurl: "{{PUBLIC_BASEURL}}" | ||
listeners: | ||
- port: 8008 | ||
tls: false | ||
bind_addresses: ["::"] | ||
type: http | ||
x_forwarded: true | ||
|
||
resources: | ||
- names: [client] | ||
compress: false | ||
|
||
database: | ||
name: "sqlite3" | ||
args: | ||
database: ":memory:" | ||
|
||
log_config: "/data/log.config" | ||
|
||
rc_messages_per_second: 10000 | ||
rc_message_burst_count: 10000 | ||
rc_registration: | ||
per_second: 10000 | ||
burst_count: 10000 | ||
rc_joins: | ||
local: | ||
per_second: 9999 | ||
burst_count: 9999 | ||
remote: | ||
per_second: 9999 | ||
burst_count: 9999 | ||
rc_joins_per_room: | ||
per_second: 9999 | ||
burst_count: 9999 | ||
rc_3pid_validation: | ||
per_second: 1000 | ||
burst_count: 1000 | ||
|
||
rc_invites: | ||
per_room: | ||
per_second: 1000 | ||
burst_count: 1000 | ||
per_user: | ||
per_second: 1000 | ||
burst_count: 1000 | ||
|
||
rc_login: | ||
address: | ||
per_second: 10000 | ||
burst_count: 10000 | ||
account: | ||
per_second: 10000 | ||
burst_count: 10000 | ||
failed_attempts: | ||
per_second: 10000 | ||
burst_count: 10000 | ||
|
||
media_store_path: "/data/media_store" | ||
uploads_path: "/data/uploads" | ||
enable_registration: true | ||
enable_registration_without_verification: true | ||
disable_msisdn_registration: false | ||
registration_shared_secret: "{{REGISTRATION_SECRET}}" | ||
report_stats: false | ||
macaroon_secret_key: "{{MACAROON_SECRET_KEY}}" | ||
form_secret: "{{FORM_SECRET}}" | ||
signing_key_path: "/data/localhost.signing.key" | ||
|
||
trusted_key_servers: | ||
- server_name: "matrix.org" | ||
suppress_key_server_warning: true | ||
|
||
ui_auth: | ||
session_timeout: "300s" | ||
|
||
oidc_providers: | ||
- idp_id: test | ||
idp_name: "OAuth test" | ||
issuer: "http://localhost:{{OAUTH_SERVER_PORT}}/oauth" | ||
authorization_endpoint: "http://localhost:{{OAUTH_SERVER_PORT}}/oauth/auth.html" | ||
# the token endpoint receives requests from synapse, rather than the webapp, so needs to escape the docker container. | ||
token_endpoint: "http://host.containers.internal:{{OAUTH_SERVER_PORT}}/oauth/token" | ||
userinfo_endpoint: "http://host.containers.internal:{{OAUTH_SERVER_PORT}}/oauth/userinfo" | ||
client_id: "synapse" | ||
discover: false | ||
scopes: ["profile"] | ||
skip_verification: true | ||
client_auth_method: none | ||
user_mapping_provider: | ||
config: | ||
display_name_template: "{{ user.name }}" | ||
|
||
# Inhibit background updates as this Synapse isn't long-lived | ||
background_updates: | ||
min_batch_size: 100000 | ||
sleep_duration_ms: 100000 | ||
|
||
experimental_features: | ||
msc2697_enabled: false | ||
msc3814_enabled: true |
50 changes: 50 additions & 0 deletions
50
playwright/plugins/homeserver/synapse/templates/dehydration/log.config
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
# Log configuration for Synapse. | ||
# | ||
# This is a YAML file containing a standard Python logging configuration | ||
# dictionary. See [1] for details on the valid settings. | ||
# | ||
# Synapse also supports structured logging for machine readable logs which can | ||
# be ingested by ELK stacks. See [2] for details. | ||
# | ||
# [1]: https://docs.python.org/3.7/library/logging.config.html#configuration-dictionary-schema | ||
# [2]: https://matrix-org.github.io/synapse/latest/structured_logging.html | ||
|
||
version: 1 | ||
|
||
formatters: | ||
precise: | ||
format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s' | ||
|
||
handlers: | ||
# A handler that writes logs to stderr. Unused by default, but can be used | ||
# instead of "buffer" and "file" in the logger handlers. | ||
console: | ||
class: logging.StreamHandler | ||
formatter: precise | ||
|
||
loggers: | ||
synapse.storage.SQL: | ||
# beware: increasing this to DEBUG will make synapse log sensitive | ||
# information such as access tokens. | ||
level: DEBUG | ||
|
||
twisted: | ||
# We send the twisted logging directly to the file handler, | ||
# to work around https://github.com/matrix-org/synapse/issues/3471 | ||
# when using "buffer" logger. Use "console" to log to stderr instead. | ||
handlers: [console] | ||
propagate: false | ||
|
||
root: | ||
level: DEBUG | ||
|
||
# Write logs to the `buffer` handler, which will buffer them together in memory, | ||
# then write them to a file. | ||
# | ||
# Replace "buffer" with "console" to log to stderr instead. (Note that you'll | ||
# also need to update the configuration for the `twisted` logger above, in | ||
# this case.) | ||
# | ||
handlers: [console] | ||
|
||
disable_existing_loggers: false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.