commit 5f31f2a3317fc8bc7eaea4f7d05bf18682a886af
author Dmitry Dementyev <dementyev@google.com> Mon Apr 01 21:32:48 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Apr 01 21:32:48 2024 +0000
tree 34e84ff43e1ec253e7aea989e225415e630f273a
parent 1bf4bf7a102f0662a78ba146c7a993839f86c44e
parent 748b1dc959e6e180ba391555332ea6eb792966e0

Merge "Add more checkKeyIntent checks to AccountManagerService." into sc-dev am: 649ff85e3a am: b614ab2913 am: 30ed0c5552 am: 748b1dc959

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26720245

Change-Id: I6271ba092dd85db23d83f2d2825e4d5d7c3bb77f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/core/java/com/android/server/accounts/AccountManagerService.java

diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
index edc0bd3..cea0846 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -3561,6 +3561,11 @@
 
             // Strip auth token from result.
             result.remove(AccountManager.KEY_AUTHTOKEN);
+            if (!checkKeyIntent(Binder.getCallingUid(), result)) {
+                onError(AccountManager.ERROR_CODE_INVALID_RESPONSE,
+                        "invalid intent in bundle returned");
+                return;
+            }
 
             if (Log.isLoggable(TAG, Log.VERBOSE)) {
                 Log.v(TAG,
@@ -5137,6 +5142,11 @@
                     } else {
                         if (mStripAuthTokenFromResult) {
                             result.remove(AccountManager.KEY_AUTHTOKEN);
+                            if (!checkKeyIntent(Binder.getCallingUid(), result)) {
+                                onError(AccountManager.ERROR_CODE_INVALID_RESPONSE,
+                                        "invalid intent in bundle returned");
+                                return;
+                            }
                         }
                         if (Log.isLoggable(TAG, Log.VERBOSE)) {
                             Log.v(TAG, getClass().getSimpleName()