1
0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-07-29 22:01:14 +03:00

Merge branch 'main' into quenting/user-lock

This commit is contained in:
Quentin Gliech
2023-08-03 15:20:05 +02:00
committed by GitHub
27 changed files with 86 additions and 76 deletions

View File

@ -85,7 +85,7 @@ jobs:
rustup target add ${{ matrix.arch }}-unknown-linux-musl
- name: Setup Rust build cache
uses: Swatinem/rust-cache@v2.5.1
uses: Swatinem/rust-cache@v2.6.0
with:
shared-key: ${{ matrix.arch }}-linux
save-if: "${{ github.event_name != 'pull_request' }}"
@ -149,7 +149,7 @@ jobs:
rustup target add ${{ matrix.arch }}-apple-darwin
- name: Setup Rust build cache
uses: Swatinem/rust-cache@v2.5.1
uses: Swatinem/rust-cache@v2.6.0
with:
shared-key: ${{ matrix.arch }}-macos
save-if: "${{ github.event_name != 'pull_request' }}"

View File

@ -127,7 +127,7 @@ jobs:
rustup default stable
- name: Setup Rust cache
uses: Swatinem/rust-cache@v2.5.1
uses: Swatinem/rust-cache@v2.6.0
with:
save-if: "${{ github.event_name != 'pull_request' }}"
@ -188,7 +188,7 @@ jobs:
run: make
- name: Setup Rust cache
uses: Swatinem/rust-cache@v2.5.1
uses: Swatinem/rust-cache@v2.6.0
with:
save-if: "${{ github.event_name != 'pull_request' }}"
@ -252,7 +252,7 @@ jobs:
run: make
- name: Setup Rust cache
uses: Swatinem/rust-cache@v2.5.1
uses: Swatinem/rust-cache@v2.6.0
with:
save-if: "${{ github.event_name != 'pull_request' }}"

View File

@ -126,7 +126,7 @@ jobs:
run: make
- name: Setup Rust cache
uses: Swatinem/rust-cache@v2.5.1
uses: Swatinem/rust-cache@v2.6.0
with:
save-if: "${{ github.event_name != 'pull_request' }}"

View File

@ -28,7 +28,7 @@ jobs:
rustup default stable
- name: Setup Rust cache
uses: Swatinem/rust-cache@v2.5.1
uses: Swatinem/rust-cache@v2.6.0
with:
save-if: "${{ github.event_name != 'pull_request' }}"

94
Cargo.lock generated
View File

@ -462,7 +462,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
@ -479,7 +479,7 @@ checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
@ -529,7 +529,7 @@ dependencies = [
"fastrand 1.9.0",
"http",
"hyper",
"time 0.3.23",
"time 0.3.24",
"tokio",
"tower",
"tracing",
@ -662,7 +662,7 @@ dependencies = [
"percent-encoding",
"regex",
"sha2",
"time 0.3.23",
"time 0.3.24",
"tracing",
]
@ -764,7 +764,7 @@ dependencies = [
"itoa",
"num-integer",
"ryu",
"time 0.3.23",
"time 0.3.24",
]
[[package]]
@ -874,7 +874,7 @@ dependencies = [
"heck",
"proc-macro2",
"quote",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
@ -1235,7 +1235,7 @@ dependencies = [
"heck",
"proc-macro2",
"quote",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
@ -1299,7 +1299,7 @@ dependencies = [
"rand 0.8.5",
"sha2",
"subtle",
"time 0.3.23",
"time 0.3.24",
"version_check",
]
@ -1631,7 +1631,7 @@ dependencies = [
"proc-macro2",
"quote",
"strsim",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
@ -1653,7 +1653,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
dependencies = [
"darling_core 0.20.3",
"quote",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
@ -1715,6 +1715,15 @@ dependencies = [
"zeroize",
]
[[package]]
name = "deranged"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8810e7e2cf385b1e9b50d68264908ec367ba642c96d02edfe61c39e88e2a3c01"
dependencies = [
"serde",
]
[[package]]
name = "deunicode"
version = "0.4.3"
@ -1777,7 +1786,7 @@ dependencies = [
"rust_decimal",
"serde",
"thiserror",
"time 0.3.23",
"time 0.3.24",
]
[[package]]
@ -2099,7 +2108,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
@ -2674,7 +2683,7 @@ checksum = "ce243b1bfa62ffc028f1cc3b6034ec63d649f3031bc8a4fbbb004e1ac17d1f68"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
@ -3206,7 +3215,7 @@ dependencies = [
"serde_with",
"sqlx",
"thiserror",
"time 0.3.23",
"time 0.3.24",
"tokio",
"tower",
"tower-http",
@ -4137,7 +4146,7 @@ dependencies = [
"regex",
"regex-syntax 0.7.4",
"structmeta",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
@ -4205,7 +4214,7 @@ dependencies = [
"proc-macro2",
"proc-macro2-diagnostics",
"quote",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
@ -4253,7 +4262,7 @@ dependencies = [
"pest_meta",
"proc-macro2",
"quote",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
@ -4361,7 +4370,7 @@ checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
@ -4501,7 +4510,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.27",
"syn 2.0.28",
"version_check",
"yansi",
]
@ -5214,16 +5223,16 @@ dependencies = [
"serde",
"serde_json",
"thiserror",
"time 0.3.23",
"time 0.3.24",
"url",
"uuid",
]
[[package]]
name = "serde"
version = "1.0.177"
version = "1.0.180"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "63ba2516aa6bf82e0b19ca8b50019d52df58455d3cf9bdaf6315225fdd0c560a"
checksum = "0ea67f183f058fe88a4e3ec6e2788e003840893b91bac4559cabedd00863b3ed"
dependencies = [
"serde_derive",
]
@ -5243,13 +5252,13 @@ dependencies = [
[[package]]
name = "serde_derive"
version = "1.0.177"
version = "1.0.180"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "401797fe7833d72109fedec6bfcbe67c0eed9b99772f26eb8afd261f0abc6fd3"
checksum = "24e744d7782b686ab3b73267ef05697159cc0e5abbed3f47f9933165e5219036"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
@ -5320,7 +5329,7 @@ dependencies = [
"serde",
"serde_json",
"serde_with_macros",
"time 0.3.23",
"time 0.3.24",
]
[[package]]
@ -5332,7 +5341,7 @@ dependencies = [
"darling 0.20.3",
"proc-macro2",
"quote",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
@ -5751,7 +5760,7 @@ dependencies = [
"proc-macro2",
"quote",
"structmeta-derive",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
@ -5762,7 +5771,7 @@ checksum = "a60bcaff7397072dca0017d1db428e30d5002e00b6847703e2e42005c95fbe00"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
@ -5784,7 +5793,7 @@ dependencies = [
"proc-macro2",
"quote",
"rustversion",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
@ -5806,9 +5815,9 @@ dependencies = [
[[package]]
name = "syn"
version = "2.0.27"
version = "2.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0"
checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567"
dependencies = [
"proc-macro2",
"quote",
@ -5889,7 +5898,7 @@ checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
@ -5936,10 +5945,11 @@ dependencies = [
[[package]]
name = "time"
version = "0.3.23"
version = "0.3.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446"
checksum = "b79eabcd964882a646b3584543ccabeae7869e9ac32a46f6f22b7a5bd405308b"
dependencies = [
"deranged",
"itoa",
"serde",
"time-core",
@ -5954,9 +5964,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
[[package]]
name = "time-macros"
version = "0.2.10"
version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4"
checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd"
dependencies = [
"time-core",
]
@ -6014,7 +6024,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
@ -6219,7 +6229,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e"
dependencies = [
"crossbeam-channel",
"time 0.3.23",
"time 0.3.24",
"tracing-subscriber",
]
@ -6231,7 +6241,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
@ -6613,7 +6623,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
"syn 2.0.27",
"syn 2.0.28",
"wasm-bindgen-shared",
]
@ -6647,7 +6657,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.27",
"syn 2.0.28",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]

View File

@ -18,7 +18,7 @@ http-body = "0.4.5"
mime = "0.3.17"
rand = "0.8.5"
sentry = { version = "0.31.5", default-features = false }
serde = "1.0.177"
serde = "1.0.180"
serde_with = "3.1.0"
serde_urlencoded = "0.7.1"
serde_json = "1.0.104"

View File

@ -20,7 +20,7 @@ schemars = { version = "0.8.12", features = ["url", "chrono"] }
ulid = { version = "1.0.0", features = ["serde"] }
url = { version = "2.4.0", features = ["serde"] }
serde = { version = "1.0.177", features = ["derive"] }
serde = { version = "1.0.180", features = ["derive"] }
serde_with = { version = "3.1.0", features = ["hex", "chrono"] }
serde_json = "1.0.104"

View File

@ -8,7 +8,7 @@ license = "Apache-2.0"
[dependencies]
chrono = "0.4.26"
thiserror = "1.0.44"
serde = "1.0.177"
serde = "1.0.180"
url = { version = "2.4.0", features = ["serde"] }
crc = "3.0.1"
ulid = { version = "1.0.0", features = ["serde"] }

View File

@ -11,7 +11,7 @@ async-graphql = { version = "5.0.10", features = ["chrono", "url"] }
async-trait = "0.1.72"
chrono = "0.4.26"
lettre = { version = "0.10.4", default-features = false }
serde = { version = "1.0.177", features = ["derive"] }
serde = { version = "1.0.180", features = ["derive"] }
thiserror = "1.0.44"
tokio = { version = "1.29.1", features = ["sync"] }
tracing = "0.1.37"

View File

@ -36,7 +36,7 @@ lettre = { version = "0.10.4", default-features = false, features = ["builder"]
sqlx = { version = "0.7.1", features = ["runtime-tokio-rustls", "postgres"] }
# Various structure (de)serialization
serde = { version = "1.0.177", features = ["derive"] }
serde = { version = "1.0.180", features = ["derive"] }
serde_with = { version = "3.1.0", features = ["hex", "chrono"] }
serde_json = "1.0.104"
serde_urlencoded = "0.7.1"
@ -50,7 +50,7 @@ zeroize = "1.6.0"
# Various data types and utilities
camino = "1.1.6"
chrono = { version = "0.4.26", features = ["serde"] }
time = "0.3.23"
time = "0.3.24"
url = { version = "2.4.0", features = ["serde"] }
mime = "0.3.17"
rand = "0.8.5"

View File

@ -20,7 +20,7 @@ once_cell = "1.18.0"
opentelemetry = "0.19.0"
rustls = { version = "0.21.5", optional = true }
rustls-native-certs = { version = "0.6.3", optional = true }
serde = "1.0.177"
serde = "1.0.180"
serde_json = "1.0.104"
serde_urlencoded = "0.7.1"
thiserror = "1.0.44"
@ -36,7 +36,7 @@ mas-tower = { path = "../tower" }
[dev-dependencies]
anyhow = "1.0.72"
serde = { version = "1.0.177", features = ["derive"] }
serde = { version = "1.0.180", features = ["derive"] }
tokio = { version = "1.29.1", features = ["macros", "rt"] }
tower = { version = "0.4.13", features = ["util"] }

View File

@ -13,7 +13,7 @@ convert_case = "0.6.0"
csv = "1.2.2"
futures-util = "0.3.28"
hyper = { version = "0.14.27", features = ["tcp", "client", "http1"] }
serde = { version = "1.0.177", features = ["derive"] }
serde = { version = "1.0.180", features = ["derive"] }
tokio = { version = "1.29.1", features = ["macros", "rt-multi-thread", "fs", "io-util"] }
tracing = "0.1.37"
tracing-subscriber = "0.3.17"

View File

@ -6,7 +6,7 @@ edition = "2021"
license = "Apache-2.0"
[dependencies]
serde = { version = "1.0.177", optional = true }
serde = { version = "1.0.180", optional = true }
schemars = { version = "0.8.12", default-features = false, optional = true }
[features]

View File

@ -20,7 +20,7 @@ rand = "0.8.5"
rsa = "0.9.2"
schemars = "0.8.12"
sec1 = "0.7.3"
serde = { version = "1.0.177", features = ["derive"] }
serde = { version = "1.0.180", features = ["derive"] }
serde_json = "1.0.104"
serde_with = { version = "3.1.0", features = ["base64"] }
sha2 = { version = "0.10.7", features = ["oid"] }

View File

@ -9,7 +9,7 @@ license = "Apache-2.0"
anyhow = "1.0.72"
async-trait = "0.1.72"
http = "0.2.9"
serde = { version = "1.0.177", features = ["derive"] }
serde = { version = "1.0.180", features = ["derive"] }
tower = { version = "0.4.13", features = ["util"] }
tracing = "0.1.37"
url = "2.4.0"

View File

@ -7,7 +7,7 @@ license = "Apache-2.0"
[dependencies]
anyhow = "1.0.71"
serde = { version = "1.0.177", features = ["derive"] }
serde = { version = "1.0.180", features = ["derive"] }
async-trait = "0.1.72"
http = "0.2.9"
tokio = { version = "1.28.2", features = ["sync", "macros", "rt"] }

View File

@ -7,7 +7,7 @@ license = "Apache-2.0"
[dependencies]
http = "0.2.9"
serde = "1.0.177"
serde = "1.0.180"
serde_json = "1.0.104"
language-tags = { version = "0.3.2", features = ["serde"] }
url = { version = "2.4.0", features = ["serde"] }

View File

@ -29,7 +29,7 @@ http = "0.2.9"
once_cell = "1.18.0"
mime = "0.3.17"
rand = "0.8.5"
serde = { version = "1.0.177", features = ["derive"] }
serde = { version = "1.0.180", features = ["derive"] }
serde_json = "1.0.104"
serde_urlencoded = "0.7.1"
serde_with = "3.1.0"

View File

@ -8,7 +8,7 @@ license = "Apache-2.0"
[dependencies]
anyhow = "1.0.72"
opa-wasm = { git = "https://github.com/matrix-org/rust-opa-wasm.git" }
serde = { version = "1.0.177", features = ["derive"] }
serde = { version = "1.0.180", features = ["derive"] }
serde_json = "1.0.104"
thiserror = "1.0.44"
tokio = { version = "1.29.1", features = ["io-util"] }

View File

@ -7,7 +7,7 @@ license = "Apache-2.0"
[dependencies]
axum = { version = "0.6.19", default-features = false }
serde = { version = "1.0.177", features = ["derive"] }
serde = { version = "1.0.180", features = ["derive"] }
serde_urlencoded = "0.7.1"
url = "2.4.0"
ulid = "1.0.0"

View File

@ -6,7 +6,7 @@ edition = "2021"
license = "Apache-2.0"
[dependencies]
serde = { version = "1.0.177", features = ["derive"] }
serde = { version = "1.0.180", features = ["derive"] }
thiserror = "1.0.44"
camino = { version = "1.1.6", features = ["serde1"] }

View File

@ -11,7 +11,7 @@ sqlx = { version = "0.7.1", features = ["runtime-tokio-rustls", "postgres", "mig
sea-query = { version = "0.30.0", features = ["derive", "attr", "with-uuid", "with-chrono"] }
sea-query-binder = { version = "0.5.0", features = ["sqlx-postgres", "with-uuid", "with-chrono"] }
chrono = { version = "0.4.26", features = ["serde"] }
serde = { version = "1.0.177", features = ["derive"] }
serde = { version = "1.0.180", features = ["derive"] }
serde_json = "1.0.104"
thiserror = "1.0.44"
tracing = "0.1.37"

View File

@ -14,7 +14,7 @@ futures-util = "0.3.28"
apalis-core = { version = "0.4.3", features = ["tokio-comp"] }
opentelemetry = "0.19.0"
rand_core = "0.6.4"
serde = "1.0.177"
serde = "1.0.180"
serde_json = "1.0.104"
tracing = "0.1.37"
tracing-opentelemetry = "0.19.0"

View File

@ -25,7 +25,7 @@ tracing-opentelemetry = "0.19.0"
opentelemetry = "0.19.0"
ulid = "1.0.0"
url = "2.4.0"
serde = { version = "1.0.177", features = ["derive"] }
serde = { version = "1.0.180", features = ["derive"] }
serde_json = "1.0.104"
mas-data-model = { path = "../data-model" }

View File

@ -13,7 +13,7 @@ anyhow = "1.0.72"
thiserror = "1.0.44"
tera = "1.19.0"
serde = { version = "1.0.177", features = ["derive"] }
serde = { version = "1.0.180", features = ["derive"] }
serde_json = "1.0.104"
serde_urlencoded = "0.7.1"

View File

@ -42,7 +42,7 @@
"@storybook/addon-viewport": "^7.2.0",
"@storybook/react": "^7.2.0",
"@storybook/react-vite": "^7.2.0",
"@types/node": "^20.4.5",
"@types/node": "^20.4.6",
"@types/react": "^18.2.18",
"@types/react-dom": "^18.2.7",
"@types/react-test-renderer": "^18.0.0",
@ -8369,9 +8369,9 @@
"dev": true
},
"node_modules/@types/node": {
"version": "20.4.5",
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.4.5.tgz",
"integrity": "sha512-rt40Nk13II9JwQBdeYqmbn2Q6IVTA5uPhvSO+JVqdXw/6/4glI6oR9ezty/A9Hg5u7JH4OmYmuQ+XvjKm0Datg==",
"version": "20.4.6",
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.4.6.tgz",
"integrity": "sha512-q0RkvNgMweWWIvSMDiXhflGUKMdIxBo2M2tYM/0kEGDueQByFzK4KZAgu5YHGFNxziTlppNpTIBcqHQAxlfHdA==",
"dev": true
},
"node_modules/@types/node-fetch": {

View File

@ -49,7 +49,7 @@
"@storybook/addon-viewport": "^7.2.0",
"@storybook/react": "^7.2.0",
"@storybook/react-vite": "^7.2.0",
"@types/node": "^20.4.5",
"@types/node": "^20.4.6",
"@types/react": "^18.2.18",
"@types/react-dom": "^18.2.7",
"@types/react-test-renderer": "^18.0.0",