From 74563fa3d3ed1bbf112146f4014cbf62d652dc92 Mon Sep 17 00:00:00 2001 From: Tyler Camp Date: Mon, 24 Sep 2018 13:41:21 -0400 Subject: [PATCH 1/5] Change version number to 1.3.1-SNAPSHOT --- pom.xml | 2 +- ssvl-converter/pom.xml | 4 ++-- threadfix-astam/pom.xml | 2 +- threadfix-cli-importers/pom.xml | 2 +- threadfix-cli-lib/pom.xml | 2 +- threadfix-cli/pom.xml | 2 +- threadfix-data-access/pom.xml | 2 +- threadfix-data-migration/pom.xml | 2 +- threadfix-entities/pom.xml | 2 +- threadfix-ham/pom.xml | 2 +- threadfix-importers/pom.xml | 2 +- threadfix-main/pom.xml | 4 ++-- threadfix-offline/pom.xml | 2 +- threadfix-service-interfaces/pom.xml | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index b8abd3010..4483fbf61 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.github.secdec.astam-correlator master-pom - 1.3.0 + 1.3.1-SNAPSHOT pom ThreadFix diff --git a/ssvl-converter/pom.xml b/ssvl-converter/pom.xml index f216211fe..d0654f427 100755 --- a/ssvl-converter/pom.xml +++ b/ssvl-converter/pom.xml @@ -7,11 +7,11 @@ com.github.secdec.astam-correlator master-pom - 1.3.0 + 1.3.1-SNAPSHOT ssvl-converter - 1.3.0 + 1.3.1-SNAPSHOT src/main/java diff --git a/threadfix-astam/pom.xml b/threadfix-astam/pom.xml index 68dd40dba..887297d81 100644 --- a/threadfix-astam/pom.xml +++ b/threadfix-astam/pom.xml @@ -3,7 +3,7 @@ com.github.secdec.astam-correlator master-pom - 1.3.0 + 1.3.1-SNAPSHOT 4.0.0 diff --git a/threadfix-cli-importers/pom.xml b/threadfix-cli-importers/pom.xml index dd3857e5e..0852395ee 100644 --- a/threadfix-cli-importers/pom.xml +++ b/threadfix-cli-importers/pom.xml @@ -5,7 +5,7 @@ master-pom com.github.secdec.astam-correlator - 1.3.0 + 1.3.1-SNAPSHOT 4.0.0 diff --git a/threadfix-cli-lib/pom.xml b/threadfix-cli-lib/pom.xml index e48e4531d..7b67b8300 100644 --- a/threadfix-cli-lib/pom.xml +++ b/threadfix-cli-lib/pom.xml @@ -5,7 +5,7 @@ com.github.secdec.astam-correlator master-pom - 1.3.0 + 1.3.1-SNAPSHOT threadfix-cli-lib diff --git a/threadfix-cli/pom.xml b/threadfix-cli/pom.xml index ba5764970..2f3916b0e 100644 --- a/threadfix-cli/pom.xml +++ b/threadfix-cli/pom.xml @@ -5,7 +5,7 @@ com.github.secdec.astam-correlator master-pom - 1.3.0 + 1.3.1-SNAPSHOT threadfix-cli diff --git a/threadfix-data-access/pom.xml b/threadfix-data-access/pom.xml index 04a4241c3..dab727005 100644 --- a/threadfix-data-access/pom.xml +++ b/threadfix-data-access/pom.xml @@ -5,7 +5,7 @@ master-pom com.github.secdec.astam-correlator - 1.3.0 + 1.3.1-SNAPSHOT 4.0.0 diff --git a/threadfix-data-migration/pom.xml b/threadfix-data-migration/pom.xml index 247a2f1d7..cf1a74c80 100644 --- a/threadfix-data-migration/pom.xml +++ b/threadfix-data-migration/pom.xml @@ -5,7 +5,7 @@ master-pom com.github.secdec.astam-correlator - 1.3.0 + 1.3.1-SNAPSHOT 4.0.0 diff --git a/threadfix-entities/pom.xml b/threadfix-entities/pom.xml index 967636cb4..537eda62e 100644 --- a/threadfix-entities/pom.xml +++ b/threadfix-entities/pom.xml @@ -97,7 +97,7 @@ com.github.secdec.astam-correlator master-pom - 1.3.0 + 1.3.1-SNAPSHOT diff --git a/threadfix-ham/pom.xml b/threadfix-ham/pom.xml index e6ea409b1..8b176e008 100644 --- a/threadfix-ham/pom.xml +++ b/threadfix-ham/pom.xml @@ -4,7 +4,7 @@ com.github.secdec.astam-correlator master-pom - 1.3.0 + 1.3.1-SNAPSHOT 4.0.0 diff --git a/threadfix-importers/pom.xml b/threadfix-importers/pom.xml index ef066fc59..05c919236 100644 --- a/threadfix-importers/pom.xml +++ b/threadfix-importers/pom.xml @@ -5,7 +5,7 @@ master-pom com.github.secdec.astam-correlator - 1.3.0 + 1.3.1-SNAPSHOT 4.0.0 diff --git a/threadfix-main/pom.xml b/threadfix-main/pom.xml index d20af689a..9490f951b 100644 --- a/threadfix-main/pom.xml +++ b/threadfix-main/pom.xml @@ -5,7 +5,7 @@ com.github.secdec.astam-correlator master-pom - 1.3.0 + 1.3.1-SNAPSHOT threadfix @@ -158,7 +158,7 @@ tofile="target/classes/downloads/release-2.zap" /> --> - diff --git a/threadfix-offline/pom.xml b/threadfix-offline/pom.xml index 325dd7de6..353a0a969 100644 --- a/threadfix-offline/pom.xml +++ b/threadfix-offline/pom.xml @@ -5,7 +5,7 @@ master-pom com.github.secdec.astam-correlator - 1.3.0 + 1.3.1-SNAPSHOT 4.0.0 diff --git a/threadfix-service-interfaces/pom.xml b/threadfix-service-interfaces/pom.xml index 45b98e7b3..0ca853619 100644 --- a/threadfix-service-interfaces/pom.xml +++ b/threadfix-service-interfaces/pom.xml @@ -5,7 +5,7 @@ master-pom com.github.secdec.astam-correlator - 1.3.0 + 1.3.1-SNAPSHOT 4.0.0 From fb8ace374779434f0d8d8f187c7109dd566b7bf2 Mon Sep 17 00:00:00 2001 From: Tyler Camp Date: Mon, 24 Sep 2018 13:41:53 -0400 Subject: [PATCH 2/5] Add option to ignore file path output for EndpointInfo --- .../denimgroup/threadfix/data/interfaces/Endpoint.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/threadfix-entities/src/main/java/com/denimgroup/threadfix/data/interfaces/Endpoint.java b/threadfix-entities/src/main/java/com/denimgroup/threadfix/data/interfaces/Endpoint.java index abccb7935..7628a6aff 100644 --- a/threadfix-entities/src/main/java/com/denimgroup/threadfix/data/interfaces/Endpoint.java +++ b/threadfix-entities/src/main/java/com/denimgroup/threadfix/data/interfaces/Endpoint.java @@ -96,14 +96,18 @@ public static class Info { int startingLineNumber; - public static Info fromEndpoint(Endpoint endpoint) { + public static Info fromEndpoint(Endpoint endpoint, boolean includeSourceFile) { Info info = new Info(); info.parameters = endpoint.getParameters(); info.httpMethod = endpoint.getHttpMethod(); info.urlPath = endpoint.getUrlPath(); - info.filePath = endpoint.getFilePath(); info.csvLine = endpoint.getCSVLine(); info.startingLineNumber = endpoint.getStartingLineNumber(); + + if (includeSourceFile) { + info.filePath = endpoint.getFilePath(); + } + return info; } From 8da57938aac692cb5ff811acbbc16443f0af298d Mon Sep 17 00:00:00 2001 From: Tyler Camp Date: Tue, 25 Sep 2018 12:29:15 -0400 Subject: [PATCH 3/5] Source code exclusion also excludes line numbers --- .../java/com/denimgroup/threadfix/data/interfaces/Endpoint.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/threadfix-entities/src/main/java/com/denimgroup/threadfix/data/interfaces/Endpoint.java b/threadfix-entities/src/main/java/com/denimgroup/threadfix/data/interfaces/Endpoint.java index 7628a6aff..400d07b1c 100644 --- a/threadfix-entities/src/main/java/com/denimgroup/threadfix/data/interfaces/Endpoint.java +++ b/threadfix-entities/src/main/java/com/denimgroup/threadfix/data/interfaces/Endpoint.java @@ -102,10 +102,10 @@ public static Info fromEndpoint(Endpoint endpoint, boolean includeSourceFile) { info.httpMethod = endpoint.getHttpMethod(); info.urlPath = endpoint.getUrlPath(); info.csvLine = endpoint.getCSVLine(); - info.startingLineNumber = endpoint.getStartingLineNumber(); if (includeSourceFile) { info.filePath = endpoint.getFilePath(); + info.startingLineNumber = endpoint.getStartingLineNumber(); } return info; From 1594622c9ef19531abcf98de09c09ef928d84a1c Mon Sep 17 00:00:00 2001 From: Tyler Camp Date: Tue, 25 Sep 2018 12:33:55 -0400 Subject: [PATCH 4/5] Include missing change for call to `Endpoint.Info.fromEndpoint` --- .../threadfix/webapp/controller/rest/PluginRestController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/threadfix-main/src/main/java/com/denimgroup/threadfix/webapp/controller/rest/PluginRestController.java b/threadfix-main/src/main/java/com/denimgroup/threadfix/webapp/controller/rest/PluginRestController.java index 5d394d819..93cbd3ca7 100644 --- a/threadfix-main/src/main/java/com/denimgroup/threadfix/webapp/controller/rest/PluginRestController.java +++ b/threadfix-main/src/main/java/com/denimgroup/threadfix/webapp/controller/rest/PluginRestController.java @@ -202,7 +202,7 @@ private Endpoint.Info[] getEndpointInfo(List endpoints) { Endpoint.Info[] endpointsInfos = new Endpoint.Info[allEndpoints.size()]; for (int i = 0; i < allEndpoints.size(); i++) { - endpointsInfos[i] = Endpoint.Info.fromEndpoint(allEndpoints.get(i)); + endpointsInfos[i] = Endpoint.Info.fromEndpoint(allEndpoints.get(i), true); } return endpointsInfos; From 60845bdc492fa11bb7be807dd349ad01e24dbde0 Mon Sep 17 00:00:00 2001 From: Tyler Camp Date: Tue, 25 Sep 2018 12:36:30 -0400 Subject: [PATCH 5/5] Update version number to 1.3.1 --- pom.xml | 2 +- ssvl-converter/pom.xml | 4 ++-- threadfix-astam/pom.xml | 2 +- threadfix-cli-importers/pom.xml | 2 +- threadfix-cli-lib/pom.xml | 2 +- threadfix-cli/pom.xml | 2 +- threadfix-data-access/pom.xml | 2 +- threadfix-data-migration/pom.xml | 2 +- threadfix-entities/pom.xml | 2 +- threadfix-ham/pom.xml | 2 +- threadfix-importers/pom.xml | 2 +- threadfix-main/pom.xml | 4 ++-- threadfix-offline/pom.xml | 2 +- threadfix-service-interfaces/pom.xml | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index 4483fbf61..f5ff0629b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.github.secdec.astam-correlator master-pom - 1.3.1-SNAPSHOT + 1.3.1 pom ThreadFix diff --git a/ssvl-converter/pom.xml b/ssvl-converter/pom.xml index d0654f427..d0c0eb0aa 100755 --- a/ssvl-converter/pom.xml +++ b/ssvl-converter/pom.xml @@ -7,11 +7,11 @@ com.github.secdec.astam-correlator master-pom - 1.3.1-SNAPSHOT + 1.3.1 ssvl-converter - 1.3.1-SNAPSHOT + 1.3.1 src/main/java diff --git a/threadfix-astam/pom.xml b/threadfix-astam/pom.xml index 887297d81..d5f672390 100644 --- a/threadfix-astam/pom.xml +++ b/threadfix-astam/pom.xml @@ -3,7 +3,7 @@ com.github.secdec.astam-correlator master-pom - 1.3.1-SNAPSHOT + 1.3.1 4.0.0 diff --git a/threadfix-cli-importers/pom.xml b/threadfix-cli-importers/pom.xml index 0852395ee..2875ed7e5 100644 --- a/threadfix-cli-importers/pom.xml +++ b/threadfix-cli-importers/pom.xml @@ -5,7 +5,7 @@ master-pom com.github.secdec.astam-correlator - 1.3.1-SNAPSHOT + 1.3.1 4.0.0 diff --git a/threadfix-cli-lib/pom.xml b/threadfix-cli-lib/pom.xml index 7b67b8300..c200c4283 100644 --- a/threadfix-cli-lib/pom.xml +++ b/threadfix-cli-lib/pom.xml @@ -5,7 +5,7 @@ com.github.secdec.astam-correlator master-pom - 1.3.1-SNAPSHOT + 1.3.1 threadfix-cli-lib diff --git a/threadfix-cli/pom.xml b/threadfix-cli/pom.xml index 2f3916b0e..a28431fbe 100644 --- a/threadfix-cli/pom.xml +++ b/threadfix-cli/pom.xml @@ -5,7 +5,7 @@ com.github.secdec.astam-correlator master-pom - 1.3.1-SNAPSHOT + 1.3.1 threadfix-cli diff --git a/threadfix-data-access/pom.xml b/threadfix-data-access/pom.xml index dab727005..3f42909c3 100644 --- a/threadfix-data-access/pom.xml +++ b/threadfix-data-access/pom.xml @@ -5,7 +5,7 @@ master-pom com.github.secdec.astam-correlator - 1.3.1-SNAPSHOT + 1.3.1 4.0.0 diff --git a/threadfix-data-migration/pom.xml b/threadfix-data-migration/pom.xml index cf1a74c80..a873eb395 100644 --- a/threadfix-data-migration/pom.xml +++ b/threadfix-data-migration/pom.xml @@ -5,7 +5,7 @@ master-pom com.github.secdec.astam-correlator - 1.3.1-SNAPSHOT + 1.3.1 4.0.0 diff --git a/threadfix-entities/pom.xml b/threadfix-entities/pom.xml index 537eda62e..6917ad31e 100644 --- a/threadfix-entities/pom.xml +++ b/threadfix-entities/pom.xml @@ -97,7 +97,7 @@ com.github.secdec.astam-correlator master-pom - 1.3.1-SNAPSHOT + 1.3.1 diff --git a/threadfix-ham/pom.xml b/threadfix-ham/pom.xml index 8b176e008..1263c2bdd 100644 --- a/threadfix-ham/pom.xml +++ b/threadfix-ham/pom.xml @@ -4,7 +4,7 @@ com.github.secdec.astam-correlator master-pom - 1.3.1-SNAPSHOT + 1.3.1 4.0.0 diff --git a/threadfix-importers/pom.xml b/threadfix-importers/pom.xml index 05c919236..4d93bb47f 100644 --- a/threadfix-importers/pom.xml +++ b/threadfix-importers/pom.xml @@ -5,7 +5,7 @@ master-pom com.github.secdec.astam-correlator - 1.3.1-SNAPSHOT + 1.3.1 4.0.0 diff --git a/threadfix-main/pom.xml b/threadfix-main/pom.xml index 9490f951b..ff2d6bb47 100644 --- a/threadfix-main/pom.xml +++ b/threadfix-main/pom.xml @@ -5,7 +5,7 @@ com.github.secdec.astam-correlator master-pom - 1.3.1-SNAPSHOT + 1.3.1 threadfix @@ -158,7 +158,7 @@ tofile="target/classes/downloads/release-2.zap" /> --> - diff --git a/threadfix-offline/pom.xml b/threadfix-offline/pom.xml index 353a0a969..afb3bb6be 100644 --- a/threadfix-offline/pom.xml +++ b/threadfix-offline/pom.xml @@ -5,7 +5,7 @@ master-pom com.github.secdec.astam-correlator - 1.3.1-SNAPSHOT + 1.3.1 4.0.0 diff --git a/threadfix-service-interfaces/pom.xml b/threadfix-service-interfaces/pom.xml index 0ca853619..8be4ec471 100644 --- a/threadfix-service-interfaces/pom.xml +++ b/threadfix-service-interfaces/pom.xml @@ -5,7 +5,7 @@ master-pom com.github.secdec.astam-correlator - 1.3.1-SNAPSHOT + 1.3.1 4.0.0