alarsyo/lohr
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

lohr: upgrade to latest Rocket master

Browse source
This commit is contained in:
Antoine Martin 2021-06-04 17:31:00 +02:00
parent fd50523f11
commit 1f6fe74d03
4 changed files with 175 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main.rs
View file

@ -30,8 +30,8 @@ struct Secret(String);
#[post("/", data = "<payload>")]
fn gitea_webhook(
payload: SignedJson<GiteaWebHook>,
sender: State<JobSender>,
config: State<GlobalSettings>,
sender: &State<JobSender>,
config: &State<GlobalSettings>,
) -> Status {
if config
.blacklist
@ -121,7 +121,7 @@ async fn main() -> anyhow::Result<()> {
repo_updater(receiver, homedir, config);
});
rocket::ignite()
rocket::build()
.mount("/", routes![gitea_webhook])
.manage(JobSender(Mutex::new(sender)))
.manage(Secret(secret))

4
src/signature.rs
View file

@ -8,7 +8,7 @@ use rocket::{
http::ContentType,
State,
};
use rocket::{http::Status, local_cache};
use rocket::{http::Status, request::local_cache};
use rocket::{Data, Request};
use anyhow::{anyhow, Context};
@ -100,7 +100,7 @@ where
};
let signature = signatures[0];
let secret = request.guard::<State<Secret>>().await.unwrap();
let secret = request.guard::<&State<Secret>>().await.unwrap();
if !validate_signature(&secret.0, &signature, &content) {
return Outcome::Failure((Status::BadRequest, anyhow!("couldn't verify signature")));