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

Commit ab7ac8d5 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Allow "android" package name. 

Test: /data/nativetest64/installd_utils_test/installd_utils_test
Bug: 36062649
Change-Id: I9b41a34822a1a194d256f5b99d5955e51716029c
parent d86505e9

cmds/installd/tests/installd_utils_test.cpp

+3 −14
Original line number Diff line number Diff line
@@ -334,19 +334,6 @@ TEST_F(UtilsTest, CreatePkgPath_LongPkgNameSuccess) { 
             << "Package path should be a really long string of a's";

}



TEST_F(UtilsTest, CreatePkgPath_LongPkgNameFail) {

    char path[PKG_PATH_MAX];



    // Create long packagename of "aaaaa..."

    size_t pkgnameSize = PKG_NAME_MAX + 1;

    char pkgname[pkgnameSize + 1];

    memset(pkgname, 'a', pkgnameSize);

    pkgname[pkgnameSize] = '\0';



    EXPECT_EQ(-1, create_pkg_path(path, pkgname, "", 0))

            << "Should return error because package name is too long.";

}



TEST_F(UtilsTest, CreatePkgPath_LongPostfixFail) {

    char path[PKG_PATH_MAX];
@@ -514,6 +501,7 @@ TEST_F(UtilsTest, CreateDataUserPackagePath) { 
}



TEST_F(UtilsTest, IsValidPackageName) {

    EXPECT_EQ(true, is_valid_package_name("android"));

    EXPECT_EQ(true, is_valid_package_name("com.example"));

    EXPECT_EQ(true, is_valid_package_name("com.example-1"));

    EXPECT_EQ(true, is_valid_package_name("com.example-1024"));
@@ -522,9 +510,10 @@ TEST_F(UtilsTest, IsValidPackageName) { 


    EXPECT_EQ(false, is_valid_package_name("1234.package"));

    EXPECT_EQ(false, is_valid_package_name("com.1234.package"));

    EXPECT_EQ(false, is_valid_package_name("package"));

    EXPECT_EQ(false, is_valid_package_name(""));

    EXPECT_EQ(false, is_valid_package_name("."));

    EXPECT_EQ(false, is_valid_package_name(".."));

    EXPECT_EQ(false, is_valid_package_name("../"));

    EXPECT_EQ(false, is_valid_package_name("com.example/../com.evil/"));

    EXPECT_EQ(false, is_valid_package_name("com.example-1/../com.evil/"));

    EXPECT_EQ(false, is_valid_package_name("/com.evil"));

cmds/installd/utils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ bool is_valid_package_name(const std::string& packageName) { 
        return false;

    }



    if (!hasSep || front) {

    if (front) {

        LOG(WARNING) << "Missing separator in " << packageName;

        return false;

    }