Move out IntegrityCheckResult related methods from... (0e44e0d4) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/integrity/AppIntegrityManagerServiceImpl.java

+3 −23

Original line number	Diff line number	Diff line
		@@ -268,9 +268,9 @@ public class AppIntegrityManagerServiceImpl extends IAppIntegrityManager.Stub {
		appCert,
		appInstallMetadata.getVersionCode(),
		installerPackageName,
		getLoggingResponse(result),
		isCausedByAppCertRule(result),
		isCausedByInstallerRule(result));
		result.getLoggingResponse(),
		result.isCausedByAppCertRule(),
		result.isCausedByInstallerRule());
		mPackageManagerInternal.setIntegrityVerificationResult(
		verificationId,
		result.getEffect() == IntegrityCheckResult.Effect.ALLOW
		@@ -583,26 +583,6 @@ public class AppIntegrityManagerServiceImpl extends IAppIntegrityManager.Stub {
		}
		}

		private static int getLoggingResponse(IntegrityCheckResult result) {
		if (result.getEffect() == IntegrityCheckResult.Effect.DENY) {
		return StatsLog.INTEGRITY_CHECK_RESULT_REPORTED__RESPONSE__REJECTED;
		} else if (result.getRule() != null) {
		return StatsLog.INTEGRITY_CHECK_RESULT_REPORTED__RESPONSE__FORCE_ALLOWED;
		} else {
		return StatsLog.INTEGRITY_CHECK_RESULT_REPORTED__RESPONSE__ALLOWED;
		}
		}

		private static boolean isCausedByAppCertRule(IntegrityCheckResult result) {
		// TODO(b/147095027): implement this.
		return true;
		}

		private static boolean isCausedByInstallerRule(IntegrityCheckResult result) {
		// TODO(b/147095027): implement this.
		return true;
		}

		private List<String> getAllowedRuleProviders() {
		return Arrays.asList(mContext.getResources().getStringArray(
		R.array.config_integrityRuleProviderPackages));

services/core/java/com/android/server/integrity/model/IntegrityCheckResult.java

+31 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.server.integrity.model;

		import android.annotation.Nullable;
		import android.content.integrity.Rule;
		import android.util.StatsLog;

		/**
		* A class encapsulating the result from the evaluation engine after evaluating rules against app
		@@ -76,4 +77,34 @@ public final class IntegrityCheckResult {
		public static IntegrityCheckResult deny(Rule rule) {
		return new IntegrityCheckResult(Effect.DENY, rule);
		}

		/**
		* Returns the in value of the integrity check result for logging purposes.
		*/
		public int getLoggingResponse() {
		if (getEffect() == IntegrityCheckResult.Effect.DENY) {
		return StatsLog.INTEGRITY_CHECK_RESULT_REPORTED__RESPONSE__REJECTED;
		} else if (getRule() != null) {
		return StatsLog.INTEGRITY_CHECK_RESULT_REPORTED__RESPONSE__FORCE_ALLOWED;
		} else {
		return StatsLog.INTEGRITY_CHECK_RESULT_REPORTED__RESPONSE__ALLOWED;
		}
		}

		/**
		* Returns true when the {@code Effect.DENY} result is caused by an app certificate mismatch.
		*/
		public boolean isCausedByAppCertRule() {
		// TODO(b/147095027): implement this.
		return true;
		}

		/**
		* Returns true when the {@code Effect.DENY} result is caused by an installer rule.
		*/
		public boolean isCausedByInstallerRule() {
		// TODO(b/147095027): implement this.
		return true;
		}

		}

services/tests/servicestests/src/com/android/server/integrity/model/IntegrityCheckResultTest.java

0 → 100644

+75 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2020 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.integrity.model;

		import static com.google.common.truth.Truth.assertThat;

		import android.content.integrity.AtomicFormula;
		import android.content.integrity.Rule;
		import android.util.StatsLog;

		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.junit.runners.JUnit4;

		@RunWith(JUnit4.class)
		public class IntegrityCheckResultTest {

		@Test
		public void createAllowResult() {
		IntegrityCheckResult allowResult = IntegrityCheckResult.allow();

		assertThat(allowResult.getEffect()).isEqualTo(IntegrityCheckResult.Effect.ALLOW);
		assertThat(allowResult.getRule()).isNull();
		assertThat(allowResult.getLoggingResponse())
		.isEqualTo(StatsLog.INTEGRITY_CHECK_RESULT_REPORTED__RESPONSE__ALLOWED);
		}

		@Test
		public void createAllowResultWithRule() {
		String packageName = "com.test.deny";
		Rule forceAllowRule =
		new Rule(
		new AtomicFormula.StringAtomicFormula(AtomicFormula.PACKAGE_NAME,
		packageName),
		Rule.FORCE_ALLOW);

		IntegrityCheckResult allowResult = IntegrityCheckResult.allow(forceAllowRule);

		assertThat(allowResult.getEffect()).isEqualTo(IntegrityCheckResult.Effect.ALLOW);
		assertThat(allowResult.getRule()).isEqualTo(forceAllowRule);
		assertThat(allowResult.getLoggingResponse())
		.isEqualTo(StatsLog.INTEGRITY_CHECK_RESULT_REPORTED__RESPONSE__FORCE_ALLOWED);
		}

		@Test
		public void createDenyResultWithRule() {
		String packageName = "com.test.deny";
		Rule failedRule =
		new Rule(
		new AtomicFormula.StringAtomicFormula(AtomicFormula.PACKAGE_NAME,
		packageName),
		Rule.DENY);

		IntegrityCheckResult denyResult = IntegrityCheckResult.deny(failedRule);

		assertThat(denyResult.getEffect()).isEqualTo(IntegrityCheckResult.Effect.DENY);
		assertThat(denyResult.getRule()).isEqualTo(failedRule);
		assertThat(denyResult.getLoggingResponse())
		.isEqualTo(StatsLog.INTEGRITY_CHECK_RESULT_REPORTED__RESPONSE__REJECTED);
		}
		}