Allow 2-pane deep link to access unexported Activity
If an Activity is not exported, the Activity still can be launched by components of the same application, applications with the same user ID, or privileged system components. Bug: 261678674 Bug: 250589026 Test: manual visual Launcher -> context menu -> Wallpaper & style Change-Id: I662df6cb287361b135e2c596abe946ddeb03bda4 Merged-In: I662df6cb287361b135e2c596abe946ddeb03bda4
This commit is contained in:
@@ -32,6 +32,8 @@ import android.content.pm.PackageManager;
|
|||||||
import android.content.pm.UserInfo;
|
import android.content.pm.UserInfo;
|
||||||
import android.content.res.Configuration;
|
import android.content.res.Configuration;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
import android.os.Process;
|
||||||
|
import android.os.RemoteException;
|
||||||
import android.os.UserHandle;
|
import android.os.UserHandle;
|
||||||
import android.os.UserManager;
|
import android.os.UserManager;
|
||||||
import android.text.TextUtils;
|
import android.text.TextUtils;
|
||||||
@@ -448,8 +450,6 @@ public class SettingsHomepageActivity extends FragmentActivity implements
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!TextUtils.equals(PasswordUtils.getCallingAppPackageName(getActivityToken()),
|
|
||||||
getPackageName())) {
|
|
||||||
ActivityInfo targetActivityInfo = null;
|
ActivityInfo targetActivityInfo = null;
|
||||||
try {
|
try {
|
||||||
targetActivityInfo = getPackageManager().getActivityInfo(targetComponentName,
|
targetActivityInfo = getPackageManager().getActivityInfo(targetComponentName,
|
||||||
@@ -460,8 +460,9 @@ public class SettingsHomepageActivity extends FragmentActivity implements
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!hasPrivilegedAccess(targetActivityInfo)) {
|
||||||
if (!targetActivityInfo.exported) {
|
if (!targetActivityInfo.exported) {
|
||||||
Log.e(TAG, "Must not launch an unexported Actvity for deep link");
|
Log.e(TAG, "Target Activity is not exported");
|
||||||
finish();
|
finish();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -514,6 +515,46 @@ public class SettingsHomepageActivity extends FragmentActivity implements
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Check if calling app has privileged access to launch Activity of activityInfo.
|
||||||
|
private boolean hasPrivilegedAccess(ActivityInfo activityInfo) {
|
||||||
|
if (TextUtils.equals(PasswordUtils.getCallingAppPackageName(getActivityToken()),
|
||||||
|
getPackageName())) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
int callingUid = -1;
|
||||||
|
try {
|
||||||
|
callingUid = ActivityManager.getService().getLaunchedFromUid(getActivityToken());
|
||||||
|
} catch (RemoteException re) {
|
||||||
|
Log.e(TAG, "Not able to get callingUid: " + re);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
int targetUid = -1;
|
||||||
|
try {
|
||||||
|
targetUid = getPackageManager().getApplicationInfo(activityInfo.packageName,
|
||||||
|
/* flags= */ 0).uid;
|
||||||
|
} catch (PackageManager.NameNotFoundException nnfe) {
|
||||||
|
Log.e(TAG, "Not able to get targetUid: " + nnfe);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// When activityInfo.exported is false, Activity still can be launched if applications have
|
||||||
|
// the same user ID.
|
||||||
|
if (UserHandle.isSameApp(callingUid, targetUid)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// When activityInfo.exported is false, Activity still can be launched if calling app has
|
||||||
|
// root or system privilege.
|
||||||
|
int callingAppId = UserHandle.getAppId(callingUid);
|
||||||
|
if (callingAppId == Process.ROOT_UID || callingAppId == Process.SYSTEM_UID) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
boolean isCallingAppPermitted(String permission) {
|
boolean isCallingAppPermitted(String permission) {
|
||||||
return TextUtils.isEmpty(permission) || PasswordUtils.isCallingAppPermitted(
|
return TextUtils.isEmpty(permission) || PasswordUtils.isCallingAppPermitted(
|
||||||
|
Reference in New Issue
Block a user