diff options
| author | Christopher Tate <ctate@google.com> | 2020-02-25 17:48:49 -0800 |
|---|---|---|
| committer | Chris Tate <ctate@android.com> | 2020-03-31 18:47:18 +0000 |
| commit | 24e0f76afc3a23c4c5ab7326986ccf65eaec93e2 (patch) | |
| tree | f5cf04bbd008a4c45411dd8347063ad8af882a2c | |
| parent | fb992147bef94f5524502a7e28df17d7be67a636 (diff) | |
| download | frameworks_base-24e0f76afc3a23c4c5ab7326986ccf65eaec93e2.tar.gz frameworks_base-24e0f76afc3a23c4c5ab7326986ccf65eaec93e2.tar.bz2 frameworks_base-24e0f76afc3a23c4c5ab7326986ccf65eaec93e2.zip | |
Verify all possible hosts that match web nav
Even if an <intent-filter> matches non-web schemes in addition to http
or https, make sure to include its cited hosts in the autoVerify
evaluation.
Bug: 150038428
Test: atest OsHostTests#testIntentFilterHostValidation
Change-Id: If9ef0fc53d96e6581c56d86f89fe63bc9a5fb89a
Merged-In: If9ef0fc53d96e6581c56d86f89fe63bc9a5fb89a
(cherry picked from commit 1fba0f897f276d5d47962534867e764da8061105)
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 26677dc5290..522e0884245 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -18114,7 +18114,9 @@ public class PackageManagerService extends IPackageManager.Stub final int verificationId = mIntentFilterVerificationToken++; for (PackageParser.Activity a : pkg.activities) { for (ActivityIntentInfo filter : a.intents) { - if (filter.handlesWebUris(true) && needsNetworkVerificationLPr(filter)) { + // Run verification against hosts mentioned in any web-nav intent filter, + // even if the filter matches non-web schemes as well + if (filter.handlesWebUris(false) && needsNetworkVerificationLPr(filter)) { if (DEBUG_DOMAIN_VERIFICATION) Slog.d(TAG, "Verification needed for IntentFilter:" + filter.toString()); mIntentFilterVerifier.addOneIntentFilterVerification( |