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

Merge "Handle permission group and type changed in PermissionPolicy"

Browse Source
This commit is contained in:
Yi-an Chen
2023-01-06 23:36:19 +00:00
committed by Android (Google) Code Review
parent cb683fa602 6937883190
commit 4933e5cfb0
2 changed files with 88 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
services/permission/java/com/android/server/permission/access/permission/UidPermissionPolicy.kt
View File

@@ -38,6 +38,8 @@ import com.android.server.permission.access.collection.* // ktlint-disable no-wi
import com.android.server.permission.access.util.andInv
import com.android.server.permission.access.util.hasAnyBit
import com.android.server.permission.access.util.hasBits
import com.android.server.permission.access.util.isInternal
import com.android.server.permission.access.util.isRuntime
import com.android.server.pm.KnownPackages
import com.android.server.pm.parsing.PackageInfoUtils
import com.android.server.pm.permission.CompatibilityPermissionInfo
@@ -131,8 +133,6 @@ class UidPermissionPolicy : SchemePolicy() {
volumeUuid: String?,
isSystemUpdated: Boolean
) {
// TODO: STOPSHIP: Either make addPermissionGroups() favor system packages
// like addPermissions(), or sort system packages before non-system packages for this loop.
val changedPermissionNames = IndexedSet<String>()
newState.systemState.packageStates.forEach { (_, packageState) ->
val androidPackage = packageState.androidPackage
@@ -328,12 +328,33 @@ class UidPermissionPolicy : SchemePolicy() {
val oldPermissionGroup = newState.systemState.permissionGroups[permissionGroupName]
if (oldPermissionGroup != null &&
newPermissionGroup.packageName != oldPermissionGroup.packageName) {
val newPackageName = newPermissionGroup.packageName
val oldPackageName = oldPermissionGroup.packageName
// Different from the old implementation, which defines permission group on
// a first-come-first-serve basis, and relies on system apps being scanned before
// non-system apps, we now allow system apps to override permission groups similar
// to permissions so that we no longer need to rely on the scan order.
if (!packageState.isSystem) {
Log.w(
LOG_TAG, "Ignoring permission group $permissionGroupName declared in" +
" package $newPackageName: already declared in another" +
" package $oldPackageName"
)
return@forEachIndexed
}
if (newState.systemState.packageStates[oldPackageName]?.isSystem == true) {
Log.w(
LOG_TAG, "Ignoring permission group $permissionGroupName declared in" +
" system package $newPackageName: already declared in another" +
" system package $oldPackageName"
)
return@forEachIndexed
}
Log.w(
LOG_TAG, "Ignoring permission group $permissionGroupName declared in package" +
" ${newPermissionGroup.packageName}: already declared in another package" +
" ${oldPermissionGroup.packageName}"
LOG_TAG, "Overriding permission group $permissionGroupName with" +
" new declaration in system package $newPackageName: originally" +
" declared in another package $oldPackageName"
)
return@forEachIndexed
}
newState.systemState.permissionGroups[permissionGroupName] = newPermissionGroup
}
@@ -421,7 +442,42 @@ class UidPermissionPolicy : SchemePolicy() {
return@forEachIndexed
}
} else {
// TODO: STOPSHIP: Clear permission state on type or group change.
if (oldPermission != null) {
val isPermissionGroupChanged = newPermissionInfo.isRuntime &&
newPermissionInfo.group != null &&
newPermissionInfo.group != oldPermission.groupName
val isPermissionTypeChanged = oldPermission.type != Permission.TYPE_CONFIG && (
(newPermissionInfo.isRuntime && !oldPermission.isRuntime) ||
(newPermissionInfo.isInternal && !oldPermission.isInternal)
)
if (isPermissionGroupChanged || isPermissionTypeChanged) {
systemState.userIds.forEachIndexed { _, userId ->
systemState.appIds.forEachKeyIndexed { _, appId ->
if (isPermissionGroupChanged) {
// We might auto-grant permissions if any permission of
// the group is already granted. Hence if the group of
// a granted permission changes we need to revoke it to
// avoid having permissions of the new group auto-granted.
Log.w(
LOG_TAG, "Revoking runtime permission $permissionName for" +
" appId $appId and userId $userId as the permission" +
" group changed from ${oldPermission.groupName}" +
" to ${newPermissionInfo.group}"
)
}
if (isPermissionTypeChanged) {
Log.w(
LOG_TAG, "Revoking permission $permissionName for" +
" appId $appId and userId $userId as the permission" +
" type changed."
)
}
setPermissionFlags(appId, userId, permissionName, 0)
}
}
}
}
// Different from the old implementation, which doesn't update the permission
// definition upon app update, but does update it on the next boot, we now
// consistently update the permission definition upon app update.

25
services/permission/java/com/android/server/permission/access/util/PermissionInfoExtensions.kt Normal file
View File

@@ -0,0 +1,25 @@
/*
* Copyright (C) 2023 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.permission.access.util
import android.content.pm.PermissionInfo
inline val PermissionInfo.isRuntime: Boolean
get() = protection == PermissionInfo.PROTECTION_DANGEROUS
inline val PermissionInfo.isInternal: Boolean
get() = protection == PermissionInfo.PROTECTION_INTERNAL