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

Commit c31d8ad7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove vendor apex privapp allowlist pruning" into tm-dev am: 05e61e90 am: 8c5b32dc 

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



Change-Id: I49aa25148cc61daa7424c9fb32654fd410a4cf27
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0a8b5e9d 8c5b32dc

core/java/com/android/server/SystemConfig.java

+0 −16
Original line number Diff line number Diff line
@@ -682,7 +682,6 @@ public class SystemConfig { 
            readPermissions(parser, Environment.buildPath(f, "etc", "permissions"),

                    apexPermissionFlag);

        }

        pruneVendorApexPrivappAllowlists();

    }



    @VisibleForTesting
@@ -1598,21 +1597,6 @@ public class SystemConfig { 
        }

    }



    /**

     * Prunes out any privileged permission allowlists bundled in vendor apexes.

     */

    @VisibleForTesting

    public void pruneVendorApexPrivappAllowlists() {

        for (String moduleName: mAllowedVendorApexes.keySet()) {

            if (mApexPrivAppPermissions.containsKey(moduleName)

                    || mApexPrivAppDenyPermissions.containsKey(moduleName)) {

                Slog.w(TAG, moduleName + " is a vendor apex, ignore its priv-app allowlist");

                mApexPrivAppPermissions.remove(moduleName);

                mApexPrivAppDenyPermissions.remove(moduleName);

            }

        }

    }



    private void readInstallInUserType(XmlPullParser parser,

            Map<String, Set<String>> doInstallMap,

            Map<String, Set<String>> nonInstallMap)

services/tests/servicestests/src/com/android/server/systemconfig/SystemConfigTest.java

+0 −61
Original line number Diff line number Diff line
@@ -360,67 +360,6 @@ public class SystemConfigTest { 
            .containsExactly("android.permission.BAR");

    }



    @Test

    public void pruneVendorApexPrivappAllowlists_removeVendor()

            throws Exception {

        File apexDir = createTempSubfolder("apex");



        // Read non-vendor apex permission allowlists

        final String allowlistNonVendorContents =

                "<privapp-permissions package=\"com.android.apk_in_non_vendor_apex\">"

                        + "<permission name=\"android.permission.FOO\"/>"

                        + "<deny-permission name=\"android.permission.BAR\"/>"

                        + "</privapp-permissions>";

        File nonVendorPermDir =

                createTempSubfolder("apex/com.android.non_vendor/etc/permissions");

        File nonVendorPermissionFile =

                createTempFile(nonVendorPermDir, "permissions.xml", allowlistNonVendorContents);

        XmlPullParser nonVendorParser = readXmlUntilStartTag(nonVendorPermissionFile);

        mSysConfig.readApexPrivAppPermissions(nonVendorParser, nonVendorPermissionFile,

                apexDir.toPath());



        // Read vendor apex permission allowlists

        final String allowlistVendorContents =

                "<privapp-permissions package=\"com.android.apk_in_vendor_apex\">"

                        + "<permission name=\"android.permission.BAZ\"/>"

                        + "<deny-permission name=\"android.permission.BAT\"/>"

                        + "</privapp-permissions>";

        File vendorPermissionFile =

                createTempFile(createTempSubfolder("apex/com.android.vendor/etc/permissions"),

                        "permissions.xml", allowlistNonVendorContents);

        XmlPullParser vendorParser = readXmlUntilStartTag(vendorPermissionFile);

        mSysConfig.readApexPrivAppPermissions(vendorParser, vendorPermissionFile,

                apexDir.toPath());



        // Read allowed vendor apex list

        final String allowedVendorContents =

                "<config>\n"

                        + "    <allowed-vendor-apex package=\"com.android.vendor\" "

                        + "installerPackage=\"com.installer\" />\n"

                        + "</config>";

        final File allowedVendorFolder = createTempSubfolder("folder");

        createTempFile(allowedVendorFolder, "vendor-apex-allowlist.xml", allowedVendorContents);

        readPermissions(allowedVendorFolder, /* Grant all permission flags */ ~0);



        // Finally, prune non-vendor allowlists.

        // There is no guarantee in which order the above reads will be done, however pruning

        // will always happen last.

        mSysConfig.pruneVendorApexPrivappAllowlists();



        assertThat(mSysConfig.getApexPrivAppPermissions("com.android.non_vendor",

                "com.android.apk_in_non_vendor_apex"))

            .containsExactly("android.permission.FOO");

        assertThat(mSysConfig.getApexPrivAppDenyPermissions("com.android.non_vendor",

                "com.android.apk_in_non_vendor_apex"))

            .containsExactly("android.permission.BAR");

        assertThat(mSysConfig.getApexPrivAppPermissions("com.android.vendor",

                "com.android.apk_in_vendor_apex"))

            .isNull();

        assertThat(mSysConfig.getApexPrivAppDenyPermissions("com.android.vendor",

                "com.android.apk_in_vendor_apex"))

            .isNull();

    }



    /**

     * Tests that readPermissions works correctly for a library with on-bootclasspath-before

     * and on-bootclasspath-since.