Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix cross user package visibility leakage for queryInstrumentation"

Browse Source
This commit is contained in:
Rhed Jao
2022-05-27 02:39:53 +00:00
committed by Android (Google) Code Review
parent 6738d00a76 744a05e943
commit baade6945c
10 changed files with 61 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmds/am/src/com/android/commands/am/Instrument.java
View File

@@ -425,7 +425,8 @@ public class Instrument {
if (cn == null) throw new IllegalArgumentException("Bad component name: " + cnArg);
return cn;
} else {
List<InstrumentationInfo> infos = mPm.queryInstrumentation(null, 0).getList();
List<InstrumentationInfo> infos = mPm.queryInstrumentationAsUser(
null, 0, userId).getList();
final int numInfos = infos == null ? 0: infos.size();
ArrayList<ComponentName> cns = new ArrayList<>();

9
core/java/android/app/ActivityThread.java
View File

@@ -6854,9 +6854,12 @@ public final class ActivityThread extends ClientTransactionHandler
private InstrumentationInfo prepareInstrumentation(AppBindData data) {
final InstrumentationInfo ii;
try {
ii = new ApplicationPackageManager(null, getPackageManager())
.getInstrumentationInfo(data.instrumentationName, 0);
} catch (PackageManager.NameNotFoundException e) {
ii = getPackageManager().getInstrumentationInfoAsUser(data.instrumentationName,
0 /* flags */, UserHandle.myUserId());
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
if (ii == null) {
throw new RuntimeException(
"Unable to find instrumentation info for: " + data.instrumentationName);
}

6
core/java/android/app/ApplicationPackageManager.java
View File

@@ -1695,8 +1695,8 @@ public class ApplicationPackageManager extends PackageManager {
ComponentName className, int flags)
throws NameNotFoundException {
try {
InstrumentationInfo ii = mPM.getInstrumentationInfo(
className, flags);
InstrumentationInfo ii = mPM.getInstrumentationInfoAsUser(
className, flags, getUserId());
if (ii != null) {
return ii;
}
@@ -1713,7 +1713,7 @@ public class ApplicationPackageManager extends PackageManager {
String targetPackage, int flags) {
try {
ParceledListSlice<InstrumentationInfo> parceledList =
mPM.queryInstrumentation(targetPackage, flags);
mPM.queryInstrumentationAsUser(targetPackage, flags, getUserId());
if (parceledList == null) {
return Collections.emptyList();
}

10
core/java/android/content/pm/IPackageManager.aidl
View File

@@ -201,13 +201,11 @@ interface IPackageManager {
ParceledListSlice queryContentProviders(
String processName, int uid, long flags, String metaDataKey);
@UnsupportedAppUsage
InstrumentationInfo getInstrumentationInfo(
in ComponentName className, int flags);
InstrumentationInfo getInstrumentationInfoAsUser(
in ComponentName className, int flags, int userId);
@UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)
ParceledListSlice queryInstrumentation(
String targetPackage, int flags);
ParceledListSlice queryInstrumentationAsUser(
String targetPackage, int flags, int userId);
void finishPackageInstall(int token, boolean didLaunch);

11
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -14542,6 +14542,7 @@ public class ActivityManagerService extends IActivityManager.Stub
if (arguments != null && arguments.hasFileDescriptors()) {
throw new IllegalArgumentException("File descriptors passed in Bundle");
}
final IPackageManager pm = AppGlobals.getPackageManager();
synchronized(this) {
InstrumentationInfo ii = null;
@@ -14550,11 +14551,8 @@ public class ActivityManagerService extends IActivityManager.Stub
boolean noRestart = (flags & INSTR_FLAG_NO_RESTART) != 0;
try {
ii = mContext.getPackageManager().getInstrumentationInfo(
className, STOCK_PM_FLAGS);
ai = AppGlobals.getPackageManager().getApplicationInfo(
ii.targetPackage, STOCK_PM_FLAGS, userId);
} catch (PackageManager.NameNotFoundException e) {
ii = pm.getInstrumentationInfoAsUser(className, STOCK_PM_FLAGS, userId);
ai = pm.getApplicationInfo(ii.targetPackage, STOCK_PM_FLAGS, userId);
} catch (RemoteException e) {
}
if (ii == null) {
@@ -14582,8 +14580,7 @@ public class ActivityManagerService extends IActivityManager.Stub
int match = SIGNATURE_NO_MATCH;
try {
match = AppGlobals.getPackageManager().checkSignatures(
ii.targetPackage, ii.packageName, userId);
match = pm.checkSignatures(ii.targetPackage, ii.packageName, userId);
} catch (RemoteException e) {
}
if (match < 0 && match != PackageManager.SIGNATURE_FIRST_NOT_SIGNED) {

7
services/core/java/com/android/server/pm/Computer.java
View File

@@ -452,11 +452,12 @@ public interface Computer extends PackageDataSnapshot {
@PackageManager.ComponentInfoFlagsBits long flags, @Nullable String metaDataKey);
@Nullable
InstrumentationInfo getInstrumentationInfo(@NonNull ComponentName component, int flags);
InstrumentationInfo getInstrumentationInfoAsUser(@NonNull ComponentName component, int flags,
int userId);
@NonNull
ParceledListSlice<InstrumentationInfo> queryInstrumentation(
@NonNull String targetPackage, int flags);
ParceledListSlice<InstrumentationInfo> queryInstrumentationAsUser(
@NonNull String targetPackage, int flags, int userId);
@NonNull
List<PackageStateInternal> findSharedNonSystemLibraries(

40
services/core/java/com/android/server/pm/ComputerEngine.java
View File

@@ -4927,32 +4927,33 @@ public class ComputerEngine implements Computer {
@Nullable
@Override
public InstrumentationInfo getInstrumentationInfo(@NonNull ComponentName component, int flags) {
public InstrumentationInfo getInstrumentationInfoAsUser(@NonNull ComponentName component,
int flags, int userId) {
final int callingUid = Binder.getCallingUid();
final int callingUserId = UserHandle.getUserId(callingUid);
enforceCrossUserPermission(callingUid, userId, false /* requireFullPermission */,
false /* checkShell */, "getInstrumentationInfoAsUser");
if (!mUserManager.exists(userId)) return null;
String packageName = component.getPackageName();
final PackageStateInternal ps = mSettings.getPackage(packageName);
AndroidPackage pkg = mPackages.get(packageName);
if (ps == null || pkg == null) return null;
if (shouldFilterApplication(
ps, callingUid, component, TYPE_UNKNOWN, callingUserId)) {
ps, callingUid, component, TYPE_UNKNOWN, userId)) {
return null;
}
final ParsedInstrumentation i = mInstrumentation.get(component);
return PackageInfoUtils.generateInstrumentationInfo(i, pkg, flags, callingUserId, ps);
final PackageUserStateInternal state = ps.getUserStateOrDefault(userId);
return PackageInfoUtils.generateInstrumentationInfo(i, pkg, flags, state, userId, ps);
}
@NonNull
@Override
public ParceledListSlice<InstrumentationInfo> queryInstrumentation(
@NonNull String targetPackage, int flags) {
public ParceledListSlice<InstrumentationInfo> queryInstrumentationAsUser(
@NonNull String targetPackage, int flags, int userId) {
final int callingUid = Binder.getCallingUid();
final int callingUserId = UserHandle.getUserId(callingUid);
final PackageStateInternal ps = mSettings.getPackage(targetPackage);
if (shouldFilterApplication(ps, callingUid, callingUserId)) {
return ParceledListSlice.emptyList();
}
enforceCrossUserPermission(callingUid, userId, false /* requireFullPermission */,
false /* checkShell */, "queryInstrumentationAsUser");
if (!mUserManager.exists(userId)) return ParceledListSlice.emptyList();
ArrayList<InstrumentationInfo> finalList = new ArrayList<>();
final int numInstrumentations = mInstrumentation.size();
@@ -4963,12 +4964,15 @@ public class ComputerEngine implements Computer {
String packageName = p.getPackageName();
AndroidPackage pkg = mPackages.get(packageName);
PackageStateInternal pkgSetting = getPackageStateInternal(packageName);
if (pkg != null) {
InstrumentationInfo ii = PackageInfoUtils.generateInstrumentationInfo(p,
pkg, flags, callingUserId, pkgSetting);
if (ii != null) {
finalList.add(ii);
}
if (pkg == null || pkgSetting == null
|| shouldFilterApplication(pkgSetting, callingUid, userId)) {
continue;
}
final PackageUserStateInternal state = pkgSetting.getUserStateOrDefault(userId);
InstrumentationInfo ii = PackageInfoUtils.generateInstrumentationInfo(p,
pkg, flags, state, userId, pkgSetting);
if (ii != null) {
finalList.add(ii);
}
}
}

12
services/core/java/com/android/server/pm/IPackageManagerBase.java
View File

@@ -533,9 +533,9 @@ public abstract class IPackageManagerBase extends IPackageManager.Stub {
@Nullable
@Override
@Deprecated
public final InstrumentationInfo getInstrumentationInfo(@NonNull ComponentName component,
int flags) {
return snapshot().getInstrumentationInfo(component, flags);
public final InstrumentationInfo getInstrumentationInfoAsUser(@NonNull ComponentName component,
int flags, int userId) {
return snapshot().getInstrumentationInfoAsUser(component, flags, userId);
}
@Override
@@ -1017,9 +1017,9 @@ public abstract class IPackageManagerBase extends IPackageManager.Stub {
@NonNull
@Override
@Deprecated
public final ParceledListSlice<InstrumentationInfo> queryInstrumentation(
@NonNull String targetPackage, int flags) {
return snapshot().queryInstrumentation(targetPackage, flags);
public final ParceledListSlice<InstrumentationInfo> queryInstrumentationAsUser(
@NonNull String targetPackage, int flags, int userId) {
return snapshot().queryInstrumentationAsUser(targetPackage, flags, userId);
}
@Override

4
services/core/java/com/android/server/pm/PackageManagerShellCommand.java
View File

@@ -788,7 +788,9 @@ class PackageManagerShellCommand extends ShellCommand {
}
final List<InstrumentationInfo> list =
mInterface.queryInstrumentation(targetPackage, 0 /*flags*/).getList();
mInterface.queryInstrumentationAsUser(
targetPackage, PackageManager.MATCH_KNOWN_PACKAGES, UserHandle.USER_SYSTEM)
.getList();
// sort by target package
Collections.sort(list, new Comparator<InstrumentationInfo>() {

10
services/core/java/com/android/server/pm/parsing/PackageInfoUtils.java
View File

@@ -204,7 +204,8 @@ public class PackageInfoUtils {
info.instrumentation = new InstrumentationInfo[N];
for (int i = 0; i < N; i++) {
info.instrumentation[i] = generateInstrumentationInfo(
pkg.getInstrumentations().get(i), pkg, flags, userId, pkgSetting);
pkg.getInstrumentations().get(i), pkg, flags, state,
userId, pkgSetting);
}
}
}
@@ -363,9 +364,12 @@ public class PackageInfoUtils {
*/
@Nullable
public static InstrumentationInfo generateInstrumentationInfo(ParsedInstrumentation i,
AndroidPackage pkg, @PackageManager.ComponentInfoFlagsBits long flags, int userId,
@Nullable PackageStateInternal pkgSetting) {
AndroidPackage pkg, @PackageManager.ComponentInfoFlagsBits long flags,
PackageUserStateInternal state, int userId, @Nullable PackageStateInternal pkgSetting) {
if (i == null) return null;
if (!checkUseInstalledOrHidden(pkg, pkgSetting, state, flags)) {
return null;
}
InstrumentationInfo info =
PackageInfoWithoutStateUtils.generateInstrumentationInfo(i, pkg, flags, userId,