Add IPC restriction

roceys · Jan 15, 2014 · 5d82a96 · 5d82a96
1 parent 6b2f149
commit 5d82a96
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,9 @@ Test and beta releases will have experimental functions enabled by default.
 
 **Next release**
 
+* Experimental: restriction for direct interprocess communication (System/IPC)
+* Experimental: new, faster way of getting restrictions/settings
+
 [Open issues](https://github.com/M66B/XPrivacy/issues?state=open)
 
 **Version 1.11.12 BETA**

diff --git a/assets/meta.xml b/assets/meta.xml
@@ -216,6 +216,7 @@
 	<Hook restriction="system" method="android.intent.action.EXTERNAL_APPLICATIONS_AVAILABLE" dangerous="true" permissions="" sdk="10" />
 	<Hook restriction="system" method="android.intent.action.EXTERNAL_APPLICATIONS_UNAVAILABLE" dangerous="true" permissions="" sdk="10" />
 	<Hook restriction="system" method="ApplicationsProvider" permissions="" sdk="10" />
+	<Hook restriction="system" method="IPC" dangerous="true" from="1.11.13" permissions="" sdk="1" />
 
 	<Hook restriction="view" method="loadUrl" permissions="" sdk="1" />
 	<Hook restriction="view" method="WebView" permissions="" sdk="1" />

diff --git a/src/biz/bokhorst/xprivacy/Requirements.java b/src/biz/bokhorst/xprivacy/Requirements.java
@@ -2,7 +2,6 @@
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.Inet4Address;
 import java.net.InterfaceAddress;
@@ -18,7 +17,6 @@
 import android.net.wifi.WifiInfo;
 import android.os.Build;
 import android.os.IBinder;
-import android.os.RemoteException;
 import android.text.TextUtils;
 import android.util.Log;
 

diff --git a/src/biz/bokhorst/xprivacy/XBinder.java b/src/biz/bokhorst/xprivacy/XBinder.java
@@ -21,8 +21,6 @@ public class XBinder extends XHook {
 	private static boolean mMagical = false;
 	private static int FLAG_XPRIVACY = 0x000000A0;
 	private static int BITS_MAGIC = 16;
-	private static boolean cEnabled = true;
-	private static boolean cRestrict = false;
 
 	// @formatter:off
 	public static List<String> cListService = Arrays.asList(new String[] {
@@ -69,10 +67,8 @@ private enum Methods {
 
 	public static List<XHook> getInstances() {
 		List<XHook> listHook = new ArrayList<XHook>();
-		if (cEnabled) {
-			listHook.add(new XBinder(Methods.execTransact, null)); // Binder
-			listHook.add(new XBinder(Methods.transact, null)); // BinderProxy
-		}
+		listHook.add(new XBinder(Methods.execTransact, null)); // Binder
+		listHook.add(new XBinder(Methods.transact, null)); // BinderProxy
 		return listHook;
 	}
 
@@ -113,7 +109,7 @@ private void checkIPC(MethodHookParam param) {
 					String name = binder.getInterfaceDescriptor();
 					if (cListService.contains(name)) {
 						Util.log(this, Log.WARN, "restrict name=" + name + " uid=" + uid + " my=" + Process.myUid());
-						if (cRestrict) {
+						if (PrivacyManager.getRestricted(this, null, uid, PrivacyManager.cSystem, "IPC", true, true)) {
 							// Get reply parcel
 							Parcel reply = null;
 							try {