From 72778ff99156b1e0e74c3b4b3860946b76376631 Mon Sep 17 00:00:00 2001 From: Dmytro Demydenko Date: Wed, 14 Feb 2024 04:09:30 +0200 Subject: [PATCH 1/3] [BCE-27972] fix owasp --- gradle.properties | 2 +- src/main/kotlin/com/bridgecrew/CheckovResult.kt | 2 +- .../com/bridgecrew/initialization/InitializationService.kt | 2 +- src/main/kotlin/com/bridgecrew/results/WeaknessCheckovResult.kt | 2 +- .../ui/rightPanel/dictionaryDetails/WeaknessDictionaryPanel.kt | 2 +- .../com/bridgecrew/fixtures/WeaknessCheckovResultFixture.kt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index 44ceadd..e32e6bd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ pluginGroup = com.github.bridgecrewio.prismajetbrainsidea pluginName = prismacloud-jetbrains-idea -pluginVersion = 1.0.13 +pluginVersion = 1.0.14 pluginSinceBuild = 203 # Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl # See https://jb.gg/intellij-platform-builds-list for available build versions diff --git a/src/main/kotlin/com/bridgecrew/CheckovResult.kt b/src/main/kotlin/com/bridgecrew/CheckovResult.kt index cb976a3..ee817c5 100644 --- a/src/main/kotlin/com/bridgecrew/CheckovResult.kt +++ b/src/main/kotlin/com/bridgecrew/CheckovResult.kt @@ -46,7 +46,7 @@ data class CheckovResult( var check_type: String, val fixed_definition: String = "", val cwe: ArrayList = ArrayList(), - val owasp: String = "", + val owasp: List = ArrayList(), val metadata: Metadata? = null ) diff --git a/src/main/kotlin/com/bridgecrew/initialization/InitializationService.kt b/src/main/kotlin/com/bridgecrew/initialization/InitializationService.kt index 5770889..01ae0a3 100644 --- a/src/main/kotlin/com/bridgecrew/initialization/InitializationService.kt +++ b/src/main/kotlin/com/bridgecrew/initialization/InitializationService.kt @@ -25,7 +25,7 @@ private val LOG = logger() class InitializationService(private val project: Project) { private var isCheckovInstalledGlobally: Boolean = false - private var checkovVersion: String = "2.3.329" + private var checkovVersion: String = "3.2.20" fun initializeProject() { initializeCheckovScanService() diff --git a/src/main/kotlin/com/bridgecrew/results/WeaknessCheckovResult.kt b/src/main/kotlin/com/bridgecrew/results/WeaknessCheckovResult.kt index c64c49c..b648edf 100644 --- a/src/main/kotlin/com/bridgecrew/results/WeaknessCheckovResult.kt +++ b/src/main/kotlin/com/bridgecrew/results/WeaknessCheckovResult.kt @@ -17,7 +17,7 @@ class WeaknessCheckovResult( codeBlock: List>, val checkName: String, val cwe: List, - val owasp: String, + val owasp: List, val metadata: Metadata?) : BaseCheckovResult( category = Category.WEAKNESSES, diff --git a/src/main/kotlin/com/bridgecrew/ui/rightPanel/dictionaryDetails/WeaknessDictionaryPanel.kt b/src/main/kotlin/com/bridgecrew/ui/rightPanel/dictionaryDetails/WeaknessDictionaryPanel.kt index d9731b5..d2030e6 100644 --- a/src/main/kotlin/com/bridgecrew/ui/rightPanel/dictionaryDetails/WeaknessDictionaryPanel.kt +++ b/src/main/kotlin/com/bridgecrew/ui/rightPanel/dictionaryDetails/WeaknessDictionaryPanel.kt @@ -32,7 +32,7 @@ class WeaknessDictionaryPanel(private val result: WeaknessCheckovResult, private "Description" to result.description, "Code" to extractCode(result), "CWE(s)" to result.cwe.joinToString(", "), - "OWASP Top 10" to result.owasp, + "OWASP Top 10" to result.owasp.joinToString(", "), "Data flow" to extractDataFlow(result) ) diff --git a/src/test/kotlin/com/bridgecrew/fixtures/WeaknessCheckovResultFixture.kt b/src/test/kotlin/com/bridgecrew/fixtures/WeaknessCheckovResultFixture.kt index cce77f9..6b4b883 100644 --- a/src/test/kotlin/com/bridgecrew/fixtures/WeaknessCheckovResultFixture.kt +++ b/src/test/kotlin/com/bridgecrew/fixtures/WeaknessCheckovResultFixture.kt @@ -77,7 +77,7 @@ fun createWeaknessCheckovResult(metadata: String): WeaknessCheckovResult { { "checkName": "Unsafe custom MessageDigest is implemented", "cwe": ["CWE-327: Use of a Broken or Risky Cryptographic Algorithm"], - "owasp": "TBD", + "owasp": ["TBD"], $metadata "category": "WEAKNESSES", "checkType": "SAST", From bc552fe9345a6ecac17e727020e44e4afe822550 Mon Sep 17 00:00:00 2001 From: Dmytro Demydenko Date: Wed, 14 Feb 2024 12:44:04 +0200 Subject: [PATCH 2/3] [BCE-27972] fix owasp --- build.gradle.kts | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index d7104b7..d5abb07 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,7 @@ plugins { // Kotlin support id("org.jetbrains.kotlin.jvm") version "1.8.0" // gradle-intellij-plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin - id("org.jetbrains.intellij") version "1.3.0" + id("org.jetbrains.intellij") version "1.10.1" // gradle-changelog-plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin id("org.jetbrains.changelog") version "1.3.1" // Gradle Qodana Plugin diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f371643..69a9715 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 186bc1c530d35a4214b8f97b7f13af61f9c64f2f Mon Sep 17 00:00:00 2001 From: Dmytro Demydenko Date: Wed, 14 Feb 2024 13:23:43 +0200 Subject: [PATCH 3/3] [BCE-27972] fix owasp --- build.gradle.kts | 4 ++++ gradle.properties | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index d5abb07..1860b4d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -140,4 +140,8 @@ tasks { events(TestLogEvent.PASSED, TestLogEvent.SKIPPED, TestLogEvent.FAILED) } } + + runPluginVerifier { + ideVersions.set(listOf("IC-2020.3.4", "IC-2021.1.3", "IC-2021.2.4")) + } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index e32e6bd..37730cd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,10 +7,10 @@ pluginVersion = 1.0.14 pluginSinceBuild = 203 # Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl # See https://jb.gg/intellij-platform-builds-list for available build versions -pluginVerifierIdeVersions = 2020.3.4, 2021.1.3, 2021.2.1, 2021.2.2, 2020.1.2 +pluginVerifierIdeVersions = 2020.3.4, 2021.1.3, 2021.2.4 platformType = IC -platformVersion = 2021.2.2 +platformVersion = 2021.2.4 platformDownloadSources = true # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22