diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java index c1e2deae..17c6f2ae 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java @@ -19,6 +19,7 @@ package brut.androlib.res.decoder; import android.content.res.XmlResourceParser; import android.util.TypedValue; import brut.androlib.AndrolibException; +import brut.androlib.res.data.ResID; import brut.androlib.res.xml.ResXmlEncoders; import brut.util.ExtDataInput; import com.google.common.io.LittleEndianDataInputStream; @@ -288,16 +289,15 @@ public class AXmlResourceParser implements XmlResourceParser { return ""; } - // hacky: if the attribute names are proguarded, then so are the namespace - // I don't know where these are located yet in the file, but it is always - // this.android_ns in testing, so we will default to that for now. - // @todo figure out where proguarded namespaces are stored. + // Minifiers like removing the namespace, so we will default to default namespace + // unless the pkgId of the resource is private. We will grab the non-standard one. String value = m_strings.getString(namespace); if (value.length() == 0) { - int offsetName = getAttributeOffset(index); - int name = m_attributes[offsetName + ATTRIBUTE_IX_NAME]; - if (m_strings.getString(name).length() == 0) { + ResID resourceId = new ResID(getAttributeNameResource(index)); + if (resourceId.package_ == PRIVATE_PKG_ID) { + value = getNonDefaultNamespaceUri(); + } else { value = android_ns; } } @@ -305,6 +305,17 @@ public class AXmlResourceParser implements XmlResourceParser { return value; } + private String getNonDefaultNamespaceUri() { + int offset = m_namespaces.getCurrentCount() + 1; + String prefix = m_strings.getString(m_namespaces.get(offset, true)); + + if (! prefix.equalsIgnoreCase("android")) { + return m_strings.getString(m_namespaces.get(offset, false)); + } + + return android_ns; + } + @Override public String getAttributePrefix(int index) { int offset = getAttributeOffset(index); @@ -999,4 +1010,6 @@ public class AXmlResourceParser implements XmlResourceParser { CHUNK_XML_END_NAMESPACE = 0x00100101, CHUNK_XML_START_TAG = 0x00100102, CHUNK_XML_END_TAG = 0x00100103, CHUNK_XML_TEXT = 0x00100104, CHUNK_XML_LAST = 0x00100104; + + private static final int PRIVATE_PKG_ID = 0x7F; } diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/MinifiedArscTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/MinifiedArscTest.java new file mode 100644 index 00000000..bae8dcc0 --- /dev/null +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/MinifiedArscTest.java @@ -0,0 +1,76 @@ +/** + * 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; + +import brut.directory.ExtFile; +import brut.common.BrutException; +import brut.util.OS; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; + +import static org.junit.Assert.assertEquals; + +/** + * @author Connor Tumbleson + */ +public class MinifiedArscTest { + + @BeforeClass + public static void beforeClass() throws Exception { + TestUtils.cleanFrameworkFile(); + sTmpDir = new ExtFile(OS.createTempDirectory()); + TestUtils.copyResourceDir(MinifiedArscTest.class, "brut/apktool/issue1157/", sTmpDir); + + String apk = "issue1157.apk"; + sDecodedDir = new ExtFile(sTmpDir, "issue1157"); + + // decode issue1157.apk + ApkDecoder apkDecoder = new ApkDecoder(new ExtFile(sTmpDir, apk)); + apkDecoder.setForceDelete(true); + apkDecoder.setOutDir(sDecodedDir); + + // this should not raise an exception: + apkDecoder.decode(); + } + + @AfterClass + public static void afterClass() throws BrutException { + OS.rmdir(sTmpDir); + } + + @Test + public void checkIfMinifiedArscLayoutFileMatchesTest() throws IOException { + String expected = TestUtils.replaceNewlines("\n" + + "\n" + + " \n" + + ""); + + byte[] encoded = Files.readAllBytes(Paths.get(sDecodedDir + File.separator + "res" + File.separator + "xml" + File.separator + "custom.xml")); + String obtained = TestUtils.replaceNewlines(new String(encoded)); + assertEquals(expected, obtained); + } + + private static ExtFile sDecodedDir; + private static ExtFile sTmpDir; +} \ No newline at end of file diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/issue1157/issue1157.apk b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/issue1157/issue1157.apk new file mode 100644 index 00000000..b5645a2e Binary files /dev/null and b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/issue1157/issue1157.apk differ