Better matching of sh and su

Closes #1551

CHANGELOG.md

@@ -16,6 +16,7 @@ Changelog
 **Next release**
 
 * Fixed restrictions not always showing correct after on demand restricting ([issue](/../../issues/1549))
+* Better matching of *sh* and *su* ([issue](/../../issues/1551))
 
 [Open issues](https://github.com/M66B/XPrivacy/issues?state=open)
 

README.md

@@ -520,7 +520,9 @@ To import and export XPrivacy's data, you need the [pro version](http://www.xpri
 <a name="FAQ10"></a>
 **(10) Can I restrict root access?**
 
-Yes, via "Shell (commands, superuser) > su".
+Yes, via "Shell (commands, superuser) > su",
+but be aware that applications can acquire root privileges through native libraries too.
+An example is [Android Terminal Emulator](https://play.google.com/store/apps/details?id=jackpal.androidterm).
 
 <a name="FAQ11"></a>
 **(11) Will restrictions be applied immediately?**

src/biz/bokhorst/xprivacy/XProcessBuilder.java

@@ -43,11 +43,8 @@ protected void before(XParam param) throws Throwable {
 			// Check commands
 			if (listProg != null) {
 				String command = TextUtils.join(" ", listProg);
-				if (mCommand == null ? !(command.startsWith("sh") || command.startsWith("su")
-						|| command.contains("sh ") || command.contains("su ")) : command.startsWith(mCommand)
-						|| command.contains(mCommand + " "))
-					if (isRestrictedExtra(param, command))
-						param.setThrowable(new IOException());
+				if (XRuntime.matches(command, mCommand) && isRestrictedExtra(param, command))
+					param.setThrowable(new IOException());
 			}
 		} else
 			Util.log(this, Log.WARN, "Unknown method=" + methodName);

src/biz/bokhorst/xprivacy/XRuntime.java

@@ -65,11 +65,8 @@ protected void before(XParam param) throws Throwable {
 			// Check programs
 			if (progs != null) {
 				String command = TextUtils.join(" ", progs);
-				if (mCommand == null ? !(command.startsWith("sh") || command.startsWith("su")
-						|| command.contains("sh ") || command.contains("su ")) : command.startsWith(mCommand)
-						|| command.contains(mCommand + " "))
-					if (isRestrictedExtra(param, command))
-						param.setThrowable(new IOException());
+				if (matches(command, mCommand) && isRestrictedExtra(param, command))
+					param.setThrowable(new IOException());
 			}
 
 		} else if (mMethod == Methods.load || mMethod == Methods.loadLibrary) {
@@ -80,6 +77,25 @@ protected void before(XParam param) throws Throwable {
 			Util.log(this, Log.WARN, "Unknown method=" + param.method.getName());
 	}
 
+	public static boolean matches(String command, String mCommand) {
+		if (mCommand == null)
+			return !isShell(command) && !isSU(command);
+		else if (mCommand.equals("sh"))
+			return isShell(command);
+		else if (mCommand.equals("su"))
+			return isSU(command);
+		else
+			return false;
+	}
+
+	private static boolean isShell(String command) {
+		return command.startsWith("sh") || command.matches("/.*/.*/sh.*") || command.contains("sh ");
+	}
+
+	private static boolean isSU(String command) {
+		return command.startsWith("su") || command.matches("/.*/.*/su.*") || command.contains("su ");
+	}
+
 	@Override
 	protected void after(XParam param) throws Throwable {
 	}