diff --git a/checkmarx-ast-cli.version b/checkmarx-ast-cli.version index 0a742e0..53c4a94 100644 --- a/checkmarx-ast-cli.version +++ b/checkmarx-ast-cli.version @@ -1 +1 @@ -2.3.66 +2.3.67 diff --git a/pom.xml b/pom.xml index eeb4738..1b5930e 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ com.fasterxml.jackson.core jackson-databind - 2.22.2 + 2.22.3 org.projectlombok diff --git a/src/main/resources/cx-linux b/src/main/resources/cx-linux index c87d12d..d35fd83 100755 --- a/src/main/resources/cx-linux +++ b/src/main/resources/cx-linux @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28adc185fef111b920b45bf7aaae8519468b243557b6b1fee0791e5b844d1e04 -size 84078754 +oid sha256:058824c82df0d27b81a57f93c20662dd714fe154a1b78e5846a5249e6378b1e9 +size 84254882 diff --git a/src/main/resources/cx-linux-arm b/src/main/resources/cx-linux-arm index 5e9339e..05e58bd 100755 --- a/src/main/resources/cx-linux-arm +++ b/src/main/resources/cx-linux-arm @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:43ce824788f94506833c58f20dd5e74268154faec18a222037eac22083ade6f6 -size 78512290 +oid sha256:dbf28478b4e330b6809e49963232234a513aeb15c1585d600e30eb2432853330 +size 78643362 diff --git a/src/main/resources/cx-mac b/src/main/resources/cx-mac index d365427..36e8f9e 100755 --- a/src/main/resources/cx-mac +++ b/src/main/resources/cx-mac @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a726c3fc7b08b3eab0e9e1d322e3aab601bbc5252dc47314ce67ec98dc8e428 -size 166763456 +oid sha256:2b1b547377e32341492d95711c03ce98af1aa45cac26b103327819f1b63148c8 +size 167105648 diff --git a/src/main/resources/cx.exe b/src/main/resources/cx.exe index 492bfec..c7d902b 100644 --- a/src/main/resources/cx.exe +++ b/src/main/resources/cx.exe @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:24c5ada582f835aa6688e620c42ac1b7c1cc6400ee35b79aaf4264cf6e185183 -size 85738816 +oid sha256:d8a790c88c52c7d5a31f4ba8894eb54f9e3a0c0caa7b8cd601ea6ec593195874 +size 85909312 diff --git a/src/test/java/com/checkmarx/ast/results/ResultTest.java b/src/test/java/com/checkmarx/ast/results/ResultTest.java index 0dd104d..078c143 100644 --- a/src/test/java/com/checkmarx/ast/results/ResultTest.java +++ b/src/test/java/com/checkmarx/ast/results/ResultTest.java @@ -7,6 +7,7 @@ import com.checkmarx.ast.results.result.Result; import com.checkmarx.ast.scan.Scan; import com.checkmarx.ast.wrapper.CxConstants; +import com.checkmarx.ast.wrapper.CxException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.Test; @@ -20,6 +21,8 @@ class ResultTest extends BaseTest { private static String CWE_ID = "79"; private static String LANGUAGE = "PHP"; private static String QUERY_NAME = "Reflected XSS All Clients"; + private static final int CODEBASHING_LICENSE_NOT_FOUND_EXIT_CODE = 3; + private static final int CODEBASHING_LESSON_NOT_FOUND_EXIT_CODE = 4; @Test void testResultsHTML() throws Exception { @@ -64,7 +67,16 @@ void testResultsStructure() throws Exception { @Test() void testResultsCodeBashing() throws Exception { - List codeBashingList = wrapper.codeBashingList(CWE_ID, LANGUAGE, QUERY_NAME); + List codeBashingList; + try { + codeBashingList = wrapper.codeBashingList(CWE_ID, LANGUAGE, QUERY_NAME); + } catch (CxException e) { + // The CLI exits with 3 (no CodeBashing license) or 4 (no lesson mapped, "No codebashing link available"). + // Both depend on the tenant/backend mapping, not on the wrapper. + Assumptions.assumeFalse(e.getExitCode() == CODEBASHING_LICENSE_NOT_FOUND_EXIT_CODE + || e.getExitCode() == CODEBASHING_LESSON_NOT_FOUND_EXIT_CODE, e.getMessage()); + throw e; + } Assertions.assertTrue(codeBashingList.size() > 0); String path = codeBashingList.get(0).getPath(); Assertions.assertTrue(path.length() > 0);