Retrict set/getUserAgent(String)

Refs #825
M66B · Dec 2, 2013 · bf412dc · bf412dc
1 parent eac15fd
commit bf412dc
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 14 deletions.
diff --git a/assets/meta.xml b/assets/meta.xml
@@ -198,6 +198,9 @@
     <Hook restriction="system" method="ApplicationsProvider" permissions="" sdk="14" />
 
     <Hook restriction="view" method="getDefaultUserAgent" permissions="" sdk="17" />
+    <Hook restriction="view" method="getUserAgent" permissions="" sdk="1" />
+    <Hook restriction="view" method="getUserAgentString" permissions="" sdk="1" />
+    <Hook restriction="view" method="setUserAgent" permissions="" sdk="1" />
     <Hook restriction="view" method="setUserAgentString" permissions="" sdk="1" />
     <Hook restriction="view" method="WebView.constructor" permissions="" sdk="1" />
     <Hook restriction="view" method="addView" permissions="SYSTEM_ALERT_WINDOW" sdk="1" />

diff --git a/src/biz/bokhorst/xprivacy/XWebSettings.java b/src/biz/bokhorst/xprivacy/XWebSettings.java
@@ -31,12 +31,15 @@ public String getClassName() {
 	}
 
 	// public static String getDefaultUserAgent(Context context) [17]
+	// public synchronized int getUserAgent()
+	// public synchronized String getUserAgentString()
+	// public synchronized void setUserAgent(int ua)
 	// public synchronized void setUserAgentString (String ua)
 	// frameworks/base/core/java/android/webkit/WebSettings.java
 	// http://developer.android.com/reference/android/webkit/WebSettings.html
 
 	private enum Methods {
-		getDefaultUserAgent, setUserAgentString
+		getDefaultUserAgent, getUserAgent, getUserAgentString, setUserAgent, setUserAgentString
 	};
 
 	public static List<XHook> getInstances(Object instance) {
@@ -45,16 +48,36 @@ public static List<XHook> getInstances(Object instance) {
 		List<XHook> listHook = new ArrayList<XHook>();
 		listHook.add(new XWebSettings(Methods.getDefaultUserAgent, PrivacyManager.cView, className,
 				Build.VERSION_CODES.JELLY_BEAN_MR1));
+		listHook.add(new XWebSettings(Methods.getUserAgent, PrivacyManager.cView, className));
+		listHook.add(new XWebSettings(Methods.getUserAgentString, PrivacyManager.cView, className));
+		listHook.add(new XWebSettings(Methods.setUserAgent, PrivacyManager.cView, className));
 		listHook.add(new XWebSettings(Methods.setUserAgentString, PrivacyManager.cView, className));
 		return listHook;
 	}
 
 	@Override
 	protected void before(MethodHookParam param) throws Throwable {
 		if (mMethod == Methods.getDefaultUserAgent) {
-			// Do nothing
+			int uid = Binder.getCallingUid();
+			Context context = (param.args.length > 0 ? (Context) param.args[0] : null);
+			if (getRestricted(context, uid, true)) {
+				String ua = (String) PrivacyManager.getDefacedProp(Binder.getCallingUid(), "UA");
+				param.setResult(ua);
+			}
+		} else if (mMethod == Methods.getUserAgent) {
+			if (isRestricted(param))
+				param.setResult(-1); // User defined
+		} else if (mMethod == Methods.getUserAgentString) {
+			if (isRestricted(param)) {
+				String ua = (String) PrivacyManager.getDefacedProp(Binder.getCallingUid(), "UA");
+				param.setResult(ua);
+			}
+		} else if (mMethod == Methods.setUserAgent) {
+			if (param.args.length > 0)
+				if (isRestricted(param))
+					param.args[0] = -1; // User defined
 		} else if (mMethod == Methods.setUserAgentString) {
-			if (param.args.length > 0 && param.args[0] != null)
+			if (param.args.length > 0)
 				if (isRestricted(param)) {
 					String ua = (String) PrivacyManager.getDefacedProp(Binder.getCallingUid(), "UA");
 					param.args[0] = ua;
@@ -65,16 +88,6 @@ protected void before(MethodHookParam param) throws Throwable {
 
 	@Override
 	protected void after(MethodHookParam param) throws Throwable {
-		if (mMethod == Methods.getDefaultUserAgent) {
-			int uid = Binder.getCallingUid();
-			Context context = (param.args.length > 0 ? (Context) param.args[0] : null);
-			if (getRestricted(context, uid, true)) {
-				String ua = (String) PrivacyManager.getDefacedProp(Binder.getCallingUid(), "UA");
-				param.setResult(ua);
-			}
-		} else if (mMethod == Methods.setUserAgentString) {
-			// Do nothing
-		} else
-			Util.log(this, Log.WARN, "Unknown method=" + param.method.getName());
+		// Do nothing
 	}
 }