Removed /proc exceptions, added whitelist for /proc

Refs #1375

CHANGELOG.md

@@ -16,6 +16,8 @@ Changelog
 
 * Localized whitelist names ([issue](/../../issues/1375))
 * Sorted whitelist entries ([issue](/../../issues/1375))
+* Removed /proc exceptions, except */proc/self/cmdline*
+* Added whitelist for /proc
 * Updated Dutch translation
 
 [Open issues](https://github.com/M66B/XPrivacy/issues?state=open)

res/values/strings.xml

@@ -110,6 +110,7 @@ however it is impossible to guarantee it will work flawlessly on each and every
     <string name="whitelist_filename" tools:ignore="UnusedResources">File names</string>
     <string name="whitelist_command" tools:ignore="UnusedResources">Shell commands</string>
     <string name="whitelist_url" tools:ignore="UnusedResources">URLs</string>
+    <string name="whitelist_proc" translatable="false" tools:ignore="UnusedResources">/proc</string>
     <string name="title_restrict">Check to restrict:</string>
     <string name="title_check_whitelist">Check to allow</string>
     <string name="title_fused">Filter on data usage</string>

src/biz/bokhorst/xprivacy/ActivityApp.java

@@ -878,7 +878,7 @@ protected void onPostExecute(Object result) {
 
 					final List<String> localizedType = new ArrayList<String>();
 					for (String type : mListWhitelist.keySet()) {
-						String name = type.toLowerCase().replace(".", "_");
+						String name = type.toLowerCase().replace(".", "_").replace("/", "");
 						int id = getResources().getIdentifier(name, "string", ActivityApp.this.getPackageName());
 						localizedType.add(getResources().getString(id));
 					}

src/biz/bokhorst/xprivacy/Meta.java

@@ -17,6 +17,7 @@ public class Meta {
 	public final static String cWhitelistFilename = "Whitelist.Filename";
 	public final static String cWhitelistCommand = "Whitelist.Command";
 	public final static String cWhitelistUrl = "Whitelist.Url";
+	public final static String cWhitelistProc = "Whitelist.Proc";
 
 	public static final String cWhitelistTypes[] = new String[] { cWhitelistIPAddress, cWhitelistLibrary,
 			cWhitelistFilename, cWhitelistCommand, cWhitelistUrl };
@@ -81,7 +82,7 @@ public static List<Hook> get() {
 		mListHook.add(new Hook("identification", "%macaddr", "", 1, null, null));
 		mListHook.add(new Hook("identification", "%serialno", "", 1, null, null));
 		mListHook.add(new Hook("identification", "%cid", "", 1, null, null));
-		mListHook.add(new Hook("identification", "/proc", "", 1, "1.7", null).dangerous());
+		mListHook.add(new Hook("identification", "/proc", "", 1, "1.7", null).dangerous().whitelist(cWhitelistProc));
 		mListHook.add(new Hook("identification", "/system/build.prop", "", 1, "1.9.9", null).dangerous());
 		mListHook.add(new Hook("identification", "/sys/block/.../cid", "", 1, null, null));
 		mListHook.add(new Hook("identification", "/sys/class/.../cid", "", 1, null, null));

src/biz/bokhorst/xprivacy/XIoBridge.java

@@ -4,7 +4,6 @@
 import java.net.InetAddress;
 import java.net.SocketException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import android.annotation.SuppressLint;
@@ -15,13 +14,6 @@ public class XIoBridge extends XHook {
 	private Methods mMethod;
 	private String mFileName;
 
-	// @formatter:off
-	public static List<String> cProcWhiteList = Arrays.asList(new String[] {
-		"/proc/meminfo",
-		"/proc/self/cmdline"
-	});
-	// @formatter:on
-
 	private XIoBridge(Methods method, String restrictionName) {
 		super(restrictionName, method.name(), null);
 		mMethod = method;
@@ -96,7 +88,7 @@ protected void before(XParam param) throws Throwable {
 
 					// Proc white list
 					if (mFileName.equals("/proc"))
-						if (cProcWhiteList.contains(fileName))
+						if ("/proc/self/cmdline".equals(fileName))
 							return;
 
 					// Check if restricted

tools/addstring.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #grep -RIl "\<string name=\"msg_no_restrictions" res | xargs sed -i -e "/msg_no_restrictions/a \
-#\ \ \ \ <string name=\"msg_no_whitelists\">No whitelists found for this application</string>"
+#\ \ \ \ <string name=\"whitelist_proc\">/proc</string>"
 
 grep -RIl "\<string name=\"title_categories" res | xargs sed -i -e '/title_categories/d'
 #grep -RIl "\<string name=\"title_whitelist" res | xargs sed -i -e 's/">Whitelist /">Remember /g'