From f1b42f8381d6cf48e586cc36f15ce9c6b9e50a3f Mon Sep 17 00:00:00 2001 From: "Mr.H" Date: Tue, 13 Nov 2018 09:07:51 -0500 Subject: [PATCH 01/14] added surefire --- pom.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ff03228..0113f71 100644 --- a/pom.xml +++ b/pom.xml @@ -30,8 +30,13 @@ 4.10 test + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0-M1 + maven-plugin + - src/main/java From d4a583f5b2f2d76f3644dc964fa10690e7d09b5f Mon Sep 17 00:00:00 2001 From: "Mr.H" Date: Tue, 13 Nov 2018 09:10:14 -0500 Subject: [PATCH 02/14] change surefire version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0113f71..fb66502 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M1 + 2.12.4 maven-plugin From b75982debc90b9010e4f51ec8d714cc7cebb2520 Mon Sep 17 00:00:00 2001 From: "Mr.H" Date: Tue, 13 Nov 2018 09:14:05 -0500 Subject: [PATCH 03/14] tweaked the versions again --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index fb66502..cb9af72 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.12.4 + 3.0.0-M1 maven-plugin @@ -43,7 +43,7 @@ org.jacoco jacoco-maven-plugin - 0.7.9 + 0.8.2 From a5890e4d8bcc73c0d020ae130d2b1e0c2f7597c5 Mon Sep 17 00:00:00 2001 From: "Mr.H" Date: Tue, 13 Nov 2018 09:17:57 -0500 Subject: [PATCH 04/14] added surefire plugin settings --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index cb9af72..03b972c 100644 --- a/pom.xml +++ b/pom.xml @@ -59,6 +59,13 @@ + + org.apache.maven.plugins + maven-surefire-plugin + + false + + From d058b9885aa725ab6c19a23925e9c58bf290e3ea Mon Sep 17 00:00:00 2001 From: "Mr.H" Date: Tue, 13 Nov 2018 09:20:11 -0500 Subject: [PATCH 05/14] Guessing now --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 03b972c..2fea83c 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ org.apache.maven.plugins maven-surefire-plugin - false + true From 4aba4e929784595ab1aa9d008f123495bb7d3ccf Mon Sep 17 00:00:00 2001 From: "Mr.H" Date: Tue, 13 Nov 2018 09:25:42 -0500 Subject: [PATCH 06/14] more guessing --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2fea83c..03b972c 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ org.apache.maven.plugins maven-surefire-plugin - true + false From 68ad784ea791e32e9ddcf5deca1817d1616bb1e6 Mon Sep 17 00:00:00 2001 From: "Mr.H" Date: Tue, 13 Nov 2018 09:34:00 -0500 Subject: [PATCH 07/14] taking surefire out for a test --- pom.xml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 03b972c..01e86a5 100644 --- a/pom.xml +++ b/pom.xml @@ -30,12 +30,7 @@ 4.10 test - - org.apache.maven.plugins - maven-surefire-plugin - 3.0.0-M1 - maven-plugin - + src/main/java @@ -59,13 +54,7 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - false - - + From bb8b3758a5dc40c60e73571adf3a3ac73ebb7b13 Mon Sep 17 00:00:00 2001 From: "Mr.H" Date: Tue, 13 Nov 2018 09:39:47 -0500 Subject: [PATCH 08/14] Update pom.xml --- pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pom.xml b/pom.xml index 01e86a5..ee7ea6c 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,6 @@ 4.10 test - src/main/java @@ -54,7 +53,6 @@ - From e459a360a7f63a6ec8426ffefaa0d9b752141e58 Mon Sep 17 00:00:00 2001 From: "Mr.H" Date: Tue, 13 Nov 2018 09:45:07 -0500 Subject: [PATCH 09/14] Adding surefire plugin back in --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index ee7ea6c..8625d59 100644 --- a/pom.xml +++ b/pom.xml @@ -53,6 +53,13 @@ + + org.apache.maven.plugins + maven-surefire-plugin + + false + + From 7373d3e61aa0c31698056726970ccae1553a2eb5 Mon Sep 17 00:00:00 2001 From: "Mr.H" Date: Tue, 13 Nov 2018 09:47:21 -0500 Subject: [PATCH 10/14] Update pom.xml --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index 8625d59..fca10c9 100644 --- a/pom.xml +++ b/pom.xml @@ -30,6 +30,12 @@ 4.10 test + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0-M1 + maven-plugin + src/main/java From e6a2d6cc3ef933b15e4a3b7a4cfe8bc242e807cc Mon Sep 17 00:00:00 2001 From: "Mr.H" Date: Tue, 24 Nov 2020 12:06:12 -0500 Subject: [PATCH 11/14] Created by OWASP Threat Dragon --- ThreatDragonModels/Test/Test.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 ThreatDragonModels/Test/Test.json diff --git a/ThreatDragonModels/Test/Test.json b/ThreatDragonModels/Test/Test.json new file mode 100644 index 0000000..11ddc2e --- /dev/null +++ b/ThreatDragonModels/Test/Test.json @@ -0,0 +1,11 @@ +{ + "summary": { + "title": "Test", + "owner": "Mike", + "description": "Do something today" + }, + "detail": { + "contributors": [], + "diagrams": [] + } +} \ No newline at end of file From d8f4d82f473081e98249707e801fcd88504c8ff7 Mon Sep 17 00:00:00 2001 From: "Mr.H" Date: Tue, 24 Nov 2020 12:06:37 -0500 Subject: [PATCH 12/14] Updated by OWASP Threat Dragon --- ThreatDragonModels/Test/Test.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ThreatDragonModels/Test/Test.json b/ThreatDragonModels/Test/Test.json index 11ddc2e..b754839 100644 --- a/ThreatDragonModels/Test/Test.json +++ b/ThreatDragonModels/Test/Test.json @@ -6,6 +6,12 @@ }, "detail": { "contributors": [], - "diagrams": [] + "diagrams": [ + { + "title": "Test1", + "thumbnail": "./public/content/images/thumbnail.jpg", + "id": 0 + } + ] } } \ No newline at end of file From 2587077de25c96166e76c29816618efeb7d7a32c Mon Sep 17 00:00:00 2001 From: "Mr.H" Date: Tue, 24 Nov 2020 12:23:31 -0500 Subject: [PATCH 13/14] Updated by OWASP Threat Dragon --- ThreatDragonModels/Test/Test.json | 501 +++++++++++++++++++++++++++++- 1 file changed, 500 insertions(+), 1 deletion(-) diff --git a/ThreatDragonModels/Test/Test.json b/ThreatDragonModels/Test/Test.json index b754839..5875baa 100644 --- a/ThreatDragonModels/Test/Test.json +++ b/ThreatDragonModels/Test/Test.json @@ -10,7 +10,506 @@ { "title": "Test1", "thumbnail": "./public/content/images/thumbnail.jpg", - "id": 0 + "id": 0, + "diagramJson": { + "cells": [ + { + "type": "tm.Actor", + "size": { + "width": 160, + "height": 80 + }, + "position": { + "x": 50, + "y": 50 + }, + "angle": 0, + "id": "2f7d46ae-11cd-4132-9c38-3deda63d1560", + "z": 1, + "hasOpenThreats": true, + "threats": [ + { + "status": "Open", + "severity": "High", + "type": "Elevation of privilege", + "title": "Privilege Escalation" + } + ], + "attrs": { + ".element-shape": { + "class": "element-shape hasOpenThreats isInScope" + }, + "text": { + "text": "User" + }, + ".element-text": { + "class": "element-text hasOpenThreats isInScope" + } + } + }, + { + "type": "tm.Boundary", + "smooth": true, + "source": { + "x": 230, + "y": 193 + }, + "target": { + "x": 273, + "y": 6 + }, + "vertices": [ + { + "x": 238, + "y": 187 + }, + { + "x": 254, + "y": 126 + }, + { + "x": 272, + "y": 90 + } + ], + "id": "9e0b530e-ffb4-49d2-a326-f21c94d622a3", + "z": 3, + "attrs": {} + }, + { + "type": "tm.Process", + "size": { + "width": 100, + "height": 100 + }, + "position": { + "x": 300, + "y": 51 + }, + "angle": 0, + "id": "69edd2e4-3395-45d3-86d9-49405b205f14", + "z": 4, + "hasOpenThreats": true, + "threats": [ + { + "status": "Open", + "severity": "Medium", + "type": "Denial of service", + "title": "DDOS" + } + ], + "attrs": { + ".element-shape": { + "class": "element-shape hasOpenThreats isInScope" + }, + "text": { + "text": "Reverse Proxy" + }, + ".element-text": { + "class": "element-text hasOpenThreats isInScope" + } + } + }, + { + "type": "tm.Boundary", + "smooth": true, + "source": { + "x": 452, + "y": 17 + }, + "target": { + "x": 420, + "y": 195 + }, + "vertices": [ + { + "x": 425, + "y": 161 + } + ], + "id": "f76f24c3-5ae5-46b0-aacd-1417b28da839", + "z": 5, + "attrs": {} + }, + { + "type": "tm.Process", + "size": { + "width": 100, + "height": 100 + }, + "position": { + "x": 479, + "y": 61 + }, + "angle": 0, + "id": "83eb0a1f-ded8-4919-8f92-2f97f09ec95a", + "z": 6, + "hasOpenThreats": true, + "threats": [ + { + "status": "Open", + "severity": "High", + "type": "Denial of service", + "title": "DDOS" + } + ], + "attrs": { + ".element-shape": { + "class": "element-shape hasOpenThreats isInScope" + }, + "text": { + "text": "Load Balancer" + }, + ".element-text": { + "class": "element-text hasOpenThreats isInScope" + } + } + }, + { + "type": "tm.Process", + "size": { + "width": 100, + "height": 100 + }, + "position": { + "x": 677, + "y": 23 + }, + "angle": 0, + "id": "af2fdf97-c9a3-44bd-8c9c-1ac0c7dbb4d2", + "z": 7, + "hasOpenThreats": true, + "threats": [ + { + "status": "Open", + "severity": "High", + "type": "Elevation of privilege", + "title": "Elevation of Privileges" + } + ], + "attrs": { + ".element-shape": { + "class": "element-shape hasOpenThreats isInScope" + }, + "text": { + "text": "App Server" + }, + ".element-text": { + "class": "element-text hasOpenThreats isInScope" + } + } + }, + { + "type": "tm.Flow", + "smooth": true, + "source": { + "id": "2f7d46ae-11cd-4132-9c38-3deda63d1560" + }, + "target": { + "id": "69edd2e4-3395-45d3-86d9-49405b205f14" + }, + "vertices": [], + "id": "dce05693-3daf-4060-8e43-6711a235e55d", + "labels": [ + { + "position": 0.5, + "attrs": { + "text": { + "text": "flow 6", + "font-weight": "400", + "font-size": "small" + } + } + } + ], + "z": 8, + "hasOpenThreats": false, + "attrs": { + ".marker-target": { + "class": "marker-target hasNoOpenThreats isInScope" + }, + ".connection": { + "class": "connection hasNoOpenThreats isInScope" + } + } + }, + { + "type": "tm.Flow", + "smooth": true, + "source": { + "id": "69edd2e4-3395-45d3-86d9-49405b205f14" + }, + "target": { + "id": "83eb0a1f-ded8-4919-8f92-2f97f09ec95a" + }, + "vertices": [], + "id": "eceafa41-622b-4328-8142-0513374349f2", + "labels": [ + { + "position": 0.5, + "attrs": { + "text": { + "text": "flow 7", + "font-weight": "400", + "font-size": "small" + } + } + } + ], + "z": 9, + "hasOpenThreats": false, + "attrs": { + ".marker-target": { + "class": "marker-target hasNoOpenThreats isInScope" + }, + ".connection": { + "class": "connection hasNoOpenThreats isInScope" + } + } + }, + { + "type": "tm.Flow", + "smooth": true, + "source": { + "id": "83eb0a1f-ded8-4919-8f92-2f97f09ec95a" + }, + "target": { + "id": "af2fdf97-c9a3-44bd-8c9c-1ac0c7dbb4d2" + }, + "vertices": [], + "id": "182ae12a-2817-47ba-b665-7b1376256c7c", + "labels": [ + { + "position": 0.5, + "attrs": { + "text": { + "text": "flow 8", + "font-weight": "400", + "font-size": "small" + } + } + } + ], + "z": 10, + "hasOpenThreats": false, + "attrs": { + ".marker-target": { + "class": "marker-target hasNoOpenThreats isInScope" + }, + ".connection": { + "class": "connection hasNoOpenThreats isInScope" + } + } + }, + { + "type": "tm.Store", + "size": { + "width": 160, + "height": 80 + }, + "position": { + "x": 616, + "y": 184 + }, + "angle": 0, + "id": "010be5db-1f3f-4a7f-8fa8-8fc315cc256d", + "z": 11, + "hasOpenThreats": false, + "storesCredentials": true, + "attrs": { + ".element-shape": { + "class": "element-shape hasNoOpenThreats isInScope" + }, + "text": { + "text": "Identity Store" + }, + ".element-text": { + "class": "element-text hasNoOpenThreats isInScope" + } + } + }, + { + "type": "tm.Flow", + "smooth": true, + "source": { + "id": "af2fdf97-c9a3-44bd-8c9c-1ac0c7dbb4d2" + }, + "target": { + "id": "010be5db-1f3f-4a7f-8fa8-8fc315cc256d" + }, + "vertices": [], + "id": "2e13f4c4-1f78-4ea5-af83-c859163b9ef0", + "labels": [ + { + "position": 0.5, + "attrs": { + "text": { + "text": "flow 10", + "font-weight": "400", + "font-size": "small" + } + } + } + ], + "z": 12, + "hasOpenThreats": false, + "attrs": { + ".marker-target": { + "class": "marker-target hasNoOpenThreats isInScope" + }, + ".connection": { + "class": "connection hasNoOpenThreats isInScope" + } + } + }, + { + "type": "tm.Store", + "size": { + "width": 160, + "height": 80 + }, + "position": { + "x": 804, + "y": 156 + }, + "angle": 0, + "id": "69644b89-e369-4feb-a2ca-da53e514db0c", + "z": 13, + "hasOpenThreats": false, + "isALog": true, + "attrs": { + ".element-shape": { + "class": "element-shape hasNoOpenThreats isInScope" + }, + "text": { + "text": "Application Log" + }, + ".element-text": { + "class": "element-text hasNoOpenThreats isInScope" + } + } + }, + { + "type": "tm.Flow", + "smooth": true, + "source": { + "id": "af2fdf97-c9a3-44bd-8c9c-1ac0c7dbb4d2" + }, + "target": { + "id": "69644b89-e369-4feb-a2ca-da53e514db0c" + }, + "vertices": [], + "id": "2a5c9dc6-389d-45cc-95d6-3defa1906994", + "labels": [ + { + "position": 0.5, + "attrs": { + "text": { + "text": "flow 12", + "font-weight": "400", + "font-size": "small" + } + } + } + ], + "z": 14, + "hasOpenThreats": false, + "attrs": { + ".marker-target": { + "class": "marker-target hasNoOpenThreats isInScope" + }, + ".connection": { + "class": "connection hasNoOpenThreats isInScope" + } + } + }, + { + "type": "tm.Boundary", + "smooth": true, + "source": { + "x": 815, + "y": 11 + }, + "target": { + "x": 840, + "y": 119 + }, + "vertices": [], + "id": "f92e9c76-6f32-49da-86b2-238a49c8c497", + "z": 15, + "attrs": {} + }, + { + "type": "tm.Flow", + "smooth": true, + "source": { + "id": "af2fdf97-c9a3-44bd-8c9c-1ac0c7dbb4d2" + }, + "target": { + "id": "78ccc660-ca6a-4002-aa1c-14e47d57c948" + }, + "vertices": [ + { + "x": 872, + "y": 52 + } + ], + "id": "e540b4e3-5989-4bd8-a569-b4eb0c43f1d1", + "labels": [ + { + "position": 0.5, + "attrs": { + "text": { + "text": "flow 14", + "font-weight": "400", + "font-size": "small" + } + } + } + ], + "z": 16, + "hasOpenThreats": false, + "attrs": { + ".marker-target": { + "class": "marker-target hasNoOpenThreats isInScope" + }, + ".connection": { + "class": "connection hasNoOpenThreats isInScope" + } + } + }, + { + "type": "tm.Store", + "size": { + "width": 160, + "height": 80 + }, + "position": { + "x": 896, + "y": 8 + }, + "angle": 0, + "id": "78ccc660-ca6a-4002-aa1c-14e47d57c948", + "z": 17, + "hasOpenThreats": false, + "attrs": { + ".element-shape": { + "class": "element-shape hasNoOpenThreats isInScope" + }, + "text": { + "text": "Persistence Store" + }, + ".element-text": { + "class": "element-text hasNoOpenThreats isInScope" + } + } + } + ] + }, + "size": { + "height": 590, + "width": 1669 + } } ] } From bf8f183579a4c1efd49349fc01b0c6825404a74e Mon Sep 17 00:00:00 2001 From: "Mr.H" Date: Tue, 24 Nov 2020 12:23:33 -0500 Subject: [PATCH 14/14] Updated by OWASP Threat Dragon