| Revisión | 39c9bf27471f6454202236f88c247fef4c4b2b2e (tree) |
|---|---|
| Tiempo | 2020-04-29 04:41:29 |
| Autor | Christopher Tate <ctate@goog...> |
| Commiter | Anis Assi |
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)
(cherry picked from commit bfa779601082d9021ea4e7d4cca571575bd0b13b)
| @@ -17703,7 +17703,9 @@ public class PackageManagerService extends IPackageManager.Stub | ||
| 17703 | 17703 | final int verificationId = mIntentFilterVerificationToken++; |
| 17704 | 17704 | for (PackageParser.Activity a : pkg.activities) { |
| 17705 | 17705 | for (ActivityIntentInfo filter : a.intents) { |
| 17706 | - if (filter.handlesWebUris(true) && needsNetworkVerificationLPr(filter)) { | |
| 17706 | + // Run verification against hosts mentioned in any web-nav intent filter, | |
| 17707 | + // even if the filter matches non-web schemes as well | |
| 17708 | + if (filter.handlesWebUris(false) && needsNetworkVerificationLPr(filter)) { | |
| 17707 | 17709 | if (DEBUG_DOMAIN_VERIFICATION) Slog.d(TAG, |
| 17708 | 17710 | "Verification needed for IntentFilter:" + filter.toString()); |
| 17709 | 17711 | mIntentFilterVerifier.addOneIntentFilterVerification( |
Android-x86
Fork
services/core/java/com/android/server/pm/PackageManagerService.java