pacwrap/pacwrap
pacwrap/pacwrap
1
0
Fork 0
Code Issues Activity Actions

Fix Xwayland bug relating to Xauthority presence

Browse source 
XAuthority file may not be present under a Wayland session. Therefore
we only mount it into the container if it is present.
This commit is contained in:
Xavier Moffett 2025-03-18 22:35:45 -04:00
parent a849e30528
commit f8c82d8bf2
Signed by: Sapphirus
GPG key ID: A6C061B2CEA1A7AC
1 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
pacwrap-core/src/config/permission/display.rs
View file

@ -93,14 +93,6 @@ fn validate_xorg_socket() -> Result<Option<Condition>, PermError> {
Err(Fail(format!("Expected value with colon delimiter: `DISPLAY={}`.", *X11_DISPLAY)))? Err(Fail(format!("Expected value with colon delimiter: `DISPLAY={}`.", *X11_DISPLAY)))?
} }
if XAUTHORITY.is_empty() {
Err(Fail("XAUTHORITY environment variable unspecified.".into()))?
}
if !Path::new(*XAUTHORITY).exists() {
Err(Fail(format!("Xauthority file '{}' not found.", *XAUTHORITY)))?
}
let display: Vec<&str> = X11_DISPLAY.split(":").collect(); let display: Vec<&str> = X11_DISPLAY.split(":").collect();
let xorg_socket = format!("/tmp/.X11-unix/X{}", display[1]); let xorg_socket = format!("/tmp/.X11-unix/X{}", display[1]);
@ -132,8 +124,11 @@ fn configure_xorg(args: &mut ExecutionArgs) {
let container_xauth = format!("{}/Xauthority", *XDG_RUNTIME_DIR); let container_xauth = format!("{}/Xauthority", *XDG_RUNTIME_DIR);
args.env("DISPLAY", *X11_DISPLAY); args.env("DISPLAY", *X11_DISPLAY);
args.env("XAUTHORITY", &container_xauth);
args.bind(&ReadOnly, *XAUTHORITY, &container_xauth); if Path::new(*XAUTHORITY).exists() {
args.env("XAUTHORITY", &container_xauth);
args.bind(&ReadOnly, *XAUTHORITY, &container_xauth);
}
if display[0].is_empty() || display[0] == "unix" { if display[0].is_empty() || display[0] == "unix" {
args.bind(&ReadOnly, &xorg_socket, &xorg_socket); args.bind(&ReadOnly, &xorg_socket, &xorg_socket);