From 26ac64adef6cda8bb987276a9dc557741e429f58 Mon Sep 17 00:00:00 2001 From: Daniel Martin <53006+etdsoft@users.noreply.github.com> Date: Wed, 17 Nov 2021 08:53:49 +0100 Subject: [PATCH 1/4] Add a few users to Welcome project --- lib/tasks/templates/project.xml | 58 ++++++++++++++++----------------- lib/tasks/thor/setup.rb | 7 +++- 2 files changed, 35 insertions(+), 30 deletions(-) diff --git a/lib/tasks/templates/project.xml b/lib/tasks/templates/project.xml index 12fc6dd88..eabd99816 100644 --- a/lib/tasks/templates/project.xml +++ b/lib/tasks/templates/project.xml @@ -39,7 +39,7 @@ The core concepts you need to know about: 2 - adama@dradisframework.com + helo@dradisframework.com 2 3 - adama@dradisframework.com + helo@dradisframework.com 2 4 - adama@dradisframework.com + starbuck@dradisframework.com 2 18 - adama@dradisframework.com + husker@dradisframework.com 2 19 - adama@dradisframework.com + apollo@dradisframework.com 2 update - adama@dradisframework.com + apollo@dradisframework.com 1495866657 @@ -385,7 +385,7 @@ phase=8.259, freq=-141.24, error=11.32]]> update - adama@dradisframework.com + starbuck@dradisframework.com 1495865942 @@ -393,7 +393,7 @@ phase=8.259, freq=-141.24, error=11.32]]> 4 - adama@dradisframework.com + boomer@dradisframework.com 9 create - adama@dradisframework.com + husker@dradisframework.com 1495866591 update - adama@dradisframework.com + helo@dradisframework.com 1504150101 update - adama@dradisframework.com + apollo@dradisframework.com 1525869293 update - adama@dradisframework.com + starbuck@dradisframework.com 1531237536 @@ -654,17 +654,17 @@ Scripting (Blind_Sql_Injection.script)/Blind SQL Injection update - adama@dradisframework.com + starbuck@dradisframework.com 1527084558 update - adama@dradisframework.com + helo@dradisframework.com 1530778108 update - adama@dradisframework.com + boomer@dradisframework.com 1531307150 @@ -674,27 +674,27 @@ Scripting (Blind_Sql_Injection.script)/Blind SQL Injection update - adama@dradisframework.com + apollo@dradisframework.com 1531310233 update - adama@dradisframework.com + apollo@dradisframework.com 1534423619 update - adama@dradisframework.com + starbuck@dradisframework.com 1544632065 update - adama@dradisframework.com + helo@dradisframework.com 1544632294 update - adama@dradisframework.com + starbuck@dradisframework.com 1544632331 @@ -735,12 +735,12 @@ nessus update - adama@dradisframework.com + husker@dradisframework.com 1495866298 update - adama@dradisframework.com + apollo@dradisframework.com 1495866319 @@ -790,7 +790,7 @@ nessus update - adama@dradisframework.com + husker@dradisframework.com 1495866279 @@ -841,7 +841,7 @@ ntp-clock-variables-disclosure update - adama@dradisframework.com + starbuck@dradisframework.com 1495866053 @@ -880,17 +880,17 @@ qualys update - adama@dradisframework.com + helo@dradisframework.com 1495865750 update - adama@dradisframework.com + boomer@dradisframework.com 1495866234 update - adama@dradisframework.com + husker@dradisframework.com 1500144827 @@ -965,7 +965,7 @@ qualys update - adama@dradisframework.com + apollo@dradisframework.com 1495866407 @@ -1081,7 +1081,7 @@ qualys update - adama@dradisframework.com + starbuck@dradisframework.com 1495866203 diff --git a/lib/tasks/thor/setup.rb b/lib/tasks/thor/setup.rb index 33a1ada40..12a10f568 100644 --- a/lib/tasks/thor/setup.rb +++ b/lib/tasks/thor/setup.rb @@ -92,9 +92,14 @@ def welcome # ---------------------------------------------------------- Project data detect_and_set_project_scope + # Template users + %w{adama husker halo starbuck boomer apollo}.each do |callsign| + User.create!(email: "#{callsign}@dradisframework.com") + end + task_options.merge!( plugin: Dradis::Plugins::Projects::Upload::Template, - default_user_id: User.create!(email: 'adama@dradisframework.com').id + default_user_id: User.first.id ) importer = Dradis::Plugins::Projects::Upload::Template::Importer.new(task_options) From 62ddda49085d7905436d4122f042faa100f73c14 Mon Sep 17 00:00:00 2001 From: Daniel Martin <53006+etdsoft@users.noreply.github.com> Date: Wed, 17 Nov 2021 11:16:54 +0100 Subject: [PATCH 2/4] Issues#show - tweak Send To copy and links --- app/views/issues/_send_to_menu.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/issues/_send_to_menu.html.erb b/app/views/issues/_send_to_menu.html.erb index 251873c71..b9e650e02 100644 --- a/app/views/issues/_send_to_menu.html.erb +++ b/app/views/issues/_send_to_menu.html.erb @@ -12,11 +12,11 @@ <% if sync_plugins.any? %>
<% end %> - Built-in IssueLibrary + IssueLibrary for reuse <% end %> <% unless defined?(Dradis::Pro) && defined?(Dradis::Pro::Plugins::Remediationtracker) %> <% if sync_plugins.any? %>
<% end %> - Built-in Remediation Tracker + Built-in Remediation Tracker <% end %> From b7ddb3fd56626b775d2e39dc3aa3c5405b6a6206 Mon Sep 17 00:00:00 2001 From: Daniel Martin <53006+etdsoft@users.noreply.github.com> Date: Wed, 17 Nov 2021 13:18:59 +0100 Subject: [PATCH 3/4] Issues#show : Send To - add DevOps, JIRA, and SNOW links --- app/views/issues/_send_to_menu.html.erb | 27 ++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/app/views/issues/_send_to_menu.html.erb b/app/views/issues/_send_to_menu.html.erb index b9e650e02..10ae41336 100644 --- a/app/views/issues/_send_to_menu.html.erb +++ b/app/views/issues/_send_to_menu.html.erb @@ -8,15 +8,28 @@ %> <% end %> <% end %> -<% unless defined?(Dradis::Pro) && defined?(Dradis::Pro::Issuelib) %> - <% if sync_plugins.any? %> -
- <% end %> + +<% if sync_plugins.any? %> +
+<% end %> + +<% unless defined?(Dradis::Pro) && defined?(Dradis::Pro::Plugins::Issuelib) %> IssueLibrary for reuse <% end %> <% unless defined?(Dradis::Pro) && defined?(Dradis::Pro::Plugins::Remediationtracker) %> - <% if sync_plugins.any? %> -
- <% end %> Built-in Remediation Tracker <% end %> + +<% if defined?(Dradis::Pro)%> + More ticketing integrations +<% else %> + <% unless defined?(Dradis::Pro) && defined?(Dradis::Plugins::Vsts) %> + Ticketing: Azure DevOps + <% end %> + <% unless defined?(Dradis::Pro) && defined?(Dradis::Plugins::Vsts) %> + Ticketing: JIRA + <% end %> + <% unless defined?(Dradis::Pro) && defined?(Dradis::Plugins::Vsts) %> + Ticketing: ServiceNow + <% end %> +<% end %> From f576f9e87439fe22e1c36d98356e44fecf4956f9 Mon Sep 17 00:00:00 2001 From: Matt Budz Date: Wed, 24 Jul 2024 15:34:33 +0200 Subject: [PATCH 4/4] Update app/views/issues/_send_to_menu.html.erb Co-authored-by: Aaron Manaloto --- app/views/issues/_send_to_menu.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/issues/_send_to_menu.html.erb b/app/views/issues/_send_to_menu.html.erb index 10ae41336..1c2ee07a9 100644 --- a/app/views/issues/_send_to_menu.html.erb +++ b/app/views/issues/_send_to_menu.html.erb @@ -26,7 +26,7 @@ <% unless defined?(Dradis::Pro) && defined?(Dradis::Plugins::Vsts) %> Ticketing: Azure DevOps <% end %> - <% unless defined?(Dradis::Pro) && defined?(Dradis::Plugins::Vsts) %> + <% unless defined?(Dradis::Pro) && defined?(Dradis::Plugins::Jira) %> Ticketing: JIRA <% end %> <% unless defined?(Dradis::Pro) && defined?(Dradis::Plugins::Vsts) %>