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

Merge "Validate device profiles in CdmService"

Browse Source
This commit is contained in:
Sergey Nikolaienkov
2021-10-05 16:59:20 +00:00
committed by Android (Google) Code Review
parent d694afb4d5 fd0d0536f4
commit 1d3b8a30a4
1 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
View File

@@ -145,6 +145,7 @@ import java.util.Collections;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TimeZone;
@@ -156,6 +157,15 @@ import java.util.function.Function;
@SuppressLint("LongLogTag")
public class CompanionDeviceManagerService extends SystemService implements Binder.DeathRecipient {
private static final Map<String, String> DEVICE_PROFILE_TO_PERMISSION;
static {
final Map<String, String> map = new ArrayMap<>();
map.put(AssociationRequest.DEVICE_PROFILE_WATCH,
Manifest.permission.REQUEST_COMPANION_PROFILE_WATCH);
DEVICE_PROFILE_TO_PERMISSION = Collections.unmodifiableMap(map);
}
private static final ComponentName SERVICE_TO_BIND_TO = ComponentName.createRelative(
CompanionDeviceManager.COMPANION_DEVICE_DISCOVERY_PACKAGE_NAME,
".CompanionDeviceDiscoveryService");
@@ -429,7 +439,8 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
checkCallerIsSystemOr(callingPackage);
int userId = getCallingUserId();
checkUsesFeature(callingPackage, userId);
checkProfilePermissions(request);
final String deviceProfile = request.getDeviceProfile();
validateDeviceProfileAndCheckPermission(deviceProfile);
mFindDeviceCallback = callback;
mRequest = request;
@@ -442,13 +453,8 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
}
callback.asBinder().linkToDeath(CompanionDeviceManagerService.this /* recipient */, 0);
AndroidFuture<String> fetchProfileDescription =
request.getDeviceProfile() == null
? AndroidFuture.completedFuture(null)
: getDeviceProfilePermissionDescription(
request.getDeviceProfile());
mOngoingDeviceDiscovery = fetchProfileDescription.thenComposeAsync(description -> {
mOngoingDeviceDiscovery = getDeviceProfilePermissionDescription(deviceProfile)
.thenComposeAsync(description -> {
Slog.d(LOG_TAG, "fetchProfileDescription done: " + description);
request.setDeviceProfilePrivilegesDescription(description);
@@ -464,8 +470,7 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
}, FgThread.getExecutor()).whenComplete(uncheckExceptions((deviceAddress, err) -> {
if (err == null) {
Association association = new Association(userId, deviceAddress, callingPackage,
mRequest.getDeviceProfile(), false,
System.currentTimeMillis());
deviceProfile, false, System.currentTimeMillis());
addAssociation(association, userId);
} else {
Slog.e(LOG_TAG, "Failed to discover device(s)", err);
@@ -542,18 +547,18 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
}
}
private void checkProfilePermissions(AssociationRequest request) {
checkProfilePermission(request,
AssociationRequest.DEVICE_PROFILE_WATCH,
Manifest.permission.REQUEST_COMPANION_PROFILE_WATCH);
}
private void validateDeviceProfileAndCheckPermission(@Nullable String deviceProfile) {
// Device profile can be null.
if (deviceProfile == null) return;
private void checkProfilePermission(
AssociationRequest request, String profile, String permission) {
if (profile.equals(request.getDeviceProfile())
&& getContext().checkCallingOrSelfPermission(permission)
!= PackageManager.PERMISSION_GRANTED) {
throw new SecurityException("Using " + profile + " requires " + permission);
if (!DEVICE_PROFILE_TO_PERMISSION.containsKey(deviceProfile)) {
throw new IllegalArgumentException("Unsupported device profile: " + deviceProfile);
}
final String permission = DEVICE_PROFILE_TO_PERMISSION.get(deviceProfile);
if (getContext().checkCallingOrSelfPermission(permission) != PERMISSION_GRANTED) {
throw new SecurityException("Application must hold " + permission + " to associate "
+ "with a device with " + deviceProfile + " profile.");
}
}
@@ -1517,8 +1522,14 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
return result;
}
private AndroidFuture<String> getDeviceProfilePermissionDescription(String deviceProfile) {
AndroidFuture<String> result = new AndroidFuture<>();
@NonNull
private AndroidFuture<String> getDeviceProfilePermissionDescription(
@Nullable String deviceProfile) {
if (deviceProfile == null) {
return AndroidFuture.completedFuture(null);
}
final AndroidFuture<String> result = new AndroidFuture<>();
mPermissionControllerManager.getPrivilegesDescriptionStringForProfile(
deviceProfile, FgThread.getExecutor(), desc -> {
try {