matrix/authentication-service
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-11-20 12:02:22 +03:00
Code Activity

Add a dedicated keystore crate

Browse Source
This commit is contained in:
Quentin Gliech
2022-08-31 18:25:20 +02:00
parent 768c48234a
commit e1d50b818e
49 changed files with 1455 additions and 819 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
crates/handlers/src/lib.rs
View File

@@ -33,7 +33,7 @@ use hyper::header::{ACCEPT, ACCEPT_LANGUAGE, AUTHORIZATION, CONTENT_LANGUAGE, CO
use mas_config::{Encrypter, MatrixConfig};
use mas_email::Mailer;
use mas_http::CorsLayerExt;
use mas_jose::StaticKeystore;
use mas_keystore::Keystore;
use mas_policy::PolicyFactory;
use mas_router::{Route, UrlBuilder};
use mas_templates::{ErrorContext, Templates};
@@ -56,7 +56,7 @@ mod views;
pub fn router<B>(
pool: &PgPool,
templates: &Templates,
key_store: &Arc<StaticKeystore>,
key_store: &Keystore,
encrypter: &Encrypter,
mailer: &Mailer,
url_builder: &UrlBuilder,
@@ -251,12 +251,8 @@ async fn test_router(pool: &PgPool) -> Result<Router, anyhow::Error> {
let templates_config = TemplatesConfig::default();
let templates = Templates::load_from_config(&templates_config).await?;
let key_store = {
let mut k = StaticKeystore::new();
k.add_test_rsa_key()?;
k.add_test_ecdsa_key()?;
Arc::new(k)
};
// TODO: add test keys to the store
let key_store = Keystore::default();
let encrypter = Encrypter::new(&[0x42; 32]);