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

Merge "Revert "Validate package name passed to setApplicationRestrictions."" into sc-v2-dev am: c448026af5

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

Change-Id: I328d0c25c77ee80bf0a24284e8cd51dcc59b288e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eva Tsai
2022-09-02 03:43:53 +00:00
committed by Automerger Merge Worker
parent db0ccc1771 c448026af5
commit f2c91e4cd3
2 changed files with 0 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
services/core/java/com/android/server/pm/UserManagerService.java
View File

@@ -93,7 +93,6 @@ import android.text.TextUtils;
import android.util.ArrayMap; import android.util.ArrayMap;
import android.util.ArraySet; import android.util.ArraySet;
import android.util.AtomicFile; import android.util.AtomicFile;
import android.util.EventLog;
import android.util.IndentingPrintWriter; import android.util.IndentingPrintWriter;
import android.util.IntArray; import android.util.IntArray;
import android.util.Slog; import android.util.Slog;
@@ -4895,13 +4894,6 @@ public class UserManagerService extends IUserManager.Stub {
public void setApplicationRestrictions(String packageName, Bundle restrictions, public void setApplicationRestrictions(String packageName, Bundle restrictions,
@UserIdInt int userId) { @UserIdInt int userId) {
checkSystemOrRoot("set application restrictions"); checkSystemOrRoot("set application restrictions");
String validationResult = validateName(packageName);
if (validationResult != null) {
if (packageName.contains("../")) {
EventLog.writeEvent(0x534e4554, "239701237", -1, "");
}
throw new IllegalArgumentException("Invalid package name: " + validationResult);
}
if (restrictions != null) { if (restrictions != null) {
restrictions.setDefusable(true); restrictions.setDefusable(true);
} }
@@ -4928,39 +4920,6 @@ public class UserManagerService extends IUserManager.Stub {
mContext.sendBroadcastAsUser(changeIntent, UserHandle.of(userId)); mContext.sendBroadcastAsUser(changeIntent, UserHandle.of(userId));
} }
/**
* Check if the given name is valid.
*
* Note: the logic is taken from FrameworkParsingPackageUtils in master, edited to remove
* unnecessary parts. Copied here for a security fix.
*
* @param name The name to check.
* @return null if it's valid, error message if not
*/
@VisibleForTesting
static String validateName(String name) {
final int n = name.length();
boolean front = true;
for (int i = 0; i < n; i++) {
final char c = name.charAt(i);
if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) {
front = false;
continue;
}
if (!front) {
if ((c >= '0' && c <= '9') || c == '_') {
continue;
}
if (c == '.') {
front = true;
continue;
}
}
return "bad character '" + c + "'";
}
return null;
}
private int getUidForPackage(String packageName) { private int getUidForPackage(String packageName) {
final long ident = Binder.clearCallingIdentity(); final long ident = Binder.clearCallingIdentity();
try { try {

7
services/tests/servicestests/src/com/android/server/pm/UserManagerServiceTest.java
View File

@@ -88,13 +88,6 @@ public class UserManagerServiceTest extends AndroidTestCase {
} }
} }
public void testValidateName() {
assertNull(UserManagerService.validateName("android"));
assertNull(UserManagerService.validateName("com.company.myapp"));
assertNotNull(UserManagerService.validateName("/../../data"));
assertNotNull(UserManagerService.validateName("/dir"));
}
private Bundle createBundle() { private Bundle createBundle() {
Bundle result = new Bundle(); Bundle result = new Bundle();
// Tests for 6 allowed types: Integer, Boolean, String, String[], Bundle and Parcelable[] // Tests for 6 allowed types: Integer, Boolean, String, String[], Bundle and Parcelable[]