Improve secret handling and add tests
Instead of a string `receive_hook` returns a `Response` now. Some rudimentary tests were added.
This commit is contained in:
parent
e052af5114
commit
12c3b12c31
1 changed files with 89 additions and 9 deletions
98
src/main.rs
98
src/main.rs
|
@ -3,7 +3,7 @@
|
||||||
use anyhow::{anyhow, bail, Result};
|
use anyhow::{anyhow, bail, Result};
|
||||||
use log::{debug, info, trace, warn};
|
use log::{debug, info, trace, warn};
|
||||||
use regex::Regex;
|
use regex::Regex;
|
||||||
use rocket::{fairing::AdHoc, get, post, routes, State};
|
use rocket::{fairing::AdHoc, get, http::Status, post, routes, Response, State};
|
||||||
use rocket_contrib::json::Json;
|
use rocket_contrib::json::Json;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
@ -85,14 +85,15 @@ fn execute_hook(name: &str, hook: &Hook, data: &serde_json::Value) -> Result<()>
|
||||||
}
|
}
|
||||||
|
|
||||||
#[post("/", format = "json", data = "<data>")]
|
#[post("/", format = "json", data = "<data>")]
|
||||||
fn receive_hook(address: SocketAddr, config: State<Config>, data: Json<Data>) -> Result<String> {
|
fn receive_hook(address: SocketAddr, config: State<Config>, data: Json<Data>) -> Result<Response> {
|
||||||
info!("POST request received from: {}", address);
|
info!("Post request received from: {}", address);
|
||||||
|
|
||||||
|
let mut response = Response::new();
|
||||||
let data = serde_json::to_value(data.0)?;
|
let data = serde_json::to_value(data.0)?;
|
||||||
|
|
||||||
trace!("Data received from: {}\n{}", address, data);
|
trace!("Data received from: {}\n{}", address, data);
|
||||||
|
|
||||||
if let Some(secret) = data.pointer("secret") {
|
if let Some(secret) = data.pointer("/secret") {
|
||||||
if let Some(secret) = secret.as_str() {
|
if let Some(secret) = secret.as_str() {
|
||||||
let hooks: HashMap<&String, &Hook> = config
|
let hooks: HashMap<&String, &Hook> = config
|
||||||
.hooks
|
.hooks
|
||||||
|
@ -101,16 +102,23 @@ fn receive_hook(address: SocketAddr, config: State<Config>, data: Json<Data>) ->
|
||||||
.collect();
|
.collect();
|
||||||
|
|
||||||
if hooks.is_empty() {
|
if hooks.is_empty() {
|
||||||
warn!("Secret did not match any hook");
|
warn!("Secret from {} did not match any hook", address);
|
||||||
|
response.set_status(Status::Unauthorized);
|
||||||
} else {
|
} else {
|
||||||
for (hook_name, hook) in hooks {
|
for (hook_name, hook) in hooks {
|
||||||
execute_hook(&hook_name, &hook, &data)?;
|
execute_hook(&hook_name, &hook, &data)?;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
warn!("Data received from {} contains invalid data", address);
|
||||||
|
response.set_status(Status::BadRequest);
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
warn!("Data received from {} did not contain a secret", address);
|
||||||
|
response.set_status(Status::NotFound);
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok("Request received.".to_string())
|
Ok(response)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_config() -> Result<File> {
|
fn get_config() -> Result<File> {
|
||||||
|
@ -145,9 +153,7 @@ fn get_config() -> Result<File> {
|
||||||
fn main() -> Result<()> {
|
fn main() -> Result<()> {
|
||||||
env_logger::init();
|
env_logger::init();
|
||||||
|
|
||||||
let config = get_config()?;
|
let config: Config = serde_yaml::from_reader(BufReader::new(get_config()?))?;
|
||||||
|
|
||||||
let config: Config = serde_yaml::from_reader(BufReader::new(config))?;
|
|
||||||
|
|
||||||
trace!("Parsed configuration:\n{}", serde_yaml::to_string(&config)?);
|
trace!("Parsed configuration:\n{}", serde_yaml::to_string(&config)?);
|
||||||
|
|
||||||
|
@ -160,3 +166,77 @@ fn main() -> Result<()> {
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
use rocket::{http::ContentType, local::Client};
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn index() {
|
||||||
|
let rocket = rocket::ignite().mount("/", routes![index]);
|
||||||
|
|
||||||
|
let client = Client::new(rocket).unwrap();
|
||||||
|
let mut response = client.get("/").dispatch();
|
||||||
|
|
||||||
|
assert_eq!(response.status(), Status::Ok);
|
||||||
|
assert_eq!(response.body_string(), Some("Hello, webhookey!".into()));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn secret() {
|
||||||
|
let mut hooks = HashMap::new();
|
||||||
|
hooks.insert(
|
||||||
|
"test_hook".to_string(),
|
||||||
|
Hook {
|
||||||
|
action: None,
|
||||||
|
secrets: vec!["valid".to_string()],
|
||||||
|
filters: HashMap::new(),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
let config = Config { hooks: hooks };
|
||||||
|
|
||||||
|
let rocket = rocket::ignite()
|
||||||
|
.mount("/", routes![receive_hook])
|
||||||
|
.attach(AdHoc::on_attach("webhookey config", move |rocket| {
|
||||||
|
Ok(rocket.manage(config))
|
||||||
|
}));
|
||||||
|
|
||||||
|
let client = Client::new(rocket).unwrap();
|
||||||
|
let response = client
|
||||||
|
.post("/")
|
||||||
|
.header(ContentType::JSON)
|
||||||
|
.remote("127.0.0.1:8000".parse().unwrap())
|
||||||
|
.body(r#"{ "secret": "valid" }"#)
|
||||||
|
.dispatch();
|
||||||
|
|
||||||
|
assert_eq!(response.status(), Status::Ok);
|
||||||
|
|
||||||
|
let response = client
|
||||||
|
.post("/")
|
||||||
|
.header(ContentType::JSON)
|
||||||
|
.remote("127.0.0.1:8000".parse().unwrap())
|
||||||
|
.body(r#"{ "secret": "invalid" }"#)
|
||||||
|
.dispatch();
|
||||||
|
|
||||||
|
assert_eq!(response.status(), Status::Unauthorized);
|
||||||
|
|
||||||
|
let response = client
|
||||||
|
.post("/")
|
||||||
|
.header(ContentType::JSON)
|
||||||
|
.remote("127.0.0.1:8000".parse().unwrap())
|
||||||
|
.body(r#"{ "not_secret": "invalid" }"#)
|
||||||
|
.dispatch();
|
||||||
|
|
||||||
|
assert_eq!(response.status(), Status::NotFound);
|
||||||
|
|
||||||
|
let response = client
|
||||||
|
.post("/")
|
||||||
|
.header(ContentType::JSON)
|
||||||
|
.remote("127.0.0.1:8000".parse().unwrap())
|
||||||
|
.body(r#"{ "not_secret": "invalid" "#)
|
||||||
|
.dispatch();
|
||||||
|
|
||||||
|
assert_eq!(response.status(), Status::BadRequest);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue