server: update various dependencies

server/src/domain/handler.rs

@@ -211,6 +211,8 @@ mockall::mock! {
 
 #[cfg(test)]
 mod tests {
+    use base64::Engine;
+
     use super::*;
     #[test]
     fn test_uuid_time() {
@@ -233,7 +235,9 @@ mod tests {
     #[test]
     fn test_jpeg_try_from_bytes() {
         let base64_raw = "/9j/4AAQSkZJRgABAQEASABIAAD/2wBDAP//////////////////////////////////////////////////////////////////////////////////////2wBDAf//////////////////////////////////////////////////////////////////////////////////////wAARCADqATkDASIAAhEBAxEB/8QAFwABAQEBAAAAAAAAAAAAAAAAAAECA//EACQQAQEBAAIBBAMBAQEBAAAAAAABESExQQISUXFhgZGxocHw/8QAFQEBAQAAAAAAAAAAAAAAAAAAAAH/xAAWEQEBAQAAAAAAAAAAAAAAAAAAEQH/2gAMAwEAAhEDEQA/AMriLyCKgg1gQwCgs4FTMOdutepjQak+FzMSVqgxZdRdPPIIvH5WzzGdBriphtTeAXg2ZjKA1pqKDUGZca3foBek8gFv8Ie3fKdA1qb8s7hoL6eLVt51FsAnql3Ut1M7AWbflLMDkEMX/F6/YjK/pADFQAUNA6alYagKk72m/j9p4Bq2fDDSYKLNXPNLoHE/NT6RYC31cJxZ3yWVM+aBYi/S2ZgiAsnYJx5D21vPmqrm3PTfpQQwyAC8JZvSKDni41ZrMuUVVl+Uz9w9v/1QWrZsZ5nFPHYH+JZyureQSF5M+fJ0CAfwRAVRBQA1DAWVUayoJUWoDpsxntPsueBV4+VxhdyAtv8AjOLGpIDMLbeGvbF4iozJfr/WukAVABAXAQXEAAASzVAZdO2WNordm+emFl7XcQSNZiFtv0C9w90nhJf4mA1u+GcJFwIyAqL/AOovwgGNfSRqdIrNa29M0gKCAojU9PAMjWXpckEJFNFEAAXEUBABYz6rZ0ureQc9vyt9XxDF2QAXtABcQAs0AZywkvluJbyipifas52DcyxjlZweAO0xri/hc+wZOEKIu6nSyeToVZyWXwvCg53gW81QQ7aTNAn5dGZJPs1UXURQAUEMCXQLZE93PRZ5hPTgNMrbIzKCm52LZwCs+2M8w2g3sjPuZAXb4IsMAUACzVUGM4/K+md6vEXUUyM5PDR0IxYe6ramih0VNBrS4xoqN8Q1BFQk3yqyAsioioAAKgDSJL4/jQIn5igLrPqtOuf6oOaxbMoAltUAhhIoJiiggrPu+AaOIxtAX3JbaAIaLwi4t9X4T3fg2AFtqcrUUarP20zUDAmqoE0WRBZPNVUVEAAAAVAC8kvih2DSKxOdBqs7Z0l0gI0mKAC4AuHE7ZtBriM+744QAAAAABAFsveIttBICyaikvy1+r/Cen5rWQHIBQa4rIDRqSl5qDWqziqgAAAATA7BpGdqXb2C2+J/UgAtRQBSQtkBWb6vhLbQAAAAAEBRAAAAAUbm+GZNdPxAP+ql2Tjwx7/wIgZ8iKvBk+CJoCXii9gaqZ/qqihAAAEVABGkBFUwBftNkZ3QW34QAAABFAQAVAAAAAARVkl8gs/43sk1jL45LvHArepk+E9XTG35oLqsmIKmLAEygKg0y1AFQBUXwgAAAoBC34S3UAAABAVAAAAAABAUQAVABdRQa1PcYyit2z58M8C4ouM2NXpOEGeWtNZUatiAIoAKIoCoAoG4C9MW6dgIoAIAAAAAAACKWAgL0CAAAALiANCKioNLgM1CrLihmTafkt1EF3SZ5ZVUW4mnIKvAi5fhEURVDWVQBRAAAAAAAAQFRVyAyulgAqCKlF8IqLsEgC9mGoC+IusqCrv5ZEUVOk1RuJfwSLOOkGFi4XPCoYYrNiKauosBGi9ICstM1UAAAAAAFQ0VcTBAXUGgIqGoKhKAzRRUQUAwxoSrGRpkQA/qiosOL9oJptMRRVZa0VUqSiChE6BqMgCwqKqIogAIAqKCKgKoogg0lBFuIKgAAAKNRlf2gqsftsEtZWoAAqAACKoMqAAeSoqp39kL2AqLOlE8rEBFQARYALhigrNC9gGmooLp4TweEQFFBFAECgIoAu0ifIAqAAA//9k=";
-        let base64_jpeg = base64::decode(base64_raw).unwrap();
+        let base64_jpeg = base64::engine::general_purpose::STANDARD
+            .decode(base64_raw)
+            .unwrap();
         JpegPhoto::try_from(base64_jpeg).unwrap();
     }
 }

server/src/domain/sql_opaque_handler.rs

@@ -7,6 +7,7 @@ use super::{
     types::UserId,
 };
 use async_trait::async_trait;
+use base64::Engine;
 use lldap_auth::opaque;
 use sea_orm::{ActiveModelTrait, ActiveValue, EntityTrait, QuerySelect};
 use secstr::SecUtf8;
@@ -129,7 +130,7 @@ impl OpaqueHandler for SqlOpaqueHandler {
         let encrypted_state = orion::aead::seal(&secret_key, &bincode::serialize(&server_data)?)?;
 
         Ok(login::ServerLoginStartResponse {
-            server_data: base64::encode(encrypted_state),
+            server_data: base64::engine::general_purpose::STANDARD.encode(encrypted_state),
             credential_response: start_response.message,
         })
     }
@@ -142,7 +143,7 @@ impl OpaqueHandler for SqlOpaqueHandler {
             server_login,
         } = bincode::deserialize(&orion::aead::open(
             &secret_key,
-            &base64::decode(&request.server_data)?,
+            &base64::engine::general_purpose::STANDARD.decode(&request.server_data)?,
         )?)?;
         // Finish the login: this makes sure the client data is correct, and gives a session key we
         // don't need.
@@ -170,7 +171,7 @@ impl OpaqueHandler for SqlOpaqueHandler {
         };
         let encrypted_state = orion::aead::seal(&secret_key, &bincode::serialize(&server_data)?)?;
         Ok(registration::ServerRegistrationStartResponse {
-            server_data: base64::encode(encrypted_state),
+            server_data: base64::engine::general_purpose::STANDARD.encode(encrypted_state),
             registration_response: start_response.message,
         })
     }
@@ -183,7 +184,7 @@ impl OpaqueHandler for SqlOpaqueHandler {
         let secret_key = self.get_orion_secret_key()?;
         let registration::ServerData { username } = bincode::deserialize(&orion::aead::open(
             &secret_key,
-            &base64::decode(&request.server_data)?,
+            &base64::engine::general_purpose::STANDARD.decode(&request.server_data)?,
         )?)?;
 
         let password_file =

server/src/domain/types.rs

@@ -1,3 +1,4 @@
+use base64::Engine;
 use chrono::{NaiveDateTime, TimeZone};
 use sea_orm::{
     entity::IntoActiveValue,
@@ -224,13 +225,15 @@ impl TryFrom<String> for JpegPhoto {
     type Error = anyhow::Error;
     fn try_from(string: String) -> anyhow::Result<Self> {
         // The String format is in base64.
-        <Self as TryFrom<_>>::try_from(base64::decode(string.as_str())?)
+        <Self as TryFrom<_>>::try_from(
+            base64::engine::general_purpose::STANDARD.decode(string.as_str())?,
+        )
     }
 }
 
 impl From<&JpegPhoto> for String {
     fn from(val: &JpegPhoto) -> Self {
-        base64::encode(&val.0)
+        base64::engine::general_purpose::STANDARD.encode(&val.0)
     }
 }
 

server/src/infra/graphql/mutation.rs

@@ -12,6 +12,7 @@ use crate::{
     },
 };
 use anyhow::Context as AnyhowContext;
+use base64::Engine;
 use juniper::{graphql_object, FieldResult, GraphQLInputObject, GraphQLObject};
 use tracing::{debug, debug_span, Instrument};
 
@@ -89,7 +90,7 @@ impl<Handler: BackendHandler> Mutation<Handler> {
         let user_id = UserId::new(&user.id);
         let avatar = user
             .avatar
-            .map(base64::decode)
+            .map(|bytes| base64::engine::general_purpose::STANDARD.decode(bytes))
             .transpose()
             .context("Invalid base64 image")?
             .map(JpegPhoto::try_from)
@@ -146,7 +147,7 @@ impl<Handler: BackendHandler> Mutation<Handler> {
             .ok_or_else(field_error_callback(&span, "Unauthorized user update"))?;
         let avatar = user
             .avatar
-            .map(base64::decode)
+            .map(|bytes| base64::engine::general_purpose::STANDARD.decode(bytes))
             .transpose()
             .context("Invalid base64 image")?
             .map(JpegPhoto::try_from)

server/src/infra/tcp_server.rs

@@ -18,7 +18,7 @@ use actix_server::ServerBuilder;
 use actix_service::map_config;
 use actix_web::{dev::AppConfig, web, App, HttpResponse};
 use anyhow::{Context, Result};
-use hmac::{Hmac, NewMac};
+use hmac::Hmac;
 use sha2::Sha512;
 use std::collections::HashSet;
 use std::path::PathBuf;
@@ -80,7 +80,7 @@ fn http_config<Backend>(
     let enable_password_reset = mail_options.enable_password_reset;
     cfg.app_data(web::Data::new(AppState::<Backend> {
         backend_handler: AccessControlledBackendHandler::new(backend_handler),
-        jwt_key: Hmac::new_varkey(jwt_secret.unsecure().as_bytes()).unwrap(),
+        jwt_key: hmac::Mac::new_from_slice(jwt_secret.unsecure().as_bytes()).unwrap(),
         jwt_blacklist: RwLock::new(jwt_blacklist),
         server_url,
         mail_options,