From 9317586851434973f1d5d4bb41b70b83cfe535ad Mon Sep 17 00:00:00 2001 From: Adam Lawson Date: Tue, 20 Jul 2021 12:52:14 +0100 Subject: [PATCH] Better check for if device has root "which su" will return the path of the su binary, or it will return nothing. The python boolean of a string with something in it (such as the path of the su binary), will be True. An empty string (where there is no su binary) will be False. --- mvt/android/modules/adb/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mvt/android/modules/adb/base.py b/mvt/android/modules/adb/base.py index 31aa931..3deacf7 100644 --- a/mvt/android/modules/adb/base.py +++ b/mvt/android/modules/adb/base.py @@ -96,7 +96,7 @@ class AndroidExtraction(MVTModule): """Check if we have a `su` binary on the Android device. :returns: Boolean indicating whether a `su` binary is present or not """ - return bool(self._adb_command("[ ! -f /sbin/su ] || echo 1")) + return bool(self._adb_command("which su")) def _adb_root_or_die(self): """Check if we have a `su` binary, otherwise raise an Exception.