From ae5f4c7dc079db6461dbb0be3fea35171702cfa9 Mon Sep 17 00:00:00 2001 From: giswqs Date: Sun, 15 Nov 2026 11:39:25 -0500 Subject: [PATCH] fix(engine): keep connection key redaction consistent --- crates/engine/src/connections.rs | 12 +++++++++--- crates/engine/src/tests/service_logins.rs | 23 +++++++++++++++++++++++ 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/crates/engine/src/connections.rs b/crates/engine/src/connections.rs index fa089f9c80..66c817f429 100644 --- a/crates/engine/src/connections.rs +++ b/crates/engine/src/connections.rs @@ -354,13 +354,16 @@ pub fn stripped_parameters(given: &str, saved: &str) -> Vec { use crate::render::rustgis_tiles::logins; fn names(address: &str) -> Vec<&str> { let query = address.split('#').next().and_then(|a| a.split_once('?')).map_or("", |(_, query)| query); - query.split('&').filter_map(|pair| pair.split_once('=').map(|(name, _)| name)).filter(|name| !name.is_empty()).collect() + query.split(['&', ';']).filter_map(|pair| pair.split_once('=').map(|(name, _)| name)).filter(|name| !name.is_empty()).collect() } + let query = given.split('#').next().and_then(|a| a.split_once('?')).map_or("", |(_, query)| query); + let context = rustgis_data::address::QueryNames::of(query); let kept = names(saved); let mut left_out: Vec = Vec::new(); for name in names(given) { if left_out.len() < 4 && logins::valid_query_name(name) + && rustgis_data::address::name_class(name, &context) == rustgis_data::address::NameClass::Credential && !kept.contains(&name) && !left_out.iter().any(|known| known.eq_ignore_ascii_case(name)) { @@ -395,8 +398,11 @@ pub fn clean(mut c: Connection) -> Result<(Connection, bool), String> { return Err("a connection address must be at most 2048 bytes and contain no control characters".into()); } // A query login's own parameter goes before anything quotes the address (an error included): - // its name may not be registered yet, so the generic redaction can't see it. - let query_name = Some(c.key_name.trim()).filter(|name| c.auth.trim().eq_ignore_ascii_case("query") && !name.is_empty()); + // its name may not be registered yet, so the generic redaction can't see it. A name given + // without a method still declares a possible key, as it does in the replay log. An explicit + // other method (`none` included) does not select a query parameter. + let query_name = Some(c.key_name.trim()) + .filter(|name| (c.auth.trim().is_empty() || c.auth.trim().eq_ignore_ascii_case("query")) && !name.is_empty()); let given = query_name.map_or_else(|| t.to_string(), |name| crate::render::rustgis_tiles::logins::without_query_parameter(t, name)); let stored = sources::redact(&given); let stripped = stored != t; diff --git a/crates/engine/src/tests/service_logins.rs b/crates/engine/src/tests/service_logins.rs index a81ec8113e..a2582e10e0 100644 --- a/crates/engine/src/tests/service_logins.rs +++ b/crates/engine/src/tests/service_logins.rs @@ -2727,6 +2727,29 @@ fn a_key_in_the_address_is_left_out_and_its_parameter_offered_as_the_login() { assert!(bare.get("strippedParameters").is_none(), "{bare}"); let said = format!("{bare}{:?}", s.notices_since(mark)); assert!(!said.contains("RGSYNTHbare757"), "{said}"); + // Legacy semicolons separate query pairs too. A public pair dropped alongside a key is not + // offered as a credential name. + let legacy = s + .run( + "connection.new", + &json!({"kind":"wmts","name":"Legacy separators","address":format!("{origin}/legacy?x=1;token=RGSYNTHlegacy757")}), + ) + .unwrap(); + assert_eq!(legacy["stripped"], true); + assert_eq!(legacy["strippedParameters"], json!(["token"])); + // A custom key name is a redaction hint even before a method is chosen; the saved definition + // must be as safe as its replay log. An explicit no-login method leaves ordinary data alone. + let no_method = s + .run("connection.new", &json!({"kind":"wmts","name":"Custom without method","address":format!("{origin}/custom?zqwithoutmethod757=RGSYNTHnomethod757&layer=a"),"keyName":"zqwithoutmethod757"})) + .unwrap(); + assert_eq!(no_method["stripped"], true); + assert_eq!(no_method["address"], format!("{origin}/custom?layer=a")); + assert!(!s.connections.to_json().contains("RGSYNTHnomethod757")); + let explicit_none = s + .run("connection.new", &json!({"kind":"wmts","name":"Explicit no login","address":format!("{origin}/none?zqordinary757=public-code"),"keyName":"zqordinary757","auth":"none"})) + .unwrap(); + assert!(explicit_none.get("stripped").is_none()); + assert_eq!(explicit_none["address"], format!("{origin}/none?zqordinary757=public-code")); } /// A key in a query login is sent on the wire to the origin (and only as the parameter the