From 1344aa23f68ffb2c33f80f26b2ae249452aba776 Mon Sep 17 00:00:00 2001 From: Randall Winkhart Date: Sat, 8 Jul 2023 17:24:57 -0400 Subject: [PATCH] Fixed privilege escalation code attempting to run when interacting with user-only menus Former-commit-id: bcc2a99ab5324a049982bfff83eb191cfd7c0346 Former-commit-id: ce58e4b07a2e5fc26ab34c8ecdc695953b5a2d58 --- lib/stweak.py | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/lib/stweak.py b/lib/stweak.py index 0b9d971..c175c10 100644 --- a/lib/stweak.py +++ b/lib/stweak.py @@ -512,7 +512,7 @@ def global_menu(_scr, _device_type, _top_message): _exit_signal = True if _exit_signal: break - return False, False, False + return None, None, None # runs initial configuration wizard @@ -582,16 +582,18 @@ def wrapped_entry(_gm_device_type, _gm_top_message='configuration options:'): _ext_name, _escalator, _action = \ wrapper(lambda _wrap_stdscr: (use_default_colors(), global_menu(_wrap_stdscr, _gm_device_type, _gm_top_message)))[1] - if _action: - # install with privilege escalation (outside of curses) - from tempfile import gettempdir - _exe_dir, _ini_dir = f"{gettempdir()}/sshyp_exe", f"{gettempdir()}/sshyp_ini" - run((_escalator, 'chown', 'root:root', _exe_dir, _ini_dir)) - run((_escalator, 'mv', _exe_dir, f"/usr/lib/sshyp/{_ext_name}")) - run((_escalator, 'mv', _ini_dir, f"/usr/lib/sshyp/extensions/{_ext_name}.ini")) - else: - # uninstall with privilege escalation (outside of curses) - run((_escalator, 'rm', '-I', f"/usr/lib/sshyp/{_ext_name}", - f"/usr/lib/sshyp/extensions/{_ext_name}.ini")) + # only run if privilege escalation is needed + if _action is not None: + if _action: + # install with privilege escalation (outside of curses) + from tempfile import gettempdir + _exe_dir, _ini_dir = f"{gettempdir()}/sshyp_exe", f"{gettempdir()}/sshyp_ini" + run((_escalator, 'chown', 'root:root', _exe_dir, _ini_dir)) + run((_escalator, 'mv', _exe_dir, f"/usr/lib/sshyp/{_ext_name}")) + run((_escalator, 'mv', _ini_dir, f"/usr/lib/sshyp/extensions/{_ext_name}.ini")) + else: + # uninstall with privilege escalation (outside of curses) + run((_escalator, 'rm', '-I', f"/usr/lib/sshyp/{_ext_name}", + f"/usr/lib/sshyp/extensions/{_ext_name}.ini")) for _message in term_messages: print(f"\n{_message}\n")