Merge "Improve restriction for BugreportManagerService for multi-user" into sc-dev am: 38b64a51a5

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14878617

Change-Id: I56b45102e59a9101faff85d2150effdc57f0f69c

core/java/android/app/admin/DevicePolicyManager.java

@@ -11871,7 +11871,19 @@ public class DevicePolicyManager {
     public boolean isAffiliatedUser() {
         throwIfParentInstance("isAffiliatedUser");
         try {
-            return mService.isAffiliatedUser();
+            return mService.isCallingUserAffiliated();
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /**
+     * @hide
+     * Returns whether target user is affiliated with the device.
+     */
+    public boolean isAffiliatedUser(@UserIdInt int userId) {
+        try {
+            return mService.isAffiliatedUser(userId);
         } catch (RemoteException e) {
             throw e.rethrowFromSystemServer();
         }

core/java/android/app/admin/IDevicePolicyManager.aidl

@@ -390,7 +390,8 @@ interface IDevicePolicyManager {
 
     void setAffiliationIds(in ComponentName admin, in List<String> ids);
     List<String> getAffiliationIds(in ComponentName admin);
-    boolean isAffiliatedUser();
+    boolean isCallingUserAffiliated();
+    boolean isAffiliatedUser(int userId);
 
     void setSecurityLoggingEnabled(in ComponentName admin, String packageName, boolean enabled);
     boolean isSecurityLoggingEnabled(in ComponentName admin, String packageName);

services/core/java/com/android/server/os/BugreportManagerServiceImpl.java

@@ -20,6 +20,7 @@ import android.annotation.Nullable;
 import android.annotation.RequiresPermission;
 import android.app.ActivityManager;
 import android.app.AppOpsManager;
+import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.content.pm.UserInfo;
@@ -31,6 +32,7 @@ import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.SystemClock;
 import android.os.SystemProperties;
+import android.os.UserHandle;
 import android.os.UserManager;
 import android.telephony.TelephonyManager;
 import android.util.ArraySet;
@@ -81,7 +83,7 @@ class BugreportManagerServiceImpl extends IDumpstate.Stub {
                 == BugreportParams.BUGREPORT_MODE_TELEPHONY /* checkCarrierPrivileges */);
         final long identity = Binder.clearCallingIdentity();
         try {
-            ensureIsPrimaryUser();
+            ensureUserCanTakeBugReport(bugreportMode);
         } finally {
             Binder.restoreCallingIdentity(identity);
         }
@@ -166,11 +168,12 @@ class BugreportManagerServiceImpl extends IDumpstate.Stub {
     }
 
     /**
-     * Validates that the current user is the primary user.
+     * Validates that the current user is the primary user or when bugreport is requested remotely
+     * and current user is affiliated user.
      *
      * @throws IllegalArgumentException if the current user is not the primary user
      */
-    private void ensureIsPrimaryUser() {
+    private void ensureUserCanTakeBugReport(int bugreportMode) {
         UserInfo currentUser = null;
         try {
             currentUser = ActivityManager.getService().getCurrentUser();
@@ -186,11 +189,40 @@ class BugreportManagerServiceImpl extends IDumpstate.Stub {
             logAndThrow("No primary user. Only primary user is allowed to take bugreports.");
         }
         if (primaryUser.id != currentUser.id) {
+            if (bugreportMode == BugreportParams.BUGREPORT_MODE_REMOTE
+                    && isCurrentUserAffiliated(currentUser.id)) {
+                return;
+            }
             logAndThrow("Current user not primary user. Only primary user"
                     + " is allowed to take bugreports.");
         }
     }
 
+    /**
+     * Returns {@code true} if the device has device owner and the current user is affiliated
+     * with the device owner.
+     */
+    private boolean isCurrentUserAffiliated(int currentUserId) {
+        DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class);
+        int deviceOwnerUid = dpm.getDeviceOwnerUserId();
+        if (deviceOwnerUid == UserHandle.USER_NULL) {
+            return false;
+        }
+
+        int callingUserId = UserHandle.getUserId(Binder.getCallingUid());
+
+        Slog.i(TAG, "callingUid: " + callingUserId + " deviceOwnerUid: " + deviceOwnerUid
+                + " currentUserId: " + currentUserId);
+
+        if (callingUserId != deviceOwnerUid) {
+            logAndThrow("Caller is not device owner on provisioned device.");
+        }
+        if (!dpm.isAffiliatedUser(currentUserId)) {
+            logAndThrow("Current user is not affiliated to the device owner.");
+        }
+        return true;
+    }
+
     @GuardedBy("mLock")
     private void startBugreportLocked(int callingUid, String callingPackage,
             FileDescriptor bugreportFd, FileDescriptor screenshotFd,

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

@@ -14319,7 +14319,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
     }
 
     @Override
-    public boolean isAffiliatedUser() {
+    public boolean isCallingUserAffiliated() {
         if (!mHasFeature) {
             return false;
         }
@@ -14329,6 +14329,17 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
         }
     }
 
+    @Override
+    public boolean isAffiliatedUser(@UserIdInt int userId) {
+        if (!mHasFeature) {
+            return false;
+        }
+        final CallerIdentity caller = getCallerIdentity();
+        Preconditions.checkCallAuthorization(hasCrossUsersPermission(caller, userId));
+
+        return isUserAffiliatedWithDeviceLocked(userId);
+    }
+
     private boolean isUserAffiliatedWithDeviceLocked(@UserIdInt int userId) {
         if (!mOwners.hasDeviceOwner()) {
             return false;