Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/core/wxc_common/src/config_contract_adapters/v0_6.rs
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,7 @@ mod tests {
format!(
r#"{{
"version": "0.6.0-alpha",
"containment": "processcontainer",
"process": {{"commandLine": "echo hello"}},
"processContainer": {{"ui": {{"isolation": "{isolation}"}}}}
}}"#
Expand Down
94 changes: 88 additions & 6 deletions src/core/wxc_common/src/config_contract_adapters/v0_7.rs
Original file line number Diff line number Diff line change
Expand Up @@ -414,15 +414,41 @@ mod tests {
"filesystem": {},
"fallback": {},
"network": {},
"ui": {},
"ui": {}
}"#;

const EMPTY_PROCESS_CONTAINER_SECTION_REQUEST_JSON: &str = r#"{
"version": "0.7.0-alpha",
"containment": "processcontainer",
"process": {
"commandLine": "echo hello"
},
"processContainer": {}
}"#;

const EMPTY_PROCESS_CONTAINER_UI_SECTION_REQUEST_JSON: &str = r#"{
"version": "0.7.0-alpha",
"containment": "processcontainer",
"process": {
"commandLine": "echo hello"
},
"processContainer": {
"ui": {}
}
}"#;

const EMPTY_SEATBELT_SECTION_REQUEST_JSON: &str = r#"{
"version": "0.7.0-alpha",
"containment": "seatbelt",
"process": {
"commandLine": "echo hello"
},
"seatbelt": {}
}"#;

const APP_CONTAINER_SECTION_ALIAS_REQUEST_JSON: &str = r#"{
"version": "0.7.0-alpha",
"containment": "processcontainer",
Comment thread
MGudgin marked this conversation as resolved.
"process": {
"commandLine": "echo hello"
},
Expand Down Expand Up @@ -597,6 +623,7 @@ mod tests {
format!(
r#"{{
"version": "0.7.0-alpha",
"containment": "seatbelt",
"process": {{"commandLine": "echo hello"}},
"seatbelt": {{"launchMethod": "{launch_method}"}}
}}"#
Expand Down Expand Up @@ -916,6 +943,13 @@ mod tests {
assert!(ui.disable.is_none());
assert!(ui.clipboard.is_none());
assert!(ui.injection.is_none());
}

#[test]
fn empty_process_container_section_maps_to_present_empty_wire_section() {
let request: super::contract::Request =
serde_json::from_str(EMPTY_PROCESS_CONTAINER_SECTION_REQUEST_JSON).unwrap();
let wire = super::into_wire(request);

let process_container = wire
.process_container
Expand All @@ -924,14 +958,45 @@ mod tests {
assert!(process_container.learning_mode.is_none());
assert!(process_container.capabilities.is_none());
assert!(process_container.capture_denials.is_none());
assert!(process_container.ui.is_none());
}

let process_container_ui = process_container
#[test]
fn empty_process_container_ui_section_maps_to_present_empty_wire_section() {
let request: super::contract::Request =
serde_json::from_str(EMPTY_PROCESS_CONTAINER_UI_SECTION_REQUEST_JSON).unwrap();
let wire = super::into_wire(request);

let process_container = wire
.process_container
.expect("processContainer should be populated");
assert!(process_container.least_privilege.is_none());
assert!(process_container.learning_mode.is_none());
assert!(process_container.capabilities.is_none());
assert!(process_container.capture_denials.is_none());

let ui = process_container
.ui
.expect("processContainer.ui should be populated");
assert!(process_container_ui.isolation.is_none());
assert!(process_container_ui.desktop_system_control.is_none());
assert!(process_container_ui.system_settings.is_none());
assert!(process_container_ui.ime.is_none());
assert!(ui.isolation.is_none());
assert!(ui.desktop_system_control.is_none());
assert!(ui.system_settings.is_none());
assert!(ui.ime.is_none());
}

#[test]
fn empty_seatbelt_section_maps_to_present_empty_wire_section() {
let request: super::contract::Request =
serde_json::from_str(EMPTY_SEATBELT_SECTION_REQUEST_JSON).unwrap();
let wire = super::into_wire(request);

let seatbelt = wire.seatbelt.expect("seatbelt should be populated");
assert!(seatbelt.profile_override.is_none());
assert!(seatbelt.gui_access.is_none());
assert!(seatbelt.launch_method.is_none());
assert!(seatbelt.nested_pty.is_none());
assert!(seatbelt.keychain_access.is_none());
assert!(seatbelt.extra_mach_lookups.is_none());
}

#[test]
Expand Down Expand Up @@ -1218,6 +1283,23 @@ mod tests {
assert_matches_current_wire_deserialization(EMPTY_OPTIONAL_SECTIONS_REQUEST_JSON);
}

#[test]
fn empty_process_container_section_matches_current_wire_deserialization() {
assert_matches_current_wire_deserialization(EMPTY_PROCESS_CONTAINER_SECTION_REQUEST_JSON);
}

#[test]
fn empty_process_container_ui_section_matches_current_wire_deserialization() {
assert_matches_current_wire_deserialization(
EMPTY_PROCESS_CONTAINER_UI_SECTION_REQUEST_JSON,
);
}

#[test]
fn empty_seatbelt_section_matches_current_wire_deserialization() {
assert_matches_current_wire_deserialization(EMPTY_SEATBELT_SECTION_REQUEST_JSON);
}

#[test]
fn proxy_variants_match_current_wire_deserialization() {
for case in PROXY_CASES {
Expand Down
Loading