diff --git a/src/configuration.rs b/src/configuration.rs index 024f60f..a9a4c36 100644 --- a/src/configuration.rs +++ b/src/configuration.rs @@ -1122,7 +1122,6 @@ mod test { selector: "request.id".to_string(), operator: WhenConditionOperator::Equal, value: "request_id".to_string(), - path: Default::default(), compiled: Default::default(), }; p.compile().expect("Should compile fine!"); @@ -1140,7 +1139,6 @@ mod test { selector: "request.id".to_string(), operator: WhenConditionOperator::Equal, value: "\"request_id\"".to_string(), - path: Default::default(), compiled: Default::default(), }; p.compile().expect("Should compile fine!"); @@ -1158,7 +1156,6 @@ mod test { selector: "request.id".to_string(), operator: WhenConditionOperator::Equal, value: "123".to_string(), - path: Default::default(), compiled: Default::default(), }; p.compile().expect("Should compile fine!"); @@ -1176,7 +1173,6 @@ mod test { selector: "foobar".to_string(), operator: WhenConditionOperator::Equal, value: "\"123\"".to_string(), - path: Default::default(), compiled: Default::default(), }; p.compile().expect("Should compile fine!"); @@ -1194,7 +1190,6 @@ mod test { selector: "destination.port".to_string(), operator: WhenConditionOperator::Equal, value: "8080".to_string(), - path: Default::default(), compiled: Default::default(), }; p.compile().expect("Should compile fine!"); @@ -1212,7 +1207,6 @@ mod test { selector: "foobar".to_string(), operator: WhenConditionOperator::Equal, value: "8080".to_string(), - path: Default::default(), compiled: Default::default(), }; p.compile().expect("Should compile fine!"); @@ -1230,7 +1224,6 @@ mod test { selector: "foobar".to_string(), operator: WhenConditionOperator::Equal, value: "1.0".to_string(), - path: Default::default(), compiled: Default::default(), }; p.compile().expect("Should compile fine!"); @@ -1248,7 +1241,6 @@ mod test { selector: "connection.mtls".to_string(), operator: WhenConditionOperator::Equal, value: "true".to_string(), - path: Default::default(), compiled: Default::default(), }; p.compile().expect("Should compile fine!"); @@ -1266,7 +1258,6 @@ mod test { selector: "request.time".to_string(), operator: WhenConditionOperator::Equal, value: "2023-05-28T00:00:00+00:00".to_string(), - path: Default::default(), compiled: Default::default(), }; p.compile().expect("Should compile fine!"); diff --git a/src/property.rs b/src/property.rs index c8701af..c9d017f 100644 --- a/src/property.rs +++ b/src/property.rs @@ -59,7 +59,11 @@ fn remote_address() -> Result>, Status> { fn host_get_property(property: &str) -> Result>, Status> { let path = Path::from(property); - debug!("get_property: property: {} path: {}", property, path); + debug!( + "get_property: selector: {} path: {:?}", + property, + path.tokens() + ); hostcalls::get_property(path.tokens()) } diff --git a/tests/auth.rs b/tests/auth.rs index 7e7a8e2..3b8d4af 100644 --- a/tests/auth.rs +++ b/tests/auth.rs @@ -114,24 +114,66 @@ fn it_auths() { // retrieving properties for CheckRequest .expect_get_header_map_pairs(Some(MapType::HttpRequestHeaders)) .returning(None) + .expect_log( + Some(LogLevel::Debug), + Some("get_property: selector: request.host path: [\"request\", \"host\"]"), + ) .expect_get_property(Some(vec!["request", "host"])) .returning(Some("cars.toystore.com".as_bytes())) + .expect_log( + Some(LogLevel::Debug), + Some("get_property: selector: request.method path: [\"request\", \"method\"]"), + ) .expect_get_property(Some(vec!["request", "method"])) .returning(Some("GET".as_bytes())) + .expect_log( + Some(LogLevel::Debug), + Some("get_property: selector: request.scheme path: [\"request\", \"scheme\"]"), + ) .expect_get_property(Some(vec!["request", "scheme"])) .returning(Some("http".as_bytes())) + .expect_log( + Some(LogLevel::Debug), + Some("get_property: selector: request.path path: [\"request\", \"path\"]"), + ) .expect_get_property(Some(vec!["request", "path"])) .returning(Some("/admin/toy".as_bytes())) + .expect_log( + Some(LogLevel::Debug), + Some("get_property: selector: request.protocol path: [\"request\", \"protocol\"]"), + ) .expect_get_property(Some(vec!["request", "protocol"])) .returning(Some("HTTP".as_bytes())) + .expect_log( + Some(LogLevel::Debug), + Some("get_property: selector: request.time path: [\"request\", \"time\"]"), + ) .expect_get_property(Some(vec!["request", "time"])) .returning(None) + .expect_log( + Some(LogLevel::Debug), + Some( + "get_property: selector: destination.address path: [\"destination\", \"address\"]", + ), + ) .expect_get_property(Some(vec!["destination", "address"])) .returning(Some("127.0.0.1:8000".as_bytes())) + .expect_log( + Some(LogLevel::Debug), + Some("get_property: selector: destination.port path: [\"destination\", \"port\"]"), + ) .expect_get_property(Some(vec!["destination", "port"])) .returning(Some("8000".as_bytes())) + .expect_log( + Some(LogLevel::Debug), + Some("get_property: selector: source.address path: [\"source\", \"address\"]"), + ) .expect_get_property(Some(vec!["source", "address"])) .returning(Some("127.0.0.1:45000".as_bytes())) + .expect_log( + Some(LogLevel::Debug), + Some("get_property: selector: source.port path: [\"source\", \"port\"]"), + ) .expect_get_property(Some(vec!["source", "port"])) .returning(Some("45000".as_bytes())) // retrieving tracing headers @@ -266,24 +308,66 @@ fn it_denies() { // retrieving properties for CheckRequest .expect_get_header_map_pairs(Some(MapType::HttpRequestHeaders)) .returning(None) + .expect_log( + Some(LogLevel::Debug), + Some("get_property: selector: request.host path: [\"request\", \"host\"]"), + ) .expect_get_property(Some(vec!["request", "host"])) .returning(Some("cars.toystore.com".as_bytes())) + .expect_log( + Some(LogLevel::Debug), + Some("get_property: selector: request.method path: [\"request\", \"method\"]"), + ) .expect_get_property(Some(vec!["request", "method"])) .returning(Some("GET".as_bytes())) + .expect_log( + Some(LogLevel::Debug), + Some("get_property: selector: request.scheme path: [\"request\", \"scheme\"]"), + ) .expect_get_property(Some(vec!["request", "scheme"])) .returning(Some("http".as_bytes())) + .expect_log( + Some(LogLevel::Debug), + Some("get_property: selector: request.path path: [\"request\", \"path\"]"), + ) .expect_get_property(Some(vec!["request", "path"])) .returning(Some("/admin/toy".as_bytes())) + .expect_log( + Some(LogLevel::Debug), + Some("get_property: selector: request.protocol path: [\"request\", \"protocol\"]"), + ) .expect_get_property(Some(vec!["request", "protocol"])) .returning(Some("HTTP".as_bytes())) + .expect_log( + Some(LogLevel::Debug), + Some("get_property: selector: request.time path: [\"request\", \"time\"]"), + ) .expect_get_property(Some(vec!["request", "time"])) .returning(None) + .expect_log( + Some(LogLevel::Debug), + Some( + "get_property: selector: destination.address path: [\"destination\", \"address\"]", + ), + ) .expect_get_property(Some(vec!["destination", "address"])) .returning(Some("127.0.0.1:8000".as_bytes())) + .expect_log( + Some(LogLevel::Debug), + Some("get_property: selector: destination.port path: [\"destination\", \"port\"]"), + ) .expect_get_property(Some(vec!["destination", "port"])) .returning(Some("8000".as_bytes())) + .expect_log( + Some(LogLevel::Debug), + Some("get_property: selector: source.address path: [\"source\", \"address\"]"), + ) .expect_get_property(Some(vec!["source", "address"])) .returning(Some("127.0.0.1:45000".as_bytes())) + .expect_log( + Some(LogLevel::Debug), + Some("get_property: selector: source.port path: [\"source\", \"port\"]"), + ) .expect_get_property(Some(vec!["source", "port"])) .returning(Some("45000".as_bytes())) // retrieving tracing headers