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

Merge "[pm/metrics][8/n] log to SecurityLog"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-12-09 21:44:45 +00:00
committed by Android (Google) Code Review
parent e56846d9fc 19bb9aa5f1
commit 3a715e87b0
11 changed files with 102 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/api/current.txt
View File

@@ -8013,6 +8013,9 @@ package android.app.admin {
field public static final int TAG_MEDIA_UNMOUNT = 210014; // 0x3345e
field public static final int TAG_OS_SHUTDOWN = 210010; // 0x3345a
field public static final int TAG_OS_STARTUP = 210009; // 0x33459
field public static final int TAG_PACKAGE_INSTALLED = 210041; // 0x33479
field public static final int TAG_PACKAGE_UNINSTALLED = 210043; // 0x3347b
field public static final int TAG_PACKAGE_UPDATED = 210042; // 0x3347a
field public static final int TAG_PASSWORD_CHANGED = 210036; // 0x33474
field public static final int TAG_PASSWORD_COMPLEXITY_REQUIRED = 210035; // 0x33473
field public static final int TAG_PASSWORD_COMPLEXITY_SET = 210017; // 0x33461

39
core/java/android/app/admin/SecurityLog.java
View File

@@ -96,6 +96,9 @@ public class SecurityLog {
TAG_WIFI_DISCONNECTION,
TAG_BLUETOOTH_CONNECTION,
TAG_BLUETOOTH_DISCONNECTION,
TAG_PACKAGE_INSTALLED,
TAG_PACKAGE_UPDATED,
TAG_PACKAGE_UNINSTALLED,
})
public @interface SecurityLogTag {}
@@ -562,6 +565,39 @@ public class SecurityLog {
public static final int TAG_BLUETOOTH_DISCONNECTION =
SecurityLogTags.SECURITY_BLUETOOTH_DISCONNECTION;
/**
* Indicates that a package is installed.
* The log entry contains the following information about the
* event, encapsulated in an {@link Object} array and accessible via
* {@link SecurityEvent#getData()}:
* <li> [0] Name of the package being installed ({@code String})
* <li> [1] Package version code ({@code Long})
* <li> [2] UserId of the user that installed this package ({@code Integer})
*/
public static final int TAG_PACKAGE_INSTALLED = SecurityLogTags.SECURITY_PACKAGE_INSTALLED;
/**
* Indicates that a package is updated.
* The log entry contains the following information about the
* event, encapsulated in an {@link Object} array and accessible via
* {@link SecurityEvent#getData()}:
* <li> [0] Name of the package being updated ({@code String})
* <li> [1] Package version code ({@code Long})
* <li> [2] UserId of the user that updated this package ({@code Integer})
*/
public static final int TAG_PACKAGE_UPDATED = SecurityLogTags.SECURITY_PACKAGE_UPDATED;
/**
* Indicates that a package is uninstalled.
* The log entry contains the following information about the
* event, encapsulated in an {@link Object} array and accessible via
* {@link SecurityEvent#getData()}:
* <li> [0] Name of the package being uninstalled ({@code String})
* <li> [1] Package version code ({@code Long})
* <li> [2] UserId of the user that uninstalled this package ({@code Integer})
*/
public static final int TAG_PACKAGE_UNINSTALLED = SecurityLogTags.SECURITY_PACKAGE_UNINSTALLED;
/**
* Event severity level indicating that the event corresponds to normal workflow.
*/
@@ -772,6 +808,9 @@ public class SecurityLog {
break;
case SecurityLog.TAG_CERT_AUTHORITY_INSTALLED:
case SecurityLog.TAG_CERT_AUTHORITY_REMOVED:
case SecurityLog.TAG_PACKAGE_INSTALLED:
case SecurityLog.TAG_PACKAGE_UPDATED:
case SecurityLog.TAG_PACKAGE_UNINSTALLED:
try {
userId = getIntegerData(2);
} catch (Exception e) {

5
core/java/android/app/admin/SecurityLogTags.logtags
View File

@@ -44,4 +44,7 @@ option java_package android.app.admin
210037 security_wifi_connection (bssid|3),(event_type|3),(reason|3)
210038 security_wifi_disconnection (bssid|3),(reason|3)
210039 security_bluetooth_connection (addr|3),(success|1),(reason|3)
210040 security_bluetooth_disconnection (addr|3),(reason|3)
210040 security_bluetooth_disconnection (addr|3),(reason|3)
210041 security_package_installed (package_name|3),(version_code|1),(user_id|1)
210042 security_package_updated (package_name|3),(version_code|1),(user_id|1)
210043 security_package_uninstalled (package_name|3),(version_code|1),(user_id|1)

3
services/core/java/com/android/server/pm/DeletePackageHelper.java
View File

@@ -261,7 +261,7 @@ final class DeletePackageHelper {
final boolean killApp = (deleteFlags & PackageManager.DELETE_DONT_KILL_APP) == 0;
info.sendPackageRemovedBroadcasts(killApp, removedBySystem);
info.sendSystemPackageUpdatedBroadcasts();
PackageMetrics.onUninstallSucceeded(info, deleteFlags, mUserManagerInternal);
PackageMetrics.onUninstallSucceeded(info, deleteFlags, userId);
}
// Force a gc to clear up things.
@@ -550,6 +550,7 @@ final class DeletePackageHelper {
outInfo.mRemovedUsers = userIds;
outInfo.mBroadcastUsers = userIds;
outInfo.mIsExternal = ps.isExternalStorage();
outInfo.mRemovedPackageVersionCode = ps.getVersionCode();
}
}

1
services/core/java/com/android/server/pm/InstallPackageHelper.java
View File

@@ -1608,6 +1608,7 @@ final class InstallPackageHelper {
ps.getUninstallReason(userId));
}
removedInfo.mIsExternal = oldPackage.isExternalStorage();
removedInfo.mRemovedPackageVersionCode = oldPackage.getLongVersionCode();
request.setRemovedInfo(removedInfo);
sysPkg = oldPackage.isSystem();

4
services/core/java/com/android/server/pm/InstallRequest.java
View File

@@ -773,10 +773,10 @@ final class InstallRequest {
}
}
public void onInstallCompleted() {
public void onInstallCompleted(int userId) {
if (getReturnCode() == INSTALL_SUCCEEDED) {
if (mPackageMetrics != null) {
mPackageMetrics.onInstallSucceed();
mPackageMetrics.onInstallSucceed(userId);
}
}
}

2
services/core/java/com/android/server/pm/InstallingSession.java
View File

@@ -535,7 +535,7 @@ class InstallingSession {
mInstallPackageHelper.installPackagesTraced(installRequests);
for (InstallRequest request : installRequests) {
request.onInstallCompleted();
request.onInstallCompleted(mUser.getIdentifier());
doPostInstall(request);
}
}

1
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -3078,6 +3078,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService
info.mRemovedUsers = new int[] {userId};
info.mBroadcastUsers = new int[] {userId};
info.mUid = UserHandle.getUid(userId, packageState.getAppId());
info.mRemovedPackageVersionCode = packageState.getVersionCode();
info.sendPackageRemovedBroadcasts(true /*killApp*/, false /*removedBySystem*/);
}

52
services/core/java/com/android/server/pm/PackageMetrics.java
View File

@@ -19,6 +19,7 @@ package com.android.server.pm;
import static android.os.Process.INVALID_UID;
import android.annotation.IntDef;
import android.app.admin.SecurityLog;
import android.content.pm.PackageManager;
import android.content.pm.parsing.ApkLiteParseUtils;
import android.util.Pair;
@@ -67,8 +68,8 @@ final class PackageMetrics {
mInstallRequest = installRequest;
}
public void onInstallSucceed() {
// TODO(b/239722919): report to SecurityLog if on work profile or managed device
public void onInstallSucceed(int userId) {
reportInstallationToSecurityLog(userId);
reportInstallationStats(true /* success */);
}
@@ -77,8 +78,13 @@ final class PackageMetrics {
}
private void reportInstallationStats(boolean success) {
UserManagerInternal userManagerInternal =
final UserManagerInternal userManagerInternal =
LocalServices.getService(UserManagerInternal.class);
if (userManagerInternal == null) {
// UserManagerService is not available. Skip metrics reporting.
return;
}
final long installDurationMillis =
System.currentTimeMillis() - mInstallStartTimestampMillis;
// write to stats
@@ -196,12 +202,17 @@ final class PackageMetrics {
}
}
public static void onUninstallSucceeded(PackageRemovedInfo info, int deleteFlags,
UserManagerInternal userManagerInternal) {
public static void onUninstallSucceeded(PackageRemovedInfo info, int deleteFlags, int userId) {
if (info.mIsUpdate) {
// Not logging uninstalls caused by app updates
return;
}
final UserManagerInternal userManagerInternal =
LocalServices.getService(UserManagerInternal.class);
if (userManagerInternal == null) {
// UserManagerService is not available. Skip metrics reporting.
return;
}
final int[] removedUsers = info.mRemovedUsers;
final int[] removedUserTypes = userManagerInternal.getUserTypesForStatsd(removedUsers);
final int[] originalUsers = info.mOrigUsers;
@@ -210,6 +221,9 @@ final class PackageMetrics {
info.mUid, removedUsers, removedUserTypes, originalUsers, originalUserTypes,
deleteFlags, PackageManager.DELETE_SUCCEEDED, info.mIsRemovedPackageSystemUpdate,
!info.mRemovedForAllUsers);
final String packageName = info.mRemovedPackage;
final long versionCode = info.mRemovedPackageVersionCode;
reportUninstallationToSecurityLog(packageName, versionCode, userId);
}
public static void onVerificationFailed(VerifyingSession verifyingSession) {
@@ -242,4 +256,32 @@ final class PackageMetrics {
verifyingSession.isStaged() /* is_staged */
);
}
private void reportInstallationToSecurityLog(int userId) {
if (!SecurityLog.isLoggingEnabled()) {
return;
}
final PackageSetting ps = mInstallRequest.getScannedPackageSetting();
if (ps == null) {
return;
}
final String packageName = ps.getPackageName();
final long versionCode = ps.getVersionCode();
if (!mInstallRequest.isInstallReplace()) {
SecurityLog.writeEvent(SecurityLog.TAG_PACKAGE_INSTALLED, packageName, versionCode,
userId);
} else {
SecurityLog.writeEvent(SecurityLog.TAG_PACKAGE_UPDATED, packageName, versionCode,
userId);
}
}
private static void reportUninstallationToSecurityLog(String packageName, long versionCode,
int userId) {
if (!SecurityLog.isLoggingEnabled()) {
return;
}
SecurityLog.writeEvent(SecurityLog.TAG_PACKAGE_UNINSTALLED, packageName, versionCode,
userId);
}
}

1
services/core/java/com/android/server/pm/PackageRemovedInfo.java
View File

@@ -51,6 +51,7 @@ final class PackageRemovedInfo {
boolean mRemovedForAllUsers;
boolean mIsStaticSharedLib;
boolean mIsExternal;
long mRemovedPackageVersionCode;
// a two dimensional array mapping userId to the set of appIds that can receive notice
// of package changes
SparseArray<int[]> mBroadcastAllowList;

1
services/core/java/com/android/server/pm/RemovePackageHelper.java
View File

@@ -275,6 +275,7 @@ final class RemovePackageHelper {
outInfo.populateUsers(deletedPs.queryInstalledUsers(
mUserManagerInternal.getUserIds(), true), deletedPs);
outInfo.mIsExternal = deletedPs.isExternalStorage();
outInfo.mRemovedPackageVersionCode = deletedPs.getVersionCode();
}
removePackageLI(deletedPs.getPackageName(), (flags & PackageManager.DELETE_CHATTY) != 0);