From 7a865a19e9bcfc84477ef9a4087ed85539a0cd73 Mon Sep 17 00:00:00 2001 From: Bastian Kanbach Date: Mon, 28 Feb 2022 10:34:06 +0100 Subject: Remove marco WM due to logon screen bypass This commit removes invocation of MATE's window manager marco, that was introduced with 9b3526d12d9d6c828fbd4a29dec2295ae2f735a5 Having marco launched allows any user to use its keybindings to open applications which could bypass arctica-greeter and access the operating system as the "lightdm" user. --- src/arctica-greeter.vala | 35 ----------------------------------- 1 file changed, 35 deletions(-) (limited to 'src/arctica-greeter.vala') diff --git a/src/arctica-greeter.vala b/src/arctica-greeter.vala index ecbcc01..19e3b4d 100644 --- a/src/arctica-greeter.vala +++ b/src/arctica-greeter.vala @@ -1028,7 +1028,6 @@ public class ArcticaGreeter : Object string systemd_stderr; int systemd_exitcode = 0; - Pid marco_pid = 0; Pid nmapplet_pid = 0; var indicator_list = AGSettings.get_strv(AGSettings.KEY_INDICATORS); @@ -1053,24 +1052,6 @@ public class ArcticaGreeter : Object activate_upower(); - try - { - string[] argv; - - Shell.parse_argv ("marco", out argv); - Process.spawn_async (null, - argv, - null, - SpawnFlags.SEARCH_PATH, - null, - out marco_pid); - debug ("Launched marco WM. PID: %d", marco_pid); - } - catch (Error e) - { - warning ("Error starting the Marco Window Manager: %s", e.message); - } - greeter.greeter_ready.connect (() => { debug ("Showing greeter"); greeter.show (); @@ -1220,22 +1201,6 @@ public class ArcticaGreeter : Object debug ("AT-SPI terminated with signal %d", Process.term_sig (status)); atspi_pid = 0; } - - if (marco_pid != 0) - { -#if VALA_0_40 - Posix.kill (marco_pid, Posix.Signal.TERM); -#else - Posix.kill (marco_pid, Posix.SIGTERM); -#endif - int status; - Posix.waitpid (marco_pid, out status, 0); - if (Process.if_exited (status)) - debug ("Marco Window Manager exited with return value %d", Process.exit_status (status)); - else - debug ("Marco Window Manager terminated with signal %d", Process.term_sig (status)); - marco_pid = 0; - } } var screen = Gdk.Screen.get_default (); -- cgit v1.2.3