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.

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

[develop] Release 4.10 #1170

Merged
merged 30 commits into from
Sep 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
f97acd0
Validate that issue cannot be on a different project than node's project
Nov 1, 2021
4e6cd5b
Fix evidence factory
Nov 1, 2021
4087edc
Add project to issue factory object
Nov 1, 2021
f8c3593
Merge branch 'main' into validate-evidence-issue-id
Nov 2, 2021
351a08d
Add changelog entry
Nov 2, 2021
96ea6b5
Fix typo
Nov 2, 2021
d50bf5c
Update changelog entry
Nov 2, 2021
8664a00
Backport spec changes
Nov 3, 2021
bae7c77
Rename validation method to something friendlier
Nov 8, 2021
709b856
Delete project call to node
Nov 8, 2021
8fbb7e8
Update spec expectation message
Nov 8, 2021
1d47707
Improve changelog language. Rename validation method name.
Nov 9, 2021
4173c39
Remove redundant language in changelog
Nov 10, 2021
35ce083
Merge pull request #6 from secroots/validate-evidence-issue-id
Nov 10, 2021
de2021b
Merge remote-tracking branch 'ce/main'
aapomm Dec 14, 2021
6534723
Merge branch 'main' of github.com:secroots/dradis-shadow
aapomm Jul 21, 2023
d34c1db
Merge remote-tracking branch 'ce/develop' into develop
aapomm Jul 21, 2023
52d5935
Update changelog
aapomm Jul 21, 2023
db7de8d
Update severity to medium
aapomm Jul 27, 2023
59e9d18
Bump version and update changelog
aapomm Aug 18, 2023
52d35eb
Merge branch 'develop' into release-4.10.0
aapomm Aug 30, 2023
fe794de
Update CHANGELOG
aapomm Aug 30, 2023
ca14908
Update Gemfile.lock
aapomm Aug 30, 2023
637829b
Merge pull request #16 from secroots/4.10-security-report
aapomm Aug 30, 2023
e02262b
Update changelog
aapomm Aug 30, 2023
c205581
add issue.author to issue drop
caitmich Sep 1, 2023
c9190d3
update Gemfile to fetxh 4.10.0 gems from rubygems
caitmich Sep 7, 2023
f815542
Merge branch 'develop' of github.com:dradis/dradis-ce into release-4.…
caitmich Sep 7, 2023
e134711
bump dradis-html_export
caitmich Sep 8, 2023
dc8a4bc
add no_templates partial so that html_export doesn't throw error
caitmich Sep 8, 2023
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
30 changes: 8 additions & 22 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,31 +1,15 @@
[v#.#.#] ([month] [YYYY])
- Tylium: Consolidate sidebars
v4.10.0 (September 2023)
- Tylium:
- Consolidate sidebars
- Add issue.author to liquid issue drop
- Upgraded gems:
- font-awesome-sass, nokogiri, puma, rails, sanitize, selenium-webdriver
- Bugs fixes:
- QA:
- Enable @mentions and formatting toolbar for comments in QA show views
- Updated link to QA guide
- [entity]:
- [future tense verb] [bug fix]
- Bug tracker items:
- [item]
- New integrations:
- [integration]
- Integration enhancements:
- [integration]:
- [future tense verb] [integration enhancement]
- [integration bug fixes]:
- [future tense verb] [integration bug fix]
- Reporting enhancements:
- [report type]:
- [future tense verb] [reporting enhancement]
- QA: Enable @mentions and formatting toolbar for comments in QA show views
- REST/JSON API enhancements:
- Boards, Lists, Cards: add initial implementation
- Security Fixes:
- High: (Authenticated|Unauthenticated) (admin|author|contributor) [vulnerability description]
- Medium: (Authenticated|Unauthenticated) (admin|author|contributor) [vulnerability description]
- Low: (Authenticated|Unauthenticated) (admin|author|contributor) [vulnerability description]
- Medium: Authenticated (author) broken access control: read access to system files

v4.9.0 (June 2023)
- Tylium: Extend support for Liquid Dynamic Content
Expand Down Expand Up @@ -219,6 +203,8 @@ v4.1.0 (November 2021)
- Remove orphaned <b> tags
- Security Fixes:
- High: Authenticated author broken access control: read access to issue content
- Medium: (Authenticated|Unauthenticated) (admin|author|contributor) [vulnerability description]
- Low: (Authenticated|Unauthenticated) (admin|author|contributor) [vulnerability description]

v4.0.0 (July 2021)
* Dynamic content across the app
Expand Down
51 changes: 25 additions & 26 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -215,12 +215,12 @@ end
#

# Base framework classes required by other plugins
gem 'dradis-plugins', '~> 4.9.0'
gem 'dradis-plugins', '~> 4.10.0'

gem 'dradis-api', path: 'engines/dradis-api'

# Import / export project data
gem 'dradis-projects', '~> 4.9.0'
gem 'dradis-projects', '~> 4.10.0'

plugins_file = 'Gemfile.plugins'
if File.exists?(plugins_file)
Expand All @@ -232,33 +232,32 @@ end

# ----------------------------------------------------------------- Calculators

# Update these to v4.10.0 before release
gem 'dradis-calculator_cvss', github: 'dradis/dradis-calculator_cvss'
gem 'dradis-calculator_dread', github: 'dradis/dradis-calculator_dread'
gem 'dradis-calculator_cvss', '~> 4.10.0'
gem 'dradis-calculator_dread', '~> 4.10.0'

# ---------------------------------------------------------------------- Export
gem 'dradis-csv_export', '~> 4.9.0'
gem 'dradis-html_export', '~> 4.9.1'
gem 'dradis-csv_export', '~> 4.10.0'
gem 'dradis-html_export', '~> 4.10.1'

# ---------------------------------------------------------------------- Import
gem 'dradis-csv', '~> 4.9.0'
gem 'dradis-csv', '~> 4.10.0'

# ---------------------------------------------------------------------- Upload
gem 'dradis-acunetix', '~> 4.9.0'
gem 'dradis-brakeman', '~> 4.9.0'
gem 'dradis-burp', '~> 4.9.0'
gem 'dradis-coreimpact', '~> 4.9.0'
gem 'dradis-metasploit', '~> 4.9.0'
gem 'dradis-nessus', '~> 4.9.0'
gem 'dradis-netsparker', '~> 4.9.0'
gem 'dradis-nexpose', '~> 4.9.0'
gem 'dradis-nikto', '~> 4.9.0'
gem 'dradis-nipper', '~> 4.9.0'
gem 'dradis-nmap', '~> 4.9.0'
gem 'dradis-ntospider', '~> 4.9.0'
gem 'dradis-openvas', '~> 4.9.0'
gem 'dradis-qualys', '~> 4.9.0'
gem 'dradis-saint', '~> 4.9.0'
gem 'dradis-veracode', '~> 4.9.0'
gem 'dradis-wpscan', '~> 4.9.0'
gem 'dradis-zap', '~> 4.9.0'
gem 'dradis-acunetix', '~> 4.10.0'
gem 'dradis-brakeman', '~> 4.10.0'
gem 'dradis-burp', '~> 4.10.0'
gem 'dradis-coreimpact', '~> 4.10.0'
gem 'dradis-metasploit', '~> 4.10.0'
gem 'dradis-nessus', '~> 4.10.0'
gem 'dradis-netsparker', '~> 4.10.0'
gem 'dradis-nexpose', '~> 4.10.0'
gem 'dradis-nikto', '~> 4.10.0'
gem 'dradis-nipper', '~> 4.10.0'
gem 'dradis-nmap', '~> 4.10.0'
gem 'dradis-ntospider', '~> 4.10.0'
gem 'dradis-openvas', '~> 4.10.0'
gem 'dradis-qualys', '~> 4.10.0'
gem 'dradis-saint', '~> 4.10.0'
gem 'dradis-veracode', '~> 4.10.0'
gem 'dradis-wpscan', '~> 4.10.0'
gem 'dradis-zap', '~> 4.10.0'
116 changes: 53 additions & 63 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,21 +1,7 @@
GIT
remote: https://github.com/dradis/dradis-calculator_cvss.git
revision: 8d2ffb5047b03b1ef015c450597a4828f80209b5
specs:
dradis-calculator_cvss (4.9.0)
dradis-plugins (~> 4.0)

GIT
remote: https://github.com/dradis/dradis-calculator_dread.git
revision: 241855179610221f021d065427515e4df7057f22
specs:
dradis-calculator_dread (4.9.0)
dradis-plugins (~> 4.0)

PATH
remote: engines/dradis-api
specs:
dradis-api (4.9.0)
dradis-api (4.10.0)
jbuilder

GEM
Expand Down Expand Up @@ -131,67 +117,71 @@ GEM
date (3.3.3)
diff-lcs (1.5.0)
differ (0.1.2)
dradis-acunetix (4.9.0)
dradis-acunetix (4.10.0)
dradis-plugins (~> 4.0)
nokogiri (~> 1.3)
dradis-brakeman (4.9.0)
dradis-brakeman (4.10.0)
dradis-plugins (~> 4.0)
dradis-burp (4.9.0)
dradis-burp (4.10.0)
dradis-plugins (~> 4.0)
nokogiri (~> 1.3)
dradis-coreimpact (4.9.0)
dradis-calculator_cvss (4.10.0)
dradis-plugins (~> 4.0)
dradis-calculator_dread (4.10.0)
dradis-plugins (~> 4.0)
dradis-coreimpact (4.10.0)
dradis-plugins (~> 4.0)
dradis-csv (4.9.0)
dradis-csv (4.10.0)
dradis-plugins (~> 4.0)
dradis-csv_export (4.9.0)
dradis-csv_export (4.10.0)
dradis-plugins (>= 4.8.0)
dradis-html_export (4.9.1)
dradis-html_export (4.10.1)
RedCloth (~> 4.3.2)
dradis-plugins (>= 4.8.0)
rails_autolink (~> 1.1)
dradis-metasploit (4.9.0)
dradis-metasploit (4.10.0)
dradis-plugins (~> 4.0)
nokogiri (~> 1.3)
dradis-nessus (4.9.0)
dradis-nessus (4.10.0)
dradis-plugins (~> 4.0)
nokogiri
dradis-netsparker (4.9.0)
dradis-netsparker (4.10.0)
dradis-plugins (~> 4.0)
nokogiri (>= 1.12.5)
dradis-nexpose (4.9.0)
dradis-nexpose (4.10.0)
dradis-plugins (~> 4.0)
nokogiri (~> 1.3)
dradis-nikto (4.9.0)
dradis-nikto (4.10.0)
dradis-plugins (~> 4.0)
nokogiri (~> 1.3)
dradis-nipper (4.9.0)
dradis-nipper (4.10.0)
dradis-plugins (~> 4.0)
dradis-nmap (4.9.0)
dradis-nmap (4.10.0)
dradis-plugins (~> 4.0)
ruby-nmap (~> 0.7)
dradis-ntospider (4.9.0)
dradis-ntospider (4.10.0)
dradis-plugins (~> 4.0)
dradis-openvas (4.9.0)
dradis-openvas (4.10.0)
dradis-plugins (~> 4.0)
dradis-plugins (4.9.0)
dradis-projects (4.9.0)
dradis-plugins (4.10.0)
dradis-projects (4.10.0)
dradis-plugins (>= 4.8.0)
rubyzip
dradis-qualys (4.9.0)
dradis-qualys (4.10.0)
dradis-plugins (~> 4.0)
nokogiri (~> 1.3)
dradis-saint (4.9.0)
dradis-saint (4.10.0)
combustion (~> 0.6.0)
dradis-plugins (~> 4.0)
nokogiri
rake (~> 13.0)
rspec-rails
dradis-veracode (4.9.0)
dradis-veracode (4.10.0)
dradis-plugins (~> 4.0)
dradis-wpscan (4.9.0)
dradis-wpscan (4.10.0)
dradis-plugins (~> 4.0)
multi_json
dradis-zap (4.9.0)
dradis-zap (4.10.0)
dradis-plugins (~> 4.0)
nokogiri (~> 1.3)
erubi (1.12.0)
Expand Down Expand Up @@ -530,32 +520,32 @@ DEPENDENCIES
coffee-rails (~> 5.0)
database_cleaner
differ (~> 0.1.2)
dradis-acunetix (~> 4.9.0)
dradis-acunetix (~> 4.10.0)
dradis-api!
dradis-brakeman (~> 4.9.0)
dradis-burp (~> 4.9.0)
dradis-calculator_cvss!
dradis-calculator_dread!
dradis-coreimpact (~> 4.9.0)
dradis-csv (~> 4.9.0)
dradis-csv_export (~> 4.9.0)
dradis-html_export (~> 4.9.1)
dradis-metasploit (~> 4.9.0)
dradis-nessus (~> 4.9.0)
dradis-netsparker (~> 4.9.0)
dradis-nexpose (~> 4.9.0)
dradis-nikto (~> 4.9.0)
dradis-nipper (~> 4.9.0)
dradis-nmap (~> 4.9.0)
dradis-ntospider (~> 4.9.0)
dradis-openvas (~> 4.9.0)
dradis-plugins (~> 4.9.0)
dradis-projects (~> 4.9.0)
dradis-qualys (~> 4.9.0)
dradis-saint (~> 4.9.0)
dradis-veracode (~> 4.9.0)
dradis-wpscan (~> 4.9.0)
dradis-zap (~> 4.9.0)
dradis-brakeman (~> 4.10.0)
dradis-burp (~> 4.10.0)
dradis-calculator_cvss (~> 4.10.0)
dradis-calculator_dread (~> 4.10.0)
dradis-coreimpact (~> 4.10.0)
dradis-csv (~> 4.10.0)
dradis-csv_export (~> 4.10.0)
dradis-html_export (~> 4.10.1)
dradis-metasploit (~> 4.10.0)
dradis-nessus (~> 4.10.0)
dradis-netsparker (~> 4.10.0)
dradis-nexpose (~> 4.10.0)
dradis-nikto (~> 4.10.0)
dradis-nipper (~> 4.10.0)
dradis-nmap (~> 4.10.0)
dradis-ntospider (~> 4.10.0)
dradis-openvas (~> 4.10.0)
dradis-plugins (~> 4.10.0)
dradis-projects (~> 4.10.0)
dradis-qualys (~> 4.10.0)
dradis-saint (~> 4.10.0)
dradis-veracode (~> 4.10.0)
dradis-wpscan (~> 4.10.0)
dradis-zap (~> 4.10.0)
factory_bot_rails
font-awesome-sass (~> 6.4.0)
foreman
Expand Down
2 changes: 1 addition & 1 deletion app/drops/issue_drop.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
class IssueDrop < BaseDrop
delegate :fields, :text, :title, to: :@record
delegate :author, :fields, :text, :title, to: :@record

def affected
@affected ||= @record.affected.map { |node| NodeDrop.new(node) }
Expand Down
11 changes: 11 additions & 0 deletions app/views/export/_no_templates.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<div class="alert alert-warning m-0">
<p>
This exporter doesn't have any report templates yet.
<% if current_user.respond_to?(:role?) && current_user.role?(:admin) %>
<%= link_to 'Upload a template', main_app.admin_templates_reports_path(tab: plugin_name) %>, then try again.
<% else %>
Please contact your administrator.
<% end %>
</p>
<p>Read more about <%= link_to 'report templates', 'https://dradisframework.com/support/guides/administration/report_templates.html', target: '_blank' %>.</p>
</div>
2 changes: 1 addition & 1 deletion lib/dradis/ce/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module Dradis
module CE #:nodoc:
module VERSION #:nodoc:
MAJOR = 4
MINOR = 9
MINOR = 10
TINY = 0
PRE = nil

Expand Down