Null check before calling TrustAgentService and throw Security exception if the API is not allowed. (44196d31) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/trust/TrustAgentWrapper.java

+22 −14

Original line number	Original line	Diff line number	Diff line
	@@ -204,12 +204,20 @@ public class TrustAgentWrapper {
	byte[] eToken = msg.getData().getByteArray(DATA_ESCROW_TOKEN);		byte[] eToken = msg.getData().getByteArray(DATA_ESCROW_TOKEN);
	int userId = msg.getData().getInt(DATA_USER_ID);		int userId = msg.getData().getInt(DATA_USER_ID);
	long handle = mTrustManagerService.addEscrowToken(eToken, userId);		long handle = mTrustManagerService.addEscrowToken(eToken, userId);
			boolean resultDeliverred = false;
	try {		try {
			if (mTrustAgentService != null) {
	mTrustAgentService.onEscrowTokenAdded(		mTrustAgentService.onEscrowTokenAdded(
	eToken, handle, UserHandle.of(userId));		eToken, handle, UserHandle.of(userId));
			resultDeliverred = true;
			}
	} catch (RemoteException e) {		} catch (RemoteException e) {
	onError(e);		onError(e);
	}		}

			if (!resultDeliverred) {
			mTrustManagerService.removeEscrowToken(handle, userId);
			}
	break;		break;
	}		}
	case MSG_ESCROW_TOKEN_STATE: {		case MSG_ESCROW_TOKEN_STATE: {
	@@ -217,9 +225,11 @@ public class TrustAgentWrapper {
	int userId = msg.getData().getInt(DATA_USER_ID);		int userId = msg.getData().getInt(DATA_USER_ID);
	boolean active = mTrustManagerService.isEscrowTokenActive(handle, userId);		boolean active = mTrustManagerService.isEscrowTokenActive(handle, userId);
	try {		try {
			if (mTrustAgentService != null) {
	mTrustAgentService.onTokenStateReceived(handle,		mTrustAgentService.onTokenStateReceived(handle,
	active ? TrustAgentService.TOKEN_STATE_ACTIVE		active ? TrustAgentService.TOKEN_STATE_ACTIVE
	: TrustAgentService.TOKEN_STATE_INACTIVE);		: TrustAgentService.TOKEN_STATE_INACTIVE);
			}
	} catch (RemoteException e) {		} catch (RemoteException e) {
	onError(e);		onError(e);
	}		}
	@@ -230,7 +240,9 @@ public class TrustAgentWrapper {
	int userId = msg.getData().getInt(DATA_USER_ID);		int userId = msg.getData().getInt(DATA_USER_ID);
	boolean success = mTrustManagerService.removeEscrowToken(handle, userId);		boolean success = mTrustManagerService.removeEscrowToken(handle, userId);
	try {		try {
			if (mTrustAgentService != null) {
	mTrustAgentService.onEscrowTokenRemoved(handle, success);		mTrustAgentService.onEscrowTokenRemoved(handle, success);
			}
	} catch (RemoteException e) {		} catch (RemoteException e) {
	onError(e);		onError(e);
	}		}
	@@ -283,8 +295,7 @@ public class TrustAgentWrapper {
	public void addEscrowToken(byte[] token, int userId) {		public void addEscrowToken(byte[] token, int userId) {
	if (mContext.getResources()		if (mContext.getResources()
	.getBoolean(com.android.internal.R.bool.config_allowEscrowTokenForTrustAgent)) {		.getBoolean(com.android.internal.R.bool.config_allowEscrowTokenForTrustAgent)) {
	Slog.e(TAG, "Escrow token API is not allowed.");		throw new SecurityException("Escrow token API is not allowed.");
	return;
	}		}

	if (DEBUG) Slog.d(TAG, "adding escrow token for user " + userId);		if (DEBUG) Slog.d(TAG, "adding escrow token for user " + userId);
	@@ -298,8 +309,7 @@ public class TrustAgentWrapper {
	public void isEscrowTokenActive(long handle, int userId) {		public void isEscrowTokenActive(long handle, int userId) {
	if (mContext.getResources()		if (mContext.getResources()
	.getBoolean(com.android.internal.R.bool.config_allowEscrowTokenForTrustAgent)) {		.getBoolean(com.android.internal.R.bool.config_allowEscrowTokenForTrustAgent)) {
	Slog.e(TAG, "Escrow token API is not allowed.");		throw new SecurityException("Escrow token API is not allowed.");
	return;
	}		}

	if (DEBUG) Slog.d(TAG, "checking the state of escrow token on user " + userId);		if (DEBUG) Slog.d(TAG, "checking the state of escrow token on user " + userId);
	@@ -313,8 +323,7 @@ public class TrustAgentWrapper {
	public void removeEscrowToken(long handle, int userId) {		public void removeEscrowToken(long handle, int userId) {
	if (mContext.getResources()		if (mContext.getResources()
	.getBoolean(com.android.internal.R.bool.config_allowEscrowTokenForTrustAgent)) {		.getBoolean(com.android.internal.R.bool.config_allowEscrowTokenForTrustAgent)) {
	Slog.e(TAG, "Escrow token API is not allowed.");		throw new SecurityException("Escrow token API is not allowed.");
	return;
	}		}

	if (DEBUG) Slog.d(TAG, "removing escrow token on user " + userId);		if (DEBUG) Slog.d(TAG, "removing escrow token on user " + userId);
	@@ -328,8 +337,7 @@ public class TrustAgentWrapper {
	public void unlockUserWithToken(long handle, byte[] token, int userId) {		public void unlockUserWithToken(long handle, byte[] token, int userId) {
	if (mContext.getResources()		if (mContext.getResources()
	.getBoolean(com.android.internal.R.bool.config_allowEscrowTokenForTrustAgent)) {		.getBoolean(com.android.internal.R.bool.config_allowEscrowTokenForTrustAgent)) {
	Slog.e(TAG, "Escrow token API is not allowed.");		throw new SecurityException("Escrow token API is not allowed.");
	return;
	}		}

	if (DEBUG) Slog.d(TAG, "unlocking user " + userId);		if (DEBUG) Slog.d(TAG, "unlocking user " + userId);