From 6a9eba72e153f42131db5de61d749c48d6595c14 Mon Sep 17 00:00:00 2001 From: firmianay Date: Sun, 17 Dec 2023 17:08:48 +0800 Subject: [PATCH] add exportedCompos --- .../net/bytedance/security/app/RuleData.kt | 2 ++ .../security/app/result/OutputSecResults.kt | 21 ++++++++++++++++++- .../security/app/rules/AbstractRule.kt | 9 +++----- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/src/main/kotlin/net/bytedance/security/app/RuleData.kt b/src/main/kotlin/net/bytedance/security/app/RuleData.kt index f33f99d..cc52ab0 100644 --- a/src/main/kotlin/net/bytedance/security/app/RuleData.kt +++ b/src/main/kotlin/net/bytedance/security/app/RuleData.kt @@ -127,6 +127,8 @@ data class RuleData( val targetSdk: String = "", // 规则适用的targetSdk版本 val runtimeSdk: String = "", // 规则适用的运行时系统版本 + + val exportedCompos: Boolean? = null, // 是否过滤导出组件 ) val defaultSourceReturn = SourceReturn() diff --git a/src/main/kotlin/net/bytedance/security/app/result/OutputSecResults.kt b/src/main/kotlin/net/bytedance/security/app/result/OutputSecResults.kt index 458cab8..5a8b013 100644 --- a/src/main/kotlin/net/bytedance/security/app/result/OutputSecResults.kt +++ b/src/main/kotlin/net/bytedance/security/app/result/OutputSecResults.kt @@ -24,8 +24,10 @@ import net.bytedance.security.app.Log import net.bytedance.security.app.PLUtils import net.bytedance.security.app.PreAnalyzeContext import net.bytedance.security.app.android.AndroidUtils +import net.bytedance.security.app.android.ComponentDescription import net.bytedance.security.app.getConfig import net.bytedance.security.app.result.model.* +import net.bytedance.security.app.rules.AbstractRule import net.bytedance.security.app.util.Json import net.bytedance.security.app.util.TaskQueue import net.bytedance.security.app.util.profiler @@ -151,6 +153,23 @@ object OutputSecResults { return map.values.toList() } + /** + * filter results based on "exportedCompos" field + */ + private fun filterExportedCompos(securityVulnerabilityItems: List): + List { + return securityVulnerabilityItems.filter { + it.details?.get("Manifest")?.let { manifest -> + val exported = (manifest as ComponentDescription).exported + when ((it.rule as AbstractRule).exportedCompos) { + true -> exported + false -> !exported + null -> true + } + } ?: false + } + } + /** * group the results by the category */ @@ -196,7 +215,7 @@ object OutputSecResults { insertPerm() insertMani() addManifest(ctx) - groupResult(removeDup()) + groupResult(filterExportedCompos(removeDup())) val jsonName = "results_" + AndroidUtils.PackageName + "_" + java.lang.Long.toHexString(System.nanoTime() + (Math.random() * 100).toLong()) val outputPath = getConfig().outPath + "/results.json" diff --git a/src/main/kotlin/net/bytedance/security/app/rules/AbstractRule.kt b/src/main/kotlin/net/bytedance/security/app/rules/AbstractRule.kt index 37e8494..48b3e7c 100644 --- a/src/main/kotlin/net/bytedance/security/app/rules/AbstractRule.kt +++ b/src/main/kotlin/net/bytedance/security/app/rules/AbstractRule.kt @@ -21,9 +21,6 @@ import net.bytedance.security.app.RuleData import net.bytedance.security.app.RuleDescription abstract class AbstractRule(override val name: String, ruleData: RuleData) : IRule { - final override val desc: RuleDescription - - init { - desc = ruleData.desc - } -} \ No newline at end of file + final override val desc: RuleDescription = ruleData.desc + val exportedCompos: Boolean? = ruleData.exportedCompos +}