finga/webhookey
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases Wiki Activity

Fix matching numbers against the regex

Browse source 
Still, `Null`, `Bool`, `Array` and `Object` types are
unmatchable. Work TBD...
This commit is contained in:
finga 2021-04-13 16:55:13 +02:00
parent 7f143e0b08
commit ea3121a985
1 changed files with 26 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/main.rs
View file

@ -189,6 +189,15 @@ fn replace_parameter(input: &str, headers: &HeaderMap, data: &serde_json::Value)
Ok(result.join(""))
}
fn number_to_string(number: &serde_json::Number) -> String {
if number.is_f64() {
return number.as_f64().unwrap().to_string();
} else if number.is_i64() {
return number.as_i64().unwrap().to_string();
}
number.as_u64().unwrap().to_string()
}
fn filter_match(
hook_name: &str,
hook: &Hook,
@ -202,26 +211,27 @@ fn filter_match(
let regex = Regex::new(&filter.regex)?;
if let Some(value) = data.pointer(&filter.pointer) {
if let Some(value) = value.as_str() {
if regex.is_match(value) {
debug!("Filter `{}` of hook `{}` matched", filter_name, hook_name);
let value = match &value {
serde_json::Value::Null => unimplemented!(),
serde_json::Value::Bool(_bool) => unimplemented!(),
serde_json::Value::Number(number) => number_to_string(number),
serde_json::Value::String(string) => string.as_str().to_string(),
serde_json::Value::Array(_array) => unimplemented!(),
serde_json::Value::Object(_object) => unimplemented!(),
};
return Ok(Some(replace_parameter(
&hook.command.to_string(),
&request.headers(),
data,
)?));
}
} else {
bail!(
"Could not parse pointer in hook `{}` from filter `{}`",
hook_name,
filter_name
);
if regex.is_match(&value) {
debug!("Filter `{}` of hook `{}` matched", filter_name, hook_name);
return Ok(Some(replace_parameter(
&hook.command.to_string(),
&request.headers(),
data,
)?));
}
}
trace!(
debug!(
"Filter `{}` of hook `{}` did not match",
filter_name,
hook_name