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

Remove HardwareAuthToken support from FakeStorageManager am: 401e447e10

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

Change-Id: I70828b9320ea2b0fd4dba558e362795904b2bf74
This commit is contained in:
Eric Biggers
2022-03-15 22:12:00 +00:00
committed by Automerger Merge Worker
parent 741d018f3d 401e447e10
commit 7028c0f4ab
2 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -221,7 +221,6 @@ public abstract class BaseLockSettingsServiceTests {
Object[] args = invocation.getArguments();
mStorageManager.addUserKeyAuth((int) args[0] /* userId */,
(int) args[1] /* serialNumber */,
(byte[]) args[2] /* token */,
(byte[]) args[3] /* secret */);
return null;
}
@@ -233,7 +232,6 @@ public abstract class BaseLockSettingsServiceTests {
Object[] args = invocation.getArguments();
mStorageManager.clearUserKeyAuth((int) args[0] /* userId */,
(int) args[1] /* serialNumber */,
(byte[]) args[2] /* token */,
(byte[]) args[3] /* secret */);
return null;
}

39
services/tests/servicestests/src/com/android/server/locksettings/FakeStorageManager.java
View File

@@ -19,7 +19,6 @@ package com.android.server.locksettings;
import android.os.IProgressListener;
import android.os.RemoteException;
import android.util.ArrayMap;
import android.util.Pair;
import junit.framework.AssertionFailedError;
@@ -29,56 +28,56 @@ import java.util.Arrays;
public class FakeStorageManager {
private ArrayMap<Integer, ArrayList<Pair<byte[], byte[]>>> mAuth = new ArrayMap<>();
private ArrayMap<Integer, ArrayList<byte[]>> mAuth = new ArrayMap<>();
private boolean mIgnoreBadUnlock;
public void addUserKeyAuth(int userId, int serialNumber, byte[] token, byte[] secret) {
getUserAuth(userId).add(new Pair<>(token, secret));
public void addUserKeyAuth(int userId, int serialNumber, byte[] secret) {
getUserAuth(userId).add(secret);
}
public void clearUserKeyAuth(int userId, int serialNumber, byte[] token, byte[] secret) {
ArrayList<Pair<byte[], byte[]>> auths = getUserAuth(userId);
if (token == null && secret == null) {
public void clearUserKeyAuth(int userId, int serialNumber, byte[] secret) {
ArrayList<byte[]> auths = getUserAuth(userId);
if (secret == null) {
return;
}
auths.remove(new Pair<>(token, secret));
auths.add(new Pair<>(null, null));
auths.remove(secret);
auths.add(null);
}
public void fixateNewestUserKeyAuth(int userId) {
ArrayList<Pair<byte[], byte[]>> auths = mAuth.get(userId);
Pair<byte[], byte[]> latest = auths.get(auths.size() - 1);
ArrayList<byte[]> auths = mAuth.get(userId);
byte[] latest = auths.get(auths.size() - 1);
auths.clear();
auths.add(latest);
}
private ArrayList<Pair<byte[], byte[]>> getUserAuth(int userId) {
private ArrayList<byte[]> getUserAuth(int userId) {
if (!mAuth.containsKey(userId)) {
ArrayList<Pair<byte[], byte[]>> auths = new ArrayList<Pair<byte[], byte[]>>();
auths.add(new Pair(null, null));
mAuth.put(userId, auths);
ArrayList<byte[]> auths = new ArrayList<>();
auths.add(null);
mAuth.put(userId, auths);
}
return mAuth.get(userId);
}
public byte[] getUserUnlockToken(int userId) {
ArrayList<Pair<byte[], byte[]>> auths = getUserAuth(userId);
ArrayList<byte[]> auths = getUserAuth(userId);
if (auths.size() != 1) {
throw new AssertionFailedError("More than one secret exists");
}
return auths.get(0).second;
return auths.get(0);
}
public void unlockUser(int userId, byte[] secret, IProgressListener listener)
throws RemoteException {
listener.onStarted(userId, null);
listener.onFinished(userId, null);
ArrayList<Pair<byte[], byte[]>> auths = getUserAuth(userId);
ArrayList<byte[]> auths = getUserAuth(userId);
if (auths.size() > 1) {
throw new AssertionFailedError("More than one secret exists");
}
Pair<byte[], byte[]> auth = auths.get(0);
if (!Arrays.equals(secret, auth.second)) {
byte[] auth = auths.get(0);
if (!Arrays.equals(secret, auth)) {
if (!mIgnoreBadUnlock) {
throw new AssertionFailedError("Invalid secret to unlock user " + userId);
}