Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Small onboarding tweaks to Welcome template #928

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Small onboarding tweaks to Welcome template #928

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26ac64a
Add a few users to Welcome project
etdsoft Nov 17, 2021
62ddda4
Issues#show - tweak Send To copy and links
etdsoft Nov 17, 2021
b7ddb3f
Issues#show : Send To - add DevOps, JIRA, and SNOW links
etdsoft Nov 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/views/issues/_send_to_menu.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
<% if sync_plugins.any? %>
<div class="divider"></div>
<% end %>
<a href="javascript:void(0)" class="js-try-pro dropdown-item" data-term="issuelib" data-url="https://dradisframework.com/pro/pages/issuelib.html"><i class="fa fa-book fa-fw"></i> Built-in IssueLibrary</a>
<a href="javascript:void(0)" class="js-try-pro dropdown-item" data-term="issuelib" data-url="https://dradisframework.com/pro/pages/issuelib.html"><i class="fa fa-book fa-fw"></i> IssueLibrary for reuse</a>
<% end %>
<% unless defined?(Dradis::Pro) && defined?(Dradis::Pro::Plugins::Remediationtracker) %>
<% if sync_plugins.any? %>
<div class="divider"></div>
<% end %>
<a href="javascript:void(0)" class="js-try-pro dropdown-item" data-term="remediation" data-url="https://dradisframework.com/pro/add-ons/remediation.html"><i class="fa fa-tasks fa-fw"></i> Built-in Remediation Tracker</a>
<a href="javascript:void(0)" class="js-try-pro dropdown-item" data-term="remediation" data-url="https://dradisframework.com/tools/remediation.html"><i class="fa fa-check-square-o fa-fw"></i> Built-in Remediation Tracker</a>
Copy link
Contributor

@MattBudz MattBudz Nov 17, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We specifically use pro/pages|addons for these modals because we are styling the pages in mind that they are likely viewed in a modal (hiding the website navbar & footer, and some other small adjustments).

I think a better approach would be to keep the pro/pages link here and update the pro/pages/remdiation.html page on the website

<% end %>
58 changes: 29 additions & 29 deletions lib/tasks/templates/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ The core concepts you need to know about:
</note>
<note>
<id>2</id>
<author>adama@dradisframework.com</author>
<author>helo@dradisframework.com</author>
<category-id>2</category-id>
<text><![CDATA[#[Title]#
1.- Adding Issues
Expand Down Expand Up @@ -78,7 +78,7 @@ https://dradisframework.com/support/guides/projects/index.html
</note>
<note>
<id>3</id>
<author>adama@dradisframework.com</author>
<author>helo@dradisframework.com</author>
<category-id>2</category-id>
<text><![CDATA[#[Title]#
2.- Adding Evidence
Expand All @@ -97,7 +97,7 @@ You can also add "images/screenshots and captions":https://dradisframework.com/s
</note>
<note>
<id>4</id>
<author>adama@dradisframework.com</author>
<author>starbuck@dradisframework.com</author>
<category-id>2</category-id>
<text><![CDATA[#[Title]#
5.- Next steps
Expand All @@ -120,7 +120,7 @@ If you ever want to reload this sample project again:
</note>
<note>
<id>18</id>
<author>adama@dradisframework.com</author>
<author>husker@dradisframework.com</author>
<category-id>2</category-id>
<text><![CDATA[#[Title]#
3.- Adding Nodes
Expand All @@ -134,7 +134,7 @@ Once you have created a Node, you can add Notes or Evidence to that Node. A Not
</note>
<note>
<id>19</id>
<author>adama@dradisframework.com</author>
<author>apollo@dradisframework.com</author>
<category-id>2</category-id>
<text><![CDATA[#[Title]#
4.- Working with Methodologies
Expand Down Expand Up @@ -334,7 +334,7 @@ n/a
<activities>
<activity>
<action>update</action>
<user_email>adama@dradisframework.com</user_email>
<user_email>apollo@dradisframework.com</user_email>
<created_at>1495866657</created_at>
</activity>
</activities>
Expand Down Expand Up @@ -385,15 +385,15 @@ phase=8.259, freq=-141.24, error=11.32]]></content>
<activities>
<activity>
<action>update</action>
<user_email>adama@dradisframework.com</user_email>
<user_email>starbuck@dradisframework.com</user_email>
<created_at>1495865942</created_at>
</activity>
</activities>
<comments/>
</evidence>
<evidence>
<id>4</id>
<author>adama@dradisframework.com</author>
<author>boomer@dradisframework.com</author>
<issue-id>9</issue-id>
<content><![CDATA[#[Location]#
/ui/warehouse/index.php
Expand Down Expand Up @@ -421,22 +421,22 @@ Tests performed:
<activities>
<activity>
<action>create</action>
<user_email>adama@dradisframework.com</user_email>
<user_email>husker@dradisframework.com</user_email>
<created_at>1495866591</created_at>
</activity>
<activity>
<action>update</action>
<user_email>adama@dradisframework.com</user_email>
<user_email>helo@dradisframework.com</user_email>
<created_at>1504150101</created_at>
</activity>
<activity>
<action>update</action>
<user_email>adama@dradisframework.com</user_email>
<user_email>apollo@dradisframework.com</user_email>
<created_at>1525869293</created_at>
</activity>
<activity>
<action>update</action>
<user_email>adama@dradisframework.com</user_email>
<user_email>starbuck@dradisframework.com</user_email>
<created_at>1531237536</created_at>
</activity>
</activities>
Expand Down Expand Up @@ -654,17 +654,17 @@ Scripting (Blind_Sql_Injection.script)/Blind SQL Injection
</activity>
<activity>
<action>update</action>
<user_email>adama@dradisframework.com</user_email>
<user_email>starbuck@dradisframework.com</user_email>
<created_at>1527084558</created_at>
</activity>
<activity>
<action>update</action>
<user_email>adama@dradisframework.com</user_email>
<user_email>helo@dradisframework.com</user_email>
<created_at>1530778108</created_at>
</activity>
<activity>
<action>update</action>
<user_email>adama@dradisframework.com</user_email>
<user_email>boomer@dradisframework.com</user_email>
<created_at>1531307150</created_at>
</activity>
<activity>
Expand All @@ -674,27 +674,27 @@ Scripting (Blind_Sql_Injection.script)/Blind SQL Injection
</activity>
<activity>
<action>update</action>
<user_email>adama@dradisframework.com</user_email>
<user_email>apollo@dradisframework.com</user_email>
<created_at>1531310233</created_at>
</activity>
<activity>
<action>update</action>
<user_email>adama@dradisframework.com</user_email>
<user_email>apollo@dradisframework.com</user_email>
<created_at>1534423619</created_at>
</activity>
<activity>
<action>update</action>
<user_email>adama@dradisframework.com</user_email>
<user_email>starbuck@dradisframework.com</user_email>
<created_at>1544632065</created_at>
</activity>
<activity>
<action>update</action>
<user_email>adama@dradisframework.com</user_email>
<user_email>helo@dradisframework.com</user_email>
<created_at>1544632294</created_at>
</activity>
<activity>
<action>update</action>
<user_email>adama@dradisframework.com</user_email>
<user_email>starbuck@dradisframework.com</user_email>
<created_at>1544632331</created_at>
</activity>
</activities>
Expand Down Expand Up @@ -735,12 +735,12 @@ nessus
<activities>
<activity>
<action>update</action>
<user_email>adama@dradisframework.com</user_email>
<user_email>husker@dradisframework.com</user_email>
<created_at>1495866298</created_at>
</activity>
<activity>
<action>update</action>
<user_email>adama@dradisframework.com</user_email>
<user_email>apollo@dradisframework.com</user_email>
<created_at>1495866319</created_at>
</activity>
</activities>
Expand Down Expand Up @@ -790,7 +790,7 @@ nessus
</activity>
<activity>
<action>update</action>
<user_email>adama@dradisframework.com</user_email>
<user_email>husker@dradisframework.com</user_email>
<created_at>1495866279</created_at>
</activity>
</activities>
Expand Down Expand Up @@ -841,7 +841,7 @@ ntp-clock-variables-disclosure
<activities>
<activity>
<action>update</action>
<user_email>adama@dradisframework.com</user_email>
<user_email>starbuck@dradisframework.com</user_email>
<created_at>1495866053</created_at>
</activity>
</activities>
Expand Down Expand Up @@ -880,17 +880,17 @@ qualys
<activities>
<activity>
<action>update</action>
<user_email>adama@dradisframework.com</user_email>
<user_email>helo@dradisframework.com</user_email>
<created_at>1495865750</created_at>
</activity>
<activity>
<action>update</action>
<user_email>adama@dradisframework.com</user_email>
<user_email>boomer@dradisframework.com</user_email>
<created_at>1495866234</created_at>
</activity>
<activity>
<action>update</action>
<user_email>adama@dradisframework.com</user_email>
<user_email>husker@dradisframework.com</user_email>
<created_at>1500144827</created_at>
</activity>
</activities>
Expand Down Expand Up @@ -965,7 +965,7 @@ qualys
<activities>
<activity>
<action>update</action>
<user_email>adama@dradisframework.com</user_email>
<user_email>apollo@dradisframework.com</user_email>
<created_at>1495866407</created_at>
</activity>
</activities>
Expand Down Expand Up @@ -1081,7 +1081,7 @@ qualys
<activities>
<activity>
<action>update</action>
<user_email>adama@dradisframework.com</user_email>
<user_email>starbuck@dradisframework.com</user_email>
<created_at>1495866203</created_at>
</activity>
</activities>
Expand Down
7 changes: 6 additions & 1 deletion lib/tasks/thor/setup.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: '[email protected]').id
default_user_id: User.first.id
)

importer = Dradis::Plugins::Projects::Upload::Template::Importer.new(task_options)
Expand Down