diff --git a/src/api/v1/forgejo.rs b/src/api/v1/forgejo.rs index 8fa9b9c..79c6a98 100644 --- a/src/api/v1/forgejo.rs +++ b/src/api/v1/forgejo.rs @@ -184,7 +184,7 @@ mod tests { assert_eq!(hook, response); let list_all_webhooks_resp = - get_request!(&app, &V1_API_ROUTES.forgejo.list_webhooks, cookies.clone()); + get_request!(&app, V1_API_ROUTES.forgejo.list_webhooks, cookies.clone()); check_status!(list_all_webhooks_resp, StatusCode::OK); let hooks: Vec = actix_web::test::read_body_json(list_all_webhooks_resp).await; @@ -201,7 +201,7 @@ mod tests { let body = body.as_bytes(); let mut mac = HmacSha256::new_from_slice(hook.forgejo_webhook_secret.as_bytes()) .expect("HMAC can take key of any size"); - mac.update(&body); + mac.update(body); let res = mac.finalize(); let sig = res.into_bytes(); let sig = hex::encode(&sig[..]); @@ -227,7 +227,7 @@ mod tests { let body = body.as_bytes(); let mut mac = HmacSha256::new_from_slice(b"nosecret").expect("HMAC can take key of any size"); - mac.update(&body); + mac.update(body); let res = mac.finalize(); let fake_sig = res.into_bytes(); let fake_sig = hex::encode(&fake_sig[..]); @@ -257,7 +257,7 @@ mod tests { let body = body.as_bytes(); let mut mac = HmacSha256::new_from_slice(hook.forgejo_webhook_secret.as_bytes()) .expect("HMAC can take key of any size"); - mac.update(&body); + mac.update(body); let res = mac.finalize(); let sig = res.into_bytes(); let sig = hex::encode(&sig[..]); diff --git a/src/ctx/api/v1/forgejo.rs b/src/ctx/api/v1/forgejo.rs index e74704a..bc8c9ab 100644 --- a/src/ctx/api/v1/forgejo.rs +++ b/src/ctx/api/v1/forgejo.rs @@ -160,7 +160,7 @@ impl Ctx { let sig = hex::decode(sig).unwrap(); let event_type = headers.get("X-Gitea-Event").unwrap(); - let payload: WebhookPayload = serde_json::from_slice(&body).unwrap(); + let payload: WebhookPayload = serde_json::from_slice(body).unwrap(); let hook = self.db.get_webhook(auth_token).await?; @@ -171,7 +171,7 @@ impl Ctx { ] { if self.db.site_with_repository_exists(url).await? { let mut mac = HmacSha256::new_from_slice(hook.forgejo_webhook_secret.as_bytes())?; - mac.update(&body); + mac.update(body); mac.verify_slice(&sig[..])?; let site = self.db.get_site_from_repo_url(url).await?; diff --git a/src/pages/dash/forgejo/add.rs b/src/pages/dash/forgejo/add.rs index 967e016..9448b3f 100644 --- a/src/pages/dash/forgejo/add.rs +++ b/src/pages/dash/forgejo/add.rs @@ -170,7 +170,7 @@ mod tests { let resp = get_request!(&app, PAGES.dash.forgejo_webhook.list, cookies.clone()); assert_eq!(resp.status(), StatusCode::OK); let res = String::from_utf8(test::read_body(resp).await.to_vec()).unwrap(); - assert!(res.contains(&hook.forgejo_url.as_str())); + assert!(res.contains(hook.forgejo_url.as_str())); // view webhook let resp = get_request!(&app, &view_webhook_url, cookies.clone()); diff --git a/src/pages/dash/forgejo/list.rs b/src/pages/dash/forgejo/list.rs index f5aed37..6e0eb37 100644 --- a/src/pages/dash/forgejo/list.rs +++ b/src/pages/dash/forgejo/list.rs @@ -18,7 +18,7 @@ use std::cell::RefCell; use actix_identity::Identity; use actix_web::http::header::ContentType; -use serde::{Deserialize, Serialize}; + use tera::Context; use super::get_auth_middleware; diff --git a/src/pages/dash/forgejo/view.rs b/src/pages/dash/forgejo/view.rs index a9f8e43..2d4bc5d 100644 --- a/src/pages/dash/forgejo/view.rs +++ b/src/pages/dash/forgejo/view.rs @@ -20,12 +20,9 @@ use actix_identity::Identity; use actix_web::http::header::ContentType; use serde::{Deserialize, Serialize}; use tera::Context; -use uuid::Uuid; use super::get_auth_middleware; -use crate::db::Site; -use crate::pages::dash::TemplateSiteEvent; use crate::pages::errors::*; use crate::settings::Settings; use crate::AppCtx;