Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97055192 authored by Oli Lan's avatar Oli Lan Committed by Automerger Merge Worker
Browse files

Merge "Validate package name passed to setApplicationRestrictions. (Reland)"... 

Merge "Validate package name passed to setApplicationRestrictions. (Reland)" into tm-dev am: d28c0aa6

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



Change-Id: I2f5ac98904e91e73711a1a19140a0575f40037e8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 842e3bcd d28c0aa6

services/core/java/com/android/server/pm/UserManagerService.java

+41 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ import android.text.TextUtils; 
import android.util.ArrayMap;

import android.util.ArraySet;

import android.util.AtomicFile;

import android.util.EventLog;

import android.util.IndentingPrintWriter;

import android.util.IntArray;

import android.util.Slog;
@@ -4894,6 +4895,13 @@ public class UserManagerService extends IUserManager.Stub { 
    public void setApplicationRestrictions(String packageName, Bundle restrictions,

            @UserIdInt int userId) {

        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) {

            restrictions.setDefusable(true);

        }
@@ -4920,6 +4928,39 @@ public class UserManagerService extends IUserManager.Stub { 
        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) {

        final long ident = Binder.clearCallingIdentity();

        try {