letro/letro-authentication-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Automatic merge back to main (#5235)

Browse Source
This commit is contained in:
matrixbot
2025-11-11 12:07:40 +01:00
committed by GitHub
parent 4d722c47b5 cd555bc808
commit a6a1a67dbf
4 changed files with 105 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
Cargo.lock generated
View File

@@ -3096,7 +3096,7 @@ dependencies = [
[[package]]
name = "mas-axum-utils"
version = "1.6.0-rc.0"
version = "1.6.0"
dependencies = [
"anyhow",
"axum",
@@ -3130,7 +3130,7 @@ dependencies = [
[[package]]
name = "mas-cli"
version = "1.6.0-rc.0"
version = "1.6.0"
dependencies = [
"anyhow",
"axum",
@@ -3203,7 +3203,7 @@ dependencies = [
[[package]]
name = "mas-config"
version = "1.6.0-rc.0"
version = "1.6.0"
dependencies = [
"anyhow",
"camino",
@@ -3235,7 +3235,7 @@ dependencies = [
[[package]]
name = "mas-context"
version = "1.6.0-rc.0"
version = "1.6.0"
dependencies = [
"console",
"opentelemetry",
@@ -3251,7 +3251,7 @@ dependencies = [
[[package]]
name = "mas-data-model"
version = "1.6.0-rc.0"
version = "1.6.0"
dependencies = [
"base64ct",
"chrono",
@@ -3274,7 +3274,7 @@ dependencies = [
[[package]]
name = "mas-email"
version = "1.6.0-rc.0"
version = "1.6.0"
dependencies = [
"async-trait",
"lettre",
@@ -3285,7 +3285,7 @@ dependencies = [
[[package]]
name = "mas-handlers"
version = "1.6.0-rc.0"
version = "1.6.0"
dependencies = [
"aide",
"anyhow",
@@ -3365,7 +3365,7 @@ dependencies = [
[[package]]
name = "mas-http"
version = "1.6.0-rc.0"
version = "1.6.0"
dependencies = [
"futures-util",
"headers",
@@ -3386,7 +3386,7 @@ dependencies = [
[[package]]
name = "mas-i18n"
version = "1.6.0-rc.0"
version = "1.6.0"
dependencies = [
"camino",
"icu_calendar",
@@ -3408,7 +3408,7 @@ dependencies = [
[[package]]
name = "mas-i18n-scan"
version = "1.6.0-rc.0"
version = "1.6.0"
dependencies = [
"camino",
"clap",
@@ -3422,7 +3422,7 @@ dependencies = [
[[package]]
name = "mas-iana"
version = "1.6.0-rc.0"
version = "1.6.0"
dependencies = [
"schemars 0.9.0",
"serde",
@@ -3430,7 +3430,7 @@ dependencies = [
[[package]]
name = "mas-iana-codegen"
version = "1.6.0-rc.0"
version = "1.6.0"
dependencies = [
"anyhow",
"async-trait",
@@ -3447,7 +3447,7 @@ dependencies = [
[[package]]
name = "mas-jose"
version = "1.6.0-rc.0"
version = "1.6.0"
dependencies = [
"base64ct",
"chrono",
@@ -3477,7 +3477,7 @@ dependencies = [
[[package]]
name = "mas-keystore"
version = "1.6.0-rc.0"
version = "1.6.0"
dependencies = [
"aead",
"base64ct",
@@ -3505,7 +3505,7 @@ dependencies = [
[[package]]
name = "mas-listener"
version = "1.6.0-rc.0"
version = "1.6.0"
dependencies = [
"anyhow",
"bytes",
@@ -3530,7 +3530,7 @@ dependencies = [
[[package]]
name = "mas-matrix"
version = "1.6.0-rc.0"
version = "1.6.0"
dependencies = [
"anyhow",
"async-trait",
@@ -3540,7 +3540,7 @@ dependencies = [
[[package]]
name = "mas-matrix-synapse"
version = "1.6.0-rc.0"
version = "1.6.0"
dependencies = [
"anyhow",
"async-trait",
@@ -3557,7 +3557,7 @@ dependencies = [
[[package]]
name = "mas-oidc-client"
version = "1.6.0-rc.0"
version = "1.6.0"
dependencies = [
"assert_matches",
"async-trait",
@@ -3593,7 +3593,7 @@ dependencies = [
[[package]]
name = "mas-policy"
version = "1.6.0-rc.0"
version = "1.6.0"
dependencies = [
"anyhow",
"arc-swap",
@@ -3610,7 +3610,7 @@ dependencies = [
[[package]]
name = "mas-router"
version = "1.6.0-rc.0"
version = "1.6.0"
dependencies = [
"axum",
"serde",
@@ -3621,7 +3621,7 @@ dependencies = [
[[package]]
name = "mas-spa"
version = "1.6.0-rc.0"
version = "1.6.0"
dependencies = [
"camino",
"serde",
@@ -3630,7 +3630,7 @@ dependencies = [
[[package]]
name = "mas-storage"
version = "1.6.0-rc.0"
version = "1.6.0"
dependencies = [
"async-trait",
"chrono",
@@ -3652,7 +3652,7 @@ dependencies = [
[[package]]
name = "mas-storage-pg"
version = "1.6.0-rc.0"
version = "1.6.0"
dependencies = [
"async-trait",
"chrono",
@@ -3680,7 +3680,7 @@ dependencies = [
[[package]]
name = "mas-tasks"
version = "1.6.0-rc.0"
version = "1.6.0"
dependencies = [
"anyhow",
"async-trait",
@@ -3712,7 +3712,7 @@ dependencies = [
[[package]]
name = "mas-templates"
version = "1.6.0-rc.0"
version = "1.6.0"
dependencies = [
"anyhow",
"arc-swap",
@@ -3742,7 +3742,7 @@ dependencies = [
[[package]]
name = "mas-tower"
version = "1.6.0-rc.0"
version = "1.6.0"
dependencies = [
"http",
"opentelemetry",
@@ -4012,7 +4012,7 @@ dependencies = [
[[package]]
name = "oauth2-types"
version = "1.6.0-rc.0"
version = "1.6.0"
dependencies = [
"assert_matches",
"base64ct",
@@ -6083,7 +6083,7 @@ dependencies = [
[[package]]
name = "syn2mas"
version = "1.6.0-rc.0"
version = "1.6.0"
dependencies = [
"anyhow",
"arc-swap",

60
Cargo.toml
View File

@@ -9,7 +9,7 @@ members = ["crates/*"]
resolver = "2"
# Updated in the CI with a `sed` command
package.version = "1.6.0-rc.0"
package.version = "1.6.0"
package.license = "AGPL-3.0-only OR LicenseRef-Element-Commercial"
package.authors = ["Element Backend Team"]
package.edition = "2024"
@@ -34,35 +34,35 @@ broken_intra_doc_links = "deny"
[workspace.dependencies]
# Workspace crates
mas-axum-utils = { path = "./crates/axum-utils/", version = "=1.6.0-rc.0" }
mas-cli = { path = "./crates/cli/", version = "=1.6.0-rc.0" }
mas-config = { path = "./crates/config/", version = "=1.6.0-rc.0" }
mas-context = { path = "./crates/context/", version = "=1.6.0-rc.0" }
mas-data-model = { path = "./crates/data-model/", version = "=1.6.0-rc.0" }
mas-email = { path = "./crates/email/", version = "=1.6.0-rc.0" }
mas-graphql = { path = "./crates/graphql/", version = "=1.6.0-rc.0" }
mas-handlers = { path = "./crates/handlers/", version = "=1.6.0-rc.0" }
mas-http = { path = "./crates/http/", version = "=1.6.0-rc.0" }
mas-i18n = { path = "./crates/i18n/", version = "=1.6.0-rc.0" }
mas-i18n-scan = { path = "./crates/i18n-scan/", version = "=1.6.0-rc.0" }
mas-iana = { path = "./crates/iana/", version = "=1.6.0-rc.0" }
mas-iana-codegen = { path = "./crates/iana-codegen/", version = "=1.6.0-rc.0" }
mas-jose = { path = "./crates/jose/", version = "=1.6.0-rc.0" }
mas-keystore = { path = "./crates/keystore/", version = "=1.6.0-rc.0" }
mas-listener = { path = "./crates/listener/", version = "=1.6.0-rc.0" }
mas-matrix = { path = "./crates/matrix/", version = "=1.6.0-rc.0" }
mas-matrix-synapse = { path = "./crates/matrix-synapse/", version = "=1.6.0-rc.0" }
mas-oidc-client = { path = "./crates/oidc-client/", version = "=1.6.0-rc.0" }
mas-policy = { path = "./crates/policy/", version = "=1.6.0-rc.0" }
mas-router = { path = "./crates/router/", version = "=1.6.0-rc.0" }
mas-spa = { path = "./crates/spa/", version = "=1.6.0-rc.0" }
mas-storage = { path = "./crates/storage/", version = "=1.6.0-rc.0" }
mas-storage-pg = { path = "./crates/storage-pg/", version = "=1.6.0-rc.0" }
mas-tasks = { path = "./crates/tasks/", version = "=1.6.0-rc.0" }
mas-templates = { path = "./crates/templates/", version = "=1.6.0-rc.0" }
mas-tower = { path = "./crates/tower/", version = "=1.6.0-rc.0" }
oauth2-types = { path = "./crates/oauth2-types/", version = "=1.6.0-rc.0" }
syn2mas = { path = "./crates/syn2mas", version = "=1.6.0-rc.0" }
mas-axum-utils = { path = "./crates/axum-utils/", version = "=1.6.0" }
mas-cli = { path = "./crates/cli/", version = "=1.6.0" }
mas-config = { path = "./crates/config/", version = "=1.6.0" }
mas-context = { path = "./crates/context/", version = "=1.6.0" }
mas-data-model = { path = "./crates/data-model/", version = "=1.6.0" }
mas-email = { path = "./crates/email/", version = "=1.6.0" }
mas-graphql = { path = "./crates/graphql/", version = "=1.6.0" }
mas-handlers = { path = "./crates/handlers/", version = "=1.6.0" }
mas-http = { path = "./crates/http/", version = "=1.6.0" }
mas-i18n = { path = "./crates/i18n/", version = "=1.6.0" }
mas-i18n-scan = { path = "./crates/i18n-scan/", version = "=1.6.0" }
mas-iana = { path = "./crates/iana/", version = "=1.6.0" }
mas-iana-codegen = { path = "./crates/iana-codegen/", version = "=1.6.0" }
mas-jose = { path = "./crates/jose/", version = "=1.6.0" }
mas-keystore = { path = "./crates/keystore/", version = "=1.6.0" }
mas-listener = { path = "./crates/listener/", version = "=1.6.0" }
mas-matrix = { path = "./crates/matrix/", version = "=1.6.0" }
mas-matrix-synapse = { path = "./crates/matrix-synapse/", version = "=1.6.0" }
mas-oidc-client = { path = "./crates/oidc-client/", version = "=1.6.0" }
mas-policy = { path = "./crates/policy/", version = "=1.6.0" }
mas-router = { path = "./crates/router/", version = "=1.6.0" }
mas-spa = { path = "./crates/spa/", version = "=1.6.0" }
mas-storage = { path = "./crates/storage/", version = "=1.6.0" }
mas-storage-pg = { path = "./crates/storage-pg/", version = "=1.6.0" }
mas-tasks = { path = "./crates/tasks/", version = "=1.6.0" }
mas-templates = { path = "./crates/templates/", version = "=1.6.0" }
mas-tower = { path = "./crates/tower/", version = "=1.6.0" }
oauth2-types = { path = "./crates/oauth2-types/", version = "=1.6.0" }
syn2mas = { path = "./crates/syn2mas", version = "=1.6.0" }
# OpenAPI schema generation and validation
[workspace.dependencies.aide]

27
crates/cli/src/server.rs
View File

@@ -136,18 +136,23 @@ fn make_http_span<B>(req: &Request<B>) -> Span {
span.record(USER_AGENT_ORIGINAL, user_agent);
}
// Extract the parent span context from the request headers
let parent_context = opentelemetry::global::get_text_map_propagator(|propagator| {
let extractor = HeaderExtractor(req.headers());
let context = opentelemetry::Context::new();
propagator.extract_with_context(&context, &extractor)
});
// In case the span is disabled by any of tracing layers, e.g. if `RUST_LOG`
// is set to `warn`, `set_parent` will fail. So we only try to set the
// parent context if the span is not disabled.
if !span.is_disabled() {
// Extract the parent span context from the request headers
let parent_context = opentelemetry::global::get_text_map_propagator(|propagator| {
let extractor = HeaderExtractor(req.headers());
let context = opentelemetry::Context::new();
propagator.extract_with_context(&context, &extractor)
});
if let Err(err) = span.set_parent(parent_context) {
tracing::error!(
error = &err as &dyn std::error::Error,
"Failed to set parent context on span"
);
if let Err(err) = span.set_parent(parent_context) {
tracing::error!(
error = &err as &dyn std::error::Error,
"Failed to set parent context on span"
);
}
}
span

62
frontend/.storybook/locales.ts
View File

@@ -27,7 +27,7 @@ export type LocalazyMetadata = {
};
const localazyMetadata: LocalazyMetadata = {
projectUrl: "https://localazy.com/p/matrix-authentication-service",
projectUrl: "https://localazy.com/p/matrix-authentication-service!v1.6",
baseLocale: "en",
languages: [
{
@@ -172,21 +172,21 @@ const localazyMetadata: LocalazyMetadata = {
file: "frontend.json",
path: "",
cdnFiles: {
"cs": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/cs/frontend.json",
"da": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/da/frontend.json",
"de": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/de/frontend.json",
"en": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/en/frontend.json",
"et": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/et/frontend.json",
"fi": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/fi/frontend.json",
"fr": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/fr/frontend.json",
"hu": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/hu/frontend.json",
"nb_NO": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/nb-NO/frontend.json",
"nl": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/nl/frontend.json",
"pt": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/pt/frontend.json",
"ru": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/ru/frontend.json",
"sv": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/sv/frontend.json",
"uk": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/uk/frontend.json",
"zh#Hans": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/zh-Hans/frontend.json"
"cs": "https://delivery.localazy.com/_a67480892591190493723a576eac/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/cs/frontend.json",
"da": "https://delivery.localazy.com/_a67480892591190493723a576eac/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/da/frontend.json",
"de": "https://delivery.localazy.com/_a67480892591190493723a576eac/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/de/frontend.json",
"en": "https://delivery.localazy.com/_a67480892591190493723a576eac/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/en/frontend.json",
"et": "https://delivery.localazy.com/_a67480892591190493723a576eac/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/et/frontend.json",
"fi": "https://delivery.localazy.com/_a67480892591190493723a576eac/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/fi/frontend.json",
"fr": "https://delivery.localazy.com/_a67480892591190493723a576eac/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/fr/frontend.json",
"hu": "https://delivery.localazy.com/_a67480892591190493723a576eac/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/hu/frontend.json",
"nb_NO": "https://delivery.localazy.com/_a67480892591190493723a576eac/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/nb-NO/frontend.json",
"nl": "https://delivery.localazy.com/_a67480892591190493723a576eac/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/nl/frontend.json",
"pt": "https://delivery.localazy.com/_a67480892591190493723a576eac/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/pt/frontend.json",
"ru": "https://delivery.localazy.com/_a67480892591190493723a576eac/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/ru/frontend.json",
"sv": "https://delivery.localazy.com/_a67480892591190493723a576eac/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/sv/frontend.json",
"uk": "https://delivery.localazy.com/_a67480892591190493723a576eac/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/uk/frontend.json",
"zh#Hans": "https://delivery.localazy.com/_a67480892591190493723a576eac/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/zh-Hans/frontend.json"
}
},
{
@@ -194,21 +194,21 @@ const localazyMetadata: LocalazyMetadata = {
file: "file.json",
path: "",
cdnFiles: {
"cs": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/cs/file.json",
"da": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/da/file.json",
"de": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/de/file.json",
"en": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/en/file.json",
"et": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/et/file.json",
"fi": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/fi/file.json",
"fr": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/fr/file.json",
"hu": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/hu/file.json",
"nb_NO": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/nb-NO/file.json",
"nl": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/nl/file.json",
"pt": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/pt/file.json",
"ru": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/ru/file.json",
"sv": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/sv/file.json",
"uk": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/uk/file.json",
"zh#Hans": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/zh-Hans/file.json"
"cs": "https://delivery.localazy.com/_a67480892591190493723a576eac/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/cs/file.json",
"da": "https://delivery.localazy.com/_a67480892591190493723a576eac/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/da/file.json",
"de": "https://delivery.localazy.com/_a67480892591190493723a576eac/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/de/file.json",
"en": "https://delivery.localazy.com/_a67480892591190493723a576eac/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/en/file.json",
"et": "https://delivery.localazy.com/_a67480892591190493723a576eac/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/et/file.json",
"fi": "https://delivery.localazy.com/_a67480892591190493723a576eac/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/fi/file.json",
"fr": "https://delivery.localazy.com/_a67480892591190493723a576eac/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/fr/file.json",
"hu": "https://delivery.localazy.com/_a67480892591190493723a576eac/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/hu/file.json",
"nb_NO": "https://delivery.localazy.com/_a67480892591190493723a576eac/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/nb-NO/file.json",
"nl": "https://delivery.localazy.com/_a67480892591190493723a576eac/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/nl/file.json",
"pt": "https://delivery.localazy.com/_a67480892591190493723a576eac/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/pt/file.json",
"ru": "https://delivery.localazy.com/_a67480892591190493723a576eac/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/ru/file.json",
"sv": "https://delivery.localazy.com/_a67480892591190493723a576eac/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/sv/file.json",
"uk": "https://delivery.localazy.com/_a67480892591190493723a576eac/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/uk/file.json",
"zh#Hans": "https://delivery.localazy.com/_a67480892591190493723a576eac/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/zh-Hans/file.json"
}
}
]