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

LockSettingsService: Authsecret HIDL->AIDL adapter

Browse Source 
Simplify LockSettingsService by hiding the details of supporting the
legacy HIDL interface for IAuthSecret inside an adapter that presents
the AIDL interface. Refactor to clear the way for b/258560859

Bug: 244746589
Bug: 258560859
Test: atest com.android.server.locksettings
Change-Id: I3582ce5468b577289634819e75db548455fc9c45
This commit is contained in:
Paul Crowley
2022-12-19 15:23:02 -08:00
parent 9919e3b758
commit 74625971f4
3 changed files with 82 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
services/core/java/com/android/server/locksettings/AuthSecretHidlAdapter.java Normal file
View File

@@ -0,0 +1,61 @@
/*
* Copyright (C) 2022 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.server.locksettings;
import android.hardware.authsecret.IAuthSecret;
import android.os.IBinder;
import android.os.RemoteException;
import java.util.ArrayList;
/**
* Adapt the legacy HIDL interface to present the AIDL interface.
*/
class AuthSecretHidlAdapter implements IAuthSecret {
// private final String TAG = "AuthSecretHidlAdapter";
private final android.hardware.authsecret.V1_0.IAuthSecret mImpl;
AuthSecretHidlAdapter(android.hardware.authsecret.V1_0.IAuthSecret impl) {
mImpl = impl;
}
@Override
public void setPrimaryUserCredential(byte[] secret) throws RemoteException {
final ArrayList<Byte> secretAsArrayList = new ArrayList<>(secret.length);
for (int i = 0; i < secret.length; ++i) {
secretAsArrayList.add(secret[i]);
}
mImpl.primaryUserCredential(secretAsArrayList);
}
@Override
public int getInterfaceVersion() throws RemoteException {
// Supports only V1
return 1;
}
@Override
public IBinder asBinder() {
throw new UnsupportedOperationException("AuthSecretHidlAdapter does not support asBinder");
}
@Override
public String getInterfaceHash() throws RemoteException {
throw new UnsupportedOperationException(
"AuthSecretHidlAdapter does not support getInterfaceHash");
}
}

47
services/core/java/com/android/server/locksettings/LockSettingsService.java
View File

@@ -268,8 +268,7 @@ public class LockSettingsService extends ILockSettings.Stub {
protected boolean mHasSecureLockScreen;
protected IGateKeeperService mGateKeeperService;
protected IAuthSecret mAuthSecretServiceAidl;
protected android.hardware.authsecret.V1_0.IAuthSecret mAuthSecretServiceHidl;
protected IAuthSecret mAuthSecretService;
private static final String GSI_RUNNING_PROP = "ro.gsid.image_running";
@@ -837,16 +836,19 @@ public class LockSettingsService extends ILockSettings.Stub {
}
private void getAuthSecretHal() {
mAuthSecretServiceAidl = IAuthSecret.Stub.asInterface(ServiceManager.
waitForDeclaredService(IAuthSecret.DESCRIPTOR + "/default"));
if (mAuthSecretServiceAidl == null) {
Slog.i(TAG, "Device doesn't implement AuthSecret HAL(aidl), try to get hidl version");
mAuthSecretService =
IAuthSecret.Stub.asInterface(
ServiceManager.waitForDeclaredService(IAuthSecret.DESCRIPTOR + "/default"));
if (mAuthSecretService != null) {
Slog.i(TAG, "Device implements AIDL AuthSecret HAL");
} else {
try {
mAuthSecretServiceHidl =
android.hardware.authsecret.V1_0.IAuthSecret.getService(/* retry */ true);
android.hardware.authsecret.V1_0.IAuthSecret authSecretServiceHidl =
android.hardware.authsecret.V1_0.IAuthSecret.getService(/* retry */ true);
mAuthSecretService = new AuthSecretHidlAdapter(authSecretServiceHidl);
Slog.i(TAG, "Device implements HIDL AuthSecret HAL");
} catch (NoSuchElementException e) {
Slog.i(TAG, "Device doesn't implement AuthSecret HAL(hidl)");
Slog.i(TAG, "Device doesn't implement AuthSecret HAL");
} catch (RemoteException e) {
Slog.w(TAG, "Failed to get AuthSecret HAL(hidl)", e);
}
@@ -2612,25 +2614,16 @@ public class LockSettingsService extends ILockSettings.Stub {
// If the given user is the primary user, pass the auth secret to the HAL. Only the system
// user can be primary. Check for the system user ID before calling getUserInfo(), as other
// users may still be under construction.
if (mAuthSecretService == null) {
return;
}
if (userId == UserHandle.USER_SYSTEM &&
mUserManager.getUserInfo(userId).isPrimary()) {
final byte[] rawSecret = sp.deriveVendorAuthSecret();
if (mAuthSecretServiceAidl != null) {
try {
mAuthSecretServiceAidl.setPrimaryUserCredential(rawSecret);
} catch (RemoteException e) {
Slog.w(TAG, "Failed to pass primary user secret to AuthSecret HAL(aidl)", e);
}
} else if (mAuthSecretServiceHidl != null) {
try {
final ArrayList<Byte> secret = new ArrayList<>(rawSecret.length);
for (int i = 0; i < rawSecret.length; ++i) {
secret.add(rawSecret[i]);
}
mAuthSecretServiceHidl.primaryUserCredential(secret);
} catch (RemoteException e) {
Slog.w(TAG, "Failed to pass primary user secret to AuthSecret HAL(hidl)", e);
}
final byte[] secret = sp.deriveVendorAuthSecret();
try {
mAuthSecretService.setPrimaryUserCredential(secret);
} catch (RemoteException e) {
Slog.w(TAG, "Failed to pass primary user secret to AuthSecret HAL", e);
}
}
}

2
services/tests/servicestests/src/com/android/server/locksettings/LockSettingsServiceTestable.java
View File

@@ -154,7 +154,7 @@ public class LockSettingsServiceTestable extends LockSettingsService {
storageManager, spManager, gsiService, recoverableKeyStoreManager,
userManagerInternal, deviceStateCache));
mGateKeeperService = gatekeeper;
mAuthSecretServiceAidl = authSecretService;
mAuthSecretService = authSecretService;
}
@Override