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

Merge "Enfore caller permission check before reading whether a user is ready for backup."

Browse Source
This commit is contained in:
Piyush Mehrotra
2022-08-11 12:44:51 +00:00
committed by Android (Google) Code Review
parent 0e2eb0e94c 57a56f9104
commit 431faf4e31
2 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/backup/java/com/android/server/backup/BackupManagerService.java
View File

@@ -25,7 +25,6 @@ import android.annotation.UserIdInt;
import android.app.ActivityManager;
import android.app.admin.DevicePolicyManager;
import android.app.backup.BackupManager;
import android.app.backup.BackupManager.OperationType;
import android.app.backup.IBackupManager;
import android.app.backup.IBackupManagerMonitor;
import android.app.backup.IBackupObserver;
@@ -284,6 +283,7 @@ public class BackupManagerService extends IBackupManager.Stub {
*/
@Override
public boolean isUserReadyForBackup(int userId) {
enforceCallingPermissionOnUserId(userId, "isUserReadyForBackup()");
return mUserServices.get(UserHandle.USER_SYSTEM) != null
&& mUserServices.get(userId) != null;
}

29
services/robotests/backup/src/com/android/server/backup/BackupManagerServiceRoboTest.java
View File

@@ -301,6 +301,35 @@ public class BackupManagerServiceRoboTest {
verify(mUserOneService, never()).initializeTransports(transports, /* observer */ null);
}
/**
* Test that the backup services throws a {@link SecurityException} if the caller does not have
* INTERACT_ACROSS_USERS_FULL permission and passes a different user id.
*/
@Test
public void testIsUserReadyForBackup_withoutPermission_throwsSecurityException() {
BackupManagerService backupManagerService = createService();
registerUser(backupManagerService, mUserOneId, mUserOneService);
setCallerAndGrantInteractUserPermission(mUserTwoId, /* shouldGrantPermission */ false);
expectThrows(
SecurityException.class,
() -> backupManagerService.isUserReadyForBackup(mUserOneId));
}
/**
* Test that the backup service does not throw a {@link SecurityException} if the caller has
* INTERACT_ACROSS_USERS_FULL permission and passes a different user id.
*/
@Test
public void testIsUserReadyForBackup_withPermission_callsMethodForUser() {
BackupManagerService backupManagerService = createService();
registerUser(backupManagerService, UserHandle.USER_SYSTEM, mUserSystemService);
registerUser(backupManagerService, mUserOneId, mUserOneService);
setCallerAndGrantInteractUserPermission(mUserTwoId, /* shouldGrantPermission */ true);
assertThat(backupManagerService.isUserReadyForBackup(mUserOneId)).isTrue();
}
/** Test that the backup service routes methods correctly to the user that requests it. */
@Test
public void testClearBackupData_onRegisteredUser_callsMethodForUser() throws Exception {