Adjust chmod and add restorecon to app_process/libdaemonize

Chainfire · Chainfire · commit 88ada1f80e21 · 2018-12-19T10:48:10.000+01:00
This may prevent some EACCESS issues and allow the non-root app to
clear left-over files.
diff --git a/librootjava/src/main/java/eu/chainfire/librootjava/AppProcess.java b/librootjava/src/main/java/eu/chainfire/librootjava/AppProcess.java
@@ -321,14 +321,17 @@ public static String getAppProcessRelocate(Context context, String appProcessBas
             }
         }
 
+        boolean onData = path.startsWith("/data/");
+
         String appProcessCopy;
         if (guessIfAppProcessIs64Bits(appProcessBase)) {
             appProcessCopy = path + "/.app_process64_" + uuid;
         } else {
             appProcessCopy = path + "/.app_process32_" + uuid;
         }
         preLaunch.add(String.format(Locale.ENGLISH, "%s cp %s %s >/dev/null 2>/dev/null", box, appProcessBase, appProcessCopy));
-        preLaunch.add(String.format(Locale.ENGLISH, "%s chmod 0700 %s >/dev/null 2>/dev/null", box, appProcessCopy));
+        preLaunch.add(String.format(Locale.ENGLISH, "%s chmod %s %s >/dev/null 2>/dev/null", box, onData ? "0766" : "0700", appProcessCopy));
+        if (onData) preLaunch.add(String.format(Locale.ENGLISH, "restorecon %s >/dev/null 2>/dev/null", appProcessCopy));
         postExecution.add(String.format(Locale.ENGLISH, "%s rm %s >/dev/null 2>/dev/null", box, appProcessCopy));
         return appProcessCopy;
     }
diff --git a/librootjavadaemon/src/main/java/eu/chainfire/librootjavadaemon/RootDaemon.java b/librootjavadaemon/src/main/java/eu/chainfire/librootjavadaemon/RootDaemon.java
@@ -76,8 +76,11 @@ public static List<String> patchLaunchScript(Context context, List<String> scrip
                 // copy our executable
                 String libSrc = RootJava.getLibraryPath(context, "daemonize");
                 String libDest = app_process_path + "/.daemonize_" + AppProcess.uuid;
+                boolean onData = libDest.startsWith("/data/");
+
                 ret.add(String.format(Locale.ENGLISH, "%s cp %s %s >/dev/null 2>/dev/null", AppProcess.box, libSrc, libDest));
-                ret.add(String.format(Locale.ENGLISH, "%s chmod 0700 %s >/dev/null 2>/dev/null", AppProcess.box, libDest));
+                ret.add(String.format(Locale.ENGLISH, "%s chmod %s %s >/dev/null 2>/dev/null", AppProcess.box, onData ? "0766" : "0700", libDest));
+                if (onData) ret.add(String.format(Locale.ENGLISH, "restorecon %s >/dev/null 2>/dev/null", libDest));
 
                 // inject executable into command
                 int idx = line.indexOf(app_process);

Original file line number	Diff line number	Diff line change
`@@ -321,14 +321,17 @@ public static String getAppProcessRelocate(Context context, String appProcessBas`
`321`	`321`	`}`
`322`	`322`	`}`
`323`	`323`
	`324`	`+ boolean onData = path.startsWith("/data/");`
	`325`	`+`
`324`	`326`	`String appProcessCopy;`
`325`	`327`	`if (guessIfAppProcessIs64Bits(appProcessBase)) {`
`326`	`328`	`appProcessCopy = path + "/.app_process64_" + uuid;`
`327`	`329`	`} else {`
`328`	`330`	`appProcessCopy = path + "/.app_process32_" + uuid;`
`329`	`331`	`}`
`330`	`332`	`preLaunch.add(String.format(Locale.ENGLISH, "%s cp %s %s >/dev/null 2>/dev/null", box, appProcessBase, appProcessCopy));`
`331`		`- preLaunch.add(String.format(Locale.ENGLISH, "%s chmod 0700 %s >/dev/null 2>/dev/null", box, appProcessCopy));`
	`333`	`+ preLaunch.add(String.format(Locale.ENGLISH, "%s chmod %s %s >/dev/null 2>/dev/null", box, onData ? "0766" : "0700", appProcessCopy));`
	`334`	`+ if (onData) preLaunch.add(String.format(Locale.ENGLISH, "restorecon %s >/dev/null 2>/dev/null", appProcessCopy));`
`332`	`335`	`postExecution.add(String.format(Locale.ENGLISH, "%s rm %s >/dev/null 2>/dev/null", box, appProcessCopy));`
`333`	`336`	`return appProcessCopy;`
`334`	`337`	`}`