From ed56eb2ec12cce3765415abc78c06a027f594823 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sun, 16 Jul 2017 08:46:48 -0400 Subject: [PATCH] updated test case per issue #792 --- .../src/it/629-jackson-dataformat/pom.xml | 20 +++++++++++++++++++ .../629-jackson-dataformat/postbuild.groovy | 7 ++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/dependency-check-maven/src/it/629-jackson-dataformat/pom.xml b/dependency-check-maven/src/it/629-jackson-dataformat/pom.xml index 0c7cce1f4..48eeeefc7 100644 --- a/dependency-check-maven/src/it/629-jackson-dataformat/pom.xml +++ b/dependency-check-maven/src/it/629-jackson-dataformat/pom.xml @@ -43,5 +43,25 @@ Copyright (c) 2017 Jeremy Long. All Rights Reserved. jackson-dataformat-xml 2.4.5 + + com.fasterxml.jackson.module + jackson-module-kotlin + 2.8.9 + + + com.fasterxml.jackson.dataformat + jackson-dataformat-ion + 2.8.9 + + + com.fasterxml.jackson.datatype + jackson-datatype-hppc + 2.8.9 + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-yaml-provider + 2.8.9 + diff --git a/dependency-check-maven/src/it/629-jackson-dataformat/postbuild.groovy b/dependency-check-maven/src/it/629-jackson-dataformat/postbuild.groovy index acb7cb3a5..2d3394e40 100644 --- a/dependency-check-maven/src/it/629-jackson-dataformat/postbuild.groovy +++ b/dependency-check-maven/src/it/629-jackson-dataformat/postbuild.groovy @@ -24,7 +24,12 @@ import java.nio.charset.Charset; // Check to see if jackson-dataformat-xml-2.4.5.jar was identified. //TODO change this to xpath and check for CVE-2016-3720 String log = FileUtils.readFileToString(new File(basedir, "target/dependency-check-report.xml"), Charset.defaultCharset().name()); -int count = StringUtils.countMatches(log, "jackson-dataformat-xml-2.4.5.jar"); +int count = StringUtils.countMatches(log, "CVE-2016-7051"); +if (count == 0){ + System.out.println(String.format("jackson-dataformat-xml was identified %s times, expected 1", count)); + return false; +} +count = StringUtils.countMatches(log, "CVE-2016-3720"); if (count == 0){ System.out.println(String.format("jackson-dataformat-xml was identified %s times, expected 1", count)); return false;