mirror of
https://github.com/yuezk/GlobalProtect-openconnect.git
synced 2026-11-19 22:46:14 -05:00
feat(gui): require confirmation before interface downloads
This commit is contained in:
3 files changed
+144
-35
No files matched your search
@@ -11,6 +11,21 @@ pub enum GuiVariant {
|
|||||||
Nsh,
|
Nsh,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct GuiSwitchRequest {
|
||||||
|
pub variant: GuiVariant,
|
||||||
|
/// Permit a download only after the user accepts the confirmation dialog.
|
||||||
|
pub allow_download: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, Type)]
|
||||||
|
#[serde(rename_all = "kebab-case")]
|
||||||
|
pub enum GuiSwitchOutcome {
|
||||||
|
Switched,
|
||||||
|
DownloadRequired,
|
||||||
|
}
|
||||||
|
|
||||||
impl GuiVariant {
|
impl GuiVariant {
|
||||||
pub fn binary_name(self) -> &'static str {
|
pub fn binary_name(self) -> &'static str {
|
||||||
match self {
|
match self {
|
||||||
|
|||||||
@@ -56,11 +56,7 @@ impl<'a> GuiLauncher<'a> {
|
|||||||
uzers::get_effective_uid() != 0,
|
uzers::get_effective_uid() != 0,
|
||||||
"The desktop GUI must not be launched by root"
|
"The desktop GUI must not be launched by root"
|
||||||
);
|
);
|
||||||
if let Some(program) = tokio::select! {
|
if let Some(program) = self.find_compatible_program(cancellation).await? {
|
||||||
biased;
|
|
||||||
_ = cancellation.cancelled() => anyhow::bail!("GUI resolution cancelled"),
|
|
||||||
result = self.find_compatible_program() => result,
|
|
||||||
} {
|
|
||||||
return Ok(program);
|
return Ok(program);
|
||||||
}
|
}
|
||||||
self.download_program(cancellation).await?;
|
self.download_program(cancellation).await?;
|
||||||
@@ -73,10 +69,15 @@ impl<'a> GuiLauncher<'a> {
|
|||||||
Ok(program)
|
Ok(program)
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn find_compatible_program(&self) -> Option<PathBuf> {
|
async fn find_compatible_program(&self, cancellation: &CancellationToken) -> anyhow::Result<Option<PathBuf>> {
|
||||||
for program in &self.programs {
|
for program in &self.programs {
|
||||||
match self.check_version(program).await {
|
let result = tokio::select! {
|
||||||
Ok(()) => return Some(program.clone()),
|
biased;
|
||||||
|
_ = cancellation.cancelled() => anyhow::bail!("GUI resolution cancelled"),
|
||||||
|
result = self.check_version(program) => result,
|
||||||
|
};
|
||||||
|
match result {
|
||||||
|
Ok(()) => return Ok(Some(program.clone())),
|
||||||
Err(err) => info!(
|
Err(err) => info!(
|
||||||
"GUI candidate {} is unavailable or incompatible: {err}",
|
"GUI candidate {} is unavailable or incompatible: {err}",
|
||||||
program.display()
|
program.display()
|
||||||
@@ -84,7 +85,7 @@ impl<'a> GuiLauncher<'a> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
None
|
Ok(None)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) async fn launch_program(
|
pub(crate) async fn launch_program(
|
||||||
@@ -159,6 +160,7 @@ impl<'a> GuiLauncher<'a> {
|
|||||||
service_output: &mut (impl tokio::io::AsyncRead + Unpin),
|
service_output: &mut (impl tokio::io::AsyncRead + Unpin),
|
||||||
) -> anyhow::Result<ExitStatus> {
|
) -> anyhow::Result<ExitStatus> {
|
||||||
use super::gui_switch;
|
use super::gui_switch;
|
||||||
|
use crate::gui::GuiSwitchOutcome;
|
||||||
use crate::service::transport::{DESKTOP_SWITCH_BEGIN, DESKTOP_SWITCH_CANCEL, DESKTOP_SWITCH_COMMIT};
|
use crate::service::transport::{DESKTOP_SWITCH_BEGIN, DESKTOP_SWITCH_CANCEL, DESKTOP_SWITCH_COMMIT};
|
||||||
use tokio::io::{AsyncReadExt, AsyncWriteExt};
|
use tokio::io::{AsyncReadExt, AsyncWriteExt};
|
||||||
let mut current = Some(self.start_owned(program.to_owned(), cancellation.child_token()));
|
let mut current = Some(self.start_owned(program.to_owned(), cancellation.child_token()));
|
||||||
@@ -175,7 +177,14 @@ impl<'a> GuiLauncher<'a> {
|
|||||||
let (mut socket, _) = accepted?;
|
let (mut socket, _) = accepted?;
|
||||||
let mut pending = false;
|
let mut pending = false;
|
||||||
let replacement = async {
|
let replacement = async {
|
||||||
let variant = gui_switch::receive(&mut socket).await?;
|
let selection = gui_switch::receive(&mut socket).await?;
|
||||||
|
let variant = selection.variant;
|
||||||
|
let candidate = Self::new(self.version, self.credential.clone(), variant).envs(self.envs.clone());
|
||||||
|
let program = candidate.find_compatible_program(cancellation).await?;
|
||||||
|
if program.is_none() && !selection.allow_download {
|
||||||
|
gui_switch::reply(&mut socket, Ok(GuiSwitchOutcome::DownloadRequired)).await?;
|
||||||
|
return Ok(None);
|
||||||
|
}
|
||||||
service_input.write_all(&[DESKTOP_SWITCH_BEGIN]).await?;
|
service_input.write_all(&[DESKTOP_SWITCH_BEGIN]).await?;
|
||||||
pending = true;
|
pending = true;
|
||||||
let credential = super::desktop_launcher::read_credential(service_output).await?
|
let credential = super::desktop_launcher::read_credential(service_output).await?
|
||||||
@@ -187,7 +196,10 @@ impl<'a> GuiLauncher<'a> {
|
|||||||
let launcher = Self::new(self.version, Arc::new(credential), variant)
|
let launcher = Self::new(self.version, Arc::new(credential), variant)
|
||||||
.envs(envs)
|
.envs(envs)
|
||||||
.minimized(false);
|
.minimized(false);
|
||||||
let program = launcher.resolve_program(cancellation).await?;
|
let program = match program {
|
||||||
|
Some(program) => program,
|
||||||
|
None => launcher.resolve_program(cancellation).await?,
|
||||||
|
};
|
||||||
let mut child = launcher.start_owned(program, cancellation.child_token());
|
let mut child = launcher.start_owned(program, cancellation.child_token());
|
||||||
let start_result = tokio::select! {
|
let start_result = tokio::select! {
|
||||||
result = tokio::time::timeout(std::time::Duration::from_secs(30), ready.ready()) => {
|
result = tokio::time::timeout(std::time::Duration::from_secs(30), ready.ready()) => {
|
||||||
@@ -205,7 +217,7 @@ impl<'a> GuiLauncher<'a> {
|
|||||||
let _ = child.task.await;
|
let _ = child.task.await;
|
||||||
return Err(error);
|
return Err(error);
|
||||||
}
|
}
|
||||||
if let Err(error) = gui_switch::reply(&mut socket, Ok(())).await {
|
if let Err(error) = gui_switch::reply(&mut socket, Ok(GuiSwitchOutcome::Switched)).await {
|
||||||
child.cancel.cancel();
|
child.cancel.cancel();
|
||||||
let _ = child.task.await;
|
let _ = child.task.await;
|
||||||
return Err(error);
|
return Err(error);
|
||||||
@@ -216,10 +228,11 @@ impl<'a> GuiLauncher<'a> {
|
|||||||
return Err(error.into());
|
return Err(error.into());
|
||||||
}
|
}
|
||||||
pending = false;
|
pending = false;
|
||||||
Ok(child)
|
Ok(Some(child))
|
||||||
}.await;
|
}.await;
|
||||||
match replacement {
|
match replacement {
|
||||||
Ok(child) => retired.push(current.replace(child).unwrap()),
|
Ok(Some(child)) => retired.push(current.replace(child).unwrap()),
|
||||||
|
Ok(None) => {},
|
||||||
Err(error) => {
|
Err(error) => {
|
||||||
if pending {
|
if pending {
|
||||||
service_input.write_all(&[DESKTOP_SWITCH_CANCEL]).await?;
|
service_input.write_all(&[DESKTOP_SWITCH_CANCEL]).await?;
|
||||||
@@ -406,7 +419,13 @@ mod tests {
|
|||||||
let downloaded = executable(&dir, "downloaded", "gpgui test-version", 0);
|
let downloaded = executable(&dir, "downloaded", "gpgui test-version", 0);
|
||||||
let launcher = launcher(VERSION, vec![packaged.clone(), downloaded]);
|
let launcher = launcher(VERSION, vec![packaged.clone(), downloaded]);
|
||||||
|
|
||||||
assert_eq!(launcher.find_compatible_program().await, Some(packaged));
|
assert_eq!(
|
||||||
|
launcher
|
||||||
|
.find_compatible_program(&CancellationToken::new())
|
||||||
|
.await
|
||||||
|
.unwrap(),
|
||||||
|
Some(packaged)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
@@ -416,7 +435,13 @@ mod tests {
|
|||||||
let downloaded = executable(&dir, "downloaded", "gpgui test-version", 0);
|
let downloaded = executable(&dir, "downloaded", "gpgui test-version", 0);
|
||||||
let launcher = launcher(VERSION, vec![packaged, downloaded.clone()]);
|
let launcher = launcher(VERSION, vec![packaged, downloaded.clone()]);
|
||||||
|
|
||||||
assert_eq!(launcher.find_compatible_program().await, Some(downloaded));
|
assert_eq!(
|
||||||
|
launcher
|
||||||
|
.find_compatible_program(&CancellationToken::new())
|
||||||
|
.await
|
||||||
|
.unwrap(),
|
||||||
|
Some(downloaded)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
@@ -425,7 +450,13 @@ mod tests {
|
|||||||
let program = executable(&dir, "broken", "gpgui test-version", 1);
|
let program = executable(&dir, "broken", "gpgui test-version", 1);
|
||||||
let launcher = launcher(VERSION, vec![program]);
|
let launcher = launcher(VERSION, vec![program]);
|
||||||
|
|
||||||
assert_eq!(launcher.find_compatible_program().await, None);
|
assert_eq!(
|
||||||
|
launcher
|
||||||
|
.find_compatible_program(&CancellationToken::new())
|
||||||
|
.await
|
||||||
|
.unwrap(),
|
||||||
|
None
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
@@ -435,21 +466,41 @@ mod tests {
|
|||||||
let nsh = executable(&dir, "gpgui-nsh", "gpgui-nsh old-version", 0);
|
let nsh = executable(&dir, "gpgui-nsh", "gpgui-nsh old-version", 0);
|
||||||
let mut selected = launcher(VERSION, vec![nsh.clone()]);
|
let mut selected = launcher(VERSION, vec![nsh.clone()]);
|
||||||
selected.variant = crate::gui::GuiVariant::Nsh;
|
selected.variant = crate::gui::GuiVariant::Nsh;
|
||||||
assert!(selected.find_compatible_program().await.is_none());
|
assert!(
|
||||||
|
selected
|
||||||
|
.find_compatible_program(&CancellationToken::new())
|
||||||
|
.await
|
||||||
|
.unwrap()
|
||||||
|
.is_none()
|
||||||
|
);
|
||||||
executable(&dir, "gpgui-nsh", "gpgui-nsh test-version", 0);
|
executable(&dir, "gpgui-nsh", "gpgui-nsh test-version", 0);
|
||||||
assert_eq!(selected.find_compatible_program().await, Some(nsh));
|
assert_eq!(
|
||||||
|
selected
|
||||||
|
.find_compatible_program(&CancellationToken::new())
|
||||||
|
.await
|
||||||
|
.unwrap(),
|
||||||
|
Some(nsh)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
#[cfg(target_os = "linux")]
|
#[cfg(target_os = "linux")]
|
||||||
fn supervisor_switch_success_and_failure_preserve_child_ownership() {
|
fn supervisor_switch_success_and_failure_preserve_child_ownership() {
|
||||||
for scenario in ["success", "failure"] {
|
for scenario in ["success", "failure", "missing", "incompatible"] {
|
||||||
let directory = TempDir::new().unwrap();
|
let directory = TempDir::new().unwrap();
|
||||||
let executable = std::env::current_exe().unwrap();
|
let executable = std::env::current_exe().unwrap();
|
||||||
for name in ["gpgui", "gpgui-nsh"] {
|
for name in ["gpgui", "gpgui-nsh"] {
|
||||||
|
if scenario == "missing" && name == "gpgui-nsh" {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
let version = if scenario == "incompatible" && name == "gpgui-nsh" {
|
||||||
|
"old-version"
|
||||||
|
} else {
|
||||||
|
VERSION
|
||||||
|
};
|
||||||
let path = directory.path().join(name);
|
let path = directory.path().join(name);
|
||||||
fs::write(&path, format!(
|
fs::write(&path, format!(
|
||||||
"#!/bin/sh\nif [ \"$1\" = --version ]; then echo '{name} {VERSION}'; exit 0; fi\nGP_SWITCH_GUI_VARIANT={name} exec '{}' --exact process::gui_launcher::tests::gui_process_fixture --ignored --nocapture\n",
|
"#!/bin/sh\nif [ \"$1\" = --version ]; then echo '{name} {version}'; exit 0; fi\nGP_SWITCH_GUI_VARIANT={name} exec '{}' --exact process::gui_launcher::tests::gui_process_fixture --ignored --nocapture\n",
|
||||||
executable.display()
|
executable.display()
|
||||||
)).unwrap();
|
)).unwrap();
|
||||||
fs::set_permissions(path, fs::Permissions::from_mode(0o755)).unwrap();
|
fs::set_permissions(path, fs::Permissions::from_mode(0o755)).unwrap();
|
||||||
@@ -581,15 +632,19 @@ mod tests {
|
|||||||
use crate::service::transport::{DESKTOP_SWITCH_BEGIN, DESKTOP_SWITCH_CANCEL, DESKTOP_SWITCH_COMMIT};
|
use crate::service::transport::{DESKTOP_SWITCH_BEGIN, DESKTOP_SWITCH_CANCEL, DESKTOP_SWITCH_COMMIT};
|
||||||
use tokio::io::{AsyncReadExt, AsyncWriteExt};
|
use tokio::io::{AsyncReadExt, AsyncWriteExt};
|
||||||
let directory = PathBuf::from(std::env::var_os("GP_SWITCH_DIRECTORY").unwrap());
|
let directory = PathBuf::from(std::env::var_os("GP_SWITCH_DIRECTORY").unwrap());
|
||||||
let success = std::env::var("GP_SWITCH_SCENARIO").unwrap() == "success";
|
let scenario = std::env::var("GP_SWITCH_SCENARIO").unwrap();
|
||||||
|
let success = scenario == "success";
|
||||||
|
let download_required = matches!(scenario.as_str(), "missing" | "incompatible");
|
||||||
let listener = super::super::gui_switch::SwitchListener::new().unwrap();
|
let listener = super::super::gui_switch::SwitchListener::new().unwrap();
|
||||||
let (mut service_input, mut control) = tokio::io::duplex(64);
|
let (mut service_input, mut control) = tokio::io::duplex(64);
|
||||||
let (mut service_output, mut credentials) = tokio::io::duplex(2048);
|
let (mut service_output, mut credentials) = tokio::io::duplex(2048);
|
||||||
|
let service_marker = directory.join("service-switch-started");
|
||||||
let service = tokio::spawn(async move {
|
let service = tokio::spawn(async move {
|
||||||
loop {
|
loop {
|
||||||
let message = control.read_u8().await.unwrap();
|
let message = control.read_u8().await.unwrap();
|
||||||
match message {
|
match message {
|
||||||
DESKTOP_SWITCH_BEGIN => {
|
DESKTOP_SWITCH_BEGIN => {
|
||||||
|
fs::write(&service_marker, "").unwrap();
|
||||||
let credential = SessionCredential::generate(Uuid::new_v4(), VERSION).unwrap();
|
let credential = SessionCredential::generate(Uuid::new_v4(), VERSION).unwrap();
|
||||||
credentials
|
credentials
|
||||||
.write_all(&credential.encode_frame().unwrap())
|
.write_all(&credential.encode_frame().unwrap())
|
||||||
@@ -617,8 +672,36 @@ mod tests {
|
|||||||
while !directory.join("gpgui-started").exists() {
|
while !directory.join("gpgui-started").exists() {
|
||||||
tokio::time::sleep(std::time::Duration::from_millis(10)).await;
|
tokio::time::sleep(std::time::Duration::from_millis(10)).await;
|
||||||
}
|
}
|
||||||
let result = super::super::gui_switch::request_at(&listener.path(), crate::gui::GuiVariant::Nsh).await;
|
let result = super::super::gui_switch::request_at(
|
||||||
anyhow::ensure!(result.is_ok() == success, "Unexpected switch result: {result:?}");
|
&listener.path(),
|
||||||
|
crate::gui::GuiSwitchRequest {
|
||||||
|
variant: crate::gui::GuiVariant::Nsh,
|
||||||
|
allow_download: false,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
if download_required {
|
||||||
|
anyhow::ensure!(
|
||||||
|
result? == crate::gui::GuiSwitchOutcome::DownloadRequired,
|
||||||
|
"Missing download confirmation"
|
||||||
|
);
|
||||||
|
anyhow::ensure!(
|
||||||
|
!directory.join("service-switch-started").exists(),
|
||||||
|
"Download check changed the service session"
|
||||||
|
);
|
||||||
|
anyhow::ensure!(
|
||||||
|
!directory.join("gpgui-nsh-started").exists(),
|
||||||
|
"Download check launched the replacement"
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
anyhow::ensure!(result.is_ok() == success, "Unexpected switch result: {result:?}");
|
||||||
|
if success {
|
||||||
|
anyhow::ensure!(
|
||||||
|
result? == crate::gui::GuiSwitchOutcome::Switched,
|
||||||
|
"Compatible GUI did not switch directly"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
anyhow::ensure!(
|
anyhow::ensure!(
|
||||||
!directory.join("gpgui-exited").exists(),
|
!directory.join("gpgui-exited").exists(),
|
||||||
"Current GUI exited before acknowledgement"
|
"Current GUI exited before acknowledgement"
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ use tokio::{
|
|||||||
net::{UnixListener, UnixStream},
|
net::{UnixListener, UnixStream},
|
||||||
};
|
};
|
||||||
|
|
||||||
use crate::gui::GuiVariant;
|
use crate::gui::{GuiSwitchOutcome, GuiSwitchRequest};
|
||||||
|
|
||||||
pub(crate) const SOCKET_ENV: &str = "GP_DESKTOP_CONTROL_SOCKET";
|
pub(crate) const SOCKET_ENV: &str = "GP_DESKTOP_CONTROL_SOCKET";
|
||||||
pub(crate) const READY_ENV: &str = "GP_DESKTOP_READY_SOCKET";
|
pub(crate) const READY_ENV: &str = "GP_DESKTOP_READY_SOCKET";
|
||||||
@@ -22,20 +22,24 @@ pub fn notify_ready() -> anyhow::Result<()> {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn request(variant: GuiVariant) -> anyhow::Result<()> {
|
pub async fn request(selection: GuiSwitchRequest) -> anyhow::Result<GuiSwitchOutcome> {
|
||||||
let path = std::env::var_os(SOCKET_ENV).context("GUI switching requires a desktop supervisor")?;
|
let path = std::env::var_os(SOCKET_ENV).context("GUI switching requires a desktop supervisor")?;
|
||||||
request_at(std::path::Path::new(&path), variant).await
|
request_at(std::path::Path::new(&path), selection).await
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(super) async fn request_at(path: &std::path::Path, variant: GuiVariant) -> anyhow::Result<()> {
|
pub(super) async fn request_at(
|
||||||
|
path: &std::path::Path,
|
||||||
|
selection: GuiSwitchRequest,
|
||||||
|
) -> anyhow::Result<GuiSwitchOutcome> {
|
||||||
let mut socket = UnixStream::connect(path)
|
let mut socket = UnixStream::connect(path)
|
||||||
.await
|
.await
|
||||||
.context("Could not contact the desktop supervisor")?;
|
.context("Could not contact the desktop supervisor")?;
|
||||||
socket.write_all(&serde_json::to_vec(&variant)?).await?;
|
socket.write_all(&serde_json::to_vec(&selection)?).await?;
|
||||||
socket.shutdown().await?;
|
socket.shutdown().await?;
|
||||||
let mut reply = Vec::new();
|
let mut reply = Vec::new();
|
||||||
socket.take(4096).read_to_end(&mut reply).await?;
|
socket.take(4096).read_to_end(&mut reply).await?;
|
||||||
let result: Result<(), String> = serde_json::from_slice(&reply).context("Invalid desktop supervisor response")?;
|
let result: Result<GuiSwitchOutcome, String> =
|
||||||
|
serde_json::from_slice(&reply).context("Invalid desktop supervisor response")?;
|
||||||
result.map_err(anyhow::Error::msg)
|
result.map_err(anyhow::Error::msg)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -70,7 +74,7 @@ impl SwitchListener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) async fn receive(socket: &mut UnixStream) -> anyhow::Result<GuiVariant> {
|
pub(crate) async fn receive(socket: &mut UnixStream) -> anyhow::Result<GuiSwitchRequest> {
|
||||||
anyhow::ensure!(
|
anyhow::ensure!(
|
||||||
socket.peer_cred()?.uid() == uzers::get_effective_uid(),
|
socket.peer_cred()?.uid() == uzers::get_effective_uid(),
|
||||||
"Desktop supervisor user mismatch"
|
"Desktop supervisor user mismatch"
|
||||||
@@ -84,7 +88,7 @@ pub(crate) async fn receive(socket: &mut UnixStream) -> anyhow::Result<GuiVarian
|
|||||||
serde_json::from_slice(&request).context("Invalid GUI selection")
|
serde_json::from_slice(&request).context("Invalid GUI selection")
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) async fn reply(socket: &mut UnixStream, result: Result<(), String>) -> anyhow::Result<()> {
|
pub(crate) async fn reply(socket: &mut UnixStream, result: Result<GuiSwitchOutcome, String>) -> anyhow::Result<()> {
|
||||||
socket.write_all(&serde_json::to_vec(&result)?).await?;
|
socket.write_all(&serde_json::to_vec(&result)?).await?;
|
||||||
socket.shutdown().await?;
|
socket.shutdown().await?;
|
||||||
Ok(())
|
Ok(())
|
||||||
@@ -96,19 +100,26 @@ mod tests {
|
|||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn private_switch_socket_preserves_selection_and_reports_failure() {
|
async fn private_switch_socket_preserves_selection_and_reports_failure() {
|
||||||
|
let selection = GuiSwitchRequest {
|
||||||
|
variant: crate::gui::GuiVariant::Nsh,
|
||||||
|
allow_download: false,
|
||||||
|
};
|
||||||
let control = SwitchListener::new().unwrap();
|
let control = SwitchListener::new().unwrap();
|
||||||
let path = control.path();
|
let path = control.path();
|
||||||
assert_eq!(std::fs::metadata(&path).unwrap().permissions().mode() & 0o777, 0o600);
|
assert_eq!(std::fs::metadata(&path).unwrap().permissions().mode() & 0o777, 0o600);
|
||||||
let client = tokio::spawn(async move {
|
let client = tokio::spawn(async move {
|
||||||
let mut socket = UnixStream::connect(path).await.unwrap();
|
let mut socket = UnixStream::connect(path).await.unwrap();
|
||||||
socket.write_all(b"\"nsh\"").await.unwrap();
|
socket
|
||||||
|
.write_all(&serde_json::to_vec(&selection).unwrap())
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
socket.shutdown().await.unwrap();
|
socket.shutdown().await.unwrap();
|
||||||
let mut reply = Vec::new();
|
let mut reply = Vec::new();
|
||||||
socket.read_to_end(&mut reply).await.unwrap();
|
socket.read_to_end(&mut reply).await.unwrap();
|
||||||
serde_json::from_slice::<Result<(), String>>(&reply).unwrap()
|
serde_json::from_slice::<Result<GuiSwitchOutcome, String>>(&reply).unwrap()
|
||||||
});
|
});
|
||||||
let (mut socket, _) = control.listener.accept().await.unwrap();
|
let (mut socket, _) = control.listener.accept().await.unwrap();
|
||||||
assert_eq!(receive(&mut socket).await.unwrap(), GuiVariant::Nsh);
|
assert_eq!(receive(&mut socket).await.unwrap(), selection);
|
||||||
reply(&mut socket, Err("Selected GUI could not start".into()))
|
reply(&mut socket, Err("Selected GUI could not start".into()))
|
||||||
.await
|
.await
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|||||||
Reference in new issue
Block a user