From a693f316e08bf2ca810b6b6adad6c2036b4b6d2b Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Mon, 5 Mar 2018 10:29:58 -0500 Subject: [PATCH] aapt2: add test to confirm pkgId of 0x80 --- .../androlib/aapt2/NonStandardPkgIdTest.java | 91 +++++++++++++++++++ .../apktool/aapt2/pkgid8/AndroidManifest.xml | 4 + .../brut/apktool/aapt2/pkgid8/apktool.yml | 12 +++ .../aapt2/pkgid8/res/values/integers.xml | 4 + .../aapt2/pkgid8/res/values/public.xml | 6 ++ .../aapt2/pkgid8/res/values/strings.xml | 5 + 6 files changed, 122 insertions(+) create mode 100644 brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt2/NonStandardPkgIdTest.java create mode 100644 brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/pkgid8/AndroidManifest.xml create mode 100644 brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/pkgid8/apktool.yml create mode 100644 brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/pkgid8/res/values/integers.xml create mode 100644 brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/pkgid8/res/values/public.xml create mode 100644 brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/pkgid8/res/values/strings.xml diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt2/NonStandardPkgIdTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt2/NonStandardPkgIdTest.java new file mode 100644 index 00000000..6b376a1d --- /dev/null +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt2/NonStandardPkgIdTest.java @@ -0,0 +1,91 @@ +/** + * Copyright (C) 2017 Ryszard Wiśniewski + * Copyright (C) 2017 Connor Tumbleson + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package brut.androlib.aapt2; + +import brut.androlib.*; +import brut.androlib.res.data.ResTable; +import brut.common.BrutException; +import brut.directory.ExtFile; +import brut.util.OS; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + +import java.io.File; + +import static org.junit.Assert.*; + +public class NonStandardPkgIdTest extends BaseTest { + + @BeforeClass + public static void beforeClass() throws Exception { + TestUtils.cleanFrameworkFile(); + + sTmpDir = new ExtFile(OS.createTempDirectory()); + sTmpDir.deleteOnExit(); + + sTestOrigDir = new ExtFile(sTmpDir, "pkgid8-orig"); + sTestNewDir = new ExtFile(sTmpDir, "pkgid8-new"); + LOGGER.info("Unpacking pkgid8..."); + TestUtils.copyResourceDir(BuildAndDecodeTest.class, "brut/apktool/aapt2/pkgid8/", sTestOrigDir); + + ApkOptions apkOptions = new ApkOptions(); + apkOptions.useAapt2 = true; + apkOptions.verbose = true; + + LOGGER.info("Building pkgid8.apk..."); + File testApk = new File(sTmpDir, "pkgid8.apk"); + new Androlib(apkOptions).build(sTestOrigDir, testApk); + + LOGGER.info("Decoding pkgid8.apk..."); + ApkDecoder apkDecoder = new ApkDecoder(testApk); + apkDecoder.setOutDir(sTestNewDir); + apkDecoder.decode(); + mResTable = apkDecoder.getResTable(); + } + + @AfterClass + public static void afterClass() throws BrutException { + OS.rmdir(sTmpDir); + } + + @Test + public void buildAndDecodeTest() { + assertTrue(sTestNewDir.isDirectory()); + } + + @Test + public void valuesStringsTest() throws BrutException { + compareValuesFiles("values/strings.xml"); + } + + @Test + public void confirmManifestStructureTest() throws BrutException { + compareXmlFiles("AndroidManifest.xml"); + } + + @Test + public void confirmResourcesAreFromPkgId8() throws AndrolibException { + assertEquals(0x80, mResTable.getPackageId()); + + assertEquals(0x80, mResTable.getResSpec(0x80020000).getPackage().getId()); + assertEquals(0x80, mResTable.getResSpec(0x80020001).getPackage().getId()); + assertEquals(0x80, mResTable.getResSpec(0x80030000).getPackage().getId()); + } + + private static ResTable mResTable; +} diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/pkgid8/AndroidManifest.xml b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/pkgid8/AndroidManifest.xml new file mode 100644 index 00000000..0be2ca2e --- /dev/null +++ b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/pkgid8/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/pkgid8/apktool.yml b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/pkgid8/apktool.yml new file mode 100644 index 00000000..74875006 --- /dev/null +++ b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/pkgid8/apktool.yml @@ -0,0 +1,12 @@ +version: 2.0.0 +apkFileName: pkgid8.apk +isFrameworkApk: false +usesFramework: + ids: + - 1 +packageInfo: + forcedPackageId: '128' +versionInfo: + versionCode: '1' + versionName: '1.0' +compressionType: false \ No newline at end of file diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/pkgid8/res/values/integers.xml b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/pkgid8/res/values/integers.xml new file mode 100644 index 00000000..fd3708d9 --- /dev/null +++ b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/pkgid8/res/values/integers.xml @@ -0,0 +1,4 @@ + + + 117 + \ No newline at end of file diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/pkgid8/res/values/public.xml b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/pkgid8/res/values/public.xml new file mode 100644 index 00000000..d2d98bfa --- /dev/null +++ b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/pkgid8/res/values/public.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/pkgid8/res/values/strings.xml b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/pkgid8/res/values/strings.xml new file mode 100644 index 00000000..77d94b14 --- /dev/null +++ b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/pkgid8/res/values/strings.xml @@ -0,0 +1,5 @@ + + + foo + bar + \ No newline at end of file