From 748ac27f68cb261fd4c492118384f6ee33e5249d Mon Sep 17 00:00:00 2001 From: Alastair McFarlane Date: Fri, 9 Oct 2020 15:56:37 +0100 Subject: [PATCH 1/4] DefectDojo UI components --- src/views/administration/AdminMenu.vue | 5 + src/views/administration/Administration.vue | 2 +- .../integrations/DefectDojo.vue | 96 +++++++++++++++++++ 3 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 src/views/administration/integrations/DefectDojo.vue diff --git a/src/views/administration/AdminMenu.vue b/src/views/administration/AdminMenu.vue index db7fdd7ce..27d2872cb 100644 --- a/src/views/administration/AdminMenu.vue +++ b/src/views/administration/AdminMenu.vue @@ -152,6 +152,11 @@ name: this.$t('admin.fortify_ssc'), href: "#integrationsFortifySscTab" }, + { + component: "DefectDojo", + name: this.$t('admin.defectdojo'), + href: "#integrationsDefectDojoTab" + }, { component: "KennaSecurity", name: this.$t('admin.kenna_security'), diff --git a/src/views/administration/Administration.vue b/src/views/administration/Administration.vue index 70dd9c01f..933a96e68 100644 --- a/src/views/administration/Administration.vue +++ b/src/views/administration/Administration.vue @@ -40,6 +40,7 @@ import Templates from "./notifications/Templates"; // Integration plugins import FortifySsc from "./integrations/FortifySsc"; + import DefectDojo from "./integrations/DefectDojo"; import KennaSecurity from "./integrations/KennaSecurity"; // Access Management plugins import LdapUsers from "./accessmanagement/LdapUsers"; @@ -95,4 +96,3 @@ } } - diff --git a/src/views/administration/integrations/DefectDojo.vue b/src/views/administration/integrations/DefectDojo.vue new file mode 100644 index 000000000..91577c636 --- /dev/null +++ b/src/views/administration/integrations/DefectDojo.vue @@ -0,0 +1,96 @@ + + + From 7642ba4a4ca737499326dbbcd94483bf18ddf7d4 Mon Sep 17 00:00:00 2001 From: Alastair McFarlane Date: Sat, 10 Oct 2020 17:59:02 +0100 Subject: [PATCH 2/4] Some text values and remember to export new plugin --- src/i18n/locales/en.json | 2 ++ src/views/administration/Administration.vue | 2 +- src/views/administration/integrations/DefectDojo.vue | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json index bfd66a58a..466d73213 100644 --- a/src/i18n/locales/en.json +++ b/src/i18n/locales/en.json @@ -266,6 +266,7 @@ "templates": "Templates", "integrations": "Integrations", "fortify_ssc": "Fortify SSC", + "defectdojo": "DefectDojo", "kenna_security": "Kenna Security", "threadfix": "ThreadFix", "access_management": "Access Management", @@ -315,6 +316,7 @@ "url": "URL", "enabled": "Enabled", "integration_fortify_ssc_enable": "Enable Fortify SSC integration", + "integration_defectdojo_enable": "Enable DefectDojo integration", "synchronization_cadence_minutes": "Synchronization cadence (in minutes)", "synchronization_cadence_restart_required": "Restarting Dependency-Track is required for cadence changes to take effect", "integration_kenna_enable": "Enable Kenna Security integration", diff --git a/src/views/administration/Administration.vue b/src/views/administration/Administration.vue index 933a96e68..007ef07aa 100644 --- a/src/views/administration/Administration.vue +++ b/src/views/administration/Administration.vue @@ -58,7 +58,7 @@ InternalAnalyzer, NpmAuditAnalyzer, OssIndexAnalyzer, VulnDbAnalyzer, Gem, Hex, Maven, Npm, Nuget, Python, Alerts, Templates, - FortifySsc, KennaSecurity, + FortifySsc, DefectDojo, KennaSecurity, LdapUsers, ManagedUsers, OidcUsers, OidcGroups, Teams, Permissions }, created() { diff --git a/src/views/administration/integrations/DefectDojo.vue b/src/views/administration/integrations/DefectDojo.vue index 91577c636..76c563300 100644 --- a/src/views/administration/integrations/DefectDojo.vue +++ b/src/views/administration/integrations/DefectDojo.vue @@ -23,7 +23,7 @@ /> Date: Sat, 10 Oct 2020 22:20:45 +0100 Subject: [PATCH 3/4] Update message to existing string --- src/views/administration/integrations/DefectDojo.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/administration/integrations/DefectDojo.vue b/src/views/administration/integrations/DefectDojo.vue index 76c563300..0c3aff136 100644 --- a/src/views/administration/integrations/DefectDojo.vue +++ b/src/views/administration/integrations/DefectDojo.vue @@ -23,7 +23,7 @@ /> Date: Sat, 10 Oct 2020 23:16:50 +0100 Subject: [PATCH 4/4] Fix case statement for api key --- src/views/administration/integrations/DefectDojo.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/administration/integrations/DefectDojo.vue b/src/views/administration/integrations/DefectDojo.vue index 0c3aff136..0d2fff2ca 100644 --- a/src/views/administration/integrations/DefectDojo.vue +++ b/src/views/administration/integrations/DefectDojo.vue @@ -86,7 +86,7 @@ this.cadence = item.propertyValue; break; case "defectdojo.url": this.url = item.propertyValue; break; - case "defectdojo.username": + case "defectdojo.apiKey": this.apiKey = item.propertyValue; break; } }