Merge remote-tracking branch 'origin/main'

bytedance · Jan 12, 2024 · 4f854b0 · 4f854b0
2 parents bc6a8ae + 0c51b89
commit 4f854b0
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 36 deletions.
diff --git a/config/EngineConfig.json5 b/config/EngineConfig.json5
@@ -1580,7 +1580,17 @@
             "ret"
           ]
         }
+      },
+      "<kotlin.io.ByteStreamsKt: long copyTo$default(java.io.InputStream,java.io.OutputStream,int,int,java.lang.Object)>": {
+        "p0->p1": {
+          "I": [
+            "p0"
+          ],
+          "O": [
+            "p1"
+          ]
+        }
       }
     }
   }
-}
+}
diff --git a/src/main/kotlin/net/bytedance/security/app/AnalyzeStepByStep.kt b/src/main/kotlin/net/bytedance/security/app/AnalyzeStepByStep.kt
@@ -36,7 +36,7 @@ import kotlin.io.path.pathString
 import kotlin.streams.toList
 
 class AnalyzeStepByStep {
-    suspend fun loadRules(ruleList: String, targetSdk: Int): Rules {
+    suspend fun loadRules(ruleList: String, targetSdk: Int, minSdk: Int): Rules {
         val rulePathList = if (ruleList.isNotEmpty())
             ruleList.split(",").map { "${getConfig().rulePath}/${it.trim()}" }.toList()
         else
@@ -45,7 +45,7 @@ class AnalyzeStepByStep {
             }.filter { it.pathString.endsWith(".json") }.map { it.pathString }
                 .toList()
         val rules = Rules(rulePathList, RuleFactory())
-        rules.loadRules(targetSdk)
+        rules.loadRules(targetSdk, minSdk)
         return rules
     }
 

diff --git a/src/main/kotlin/net/bytedance/security/app/RuleData.kt b/src/main/kotlin/net/bytedance/security/app/RuleData.kt
@@ -125,7 +125,8 @@ data class RuleData(
     val ConstNumberMode: Boolean? = null,
     val targetNumberArr: List<Int>? = null,
 
-    val targetSdk: String = "",
+    val targetSdk: String = "",     // 规则适用的targetSdk版本
+    val runtimeSdk: String = "",    // 规则适用的运行时系统版本
 )
 
 val defaultSourceReturn = SourceReturn()

diff --git a/src/main/kotlin/net/bytedance/security/app/StaticAnalyzeMain.kt b/src/main/kotlin/net/bytedance/security/app/StaticAnalyzeMain.kt
@@ -54,12 +54,11 @@ object StaticAnalyzeMain {
         profiler.parseApk.end()
 
         profiler.preProcessor.start()
-        val rules = v3.loadRules(argumentConfig.rules, AndroidUtils.TargetSdk)
+        val rules = v3.loadRules(argumentConfig.rules, AndroidUtils.TargetSdk, AndroidUtils.MinSdk)
         logInfo("rules loaded")
         val ctx = v3.createContext(rules)
         profiler.preProcessor.end()
 
-
         if (getConfig().doWholeProcessMode) {
             PLUtils.createWholeProgramAnalyze(ctx)
         }

diff --git a/src/main/kotlin/net/bytedance/security/app/rules/Rules.kt b/src/main/kotlin/net/bytedance/security/app/rules/Rules.kt
@@ -29,8 +29,9 @@ import java.nio.file.Paths
 
 class Rules(val rulePaths: List<String>, val factory: IRuleFactory) : IRulesForContext {
     val allRules: MutableList<IRule> = ArrayList()
+    val UNLIMITED = -1
 
-    suspend fun loadRules(targetSdk: Int? = null) {
+    suspend fun loadRules(targetSdk: Int = UNLIMITED, minSdk: Int = UNLIMITED) {
         rulePaths.forEach {
             val jsonStr = loadConfigOrQuit(it)
             val rules = Json.parseToJsonElement(jsonStr)
@@ -40,7 +41,8 @@ class Rules(val rulePaths: List<String>, val factory: IRuleFactory) : IRulesForC
                     ruleData.sanitize = ruleData.sanitizer
                     ruleData.sanitizer = null
                 }
-                if (targetSdk == null || targetSdk in parseSdkVersion(ruleData.targetSdk)) {
+                if ((targetSdk == UNLIMITED || targetSdk in parseSdkVersion(ruleData.targetSdk)) &&
+                    (minSdk == UNLIMITED || parseSdkVersion("$minSdk:").any { it in parseSdkVersion(ruleData.runtimeSdk) })) {
                     val rule = factory.create(ruleName, ruleData)
                     allRules.add(rule)
                 } else {
@@ -90,40 +92,39 @@ class Rules(val rulePaths: List<String>, val factory: IRuleFactory) : IRulesForC
                         throw Exception("read config file $path failed")
                     }
                 }
-
             return jsonStr
         }
-    }
 
-    fun parseSdkVersion(input: String): List<Int> {
-        val MIN_SDK_VERSION = 9     // Android 2.3
-        val MAX_SDK_VERSION = 50    // for future
+        fun parseSdkVersion(input: String): List<Int> {
+            val MIN_SDK_VERSION = 9     // Android 2.3
+            val MAX_SDK_VERSION = 50    // for future
 
-        if (input.isBlank() || input.trim() == ":") {
-            return (MIN_SDK_VERSION..MAX_SDK_VERSION).toList()
-        }
-        return input.split(Regex("[,\\s]+")).flatMap { part ->
-            when {
-                part.contains(":") -> {
-                    val splitPart = part.split(":")
-                    val hasStart = splitPart[0].isNotEmpty()
-                    val hasEnd = splitPart[1].isNotEmpty()
-                    when {
-                        !hasStart && !hasEnd -> listOf()
-                        !hasEnd -> {
-                            (splitPart[0].toIntOrNull() ?: return@flatMap listOf())..MAX_SDK_VERSION
-                        }
-                        !hasStart -> {
-                            (MIN_SDK_VERSION..(splitPart[1].toIntOrNull() ?: return@flatMap listOf())).toList()
-                        }
-                        else -> {
-                            val start = splitPart[0].toIntOrNull() ?: return@flatMap listOf()
-                            val end = splitPart[1].toIntOrNull() ?: return@flatMap listOf()
-                            (start..end).toList()
+            if (input.isBlank() || input.trim() == ":") {
+                return (MIN_SDK_VERSION..MAX_SDK_VERSION).toList()
+            }
+            return input.split(Regex("[,\\s]+")).flatMap { part ->
+                when {
+                    part.contains(":") -> {
+                        val splitPart = part.split(":")
+                        val hasStart = splitPart[0].isNotEmpty()
+                        val hasEnd = splitPart[1].isNotEmpty()
+                        when {
+                            !hasStart && !hasEnd -> listOf()
+                            !hasEnd -> {
+                                (splitPart[0].toIntOrNull() ?: return@flatMap listOf())..MAX_SDK_VERSION
+                            }
+                            !hasStart -> {
+                                (MIN_SDK_VERSION..(splitPart[1].toIntOrNull() ?: return@flatMap listOf())).toList()
+                            }
+                            else -> {
+                                val start = splitPart[0].toIntOrNull() ?: return@flatMap listOf()
+                                val end = splitPart[1].toIntOrNull() ?: return@flatMap listOf()
+                                (start..end).toList()
+                            }
                         }
                     }
+                    else -> listOf(part.toIntOrNull() ?: return@flatMap listOf())
                 }
-                else -> listOf(part.toIntOrNull() ?: return@flatMap listOf())
             }
         }
     }

diff --git a/src/test/kotlin/net/bytedance/security/app/rules/RulesTest.kt b/src/test/kotlin/net/bytedance/security/app/rules/RulesTest.kt
@@ -20,11 +20,11 @@ package net.bytedance.security.app.rules
 import kotlinx.coroutines.runBlocking
 import net.bytedance.security.app.getConfig
 import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.Assertions.*
 import java.io.File
 
 internal class RulesTest {
 
-
     fun createDefaultRules(): Rules {
         val rules = Rules(
             listOf(
@@ -69,7 +69,22 @@ internal class RulesTest {
         println("const strings=${rules.constStringPatterns().toSortedSet().toList()}")
         println("fields=${rules.fields().toSortedSet().toList()}")
         println("new instances=${rules.newInstances().toSortedSet().toList()}")
+    }
 
+    @Test
+    fun testParseSdkVersion() {
+        assertEquals(
+            (9..50).toList(),
+            Rules.parseSdkVersion("")
+        )
+        assertEquals(
+            (9..50).toList(),
+            Rules.parseSdkVersion(":")
+        )
+        assertEquals(
+            (9..10).toList() + listOf(15) + (25..30).toList() + (45..50).toList(),
+            Rules.parseSdkVersion(":10, 15, 25:30, 45:")
+        )
     }
 
     companion object {