hash fix, unescaping chars

Author: efraespada

src/main/kotlin/components/Extensions.kt

@@ -23,6 +23,16 @@ fun String.runCommand(runner: (command: String, result: String) -> Unit = { _, _
 fun String.escape(): String = Regex.escape(this)
 fun String.unescape(): String = StringEscapeUtils.unescapeJava(this)
 fun String.removeNewLines(): String = this.replace("\n", "")
+fun String.androidTreatment(): String {
+    val va = this.split(" ")
+    val values = mutableListOf<String>()
+    va.forEach { value ->
+        if (value.trim().isNotBlank()) {
+            values.add(value.trim())
+        }
+    }
+    return values.joinToString(separator = " ")
+}
 
 fun File.validForConfiguration(configuration: Configuration): Boolean {
     var valid = this.absolutePath.contains("/${configuration.name}/")

src/main/kotlin/components/XParser.kt

@@ -40,6 +40,7 @@ fun parseXML(file: File): List<StringEntity> {
         var name = ""
         val attributes = mutableListOf<SAttribute>()
         var obfuscate = false
+        var androidTreatment = true
         for (a in 0 until node.attributes.length) {
             val attribute = node.attributes.item(a)
             for (n in 0 until attribute.childNodes.length) {
@@ -49,11 +50,14 @@ fun parseXML(file: File): List<StringEntity> {
                 if (attribute.nodeName == "hidden" && attr.nodeValue != "false") {
                     obfuscate = true
                 }
+                if (attribute.nodeName == "androidTreatment" && attr.nodeValue == "false") {
+                    androidTreatment = false
+                }
                 attributes.add(SAttribute(attribute.nodeName, attr.nodeValue))
             }
         }
         if (obfuscate) {
-            entities.add(StringEntity(name, attributes, node.firstChild.nodeValue, "string", i))
+            entities.add(StringEntity(name, attributes, node.textContent, "string", i, androidTreatment))
         }
     }
     return entities
@@ -73,7 +77,7 @@ fun modifyXML(file: File, mainModule: String, key: String, debug: Boolean) {
             it.tag == "string" && it.index == i
         }
         entity?.let {
-            node.firstChild.nodeValue = obfuscate(mainModule, key, it).value
+            node.textContent = obfuscate(mainModule, key, it).value
         }
     }
 
@@ -85,13 +89,16 @@ fun modifyXML(file: File, mainModule: String, key: String, debug: Boolean) {
 }
 
 fun obfuscate(mainModule: String, key: String, entity: StringEntity): StringEntity {
-    val obfuscation = Stark.obfuscate(mainModule, key, entity.value.unescape().toByteArray()).toReadableString()
-    return StringEntity(entity.name, entity.attributes, obfuscation, entity.tag, entity.index)
+    val obfuscation = Stark.obfuscate(mainModule, key, when(entity.androidTreatment) {
+        true -> entity.value.androidTreatment()
+        false -> entity.value.unescape()
+    }.toByteArray()).toReadableString()
+    return StringEntity(entity.name, entity.attributes, obfuscation, entity.tag, entity.index, entity.androidTreatment)
 }
 
 fun reveal(mainModule: String, key: String, entity: StringEntity): StringEntity {
     val arr: ByteArray = entity.value.split(", ").map { it.toInt().toByte() }.toByteArray()
     val original = String(Stark.reveal(mainModule, key, arr))
-    return StringEntity(entity.name, entity.attributes, original, entity.tag, entity.index)
+    return StringEntity(entity.name, entity.attributes, original, entity.tag, entity.index, entity.androidTreatment)
 }
 

src/main/kotlin/components/jni/libsignKey.dylib

@@ -5,7 +5,8 @@ class StringEntity(
     var attributes: List<SAttribute>,
     var value: String,
     val tag: String,
-    val index: Int
+    val index: Int,
+    val androidTreatment: Boolean = false
 )
 
 data class SAttribute(val name: String, val value: String)

src/main/kotlin/models/StringEntity.kt

@@ -80,7 +80,10 @@ class SCTest {
     fun `06 - (PLUGIN) restore string files`() {
         prepareTask.runCommand { _, _ ->
             assert(restoreFiles(projectName, mainModule).isEmpty())
-            assert(backupFiles(projectName, defaultConfig()).isNotEmpty())
+            assert(backupFiles(projectName, defaultConfig().apply {
+                stringFiles.add("strings_extra.xml")
+                srcFolders.add("src/other_source")
+            }).isNotEmpty())
             assert(restoreFiles(projectName, mainModule).isNotEmpty())
         }
     }
@@ -116,7 +119,10 @@ class SCTest {
     @Test
     fun `09 - (PLUGIN) obfuscate and reveal string values`() {
         signingReportTask.runCommand { _, report ->
-            val files = locateFiles(projectName, defaultConfig())
+            val files = locateFiles(projectName, defaultConfig().apply {
+                stringFiles.add("strings_extra.xml")
+                srcFolders.add("src/other_source")
+            })
             files.forEach { file ->
                 val entities = parseXML(file.file)
                 entities.forEach { entity ->
@@ -133,7 +139,10 @@ class SCTest {
                         obfuscated
                     )
 
-                    assert(original.value == entity.value)
+                    assert(original.value == when(entity.androidTreatment) {
+                        true -> entity.value.androidTreatment()
+                        else -> entity.value
+                    })
 
                 }
             }
@@ -157,6 +166,7 @@ class SCTest {
         }
     }
 
+
     @Test
     fun `11 - (ANDROID COMPILATION) obfuscate xml and build (not real workflow)`() {
         signingReportTask.runCommand { _, report ->
@@ -189,6 +199,7 @@ class SCTest {
         }
     }
 
+
     @Test
     fun `13 - (ANDROID COMPILATION) plugin running on Android`() {
         pluginBuildTask().runCommand { _, report ->