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

Merge "Only run domain verification filtering for valid Intents" into sc-dev

Browse Source
This commit is contained in:
Winson Chiu
2021-02-20 02:00:36 +00:00
committed by Android (Google) Code Review
parent aa1d38db25 33710636a8
commit b23fc47d7f
2 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -389,6 +389,7 @@ import com.android.server.pm.permission.PermissionManagerService;
import com.android.server.pm.permission.PermissionManagerServiceInternal; import com.android.server.pm.permission.PermissionManagerServiceInternal;
import com.android.server.pm.verify.domain.DomainVerificationManagerInternal; import com.android.server.pm.verify.domain.DomainVerificationManagerInternal;
import com.android.server.pm.verify.domain.DomainVerificationService; import com.android.server.pm.verify.domain.DomainVerificationService;
import com.android.server.pm.verify.domain.DomainVerificationUtils;
import com.android.server.pm.verify.domain.proxy.DomainVerificationProxy; import com.android.server.pm.verify.domain.proxy.DomainVerificationProxy;
import com.android.server.pm.verify.domain.proxy.DomainVerificationProxyV1; import com.android.server.pm.verify.domain.proxy.DomainVerificationProxyV1;
import com.android.server.pm.verify.domain.proxy.DomainVerificationProxyV2; import com.android.server.pm.verify.domain.proxy.DomainVerificationProxyV2;
@@ -2587,6 +2588,7 @@ public class PackageManagerService extends IPackageManager.Stub
CrossProfileDomainInfo xpDomainInfo, int userId, boolean debug) { CrossProfileDomainInfo xpDomainInfo, int userId, boolean debug) {
final ArrayList<ResolveInfo> result = new ArrayList<>(); final ArrayList<ResolveInfo> result = new ArrayList<>();
final ArrayList<ResolveInfo> matchAllList = new ArrayList<>(); final ArrayList<ResolveInfo> matchAllList = new ArrayList<>();
final ArrayList<ResolveInfo> undefinedList = new ArrayList<>();
final int count = candidates.size(); final int count = candidates.size();
// First, try to use approved apps. // First, try to use approved apps.
@@ -2595,32 +2597,47 @@ public class PackageManagerService extends IPackageManager.Stub
// Add to the special match all list (Browser use case) // Add to the special match all list (Browser use case)
if (info.handleAllWebDataURI) { if (info.handleAllWebDataURI) {
matchAllList.add(info); matchAllList.add(info);
} else {
undefinedList.add(info);
} }
} }
Pair<List<ResolveInfo>, Integer> infosAndLevel = mDomainVerificationManager
.filterToApprovedApp(intent, candidates, userId, mSettings::getPackageLPr);
List<ResolveInfo> approvedInfos = infosAndLevel.first;
Integer highestApproval = infosAndLevel.second;
// We'll want to include browser possibilities in a few cases // We'll want to include browser possibilities in a few cases
boolean includeBrowser = false; boolean includeBrowser = false;
// If no apps are approved for the domain, resolve only to browsers if (!DomainVerificationUtils.isDomainVerificationIntent(intent)) {
if (approvedInfos.isEmpty()) { result.addAll(undefinedList);
// If the other profile has a result, include that and delegate to ResolveActivity // Maybe add one for the other profile.
if (xpDomainInfo != null && xpDomainInfo.highestApprovalLevel if (xpDomainInfo != null && xpDomainInfo.highestApprovalLevel
> DomainVerificationManagerInternal.APPROVAL_LEVEL_NONE) { > DomainVerificationManagerInternal.APPROVAL_LEVEL_NONE) {
result.add(xpDomainInfo.resolveInfo); result.add(xpDomainInfo.resolveInfo);
} else {
includeBrowser = true;
} }
includeBrowser = true;
} else { } else {
result.addAll(approvedInfos); Pair<List<ResolveInfo>, Integer> infosAndLevel = mDomainVerificationManager
.filterToApprovedApp(intent, undefinedList, userId,
mSettings::getPackageLPr);
List<ResolveInfo> approvedInfos = infosAndLevel.first;
Integer highestApproval = infosAndLevel.second;
// If the other profile has an app that's of equal or higher approval, add it // If no apps are approved for the domain, resolve only to browsers
if (xpDomainInfo != null && xpDomainInfo.highestApprovalLevel >= highestApproval) { if (approvedInfos.isEmpty()) {
result.add(xpDomainInfo.resolveInfo); // If the other profile has a result, include that and delegate to
// ResolveActivity
if (xpDomainInfo != null && xpDomainInfo.highestApprovalLevel
> DomainVerificationManagerInternal.APPROVAL_LEVEL_NONE) {
result.add(xpDomainInfo.resolveInfo);
} else {
includeBrowser = true;
}
} else {
result.addAll(approvedInfos);
// If the other profile has an app that's of equal or higher approval, add it
if (xpDomainInfo != null
&& xpDomainInfo.highestApprovalLevel >= highestApproval) {
result.add(xpDomainInfo.resolveInfo);
}
} }
} }

4
services/core/java/com/android/server/pm/verify/domain/DomainVerificationUtils.java
View File

@@ -28,7 +28,7 @@ import com.android.server.compat.PlatformCompat;
import com.android.server.pm.PackageManagerService; import com.android.server.pm.PackageManagerService;
import com.android.server.pm.parsing.pkg.AndroidPackage; import com.android.server.pm.parsing.pkg.AndroidPackage;
final class DomainVerificationUtils { public final class DomainVerificationUtils {
/** /**
* Consolidates package exception messages. A generic unavailable message is included since the * Consolidates package exception messages. A generic unavailable message is included since the
@@ -40,7 +40,7 @@ final class DomainVerificationUtils {
throw new NameNotFoundException("Package " + packageName + " unavailable"); throw new NameNotFoundException("Package " + packageName + " unavailable");
} }
static boolean isDomainVerificationIntent(Intent intent) { public static boolean isDomainVerificationIntent(Intent intent) {
return intent.isWebIntent() return intent.isWebIntent()
&& intent.hasCategory(Intent.CATEGORY_BROWSABLE) && intent.hasCategory(Intent.CATEGORY_BROWSABLE)
&& intent.hasCategory(Intent.CATEGORY_DEFAULT); && intent.hasCategory(Intent.CATEGORY_DEFAULT);