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

Merge "Enforce USE_ATTESTATION_VERIFICATION_SERVICE permission to call APIs." into tm-dev am: 431816112a

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

Change-Id: Ic92eef42d5ffb66860ab878a1c2ebe2f862754da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Dave McCloskey
2022-05-24 17:31:18 +00:00
committed by Automerger Merge Worker
parent ed3ec69be3 431816112a
commit 6f8858f5ec
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/security/AttestationVerificationManagerService.java
View File

@@ -16,6 +16,7 @@
package com.android.server.security; package com.android.server.security;
import static android.Manifest.permission.USE_ATTESTATION_VERIFICATION_SERVICE;
import static android.security.attestationverification.AttestationVerificationManager.PROFILE_PEER_DEVICE; import static android.security.attestationverification.AttestationVerificationManager.PROFILE_PEER_DEVICE;
import static android.security.attestationverification.AttestationVerificationManager.PROFILE_SELF_TRUSTED; import static android.security.attestationverification.AttestationVerificationManager.PROFILE_SELF_TRUSTED;
import static android.security.attestationverification.AttestationVerificationManager.RESULT_FAILURE; import static android.security.attestationverification.AttestationVerificationManager.RESULT_FAILURE;
@@ -60,6 +61,7 @@ public class AttestationVerificationManagerService extends SystemService {
Bundle requirements, Bundle requirements,
byte[] attestation, byte[] attestation,
AndroidFuture resultCallback) throws RemoteException { AndroidFuture resultCallback) throws RemoteException {
enforceUsePermission();
try { try {
Slog.d(TAG, "verifyAttestation"); Slog.d(TAG, "verifyAttestation");
verifyAttestationForAllVerifiers(profile, localBindingType, requirements, verifyAttestationForAllVerifiers(profile, localBindingType, requirements,
@@ -73,9 +75,14 @@ public class AttestationVerificationManagerService extends SystemService {
@Override @Override
public void verifyToken(VerificationToken token, ParcelDuration parcelDuration, public void verifyToken(VerificationToken token, ParcelDuration parcelDuration,
AndroidFuture resultCallback) throws RemoteException { AndroidFuture resultCallback) throws RemoteException {
enforceUsePermission();
// TODO(b/201696614): Implement // TODO(b/201696614): Implement
resultCallback.complete(RESULT_UNKNOWN); resultCallback.complete(RESULT_UNKNOWN);
} }
private void enforceUsePermission() {
getContext().enforceCallingOrSelfPermission(USE_ATTESTATION_VERIFICATION_SERVICE, null);
}
}; };
private void verifyAttestationForAllVerifiers( private void verifyAttestationForAllVerifiers(