su: warning legacy cmd

Author: vvb2060

app/core/src/main/java/com/topjohnwu/magisk/core/su/SuCallbackHandler.kt

@@ -57,6 +57,7 @@ object SuCallbackHandler {
         val toUid = data.getIntComp("to.uid", -1)
         val pid = data.getIntComp("pid", -1)
         val command = data.getString("command", "")
+        val legacyCmd = data.getBoolean("legacy_cmd", false)
         val target = data.getIntComp("target", -1)
         val seContext = data.getString("context", "")
         val gids = data.getString("gids", "")
@@ -70,7 +71,7 @@ object SuCallbackHandler {
         }.getOrNull() ?: createSuLog(fromUid, toUid, pid, command, policy, target, seContext, gids)
 
         if (notify)
-            notify(context, log.action >= SuPolicy.ALLOW, log.appName)
+            notify(context, log.action >= SuPolicy.ALLOW, log.appName, legacyCmd)
 
         runBlocking { ServiceLocator.logRepo.insert(log) }
     }
@@ -79,24 +80,30 @@ object SuCallbackHandler {
         val uid = data.getIntComp("from.uid", -1)
         val pid = data.getIntComp("pid", -1)
         val policy = data.getIntComp("policy", SuPolicy.ALLOW)
+        val legacyCmd = data.getBoolean("legacy_cmd", false)
 
         val pm = context.packageManager
 
         val appName = runCatching {
             pm.getPackageInfo(uid, pid)?.applicationInfo?.getLabel(pm)
         }.getOrNull() ?: "[UID] $uid"
 
-        notify(context, policy >= SuPolicy.ALLOW, appName)
+        notify(context, policy >= SuPolicy.ALLOW, appName, legacyCmd)
     }
 
-    private fun notify(context: Context, granted: Boolean, appName: String) {
+    private fun notify(context: Context, granted: Boolean,
+                       appName: String, legacyCmd: Boolean) {
         if (Config.suNotification == Config.Value.NOTIFICATION_TOAST) {
             val resId = if (granted)
                 R.string.su_allow_toast
             else
                 R.string.su_deny_toast
 
-            context.toast(context.getString(resId, appName), Toast.LENGTH_SHORT)
+            var str = context.getString(resId, appName)
+            if (legacyCmd) {
+                str += "\n${context.getString(R.string.su_legacy_cmd)}"
+            }
+            context.toast(str, Toast.LENGTH_SHORT)
         }
     }
 }

app/core/src/main/res/values-zh-rCN/strings.xml

@@ -64,6 +64,7 @@
     <string name="thirtymin">30 分钟</string>
     <string name="sixtymin">60 分钟</string>
     <string name="su_allow_toast">%1$s 已被授予超级用户权限</string>
+    <string name="su_legacy_cmd">警告：检测到不支持的命令行</string>
     <string name="su_deny_toast">%1$s 已被拒绝超级用户权限</string>
     <string name="su_snack_grant">已授予 %1$s 超级用户权限</string>
     <string name="su_snack_deny">已拒绝 %1$s 超级用户权限</string>

app/core/src/main/res/values/strings.xml

@@ -63,6 +63,7 @@
     <string name="thirtymin">30 mins</string>
     <string name="sixtymin">60 mins</string>
     <string name="su_allow_toast">%1$s was granted Superuser rights</string>
+    <string name="su_legacy_cmd">Warning: Unsupported command line detected</string>
     <string name="su_deny_toast">%1$s was denied Superuser rights</string>
     <string name="su_snack_grant">Superuser rights of %1$s are granted</string>
     <string name="su_snack_deny">Superuser rights of %1$s are denied</string>

native/src/core/lib.rs

@@ -132,6 +132,7 @@ pub mod ffi {
         keep_env: bool,
         drop_cap: bool,
         command: Vec<String>,
+        legacy_cmd: bool,
         context: String,
         gids: Vec<u32>,
     }

native/src/core/su/connect.rs

@@ -243,6 +243,10 @@ impl SuAppContext<'_> {
                 key: "policy",
                 value: Int(self.settings.policy.repr),
             },
+            Extra {
+                key: "legacy_cmd",
+                value: Bool(self.request.legacy_cmd),
+            },
         ];
         self.exec_cmd("notify", &extras, true);
     }
@@ -282,6 +286,10 @@ impl SuAppContext<'_> {
                 key: "command",
                 value: Str(command),
             },
+            Extra {
+                key: "legacy_cmd",
+                value: Bool(self.request.legacy_cmd),
+            },
             Extra {
                 key: "notify",
                 value: Bool(self.settings.notify),

native/src/core/su/daemon.rs

@@ -22,6 +22,7 @@ impl Default for SuRequest {
             keep_env: false,
             drop_cap: false,
             command: vec![],
+            legacy_cmd: false,
             context: "".to_string(),
             gids: vec![],
         }

native/src/core/su/su.cpp

@@ -415,6 +415,7 @@ void exec_root_shell(int client, int pid, SuRequest &req, MntNsMode mode) {
     if (req.command.size() >= 4 &&
         string_view(req.command[1].c_str()) == "-c" &&
         string_view(req.command[2].c_str()).find(' ') == string::npos) {
+        req.legacy_cmd = true;
         cmd = req.command[2].c_str();
         for (size_t i = 3; i < req.command.size(); ++i) {
             cmd += ' ';