chore(api): improve security domain test coverage and refactor legacy api extensions

Author: azasypkin

src/security/api_ext.rs

@@ -42,8 +42,8 @@ pub async fn certificate_templates_list(
 ) -> Result<HttpResponse, Error> {
     let templates = state
         .api
-        .certificates()
-        .get_certificate_templates(user.id)
+        .certificates(&user)
+        .get_certificate_templates()
         .await?;
     Ok(HttpResponse::Ok().json(templates))
 }
@@ -77,9 +77,9 @@ pub async fn certificate_templates_get(
     )
     .await?;
 
-    let certificates = state.api.certificates();
+    let certificates = state.api.certificates(&user);
     let Some(template) = certificates
-        .get_certificate_template(user.id, path.template_id)
+        .get_certificate_template(path.template_id)
         .await?
     else {
         return Err(Error::not_found("Certificate template not found."));
@@ -119,8 +119,8 @@ pub async fn certificate_templates_create(
 ) -> Result<HttpResponse, Error> {
     let template = state
         .api
-        .certificates()
-        .create_certificate_template(user.id, body.into_inner())
+        .certificates(&user)
+        .create_certificate_template(body.into_inner())
         .await?;
     Ok(HttpResponse::Created().json(template))
 }
@@ -145,8 +145,8 @@ pub async fn certificate_templates_update(
 ) -> Result<HttpResponse, Error> {
     state
         .api
-        .certificates()
-        .update_certificate_template(user.id, path.template_id, body.into_inner())
+        .certificates(&user)
+        .update_certificate_template(path.template_id, body.into_inner())
         .await?;
     Ok(HttpResponse::NoContent().finish())
 }
@@ -169,8 +169,8 @@ pub async fn certificate_templates_delete(
 ) -> Result<HttpResponse, Error> {
     state
         .api
-        .certificates()
-        .remove_certificate_template(user.id, path.template_id)
+        .certificates(&user)
+        .remove_certificate_template(path.template_id)
         .await?;
     Ok(HttpResponse::NoContent().finish())
 }
@@ -206,8 +206,8 @@ pub async fn certificate_templates_generate(
 
     let data = state
         .api
-        .certificates()
-        .generate_self_signed_certificate(user.id, path.template_id, body.into_inner())
+        .certificates(&user)
+        .generate_self_signed_certificate(path.template_id, body.into_inner())
         .await?;
     Ok(HttpResponse::Ok().json(data))
 }
@@ -230,8 +230,8 @@ pub async fn certificate_templates_share(
 ) -> Result<HttpResponse, Error> {
     let user_share = state
         .api
-        .certificates()
-        .share_certificate_template(user.id, path.template_id)
+        .certificates(&user)
+        .share_certificate_template(path.template_id)
         .await
         .map(ClientUserShare::from)?;
     Ok(HttpResponse::Ok().json(user_share))
@@ -254,8 +254,8 @@ pub async fn certificate_templates_unshare(
 ) -> Result<HttpResponse, Error> {
     state
         .api
-        .certificates()
-        .unshare_certificate_template(user.id, path.template_id)
+        .certificates(&user)
+        .unshare_certificate_template(path.template_id)
         .await?;
     Ok(HttpResponse::NoContent().finish())
 }
@@ -276,10 +276,9 @@ pub async fn certificates_fetch(
     user: User,
     body: web::Json<TemplatesFetchCertificatesParams>,
 ) -> Result<HttpResponse, Error> {
-    let _ = user; // authenticated but not used for this operation
     let certs = state
         .api
-        .certificates()
+        .certificates(&user)
         .get_peer_certificates(&body.url)
         .await?;
     Ok(HttpResponse::Ok().json(certs))

src/server/handlers/certificate_templates.rs

@@ -39,8 +39,8 @@ pub struct ContentSecurityPolicyGetResponse {
 pub async fn csp_list(state: web::Data<AppState>, user: User) -> Result<HttpResponse, Error> {
     let policies = state
         .api
-        .web_security()
-        .get_content_security_policies(user.id)
+        .web_security(&user)
+        .get_content_security_policies()
         .await?;
     Ok(HttpResponse::Ok().json(policies))
 }
@@ -74,9 +74,9 @@ pub async fn csp_get(
     )
     .await?;
 
-    let web_security = state.api.web_security();
+    let web_security = state.api.web_security(&user);
     let Some(policy) = web_security
-        .get_content_security_policy(user.id, path.policy_id)
+        .get_content_security_policy(path.policy_id)
         .await?
     else {
         return Err(Error::not_found("Content security policy not found."));
@@ -113,8 +113,8 @@ pub async fn csp_create(
 ) -> Result<HttpResponse, Error> {
     let policy = state
         .api
-        .web_security()
-        .create_content_security_policy(user.id, body.into_inner())
+        .web_security(&user)
+        .create_content_security_policy(body.into_inner())
         .await?;
     Ok(HttpResponse::Created().json(policy))
 }
@@ -139,8 +139,8 @@ pub async fn csp_update(
 ) -> Result<HttpResponse, Error> {
     state
         .api
-        .web_security()
-        .update_content_security_policy(user.id, path.policy_id, body.into_inner())
+        .web_security(&user)
+        .update_content_security_policy(path.policy_id, body.into_inner())
         .await?;
     Ok(HttpResponse::NoContent().finish())
 }
@@ -163,8 +163,8 @@ pub async fn csp_delete(
 ) -> Result<HttpResponse, Error> {
     state
         .api
-        .web_security()
-        .remove_content_security_policy(user.id, path.policy_id)
+        .web_security(&user)
+        .remove_content_security_policy(path.policy_id)
         .await?;
     Ok(HttpResponse::NoContent().finish())
 }
@@ -200,8 +200,8 @@ pub async fn csp_serialize(
 
     let data = state
         .api
-        .web_security()
-        .serialize_content_security_policy(user.id, path.policy_id, body.into_inner())
+        .web_security(&user)
+        .serialize_content_security_policy(path.policy_id, body.into_inner())
         .await?;
     Ok(HttpResponse::Ok().json(data))
 }
@@ -224,8 +224,8 @@ pub async fn csp_share(
 ) -> Result<HttpResponse, Error> {
     let user_share = state
         .api
-        .web_security()
-        .share_content_security_policy(user.id, path.policy_id)
+        .web_security(&user)
+        .share_content_security_policy(path.policy_id)
         .await
         .map(ClientUserShare::from)?;
     Ok(HttpResponse::Ok().json(user_share))
@@ -248,8 +248,8 @@ pub async fn csp_unshare(
 ) -> Result<HttpResponse, Error> {
     state
         .api
-        .web_security()
-        .unshare_content_security_policy(user.id, path.policy_id)
+        .web_security(&user)
+        .unshare_content_security_policy(path.policy_id)
         .await?;
     Ok(HttpResponse::NoContent().finish())
 }

src/server/handlers/content_security_policies.rs

@@ -28,7 +28,7 @@ pub async fn private_keys_list(
     state: web::Data<AppState>,
     user: User,
 ) -> Result<HttpResponse, Error> {
-    let keys = state.api.certificates().get_private_keys(user.id).await?;
+    let keys = state.api.certificates(&user).get_private_keys().await?;
     Ok(HttpResponse::Ok().json(keys))
 }
 
@@ -50,8 +50,8 @@ pub async fn private_keys_get(
 ) -> Result<HttpResponse, Error> {
     let Some(key) = state
         .api
-        .certificates()
-        .get_private_key(user.id, path.key_id)
+        .certificates(&user)
+        .get_private_key(path.key_id)
         .await?
     else {
         return Err(Error::not_found("Private key not found."));
@@ -78,8 +78,8 @@ pub async fn private_keys_create(
 ) -> Result<HttpResponse, Error> {
     let key = state
         .api
-        .certificates()
-        .create_private_key(user.id, body.into_inner())
+        .certificates(&user)
+        .create_private_key(body.into_inner())
         .await?;
     Ok(HttpResponse::Created().json(key))
 }
@@ -104,8 +104,8 @@ pub async fn private_keys_update(
 ) -> Result<HttpResponse, Error> {
     state
         .api
-        .certificates()
-        .update_private_key(user.id, path.key_id, body.into_inner())
+        .certificates(&user)
+        .update_private_key(path.key_id, body.into_inner())
         .await?;
     Ok(HttpResponse::NoContent().finish())
 }
@@ -128,8 +128,8 @@ pub async fn private_keys_delete(
 ) -> Result<HttpResponse, Error> {
     state
         .api
-        .certificates()
-        .remove_private_key(user.id, path.key_id)
+        .certificates(&user)
+        .remove_private_key(path.key_id)
         .await?;
     Ok(HttpResponse::NoContent().finish())
 }
@@ -154,8 +154,8 @@ pub async fn private_keys_export(
 ) -> Result<HttpResponse, Error> {
     let data = state
         .api
-        .certificates()
-        .export_private_key(user.id, path.key_id, body.into_inner())
+        .certificates(&user)
+        .export_private_key(path.key_id, body.into_inner())
         .await?;
     Ok(HttpResponse::Ok().json(data))
 }