From 0cc8b7b705e37e399ee1a5194415f2974891e222 Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk Date: Wed, 17 May 2023 19:26:42 -0600 Subject: [PATCH] utilities.py: Use geteuid() for elevated --- resources/kdk_handler.py | 8 ++++---- resources/utilities.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/kdk_handler.py b/resources/kdk_handler.py index be91bb8ca..18569217e 100644 --- a/resources/kdk_handler.py +++ b/resources/kdk_handler.py @@ -452,7 +452,7 @@ class KernelDebugKitObject: if self.passive is True: return - if os.getuid() != 0: + if os.geteuid() != 0: logging.warning("- Cannot remove KDK, not running as root") return @@ -567,7 +567,7 @@ class KernelDebugKitUtilities: bool: True if successful, False if not """ - if os.getuid() != 0: + if os.geteuid() != 0: logging.warning("- Cannot install KDK, not running as root") return False @@ -598,7 +598,7 @@ class KernelDebugKitUtilities: bool: True if successful, False if not """ - if os.getuid() != 0: + if os.geteuid() != 0: logging.warning("- Cannot install KDK, not running as root") return False @@ -659,7 +659,7 @@ class KernelDebugKitUtilities: logging.warning("- Malformed KDK Info.plist provided, cannot create backup") return - if os.getuid() != 0: + if os.geteuid() != 0: logging.warning("- Cannot create KDK backup, not running as root") return diff --git a/resources/utilities.py b/resources/utilities.py index 63d3fad97..8cbc13ec6 100644 --- a/resources/utilities.py +++ b/resources/utilities.py @@ -531,7 +531,7 @@ def check_boot_mode(): def elevated(*args, **kwargs) -> subprocess.CompletedProcess: # When running through our GUI, we run as root, however we do not get uid 0 # Best to assume CLI is running as root - if os.getuid() == 0 or check_cli_args() is not None: + if os.geteuid() == 0 or check_cli_args() is not None: return subprocess.run(*args, **kwargs) else: return subprocess.run(["sudo"] + [args[0][0]] + args[0][1:], **kwargs)