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

AAPT2: whitelist alphanums instead of blacklisting hyphens in package names.

Browse Source 
BCP 47 uses plus signs for name mangling, and future qualifiers may
start using other reserved characters as well, so we might as well
futureproof the sanitizer.

Change-Id: I1be7ee4234f8e30bb0ea832372b4dc932d30550c
Fixes: 69134786
Test: UtilTest.SplitNamesAreSanitized
(cherry picked from commit 414e48a541)
This commit is contained in:
Donald Chai
2017-11-09 21:06:52 -08:00
parent 9e628b60ba
commit 2ba1bc579f
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tools/aapt2/cmd/Util.cpp
View File

@@ -140,12 +140,27 @@ static xml::NamespaceDecl CreateAndroidNamespaceDecl() {
return decl;
}
// Returns a copy of 'name' which conforms to the regex '[a-zA-Z]+[a-zA-Z0-9_]*' by
// replacing nonconforming characters with underscores.
//
// See frameworks/base/core/java/android/content/pm/PackageParser.java which
// checks this at runtime.
static std::string MakePackageSafeName(const std::string &name) {
std::string result(name);
bool first = true;
for (char &c : result) {
if (c == '-') {
c = '_';
if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) {
first = false;
continue;
}
if (!first) {
if (c >= '0' && c <= '9') {
continue;
}
}
c = '_';
first = false;
}
return result;
}

9
tools/aapt2/cmd/Util_test.cpp
View File

@@ -24,15 +24,16 @@ namespace aapt {
TEST(UtilTest, SplitNamesAreSanitized) {
AppInfo app_info{"com.pkg"};
SplitConstraints split_constraints{{test::ParseConfigOrDie("en-rUS-land")}};
SplitConstraints split_constraints{
{test::ParseConfigOrDie("en-rUS-land"), test::ParseConfigOrDie("b+sr+Latn")}};
const auto doc = GenerateSplitManifest(app_info, split_constraints);
const auto &root = doc->root;
EXPECT_EQ(root->name, "manifest");
// split names cannot contain hyphens
EXPECT_EQ(root->FindAttribute("", "split")->value, "config.en_rUS_land");
// split names cannot contain hyphens or plus signs.
EXPECT_EQ(root->FindAttribute("", "split")->value, "config.b_sr_Latn_en_rUS_land");
// but we should use resource qualifiers verbatim in 'targetConfig'.
EXPECT_EQ(root->FindAttribute("", "targetConfig")->value, "en-rUS-land");
EXPECT_EQ(root->FindAttribute("", "targetConfig")->value, "b+sr+Latn,en-rUS-land");
}
} // namespace aapt