mirror of
https://github.com/yuezk/GlobalProtect-openconnect.git
synced 2026-11-19 06:26:14 -05:00
refactor: align GP profile and packaging flow
Main changes: - Refactor connect/auth flows around a single OS profile and host identity model, including gateway fallback and cookie-on-stdin handling. - Align request parameters, HIP host-id propagation, SAML webview user-agent behavior, and portal default-browser handling with observed official client behavior. - Add opt-in cookie cache support and Microsoft Defender HIP reporting while keeping host-id validation explicit. - Add BSD build, packaging, release artifact, and provenance support with FreeBSD/OpenBSD path and dependency cleanup. - Update NixOS install documentation and dependency compatibility fixes.
This commit is contained in:
92 files changed
+9847
-2868
No files matched your search
@@ -123,6 +123,46 @@ pub fn redact_uri(uri: &str) -> String {
|
||||
url.to_string()
|
||||
}
|
||||
|
||||
pub fn redact_form_params(params: &[(&str, &str)]) -> String {
|
||||
let mut pairs = params
|
||||
.iter()
|
||||
.map(|(key, value)| (*key, redact_form_value(key, value)))
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
pairs.sort_by(|(left, _), (right, _)| left.cmp(right));
|
||||
|
||||
form_urlencoded::Serializer::new(String::new())
|
||||
.extend_pairs(pairs)
|
||||
.finish()
|
||||
}
|
||||
|
||||
fn redact_form_value(key: &str, value: &str) -> String {
|
||||
if value.is_empty() || is_safe_form_param(key) {
|
||||
return value.to_string();
|
||||
}
|
||||
|
||||
format!("redacted-{}", value.len())
|
||||
}
|
||||
|
||||
fn is_safe_form_param(key: &str) -> bool {
|
||||
matches!(
|
||||
key,
|
||||
"clientVer"
|
||||
| "clientos"
|
||||
| "config-digest"
|
||||
| "csc-digest"
|
||||
| "csc-support"
|
||||
| "direct"
|
||||
| "ipv6-support"
|
||||
| "jnlpReady"
|
||||
| "ok"
|
||||
| "os-version"
|
||||
| "prot"
|
||||
| "swg-auth-token"
|
||||
| "swg-nonce"
|
||||
)
|
||||
}
|
||||
|
||||
fn redact_query(query: Option<&str>) -> Option<String> {
|
||||
let query = query?;
|
||||
|
||||
@@ -190,6 +230,20 @@ mod tests {
|
||||
assert_eq!(redact_uri(uri), "https://f**********r/baz?qux=q**********x");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn it_should_redact_form_params() {
|
||||
let params = [
|
||||
("portal-userauthcookie", "secret-cookie"),
|
||||
("csc-support", "yes"),
|
||||
("prelogin-cookie", ""),
|
||||
];
|
||||
|
||||
assert_eq!(
|
||||
redact_form_params(¶ms),
|
||||
"csc-support=yes&portal-userauthcookie=redacted-13&prelogin-cookie="
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn it_should_redact_data_uri() {
|
||||
let uri = "data:text/plain;a";
|
||||
|
||||
Reference in new issue
Block a user