mirror of
https://github.com/yuezk/GlobalProtect-openconnect.git
synced 2026-11-19 22:46:14 -05:00
fix: redact tunnel keys, preserve cached login and correct HIP handling
This commit is contained in:
18 files changed
+412
-196
No files matched your search
Generated
+10
@@ -2131,6 +2131,14 @@ dependencies = [
|
|||||||
"system-deps",
|
"system-deps",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "gp-xml"
|
||||||
|
version = "3.4.0"
|
||||||
|
dependencies = [
|
||||||
|
"url",
|
||||||
|
"xmltree",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gpapi"
|
name = "gpapi"
|
||||||
version = "3.4.0"
|
version = "3.4.0"
|
||||||
@@ -2149,6 +2157,7 @@ dependencies = [
|
|||||||
"env_logger",
|
"env_logger",
|
||||||
"file-rotate",
|
"file-rotate",
|
||||||
"getrandom 0.4.3",
|
"getrandom 0.4.3",
|
||||||
|
"gp-xml",
|
||||||
"gtk",
|
"gtk",
|
||||||
"humantime",
|
"humantime",
|
||||||
"libloading 0.9.0",
|
"libloading 0.9.0",
|
||||||
@@ -3856,6 +3865,7 @@ dependencies = [
|
|||||||
"autotools",
|
"autotools",
|
||||||
"cc",
|
"cc",
|
||||||
"fs_extra",
|
"fs_extra",
|
||||||
|
"gp-xml",
|
||||||
"is_executable",
|
"is_executable",
|
||||||
"libc",
|
"libc",
|
||||||
"log",
|
"log",
|
||||||
|
|||||||
@@ -174,15 +174,21 @@ async fn unreachable_gateway_keeps_cached_cookie() {
|
|||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn gateway_closing_without_response_keeps_cached_cookie() {
|
async fn gateway_closing_without_response_keeps_cached_cookie() {
|
||||||
closed_connection_keeps_cached_cookie(false).await;
|
closed_connection_keeps_cached_cookie(false, false).await;
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn portal_closing_without_response_keeps_cached_cookie() {
|
async fn portal_closing_without_response_keeps_cached_cookie() {
|
||||||
closed_connection_keeps_cached_cookie(true).await;
|
closed_connection_keeps_cached_cookie(true, false).await;
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn closed_connection_keeps_cached_cookie(portal_discovery: bool) {
|
#[tokio::test]
|
||||||
|
async fn partial_responses_keep_cached_cookie() {
|
||||||
|
closed_connection_keeps_cached_cookie(false, true).await;
|
||||||
|
closed_connection_keeps_cached_cookie(true, true).await;
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn closed_connection_keeps_cached_cookie(portal_discovery: bool, partial_body: bool) {
|
||||||
let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
|
let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
|
||||||
let origin = format!("http://{}", listener.local_addr().unwrap());
|
let origin = format!("http://{}", listener.local_addr().unwrap());
|
||||||
let worker = tokio::spawn(async move {
|
let worker = tokio::spawn(async move {
|
||||||
@@ -203,8 +209,14 @@ async fn closed_connection_keeps_cached_cookie(portal_discovery: bool) {
|
|||||||
.unwrap();
|
.unwrap();
|
||||||
}
|
}
|
||||||
let (mut stream, _) = listener.accept().await.unwrap();
|
let (mut stream, _) = listener.accept().await.unwrap();
|
||||||
// Read the complete request, then close without sending HTTP headers.
|
let request = read_request(&mut stream).await;
|
||||||
read_request(&mut stream).await
|
if partial_body {
|
||||||
|
stream
|
||||||
|
.write_all(b"HTTP/1.1 200 OK\r\nContent-Length: 100\r\n\r\n<response>")
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
}
|
||||||
|
request
|
||||||
})
|
})
|
||||||
.await
|
.await
|
||||||
.expect("Connection-closing fixture timed out")
|
.expect("Connection-closing fixture timed out")
|
||||||
@@ -248,7 +260,11 @@ async fn closed_connection_keeps_cached_cookie(portal_discovery: bool) {
|
|||||||
let Some(gpapi::error::PortalError::NetworkError(network)) = error.downcast_ref() else {
|
let Some(gpapi::error::PortalError::NetworkError(network)) = error.downcast_ref() else {
|
||||||
panic!("Expected a network error, got {error:?}");
|
panic!("Expected a network error, got {error:?}");
|
||||||
};
|
};
|
||||||
assert!(network.is_request());
|
if partial_body {
|
||||||
|
assert!(network.is_body() || network.is_decode());
|
||||||
|
} else {
|
||||||
|
assert!(network.is_request());
|
||||||
|
}
|
||||||
assert!(!network.is_connect());
|
assert!(!network.is_connect());
|
||||||
assert!(!network.is_timeout());
|
assert!(!network.is_timeout());
|
||||||
assert!(cache.exists(), "an unanswered request must not delete the cookie cache");
|
assert!(cache.exists(), "an unanswered request must not delete the cookie cache");
|
||||||
|
|||||||
@@ -128,15 +128,18 @@ impl ConnectHandler<'_> {
|
|||||||
produce_report: Arc::new(move |request, control| {
|
produce_report: Arc::new(move |request, control| {
|
||||||
control.check()?;
|
control.check()?;
|
||||||
if matches!(source.as_ref(), openconnect::HipSource::Disabled) {
|
if matches!(source.as_ref(), openconnect::HipSource::Disabled) {
|
||||||
return gphip::generate_identity_report(&gphip::ReportInput {
|
return gphip::generate_identity_report(
|
||||||
profile: profile.clone(),
|
&gphip::ReportInput {
|
||||||
context: gphip::ReportContext::Connected {
|
profile: profile.clone(),
|
||||||
cookie: request.cookie.clone(),
|
context: gphip::ReportContext::Connected {
|
||||||
client_ip: request.client_ip.clone(),
|
cookie: request.cookie.clone(),
|
||||||
client_ipv6: request.client_ipv6.clone(),
|
client_ip: request.client_ip.clone(),
|
||||||
md5: request.md5.clone(),
|
client_ipv6: request.client_ipv6.clone(),
|
||||||
|
md5: request.md5.clone(),
|
||||||
|
},
|
||||||
},
|
},
|
||||||
})
|
control,
|
||||||
|
)
|
||||||
.map_err(std::io::Error::other);
|
.map_err(std::io::Error::other);
|
||||||
}
|
}
|
||||||
source.collect(
|
source.collect(
|
||||||
|
|||||||
@@ -66,10 +66,13 @@ pub(super) async fn run(
|
|||||||
md5: request.md5.clone(),
|
md5: request.md5.clone(),
|
||||||
};
|
};
|
||||||
if !posture_enabled {
|
if !posture_enabled {
|
||||||
return gphip::generate_identity_report(&gphip::ReportInput {
|
return gphip::generate_identity_report(
|
||||||
profile: profile.clone(),
|
&gphip::ReportInput {
|
||||||
context,
|
profile: profile.clone(),
|
||||||
})
|
context,
|
||||||
|
},
|
||||||
|
control,
|
||||||
|
)
|
||||||
.map_err(std::io::Error::other);
|
.map_err(std::io::Error::other);
|
||||||
}
|
}
|
||||||
source.collect(
|
source.collect(
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
[package]
|
||||||
|
name = "gp-xml"
|
||||||
|
edition.workspace = true
|
||||||
|
rust-version.workspace = true
|
||||||
|
version.workspace = true
|
||||||
|
license = "MIT"
|
||||||
|
description = "GlobalProtect response XML redaction for diagnostics"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
url.workspace = true
|
||||||
|
xmltree.workspace = true
|
||||||
@@ -0,0 +1,172 @@
|
|||||||
|
//! Redact GlobalProtect response bodies before writing diagnostics.
|
||||||
|
use xmltree::{Element, EmitterConfig, XMLNode};
|
||||||
|
|
||||||
|
const REDACTED: &str = "[redacted]";
|
||||||
|
const MAX_XML_BYTES: usize = 1024 * 1024;
|
||||||
|
|
||||||
|
pub fn redact_xml(body: &[u8]) -> String {
|
||||||
|
if body.len() > MAX_XML_BYTES {
|
||||||
|
return "[XML omitted: exceeds 1 MiB]".into();
|
||||||
|
}
|
||||||
|
let Ok(text) = std::str::from_utf8(body) else {
|
||||||
|
return "[XML omitted: invalid UTF-8]".into();
|
||||||
|
};
|
||||||
|
if text.to_ascii_lowercase().contains("<!doctype") {
|
||||||
|
return "[XML omitted: DTD]".into();
|
||||||
|
}
|
||||||
|
let Ok(nodes) = Element::parse_all(body) else {
|
||||||
|
return "[XML omitted: malformed or non-XML response]".into();
|
||||||
|
};
|
||||||
|
let mut roots = nodes.into_iter().filter_map(|node| match node {
|
||||||
|
XMLNode::Element(element) => Some(element),
|
||||||
|
_ => None,
|
||||||
|
});
|
||||||
|
let Some(mut root) = roots.next() else {
|
||||||
|
return "[XML omitted: no document element]".into();
|
||||||
|
};
|
||||||
|
if roots.next().is_some() || root.name.eq_ignore_ascii_case("html") {
|
||||||
|
return "[XML omitted: unsupported response document]".into();
|
||||||
|
}
|
||||||
|
redact_element(&mut root);
|
||||||
|
let mut output = Vec::new();
|
||||||
|
if root
|
||||||
|
.write_with_config(
|
||||||
|
&mut output,
|
||||||
|
EmitterConfig::new()
|
||||||
|
.perform_indent(true)
|
||||||
|
.write_document_declaration(false),
|
||||||
|
)
|
||||||
|
.is_err()
|
||||||
|
{
|
||||||
|
return "[XML omitted: serialization failed]".into();
|
||||||
|
}
|
||||||
|
String::from_utf8(output).unwrap_or_else(|_| "[XML omitted: serialization failed]".into())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn sensitive_name(name: &str) -> bool {
|
||||||
|
let name: String = name
|
||||||
|
.chars()
|
||||||
|
.filter(char::is_ascii_alphanumeric)
|
||||||
|
.map(|c| c.to_ascii_lowercase())
|
||||||
|
.collect();
|
||||||
|
if name.ends_with("label") {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
name.contains("cookie")
|
||||||
|
|| name.contains("token")
|
||||||
|
|| name.contains("password")
|
||||||
|
|| name.contains("passphrase")
|
||||||
|
|| name.contains("secret")
|
||||||
|
|| name.starts_with("ekey")
|
||||||
|
|| name.starts_with("akey")
|
||||||
|
|| matches!(
|
||||||
|
name.as_str(),
|
||||||
|
"argument"
|
||||||
|
| "samlrequest"
|
||||||
|
| "samlresponse"
|
||||||
|
| "samlrequestid"
|
||||||
|
| "assertion"
|
||||||
|
| "encryptedassertion"
|
||||||
|
| "authnrequest"
|
||||||
|
| "challenge"
|
||||||
|
| "privatekey"
|
||||||
|
| "encryptionkey"
|
||||||
|
| "enckey"
|
||||||
|
| "hskey"
|
||||||
|
| "enchskey"
|
||||||
|
| "tunnelopaque"
|
||||||
|
| "nonce"
|
||||||
|
| "user"
|
||||||
|
| "username"
|
||||||
|
| "ccusername"
|
||||||
|
| "credential"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn redact_element(element: &mut Element) {
|
||||||
|
let named_secret = matches!(element.name.as_str(), "field" | "param" | "property" | "setting")
|
||||||
|
&& ["name", "key"]
|
||||||
|
.iter()
|
||||||
|
.any(|name| element.attributes.get(*name).is_some_and(|value| sensitive_name(value)));
|
||||||
|
let secret = sensitive_name(&element.name) || named_secret;
|
||||||
|
for (name, value) in &mut element.attributes {
|
||||||
|
if sensitive_name(name) || (secret && !(named_secret && matches!(name.as_str(), "name" | "key"))) {
|
||||||
|
*value = REDACTED.into();
|
||||||
|
} else {
|
||||||
|
*value = redact_url(value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if secret {
|
||||||
|
element.children = vec![XMLNode::Text(REDACTED.into())];
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
element
|
||||||
|
.children
|
||||||
|
.retain(|node| matches!(node, XMLNode::Element(_) | XMLNode::Text(_) | XMLNode::CData(_)));
|
||||||
|
for node in &mut element.children {
|
||||||
|
match node {
|
||||||
|
XMLNode::Element(child) => redact_element(child),
|
||||||
|
XMLNode::Text(value) | XMLNode::CData(value) => *value = redact_url(value),
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn redact_url(value: &str) -> String {
|
||||||
|
let Ok(mut url) = url::Url::parse(value) else {
|
||||||
|
return value.into();
|
||||||
|
};
|
||||||
|
if !matches!(url.scheme(), "http" | "https") {
|
||||||
|
return value.into();
|
||||||
|
}
|
||||||
|
if !url.username().is_empty() {
|
||||||
|
let _ = url.set_username(REDACTED);
|
||||||
|
}
|
||||||
|
if url.password().is_some() {
|
||||||
|
let _ = url.set_password(Some(REDACTED));
|
||||||
|
}
|
||||||
|
if url.query().is_some() {
|
||||||
|
let pairs: Vec<_> = url
|
||||||
|
.query_pairs()
|
||||||
|
.map(|(name, _)| (name.into_owned(), REDACTED))
|
||||||
|
.collect();
|
||||||
|
url.query_pairs_mut().clear().extend_pairs(pairs);
|
||||||
|
}
|
||||||
|
if url.fragment().is_some() {
|
||||||
|
url.set_fragment(Some(REDACTED));
|
||||||
|
}
|
||||||
|
url.to_string()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn redacts_positional_login_arguments_and_session_keys() {
|
||||||
|
let xml = redact_xml(br#"<response><jnlp><application-desc><argument>fixture-auth-cookie</argument><argument>fixture-user</argument></application-desc></jnlp><ipsec><ekey-c2s><bits>256</bits><val>fixture-key-c2s</val></ekey-c2s><ekey-s2c>fixture-key-s2c</ekey-s2c><akey-c2s><val>fixture-auth-c2s</val></akey-c2s><akey-s2c>fixture-auth-s2c</akey-s2c></ipsec><enc-hs-key>fixture-hs-key</enc-hs-key><PrivateKey>fixture-private-key</PrivateKey><SAMLResponse>fixture-saml-response</SAMLResponse><tunnel-opaque><val>fixture-opaque</val></tunnel-opaque><mtu>1400</mtu></response>"#);
|
||||||
|
assert!(!xml.contains("fixture-"));
|
||||||
|
assert!(xml.contains("<mtu>1400</mtu>"));
|
||||||
|
Element::parse(xml.as_bytes()).unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn omits_unparseable_html_dtd_and_oversized_bodies_without_echoing_them() {
|
||||||
|
for body in [
|
||||||
|
b"not XML fixture-secret".as_slice(),
|
||||||
|
b"<response><cookie>fixture-secret",
|
||||||
|
b"<html><body>fixture-secret</body></html>",
|
||||||
|
b"<!DOCTYPE response [<!ENTITY secret 'fixture-secret'>]><response>&secret;</response>",
|
||||||
|
b"<response/>fixture-secret",
|
||||||
|
b"\xfffixture-secret",
|
||||||
|
] {
|
||||||
|
let xml = redact_xml(body);
|
||||||
|
assert!(xml.starts_with("[XML omitted:"));
|
||||||
|
assert!(!xml.contains("fixture-secret"));
|
||||||
|
}
|
||||||
|
assert_eq!(
|
||||||
|
redact_xml(&vec![b'x'; MAX_XML_BYTES + 1]),
|
||||||
|
"[XML omitted: exceeds 1 MiB]"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -6,6 +6,7 @@ edition.workspace = true
|
|||||||
license = "MIT"
|
license = "MIT"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
gp-xml = { path = "../gp-xml" }
|
||||||
common = { path = "../common" }
|
common = { path = "../common" }
|
||||||
anyhow.workspace = true
|
anyhow.workspace = true
|
||||||
base64.workspace = true
|
base64.workspace = true
|
||||||
|
|||||||
@@ -202,7 +202,7 @@ async fn receive_gateway_login(
|
|||||||
let url = res.url().clone();
|
let url = res.url().clone();
|
||||||
let http_version = res.version();
|
let http_version = res.version();
|
||||||
let content_type = res.headers().get(reqwest::header::CONTENT_TYPE).cloned();
|
let content_type = res.headers().get(reqwest::header::CONTENT_TYPE).cloned();
|
||||||
let res = parse_gp_response(res).await.map_err(|err| {
|
let res = parse_gp_response(res).await.map_err(|mut err| {
|
||||||
// Redirect paths and query strings can contain authentication tokens. Log
|
// Redirect paths and query strings can contain authentication tokens. Log
|
||||||
// only the redacted origin and whether the response is from the login path.
|
// only the redacted origin and whether the response is from the login path.
|
||||||
warn!(
|
warn!(
|
||||||
@@ -221,6 +221,9 @@ async fn receive_gateway_login(
|
|||||||
if let Some(tls) = crate::error::ServerTlsError::from_request(origin, &err, gp_params.has_client_identity()) {
|
if let Some(tls) = crate::error::ServerTlsError::from_request(origin, &err, gp_params.has_client_identity()) {
|
||||||
return tls;
|
return tls;
|
||||||
}
|
}
|
||||||
|
if let Some(error) = err.take_body_read_error() {
|
||||||
|
return PortalError::NetworkError(error).into();
|
||||||
|
}
|
||||||
if gp_params.os_profile().client_os() == crate::os_profile::ClientOs::Ios && err.is_authentication_rejection() {
|
if gp_params.os_profile().client_os() == crate::os_profile::ClientOs::Ios && err.is_authentication_rejection() {
|
||||||
return anyhow::anyhow!(crate::error::AuthenticationRejected);
|
return anyhow::anyhow!(crate::error::AuthenticationRejected);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -59,4 +59,13 @@ pub struct HipReport {
|
|||||||
pub struct WindowsUpdateStatus {
|
pub struct WindowsUpdateStatus {
|
||||||
/// Present only when this report includes a completed local patch observation.
|
/// Present only when this report includes a completed local patch observation.
|
||||||
pub checked_at: Option<u64>,
|
pub checked_at: Option<u64>,
|
||||||
|
/// Time of the observed snapshot when its patch details were too large to include.
|
||||||
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
|
pub omitted_snapshot_at: Option<u64>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl WindowsUpdateStatus {
|
||||||
|
pub fn refresh_cursor(&self) -> Option<u64> {
|
||||||
|
self.checked_at.or(self.omitted_snapshot_at)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -207,10 +207,13 @@ pub async fn retrieve_config(
|
|||||||
}
|
}
|
||||||
})?;
|
})?;
|
||||||
|
|
||||||
parse_gp_response(res).await.or_else(|err| {
|
parse_gp_response(res).await.or_else(|mut err| {
|
||||||
if let Some(tls) = ServerTlsError::from_request(&server_url, &err, gp_params.has_client_identity()) {
|
if let Some(tls) = ServerTlsError::from_request(&server_url, &err, gp_params.has_client_identity()) {
|
||||||
return Err(tls);
|
return Err(tls);
|
||||||
}
|
}
|
||||||
|
if let Some(error) = err.take_body_read_error() {
|
||||||
|
return Err(PortalError::NetworkError(error).into());
|
||||||
|
}
|
||||||
if gp_params.os_profile().client_os() == crate::os_profile::ClientOs::Ios && err.is_authentication_rejection() {
|
if gp_params.os_profile().client_os() == crate::os_profile::ClientOs::Ios && err.is_authentication_rejection() {
|
||||||
return Err(anyhow::anyhow!(crate::error::AuthenticationRejected));
|
return Err(anyhow::anyhow!(crate::error::AuthenticationRejected));
|
||||||
}
|
}
|
||||||
@@ -278,10 +281,13 @@ async fn retrieve_csc_config(
|
|||||||
}
|
}
|
||||||
})?;
|
})?;
|
||||||
|
|
||||||
parse_gp_response(res).await.or_else(|err| {
|
parse_gp_response(res).await.or_else(|mut err| {
|
||||||
if let Some(tls) = ServerTlsError::from_request(&server_url, &err, gp_params.has_client_identity()) {
|
if let Some(tls) = ServerTlsError::from_request(&server_url, &err, gp_params.has_client_identity()) {
|
||||||
return Err(tls);
|
return Err(tls);
|
||||||
}
|
}
|
||||||
|
if let Some(error) = err.take_body_read_error() {
|
||||||
|
return Err(PortalError::NetworkError(error).into());
|
||||||
|
}
|
||||||
if err.status == StatusCode::NOT_FOUND {
|
if err.status == StatusCode::NOT_FOUND {
|
||||||
bail!(PortalError::ConfigError("CSC config endpoint not found".to_string()));
|
bail!(PortalError::ConfigError("CSC config endpoint not found".to_string()));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -64,6 +64,14 @@ pub struct GpError {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl GpError {
|
impl GpError {
|
||||||
|
pub(crate) fn take_body_read_error(&mut self) -> Option<reqwest::Error> {
|
||||||
|
if self.is_status_error() {
|
||||||
|
None
|
||||||
|
} else {
|
||||||
|
self.source.take()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub fn is_status_error(&self) -> bool {
|
pub fn is_status_error(&self) -> bool {
|
||||||
self.status.is_client_error() || self.status.is_server_error()
|
self.status.is_client_error() || self.status.is_server_error()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,5 @@
|
|||||||
|
use gp_xml::redact_xml;
|
||||||
use reqwest::StatusCode;
|
use reqwest::StatusCode;
|
||||||
use xmltree::{Element, EmitterConfig, XMLNode};
|
|
||||||
|
|
||||||
const REDACTED: &str = "[redacted]";
|
|
||||||
const MAX_XML_BYTES: usize = 1024 * 1024;
|
|
||||||
|
|
||||||
pub(crate) fn log_response_xml(path: &str, status: StatusCode, body: &[u8]) {
|
pub(crate) fn log_response_xml(path: &str, status: StatusCode, body: &[u8]) {
|
||||||
if !log::log_enabled!(log::Level::Debug) {
|
if !log::log_enabled!(log::Level::Debug) {
|
||||||
@@ -28,141 +25,10 @@ pub(crate) fn log_response_xml(path: &str, status: StatusCode, body: &[u8]) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn redact_xml(body: &[u8]) -> String {
|
|
||||||
if body.len() > MAX_XML_BYTES {
|
|
||||||
return "[XML omitted: exceeds 1 MiB]".into();
|
|
||||||
}
|
|
||||||
let Ok(text) = std::str::from_utf8(body) else {
|
|
||||||
return "[XML omitted: invalid UTF-8]".into();
|
|
||||||
};
|
|
||||||
if text.to_ascii_lowercase().contains("<!doctype") {
|
|
||||||
return "[XML omitted: DTD]".into();
|
|
||||||
}
|
|
||||||
let Ok(nodes) = Element::parse_all(body) else {
|
|
||||||
return "[XML omitted: malformed or non-XML response]".into();
|
|
||||||
};
|
|
||||||
let mut roots = nodes.into_iter().filter_map(|node| match node {
|
|
||||||
XMLNode::Element(element) => Some(element),
|
|
||||||
_ => None,
|
|
||||||
});
|
|
||||||
let Some(mut root) = roots.next() else {
|
|
||||||
return "[XML omitted: no document element]".into();
|
|
||||||
};
|
|
||||||
if roots.next().is_some() || root.name.eq_ignore_ascii_case("html") {
|
|
||||||
return "[XML omitted: unsupported response document]".into();
|
|
||||||
}
|
|
||||||
redact_element(&mut root);
|
|
||||||
let mut output = Vec::new();
|
|
||||||
if root
|
|
||||||
.write_with_config(
|
|
||||||
&mut output,
|
|
||||||
EmitterConfig::new()
|
|
||||||
.perform_indent(true)
|
|
||||||
.write_document_declaration(false),
|
|
||||||
)
|
|
||||||
.is_err()
|
|
||||||
{
|
|
||||||
return "[XML omitted: serialization failed]".into();
|
|
||||||
}
|
|
||||||
String::from_utf8(output).unwrap_or_else(|_| "[XML omitted: serialization failed]".into())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn sensitive_name(name: &str) -> bool {
|
|
||||||
let name: String = name
|
|
||||||
.chars()
|
|
||||||
.filter(char::is_ascii_alphanumeric)
|
|
||||||
.map(|c| c.to_ascii_lowercase())
|
|
||||||
.collect();
|
|
||||||
if name.ends_with("label") {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
name.contains("cookie")
|
|
||||||
|| name.contains("token")
|
|
||||||
|| name.contains("password")
|
|
||||||
|| name.contains("passphrase")
|
|
||||||
|| name.contains("secret")
|
|
||||||
|| name.starts_with("ekey")
|
|
||||||
|| matches!(
|
|
||||||
name.as_str(),
|
|
||||||
"argument"
|
|
||||||
| "samlrequest"
|
|
||||||
| "samlresponse"
|
|
||||||
| "samlrequestid"
|
|
||||||
| "assertion"
|
|
||||||
| "encryptedassertion"
|
|
||||||
| "authnrequest"
|
|
||||||
| "challenge"
|
|
||||||
| "privatekey"
|
|
||||||
| "encryptionkey"
|
|
||||||
| "enckey"
|
|
||||||
| "enchskey"
|
|
||||||
| "tunnelopaque"
|
|
||||||
| "nonce"
|
|
||||||
| "user"
|
|
||||||
| "username"
|
|
||||||
| "ccusername"
|
|
||||||
| "credential"
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn redact_element(element: &mut Element) {
|
|
||||||
let named_secret = matches!(element.name.as_str(), "field" | "param" | "property" | "setting")
|
|
||||||
&& ["name", "key"]
|
|
||||||
.iter()
|
|
||||||
.any(|name| element.attributes.get(*name).is_some_and(|value| sensitive_name(value)));
|
|
||||||
let secret = sensitive_name(&element.name) || named_secret;
|
|
||||||
for (name, value) in &mut element.attributes {
|
|
||||||
if sensitive_name(name) || (secret && !(named_secret && matches!(name.as_str(), "name" | "key"))) {
|
|
||||||
*value = REDACTED.into();
|
|
||||||
} else {
|
|
||||||
*value = redact_url(value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if secret {
|
|
||||||
element.children = vec![XMLNode::Text(REDACTED.into())];
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
element
|
|
||||||
.children
|
|
||||||
.retain(|node| matches!(node, XMLNode::Element(_) | XMLNode::Text(_) | XMLNode::CData(_)));
|
|
||||||
for node in &mut element.children {
|
|
||||||
match node {
|
|
||||||
XMLNode::Element(child) => redact_element(child),
|
|
||||||
XMLNode::Text(value) | XMLNode::CData(value) => *value = redact_url(value),
|
|
||||||
_ => {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn redact_url(value: &str) -> String {
|
|
||||||
let Ok(mut url) = url::Url::parse(value) else {
|
|
||||||
return value.into();
|
|
||||||
};
|
|
||||||
if !matches!(url.scheme(), "http" | "https") {
|
|
||||||
return value.into();
|
|
||||||
}
|
|
||||||
if !url.username().is_empty() {
|
|
||||||
let _ = url.set_username(REDACTED);
|
|
||||||
}
|
|
||||||
if url.password().is_some() {
|
|
||||||
let _ = url.set_password(Some(REDACTED));
|
|
||||||
}
|
|
||||||
if url.query().is_some() {
|
|
||||||
let pairs: Vec<_> = url
|
|
||||||
.query_pairs()
|
|
||||||
.map(|(name, _)| (name.into_owned(), REDACTED))
|
|
||||||
.collect();
|
|
||||||
url.query_pairs_mut().clear().extend_pairs(pairs);
|
|
||||||
}
|
|
||||||
if url.fragment().is_some() {
|
|
||||||
url.set_fragment(Some(REDACTED));
|
|
||||||
}
|
|
||||||
url.to_string()
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
use xmltree::Element;
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn preserves_policy_checks_and_redacts_authentication_material() {
|
fn preserves_policy_checks_and_redacts_authentication_material() {
|
||||||
@@ -190,32 +56,4 @@ mod tests {
|
|||||||
}
|
}
|
||||||
assert_eq!(root.name, "policy");
|
assert_eq!(root.name, "policy");
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn redacts_positional_login_arguments_and_session_keys() {
|
|
||||||
let xml = redact_xml(br#"<response><jnlp><application-desc><argument>fixture-auth-cookie</argument><argument>fixture-user</argument></application-desc></jnlp><ipsec><ekey-c2s><bits>256</bits><val>fixture-key-c2s</val></ekey-c2s><ekey-s2c>fixture-key-s2c</ekey-s2c></ipsec><enc-hs-key>fixture-hs-key</enc-hs-key><PrivateKey>fixture-private-key</PrivateKey><SAMLResponse>fixture-saml-response</SAMLResponse><tunnel-opaque><val>fixture-opaque</val></tunnel-opaque><mtu>1400</mtu></response>"#);
|
|
||||||
assert!(!xml.contains("fixture-"));
|
|
||||||
assert!(xml.contains("<mtu>1400</mtu>"));
|
|
||||||
Element::parse(xml.as_bytes()).unwrap();
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn omits_unparseable_html_dtd_and_oversized_bodies_without_echoing_them() {
|
|
||||||
for body in [
|
|
||||||
b"not XML fixture-secret".as_slice(),
|
|
||||||
b"<response><cookie>fixture-secret",
|
|
||||||
b"<html><body>fixture-secret</body></html>",
|
|
||||||
b"<!DOCTYPE response [<!ENTITY secret 'fixture-secret'>]><response>&secret;</response>",
|
|
||||||
b"<response/>fixture-secret",
|
|
||||||
b"\xfffixture-secret",
|
|
||||||
] {
|
|
||||||
let xml = redact_xml(body);
|
|
||||||
assert!(xml.starts_with("[XML omitted:"));
|
|
||||||
assert!(!xml.contains("fixture-secret"));
|
|
||||||
}
|
|
||||||
assert_eq!(
|
|
||||||
redact_xml(&vec![b'x'; MAX_XML_BYTES + 1]),
|
|
||||||
"[XML omitted: exceeds 1 MiB]"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
+18
-10
@@ -246,11 +246,10 @@ pub fn generate_report(input: &ReportInput) -> anyhow::Result<String> {
|
|||||||
/// Identity-only maintenance report. This deliberately does not enumerate the
|
/// Identity-only maintenance report. This deliberately does not enumerate the
|
||||||
/// interfaces or execute posture collectors; addresses come from the session owner.
|
/// interfaces or execute posture collectors; addresses come from the session owner.
|
||||||
/// Native profiles read the computer domain, consistent with generated and refreshed reports.
|
/// Native profiles read the computer domain, consistent with generated and refreshed reports.
|
||||||
pub fn generate_identity_report(input: &ReportInput) -> anyhow::Result<String> {
|
pub fn generate_identity_report(input: &ReportInput, control: &dyn CollectionControl) -> anyhow::Result<String> {
|
||||||
let params = cookie_params(input);
|
let params = cookie_params(input);
|
||||||
let budget = CollectionBudget::new(Duration::from_secs(60));
|
|
||||||
let domain =
|
let domain =
|
||||||
native_domain(&input.profile, &budget)?.unwrap_or_else(|| params.get("domain").cloned().unwrap_or_default());
|
native_domain(&input.profile, control)?.unwrap_or_else(|| params.get("domain").cloned().unwrap_or_default());
|
||||||
let mut report = Element::new("hip-report");
|
let mut report = Element::new("hip-report");
|
||||||
for (name, value) in [
|
for (name, value) in [
|
||||||
("md5-sum", input.context.md5()),
|
("md5-sum", input.context.md5()),
|
||||||
@@ -569,9 +568,7 @@ impl<'p, 'a> HostInfoCollector<'p, 'a> {
|
|||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
if self.profile.client_os() == ClientOs::Windows && self.profile.is_native() {
|
if self.profile.client_os() == ClientOs::Windows && self.profile.is_native() {
|
||||||
let report = windows::collect(&commands, control)?;
|
let report = windows::collect(&commands, control)?;
|
||||||
info.windows_updates = Some(gpapi::hip::WindowsUpdateStatus {
|
info.windows_updates = Some(report.update_status());
|
||||||
checked_at: report.patches_checked_at,
|
|
||||||
});
|
|
||||||
info.windows_categories = Some(report.render()?);
|
info.windows_categories = Some(report.render()?);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -813,6 +810,17 @@ mod tests {
|
|||||||
gpapi::os_profile::desktop::collect_profile(OsProfileBuilder::new(client_os), None)
|
gpapi::os_profile::desktop::collect_profile(OsProfileBuilder::new(client_os), None)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn cancelled_identity_report_stops_before_domain_collection() {
|
||||||
|
let input = make_input(make_profile(ClientOs::Linux));
|
||||||
|
let cancelled = || Err(io::Error::from(io::ErrorKind::Interrupted));
|
||||||
|
let error = generate_identity_report(&input, &cancelled).unwrap_err();
|
||||||
|
assert_eq!(
|
||||||
|
error.downcast_ref::<io::Error>().unwrap().kind(),
|
||||||
|
io::ErrorKind::Interrupted
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn identity_report_contains_session_identity_without_posture() {
|
fn identity_report_contains_session_identity_without_posture() {
|
||||||
for os in [ClientOs::Linux, ClientOs::Mac, ClientOs::Windows] {
|
for os in [ClientOs::Linux, ClientOs::Mac, ClientOs::Windows] {
|
||||||
@@ -823,7 +831,7 @@ mod tests {
|
|||||||
client_ipv6: Some("2001:db8::7".into()),
|
client_ipv6: Some("2001:db8::7".into()),
|
||||||
md5: "identity-token".into(),
|
md5: "identity-token".into(),
|
||||||
};
|
};
|
||||||
let xml = generate_identity_report(&input).unwrap();
|
let xml = generate_identity_report(&input, &|| Ok(())).unwrap();
|
||||||
let root = Element::parse(xml.as_bytes()).unwrap();
|
let root = Element::parse(xml.as_bytes()).unwrap();
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
unique_child(&root, "user-name").unwrap().get_text().unwrap(),
|
unique_child(&root, "user-name").unwrap().get_text().unwrap(),
|
||||||
@@ -988,7 +996,7 @@ mod tests {
|
|||||||
"emulated-domain.internal"
|
"emulated-domain.internal"
|
||||||
);
|
);
|
||||||
assert!(report.contains("<domain>emulated-domain.internal</domain>"));
|
assert!(report.contains("<domain>emulated-domain.internal</domain>"));
|
||||||
let identity = Element::parse(generate_identity_report(&input).unwrap().as_bytes()).unwrap();
|
let identity = Element::parse(generate_identity_report(&input, &|| Ok(())).unwrap().as_bytes()).unwrap();
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
unique_child(&identity, "domain").unwrap().get_text().unwrap(),
|
unique_child(&identity, "domain").unwrap().get_text().unwrap(),
|
||||||
"emulated-domain"
|
"emulated-domain"
|
||||||
@@ -1063,7 +1071,7 @@ mod tests {
|
|||||||
expected_domain
|
expected_domain
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
let identity = Element::parse(generate_identity_report(&input).unwrap().as_bytes()).unwrap();
|
let identity = Element::parse(generate_identity_report(&input, &|| Ok(())).unwrap().as_bytes()).unwrap();
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
unique_child(&identity, "domain").unwrap().get_text().unwrap(),
|
unique_child(&identity, "domain").unwrap().get_text().unwrap(),
|
||||||
"emulated-domain"
|
"emulated-domain"
|
||||||
@@ -1128,7 +1136,7 @@ mod tests {
|
|||||||
set_field(host_info_mut(&mut stale).unwrap(), "domain", "stale.internal").unwrap();
|
set_field(host_info_mut(&mut stale).unwrap(), "domain", "stale.internal").unwrap();
|
||||||
let refreshed = refresh_edited_report(&write_xml(&stale).unwrap(), &input).unwrap();
|
let refreshed = refresh_edited_report(&write_xml(&stale).unwrap(), &input).unwrap();
|
||||||
let refreshed = validate_edited_report(&refreshed).unwrap();
|
let refreshed = validate_edited_report(&refreshed).unwrap();
|
||||||
let identity = Element::parse(generate_identity_report(&input).unwrap().as_bytes()).unwrap();
|
let identity = Element::parse(generate_identity_report(&input, &|| Ok(())).unwrap().as_bytes()).unwrap();
|
||||||
for report in [&generated, &refreshed, &identity] {
|
for report in [&generated, &refreshed, &identity] {
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
unique_child(report, "domain")
|
unique_child(report, "domain")
|
||||||
|
|||||||
@@ -85,6 +85,16 @@ impl MissingPatch {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl WindowsReport {
|
impl WindowsReport {
|
||||||
|
pub(super) fn update_status(&self) -> gpapi::hip::WindowsUpdateStatus {
|
||||||
|
let mut status = gpapi::hip::WindowsUpdateStatus::default();
|
||||||
|
if self.missing_patches.is_some() {
|
||||||
|
status.checked_at = self.patches_checked_at;
|
||||||
|
} else {
|
||||||
|
status.omitted_snapshot_at = self.patches_checked_at;
|
||||||
|
}
|
||||||
|
status
|
||||||
|
}
|
||||||
|
|
||||||
pub fn render(&self) -> std::io::Result<String> {
|
pub fn render(&self) -> std::io::Result<String> {
|
||||||
let mut categories = Vec::new();
|
let mut categories = Vec::new();
|
||||||
categories.push(category(
|
categories.push(category(
|
||||||
@@ -245,6 +255,20 @@ fn category(name: &str, products: impl Iterator<Item = Element>) -> Element {
|
|||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn omitted_snapshot_can_be_refreshed_without_claiming_patch_details() {
|
||||||
|
let mut report = WindowsReport::default();
|
||||||
|
assert_eq!(report.update_status().refresh_cursor(), None);
|
||||||
|
report.patches_checked_at = Some(123);
|
||||||
|
let status = report.update_status();
|
||||||
|
assert_eq!(status.checked_at, None);
|
||||||
|
assert_eq!(status.refresh_cursor(), Some(123));
|
||||||
|
assert!(!report.render().unwrap().contains("missing-patches"));
|
||||||
|
report.missing_patches = Some(Vec::new());
|
||||||
|
assert_eq!(report.update_status().checked_at, Some(123));
|
||||||
|
assert_eq!(report.update_status().refresh_cursor(), Some(123));
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn real_posture_preserves_unavailable_values_and_escapes_product_text() {
|
fn real_posture_preserves_unavailable_values_and_escapes_product_text() {
|
||||||
let report: WindowsReport = serde_json::from_str(
|
let report: WindowsReport = serde_json::from_str(
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ license = "MIT"
|
|||||||
links = "openconnect"
|
links = "openconnect"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
gp-xml = { path = "../gp-xml" }
|
||||||
log.workspace = true
|
log.workspace = true
|
||||||
libc = "0.2"
|
libc = "0.2"
|
||||||
is_executable.workspace = true
|
is_executable.workspace = true
|
||||||
|
|||||||
@@ -153,6 +153,14 @@ extern "C" fn on_vpn_connected(pipe_fd: CommandHandle, session_info: *const VpnS
|
|||||||
extern "C" fn vpn_log(level: i32, message: *const c_char) {
|
extern "C" fn vpn_log(level: i32, message: *const c_char) {
|
||||||
let message = unsafe { std::ffi::CStr::from_ptr(message) };
|
let message = unsafe { std::ffi::CStr::from_ptr(message) };
|
||||||
let message = message.to_str().unwrap_or("Invalid log message");
|
let message = message.to_str().unwrap_or("Invalid log message");
|
||||||
|
// This dump comes from the native GlobalProtect protocol handler.
|
||||||
|
if let Some(body) = message.strip_prefix("GlobalProtect getconfig.esp response:\n") {
|
||||||
|
debug!(
|
||||||
|
"GlobalProtect getconfig.esp response:\n{}",
|
||||||
|
gp_xml::redact_xml(body.as_bytes())
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
// Strip the trailing newline
|
// Strip the trailing newline
|
||||||
let message = message.trim_end_matches('\n');
|
let message = message.trim_end_matches('\n');
|
||||||
|
|
||||||
@@ -172,3 +180,41 @@ extern "C" fn vpn_log(level: i32, message: *const c_char) {
|
|||||||
debug!("{}", message);
|
debug!("{}", message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod log_tests {
|
||||||
|
use super::vpn_log;
|
||||||
|
use std::sync::Mutex;
|
||||||
|
|
||||||
|
struct Capture(Mutex<String>);
|
||||||
|
impl log::Log for Capture {
|
||||||
|
fn enabled(&self, _: &log::Metadata<'_>) -> bool {
|
||||||
|
true
|
||||||
|
}
|
||||||
|
fn flush(&self) {}
|
||||||
|
fn log(&self, record: &log::Record<'_>) {
|
||||||
|
if record.target() == module_path!().trim_end_matches("::log_tests") {
|
||||||
|
self.0.lock().unwrap().push_str(&record.args().to_string());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn native_config_dump_keeps_settings_and_redacts_keys_before_logging() {
|
||||||
|
static CAPTURE: Capture = Capture(Mutex::new(String::new()));
|
||||||
|
log::set_logger(&CAPTURE).unwrap();
|
||||||
|
log::set_max_level(log::LevelFilter::Debug);
|
||||||
|
let message = c"GlobalProtect getconfig.esp response:\n<response><mtu>1400</mtu><akey-c2s><val>fixture-secret</val></akey-c2s><hs-key><bits>128</bits><val>fixture-handshake-key</val></hs-key></response>\n";
|
||||||
|
vpn_log(2, message.as_ptr());
|
||||||
|
vpn_log(
|
||||||
|
2,
|
||||||
|
c"GlobalProtect getconfig.esp response:\n<malformed>fixture-secret".as_ptr(),
|
||||||
|
);
|
||||||
|
let output = CAPTURE.0.lock().unwrap();
|
||||||
|
assert!(output.contains("<mtu>1400</mtu>"));
|
||||||
|
assert!(output.contains("[redacted]"));
|
||||||
|
assert!(output.contains("[XML omitted:"));
|
||||||
|
assert!(!output.contains("fixture-secret"));
|
||||||
|
assert!(!output.contains("fixture-handshake-key"));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -144,6 +144,56 @@ function Set-MachineState {
|
|||||||
} finally { $registry.Dispose() }
|
} finally { $registry.Dispose() }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# WScript.Shell creates the link but does not expose its shell property store.
|
||||||
|
function Set-ShortcutAppId([string]$Path, [string]$AppId) {
|
||||||
|
if (-not ('GPConnectShortcutProperties' -as [type])) {
|
||||||
|
Add-Type -TypeDefinition @'
|
||||||
|
using System;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
public static class GPConnectShortcutProperties {
|
||||||
|
[StructLayout(LayoutKind.Sequential)]
|
||||||
|
struct PropertyKey { public Guid format; public uint id; }
|
||||||
|
|
||||||
|
[StructLayout(LayoutKind.Explicit, Size = 24)]
|
||||||
|
struct StringPropVariant {
|
||||||
|
[FieldOffset(0)] public ushort type;
|
||||||
|
[FieldOffset(8)] public IntPtr text;
|
||||||
|
}
|
||||||
|
|
||||||
|
[ComImport, Guid("886D8EEB-8CF2-4446-8D02-CDBA1DBDCF99"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
|
||||||
|
interface IPropertyStore {
|
||||||
|
void GetCount(out uint count);
|
||||||
|
void GetAt(uint index, out PropertyKey key);
|
||||||
|
void GetValue(ref PropertyKey key, IntPtr value);
|
||||||
|
void SetValue(ref PropertyKey key, ref StringPropVariant value);
|
||||||
|
void Commit();
|
||||||
|
}
|
||||||
|
|
||||||
|
[DllImport("shell32.dll", CharSet = CharSet.Unicode, ExactSpelling = true, PreserveSig = false)]
|
||||||
|
static extern void SHGetPropertyStoreFromParsingName(string path, IntPtr context, uint flags,
|
||||||
|
ref Guid iid, [MarshalAs(UnmanagedType.Interface)] out IPropertyStore store);
|
||||||
|
|
||||||
|
public static void SetAppId(string path, string appId) {
|
||||||
|
Guid iid = typeof(IPropertyStore).GUID;
|
||||||
|
IPropertyStore store;
|
||||||
|
SHGetPropertyStoreFromParsingName(path, IntPtr.Zero, 2 /* GPS_READWRITE */, ref iid, out store);
|
||||||
|
var key = new PropertyKey { format = new Guid("9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3"), id = 5 };
|
||||||
|
var value = new StringPropVariant { type = 31 /* VT_LPWSTR */, text = Marshal.StringToCoTaskMemUni(appId) };
|
||||||
|
try {
|
||||||
|
store.SetValue(ref key, ref value);
|
||||||
|
store.Commit();
|
||||||
|
} finally {
|
||||||
|
Marshal.FreeCoTaskMem(value.text);
|
||||||
|
Marshal.ReleaseComObject(store);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
'@
|
||||||
|
}
|
||||||
|
[GPConnectShortcutProperties]::SetAppId($Path, $AppId)
|
||||||
|
}
|
||||||
|
|
||||||
function Set-InstallationMetadata([string]$InstalledVersion) {
|
function Set-InstallationMetadata([string]$InstalledVersion) {
|
||||||
$shell = New-Object -ComObject WScript.Shell
|
$shell = New-Object -ComObject WScript.Shell
|
||||||
$shortcut = $shell.CreateShortcut($shortcutPath)
|
$shortcut = $shell.CreateShortcut($shortcutPath)
|
||||||
@@ -152,6 +202,7 @@ function Set-InstallationMetadata([string]$InstalledVersion) {
|
|||||||
$shortcut.Description = 'A GUI client for GlobalProtect VPN'
|
$shortcut.Description = 'A GUI client for GlobalProtect VPN'
|
||||||
$shortcut.IconLocation = (Join-Path $destination 'gpgui.exe') + ',0'
|
$shortcut.IconLocation = (Join-Path $destination 'gpgui.exe') + ',0'
|
||||||
$shortcut.Save()
|
$shortcut.Save()
|
||||||
|
Set-ShortcutAppId $shortcutPath 'com.yuezk.gpgui'
|
||||||
if (Test-Path -LiteralPath (Join-Path $destination 'uninstall.exe')) {
|
if (Test-Path -LiteralPath (Join-Path $destination 'uninstall.exe')) {
|
||||||
New-Item -Path $uninstallKey -Force | Out-Null
|
New-Item -Path $uninstallKey -Force | Out-Null
|
||||||
$values = @{
|
$values = @{
|
||||||
|
|||||||
@@ -18,6 +18,13 @@ if ($process.ExitCode -ne 0) {
|
|||||||
if (Test-Path $log) { Get-Content $log -Tail 80 | Write-Host }
|
if (Test-Path $log) { Get-Content $log -Tail 80 | Write-Host }
|
||||||
throw "The installer failed with exit code $($process.ExitCode)."
|
throw "The installer failed with exit code $($process.ExitCode)."
|
||||||
}
|
}
|
||||||
|
$shortcut = Join-Path $env:ProgramData 'Microsoft\Windows\Start Menu\Programs\GP Connect.lnk'
|
||||||
|
$shell = New-Object -ComObject Shell.Application
|
||||||
|
$folder = $shell.Namespace((Split-Path $shortcut))
|
||||||
|
$link = $folder.ParseName((Split-Path $shortcut -Leaf))
|
||||||
|
if (!$link -or $link.ExtendedProperty('System.AppUserModel.ID') -ne 'com.yuezk.gpgui') {
|
||||||
|
throw 'The Start menu shortcut is missing the GP Connect notification identity.'
|
||||||
|
}
|
||||||
$info = Get-Content (Join-Path $destination 'build-info.json') -Raw | ConvertFrom-Json
|
$info = Get-Content (Join-Path $destination 'build-info.json') -Raw | ConvertFrom-Json
|
||||||
if ($info.architecture -ne $Architecture -or [string]$info.build_version -ne $Build) { throw 'The installed package identity does not match.' }
|
if ($info.architecture -ne $Architecture -or [string]$info.build_version -ne $Build) { throw 'The installed package identity does not match.' }
|
||||||
$service = Get-CimInstance Win32_Service -Filter "Name='GPConnect'"
|
$service = Get-CimInstance Win32_Service -Filter "Name='GPConnect'"
|
||||||
@@ -44,7 +51,6 @@ if ($process.ExitCode -ne 0) { throw 'The uninstaller failed.' }
|
|||||||
if ((Get-Service GPConnect -ErrorAction SilentlyContinue) -or (Test-Path $destination) -or (Test-Path ($destination + '.previous'))) {
|
if ((Get-Service GPConnect -ErrorAction SilentlyContinue) -or (Test-Path $destination) -or (Test-Path ($destination + '.previous'))) {
|
||||||
throw 'The uninstaller left service registration or runtime files.'
|
throw 'The uninstaller left service registration or runtime files.'
|
||||||
}
|
}
|
||||||
$shortcut = Join-Path $env:ProgramData 'Microsoft\Windows\Start Menu\Programs\GP Connect.lnk'
|
|
||||||
if ((Test-Path $shortcut) -or (Test-Path 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\GPConnect')) {
|
if ((Test-Path $shortcut) -or (Test-Path 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\GPConnect')) {
|
||||||
throw 'The uninstaller left its shortcut or registration.'
|
throw 'The uninstaller left its shortcut or registration.'
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user