matrix/authentication-service
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-08-07 17:03:01 +03:00
Code Activity

Fix the native-certs (and therefore docker) build

Browse Source
This commit is contained in:
Quentin Gliech
2024-02-02 14:06:17 +01:00
parent aeca03a120
commit d20b0dc81d
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/cli/Cargo.toml
View File

@@ -56,8 +56,8 @@ mas-config.workspace = true
mas-data-model.workspace = true mas-data-model.workspace = true
mas-email.workspace = true mas-email.workspace = true
mas-graphql.workspace = true mas-graphql.workspace = true
mas-handlers = { workspace = true, default-features = false } mas-handlers = { workspace = true }
mas-http = { workspace = true, default-features = false, features = ["axum", "client"] } mas-http = { workspace = true, features = ["axum", "client"] }
mas-i18n.workspace = true mas-i18n.workspace = true
mas-iana.workspace = true mas-iana.workspace = true
mas-keystore.workspace = true mas-keystore.workspace = true

6
crates/handlers/Cargo.toml
View File

@@ -68,10 +68,10 @@ rand_chacha = "0.3.1"
headers = "0.3.9" headers = "0.3.9"
ulid.workspace = true ulid.workspace = true
mas-axum-utils = { workspace = true, default-features = false } mas-axum-utils.workspace = true
mas-data-model.workspace = true mas-data-model.workspace = true
mas-graphql.workspace = true mas-graphql.workspace = true
mas-http = { workspace = true, default-features = false } mas-http.workspace = true
mas-i18n.workspace = true mas-i18n.workspace = true
mas-iana.workspace = true mas-iana.workspace = true
mas-jose.workspace = true mas-jose.workspace = true
@@ -92,8 +92,6 @@ tracing-subscriber.workspace = true
cookie_store = "0.20.0" cookie_store = "0.20.0"
[features] [features]
default = ["webpki-roots"]
# Use the native root certificates # Use the native root certificates
native-roots = ["mas-axum-utils/native-roots", "mas-http/native-roots"] native-roots = ["mas-axum-utils/native-roots", "mas-http/native-roots"]
# Use the webpki root certificates # Use the webpki root certificates

3
crates/http/src/client.rs
View File

@@ -43,8 +43,7 @@ fn load_tls_roots_blocking() -> Result<rustls::RootCertStore, NativeRootsLoadErr
let mut roots = rustls::RootCertStore::empty(); let mut roots = rustls::RootCertStore::empty();
let certs = rustls_native_certs::load_native_certs()?; let certs = rustls_native_certs::load_native_certs()?;
for cert in certs { for cert in certs {
let cert = rustls::Certificate(cert.0); roots.add(cert)?;
roots.add(&cert)?;
} }
if roots.is_empty() { if roots.is_empty() {