mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-05-08 16:04:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

sdk: Don't enable default features of mas-oidc-client

Browse Source 
We don't need the `hyper` feature as we use our own HTTP client,
and the `keystore` will not be used in most cases.

Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
This commit is contained in:
Kévin Commaille
2024-03-19 12:33:39 +01:00
committed by Benjamin Bouvier
parent c59465c54c
commit 0ff9e066fb
2 changed files with 100 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

286
Cargo.lock generated
View File

@@ -719,9 +719,9 @@ dependencies = [
[[package]]
name = "chrono"
version = "0.4.33"
version = "0.4.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb"
checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a"
dependencies = [
"android-tzdata",
"iana-time-zone",
@@ -2143,16 +2143,6 @@ dependencies = [
"hashbrown 0.14.3",
]
[[package]]
name = "hdrhistogram"
version = "7.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d"
dependencies = [
"byteorder",
"num-traits",
]
[[package]]
name = "headers"
version = "0.3.9"
@@ -2322,7 +2312,6 @@ dependencies = [
"http",
"hyper",
"rustls",
"rustls-native-certs",
"tokio",
"tokio-rustls",
]
@@ -2554,16 +2543,6 @@ version = "2.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
[[package]]
name = "iri-string"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21859b667d66a4c1dacd9df0863b3efb65785474255face87f5bca39dd8407c0"
dependencies = [
"memchr",
"serde",
]
[[package]]
name = "is-terminal"
version = "0.4.10"
@@ -2858,9 +2837,8 @@ dependencies = [
[[package]]
name = "mas-http"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da6948721a2bc05e73f8029515e05b0c7deabb6fcec51ee7f033ecbfe60b7818"
version = "0.8.0"
source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=099eabd1371d2840a2f025a6372d6428039eb511#099eabd1371d2840a2f025a6372d6428039eb511"
dependencies = [
"bytes",
"futures-util",
@@ -2868,9 +2846,7 @@ dependencies = [
"http",
"http-body",
"hyper",
"mas-tower",
"once_cell",
"opentelemetry",
"opentelemetry 0.22.0",
"serde",
"serde_json",
"serde_urlencoded",
@@ -2878,14 +2854,13 @@ dependencies = [
"tower",
"tower-http",
"tracing",
"tracing-opentelemetry",
"tracing-opentelemetry 0.23.0",
]
[[package]]
name = "mas-iana"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1c48820df73240471efb9fe90f90461b0029e4f0b7915e2df23633523635dfa3"
version = "0.8.0"
source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=099eabd1371d2840a2f025a6372d6428039eb511#099eabd1371d2840a2f025a6372d6428039eb511"
dependencies = [
"schemars",
"serde",
@@ -2893,9 +2868,8 @@ dependencies = [
[[package]]
name = "mas-jose"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b39a251dfb34fb81d7259e91b368ee3551013406149333484ae30bd7da8c2c74"
version = "0.8.0"
source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=099eabd1371d2840a2f025a6372d6428039eb511#099eabd1371d2840a2f025a6372d6428039eb511"
dependencies = [
"base64ct",
"chrono",
@@ -2922,40 +2896,10 @@ dependencies = [
"url",
]
[[package]]
name = "mas-keystore"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a75c2a138f5805d21cf62c3947e23743349cb1303e8e3374aad14a5d571d7912"
dependencies = [
"aead",
"base64ct",
"chacha20poly1305",
"const-oid",
"der",
"ecdsa",
"elliptic-curve",
"generic-array",
"k256",
"mas-iana",
"mas-jose",
"p256",
"p384",
"pem-rfc7468",
"pkcs1",
"pkcs8",
"rand 0.8.5",
"rsa",
"sec1",
"spki",
"thiserror",
]
[[package]]
name = "mas-oidc-client"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3138f9b4240f515c740ec61e27b436f1fd5a24aabb66b51d93346c7d46e2e571"
version = "0.8.0"
source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=099eabd1371d2840a2f025a6372d6428039eb511#099eabd1371d2840a2f025a6372d6428039eb511"
dependencies = [
"base64ct",
"bytes",
@@ -2964,48 +2908,23 @@ dependencies = [
"futures-util",
"headers",
"http",
"http-body",
"hyper",
"hyper-rustls",
"language-tags",
"mas-http",
"mas-iana",
"mas-jose",
"mas-keystore",
"mime",
"oauth2-types",
"once_cell",
"rand 0.8.5",
"rustls",
"serde",
"serde_json",
"serde_urlencoded",
"serde_with",
"thiserror",
"tokio",
"tower",
"tower-http",
"tracing",
"url",
]
[[package]]
name = "mas-tower"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6beeba7843e755539b582e6240293db1e6bd428e22bc1a6ef4220b1fd2fc53d"
dependencies = [
"http",
"opentelemetry",
"opentelemetry-http",
"opentelemetry-semantic-conventions",
"pin-project-lite",
"tokio",
"tower",
"tracing",
"tracing-opentelemetry",
]
[[package]]
name = "matchers"
version = "0.1.0"
@@ -3268,9 +3187,9 @@ dependencies = [
"matrix-sdk-ui",
"mime",
"once_cell",
"opentelemetry",
"opentelemetry 0.21.0",
"opentelemetry-otlp",
"opentelemetry_sdk",
"opentelemetry_sdk 0.21.2",
"paranoid-android",
"ruma",
"sanitize-filename-reader-friendly",
@@ -3282,7 +3201,7 @@ dependencies = [
"tracing",
"tracing-appender",
"tracing-core",
"tracing-opentelemetry",
"tracing-opentelemetry 0.22.0",
"tracing-subscriber",
"uniffi",
"url",
@@ -3713,9 +3632,8 @@ dependencies = [
[[package]]
name = "oauth2-types"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd0c3fa3366856696f31b0686570dc4a511b499e648a03e433ad8b940ed2f122"
version = "0.8.0"
source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=099eabd1371d2840a2f025a6372d6428039eb511#099eabd1371d2840a2f025a6372d6428039eb511"
dependencies = [
"chrono",
"data-encoding",
@@ -3848,6 +3766,21 @@ dependencies = [
"urlencoding",
]
[[package]]
name = "opentelemetry"
version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "900d57987be3f2aeb70d385fff9b27fb74c5723cc9a52d904d4f9c807a0667bf"
dependencies = [
"futures-core",
"futures-sink",
"js-sys",
"once_cell",
"pin-project-lite",
"thiserror",
"urlencoding",
]
[[package]]
name = "opentelemetry-http"
version = "0.10.0"
@@ -3857,7 +3790,7 @@ dependencies = [
"async-trait",
"bytes",
"http",
"opentelemetry",
"opentelemetry 0.21.0",
"reqwest",
]
@@ -3870,11 +3803,11 @@ dependencies = [
"async-trait",
"futures-core",
"http",
"opentelemetry",
"opentelemetry 0.21.0",
"opentelemetry-http",
"opentelemetry-proto",
"opentelemetry-semantic-conventions",
"opentelemetry_sdk",
"opentelemetry_sdk 0.21.2",
"prost 0.11.9",
"reqwest",
"thiserror",
@@ -3888,8 +3821,8 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2e155ce5cc812ea3d1dffbd1539aed653de4bf4882d60e6e04dcf0901d674e1"
dependencies = [
"opentelemetry",
"opentelemetry_sdk",
"opentelemetry 0.21.0",
"opentelemetry_sdk 0.21.2",
"prost 0.11.9",
"tonic",
]
@@ -3900,7 +3833,7 @@ version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f5774f1ef1f982ef2a447f6ee04ec383981a3ab99c8e77a1a7b30182e65bbc84"
dependencies = [
"opentelemetry",
"opentelemetry 0.21.0",
]
[[package]]
@@ -3916,7 +3849,7 @@ dependencies = [
"futures-util",
"glob",
"once_cell",
"opentelemetry",
"opentelemetry 0.21.0",
"ordered-float",
"percent-encoding",
"rand 0.8.5",
@@ -3925,6 +3858,25 @@ dependencies = [
"tokio-stream",
]
[[package]]
name = "opentelemetry_sdk"
version = "0.22.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e90c7113be649e31e9a0f8b5ee24ed7a16923b322c3c5ab6367469c049d6b7e"
dependencies = [
"async-trait",
"crossbeam-channel",
"futures-channel",
"futures-executor",
"futures-util",
"once_cell",
"opentelemetry 0.22.0",
"ordered-float",
"percent-encoding",
"rand 0.8.5",
"thiserror",
]
[[package]]
name = "option-ext"
version = "0.2.0"
@@ -4021,26 +3973,25 @@ dependencies = [
[[package]]
name = "parse-display"
version = "0.8.2"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c6509d08722b53e8dafe97f2027b22ccbe3a5db83cb352931e9716b0aa44bc5c"
checksum = "06af5f9333eb47bd9ba8462d612e37a8328a5cb80b13f0af4de4c3b89f52dee5"
dependencies = [
"once_cell",
"parse-display-derive",
"regex",
"regex-syntax 0.8.2",
]
[[package]]
name = "parse-display-derive"
version = "0.8.2"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68517892c8daf78da08c0db777fcc17e07f2f63ef70041718f8a7630ad84f341"
checksum = "dc9252f259500ee570c75adcc4e317fa6f57a1e47747d622e0bf838002a7b790"
dependencies = [
"once_cell",
"proc-macro2",
"quote",
"regex",
"regex-syntax 0.7.5",
"regex-syntax 0.8.2",
"structmeta",
"syn 2.0.48",
]
@@ -4199,21 +4150,6 @@ dependencies = [
"spki",
]
[[package]]
name = "pkcs5"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e847e2c91a18bfa887dd028ec33f2fe6f25db77db3619024764914affe8b69a6"
dependencies = [
"aes",
"cbc",
"der",
"pbkdf2",
"scrypt",
"sha2",
"spki",
]
[[package]]
name = "pkcs7"
version = "0.4.1"
@@ -4232,8 +4168,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
dependencies = [
"der",
"pkcs5",
"rand_core 0.6.4",
"spki",
]
@@ -4711,12 +4645,6 @@ version = "0.6.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
[[package]]
name = "regex-syntax"
version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
[[package]]
name = "regex-syntax"
version = "0.8.2"
@@ -5074,18 +5002,6 @@ dependencies = [
"sct",
]
[[package]]
name = "rustls-native-certs"
version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
dependencies = [
"openssl-probe",
"rustls-pemfile",
"schannel",
"security-framework",
]
[[package]]
name = "rustls-pemfile"
version = "1.0.4"
@@ -5117,15 +5033,6 @@ version = "1.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
[[package]]
name = "salsa20"
version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213"
dependencies = [
"cipher",
]
[[package]]
name = "same-file"
version = "1.0.6"
@@ -5159,10 +5066,13 @@ version = "0.8.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29"
dependencies = [
"chrono",
"dyn-clone",
"indexmap 1.9.3",
"schemars_derive",
"serde",
"serde_json",
"url",
]
[[package]]
@@ -5209,17 +5119,6 @@ dependencies = [
"syn 2.0.48",
]
[[package]]
name = "scrypt"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f"
dependencies = [
"pbkdf2",
"salsa20",
"sha2",
]
[[package]]
name = "sct"
version = "0.7.1"
@@ -5346,6 +5245,7 @@ version = "1.0.113"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79"
dependencies = [
"indexmap 2.2.2",
"itoa",
"ryu",
"serde",
@@ -5385,9 +5285,9 @@ dependencies = [
[[package]]
name = "serde_with"
version = "3.6.0"
version = "3.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b0ed1662c5a68664f45b76d18deb0e234aff37207086803165c961eb695e981"
checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a"
dependencies = [
"base64 0.21.7",
"chrono",
@@ -5395,6 +5295,7 @@ dependencies = [
"indexmap 1.9.3",
"indexmap 2.2.2",
"serde",
"serde_derive",
"serde_json",
"serde_with_macros",
"time",
@@ -5402,9 +5303,9 @@ dependencies = [
[[package]]
name = "serde_with_macros"
version = "3.6.0"
version = "3.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "568577ff0ef47b879f736cd66740e022f3672788cdf002a05a4e609ea5a6fb15"
checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655"
dependencies = [
"darling",
"proc-macro2",
@@ -5622,9 +5523,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[package]]
name = "structmeta"
version = "0.2.0"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78ad9e09554f0456d67a69c1584c9798ba733a5b50349a6c0d0948710523922d"
checksum = "2e1575d8d40908d70f6fd05537266b90ae71b15dbbe7a8b7dffa2b759306d329"
dependencies = [
"proc-macro2",
"quote",
@@ -5634,9 +5535,9 @@ dependencies = [
[[package]]
name = "structmeta-derive"
version = "0.2.0"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a60bcaff7397072dca0017d1db428e30d5002e00b6847703e2e42005c95fbe00"
checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc"
dependencies = [
"proc-macro2",
"quote",
@@ -5758,18 +5659,18 @@ dependencies = [
[[package]]
name = "thiserror"
version = "1.0.56"
version = "1.0.58"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.56"
version = "1.0.58"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
dependencies = [
"proc-macro2",
"quote",
@@ -6041,7 +5942,6 @@ checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
dependencies = [
"futures-core",
"futures-util",
"hdrhistogram",
"indexmap 1.9.3",
"pin-project",
"pin-project-lite",
@@ -6067,10 +5967,7 @@ dependencies = [
"http",
"http-body",
"http-range-header",
"iri-string",
"pin-project-lite",
"tokio",
"tower",
"tower-layer",
"tower-service",
]
@@ -6161,8 +6058,8 @@ checksum = "c67ac25c5407e7b961fafc6f7e9aa5958fd297aada2d20fa2ae1737357e55596"
dependencies = [
"js-sys",
"once_cell",
"opentelemetry",
"opentelemetry_sdk",
"opentelemetry 0.21.0",
"opentelemetry_sdk 0.21.2",
"smallvec",
"tracing",
"tracing-core",
@@ -6171,6 +6068,22 @@ dependencies = [
"web-time 0.2.4",
]
[[package]]
name = "tracing-opentelemetry"
version = "0.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a9be14ba1bbe4ab79e9229f7f89fab8d120b865859f10527f31c033e599d2284"
dependencies = [
"js-sys",
"once_cell",
"opentelemetry 0.22.0",
"opentelemetry_sdk 0.22.1",
"tracing",
"tracing-core",
"tracing-subscriber",
"web-time 1.0.0",
]
[[package]]
name = "tracing-subscriber"
version = "0.3.18"
@@ -6381,7 +6294,6 @@ dependencies = [
"serde",
"syn 2.0.48",
"toml 0.5.11",
"uniffi_build",
"uniffi_meta",
]

2
crates/matrix-sdk/Cargo.toml
View File

@@ -86,7 +86,7 @@ imbl = { workspace = true, features = ["serde"] }
indexmap = "2.0.2"
js_int = "0.2.2"
language-tags = { version = "0.3.2", optional = true }
mas-oidc-client = { version = "0.7.0", optional = true }
mas-oidc-client = { git = "https://github.com/matrix-org/matrix-authentication-service", rev = "099eabd1371d2840a2f025a6372d6428039eb511", default-features = false, optional = true }
matrix-sdk-base = { workspace = true, features = ["uniffi"] }
matrix-sdk-common = { workspace = true }
matrix-sdk-indexeddb = { workspace = true, optional = true }