dradis-projects 4.9.0 → 4.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b7835a990963a1839fdd202a226846d24979d5ce56dc9991a0b33b08ca274a2
-  data.tar.gz: cb67cd3c48680a650e5ce2bff9a38abf23cc78cd6f7f00475b1043bd0a244184
+  metadata.gz: 122f2e5016198050c734c2fcd3daff50250c912e327d0a751da9f0be79c684e7
+  data.tar.gz: 15c0ed3e0c1c2c5c0d175bbed8b47ae54cdd8beb280a3b464b8bafa34c625e5a
 SHA512:
-  metadata.gz: 13d379353149b40944deabe88f5da8222a0174e6619f74748f60dc4e0242deb65e20ae977de65cc4b3cc79285a1fbe91168d624df78c604f39d1c2d0f8abc6e7
-  data.tar.gz: b9fe36e2bd9e28c9a242033a6bcb289f1058848e8912cc203711aebb20a518d4b8393cf5aebcd8721f2e66f72108d99ff1b7a2be1ce5edda8859e8777cfa35de
+  metadata.gz: d1b8dc2d1f586f9c15070ec1e935033ee9772dcea50ae4dc5cde9b96a890c578d060538a3f1114c7a817e62b0cb3cf88ec22ccdce5e10884922afbb962653934
+  data.tar.gz: 29ca3d920c202a83810eade83de902287800b7e7530368b18607dfafc947f6386624e6cfefa9b8b5a5df0e573b42019f8a10cbdcb5c4cfe809c286a7612bacc1

data/.github/pull_request_template.md

@@ -0,0 +1,45 @@
+Please review [CONTRIBUTING.md](https://github.com/dradis/dradis-ce/blob/develop/CONTRIBUTING.md) and remove this line.
+
+### Summary
+
+Provide a general description of the code changes in your pull
+request... were there any bugs you had fixed? If so, mention them. If
+these bugs have open GitHub issues, be sure to tag them here as well,
+to keep the conversation linked together.
+
+
+### Testing Steps
+
+Provide steps to test functionality, described in detail for someone not familiar with this part of the application / code base
+
+
+### Other Information
+
+If there's anything else that's important and relevant to your pull
+request, mention that information here. This could include
+benchmarks, or other information.
+
+Thanks for contributing to Dradis!
+
+
+### Copyright assignment
+
+Collaboration is difficult with commercial closed source but we want
+to keep as much of the OSS ethos as possible available to users
+who want to fix it themselves.
+
+In order to unambiguously own and sell Dradis Framework commercial
+products, we must have the copyright associated with the entire
+codebase. Any code you create which is merged must be owned by us.
+That's not us trying to be a jerks, that's just the way it works.
+
+You can delete this section, but the following sentence needs to
+remain in the PR's description:
+
+> I assign all rights, including copyright, to any future Dradis
+> work by myself to Security Roots.
+
+### Check List
+
+- [ ] Added a CHANGELOG entry
+- [ ] Added specs

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+v4.11.0 (January 2024)
+  - No changes
+
+v4.10.0 (September 2023)
+  - Implement handling of project exports directly from Tylium
+  - Update views for compatibility with Font Awesome 6
+  - Update gemspec links
+
 v4.9.0 (June 2023)
   - Update views for compatibility with Bootstrap 5
 

data/README.md

@@ -11,12 +11,12 @@ This plugin will work with any database supported by Rails' ActiveResource data
 
 ## More information
 
-See the Dradis Framework's [README.md](https://github.com/dradis/dradisframework/blob/master/README.md)
+See the Dradis Framework's [README.md](https://github.com/dradis/dradis-ce/blob/develop/README.md)
 
 
 ## Contributing
 
-See the Dradis Framework's [CONTRIBUTING.md](https://github.com/dradis/dradisframework/blob/master/CONTRIBUTING.md)
+See the Dradis Framework's [CONTRIBUTING.md](https://github.com/dradis/dradis-ce/blob/develop/CONTRIBUTING.md)
 
 
 ## License

data/app/controllers/dradis/plugins/projects/packages_controller.rb

@@ -1,14 +1,15 @@
 module Dradis::Plugins::Projects
   class PackagesController < Dradis::Plugins::Export::BaseController
     skip_before_action :validate_scope
+    skip_before_action :validate_template
 
-    def show
+    def create
       filename = Rails.root.join('tmp', 'dradis-export.zip')
 
-      options  = export_params.merge(
+      options = export_params.merge({
         plugin: Dradis::Plugins::Projects,
         scope: :all
-      )
+      })
       exporter = Dradis::Plugins::Projects::Export::Package.new(options)
       template = exporter.export(filename: filename)
 

data/app/controllers/dradis/plugins/projects/templates_controller.rb

@@ -1,8 +1,9 @@
 module Dradis::Plugins::Projects
   class TemplatesController < Dradis::Plugins::Export::BaseController
     skip_before_action :validate_scope
+    skip_before_action :validate_template
 
-    def show
+    def create
       # this allows us to have different exporters in different editions
       exporter_class = Rails.application.config.dradis.projects.template_exporter
 

data/app/views/dradis/plugins/projects/export/_index-content.html.erb

@@ -1,19 +1,15 @@
 <%= content_tag :div, id: 'plugin-projects', class: 'tab-pane fade' do %>
-  <%= form_tag project_export_manager_path(current_project), target: '_blank' do %>
-    <%= hidden_field_tag :plugin, 'projects' %>
+  <h4 class="header-underline mb-0">Ready when you are!</h4>
 
-    <h4 class="header-underline">Choose an export option</h4>
+  <div class="mt-4">
+    <%= form_tag dradis_projects.project_package_path(current_project), class: 'd-inline' do %>
+      <button id="export-button" class="btn btn-lg btn-primary">Export All as Package</button>
+    <% end %>
 
-    <div class="form-check">
-      <%= radio_button_tag :route, :package, true, :class => 'form-check-input' %>
-      <label class="form-check-label" for='route_package'>Package</label>
-    </div>
+    or
 
-    <div class="form-check">
-      <%= radio_button_tag :route, :template, false, :class => 'form-check-input' %>
-      <label class="form-check-label" for='route_template'>Template</label>
-    </div>
-
-    <button id="export-button" class="btn btn-lg btn-primary mt-4">Export All Records</button>
-  <% end %>
+    <%= form_tag dradis_projects.project_template_path(current_project), class: 'd-inline' do %>
+      <button id="export-button" class="btn btn-lg">Export All as Template</button>
+    <% end %>
+  </div>
 <% end%>

data/app/views/dradis/plugins/projects/export/_index-tabs.html.erb

@@ -1,3 +1,3 @@
 <li class='nav-item'>
-  <a href='#plugin-projects' class='nav-link' data-bs-toggle='tab'>Project</a>
+  <a href='#plugin-projects' class='nav-link' data-bs-toggle='tab'><i class="fa-solid fa-file-zipper fa-fw"></i>Project</a>
 </li>

data/config/routes.rb

@@ -1,4 +1,6 @@
 Dradis::Plugins::Projects::Engine.routes.draw do
-  resource :package,  only: [:show]
-  resource :template, only: [:show]
+  resources :projects, only: [] do
+    resource :package,  only: [:create], path: '/export/projects/package'
+    resource :template, only: [:create], path: '/export/projects/template'
+  end
 end

data/dradis-projects.gemspec

@@ -4,7 +4,7 @@ require 'dradis/plugins/projects/version'
 
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |spec|
-  spec.platform      = Gem::Platform::RUBY
+  spec.platform = Gem::Platform::RUBY
   spec.name = 'dradis-projects'
   spec.version = Dradis::Plugins::Projects::VERSION::STRING
   spec.summary = 'Project export/upload for the Dradis Framework.'
@@ -13,11 +13,10 @@ Gem::Specification.new do |spec|
   spec.license = 'GPL-2'
 
   spec.authors = ['Daniel Martin']
-  spec.email = ['etd@nomejortu.com']
-  spec.homepage = 'http://dradisframework.org'
+  spec.homepage = 'https://dradis.com/ce/'
 
   spec.files = `git ls-files`.split($\)
-  spec.executables = spec.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  spec.executables = spec.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
 
   spec.add_development_dependency 'bundler', '~> 2.2'

data/lib/dradis/plugins/projects/engine.rb

@@ -12,17 +12,16 @@ module Dradis
 
         initializer 'dradis-projects.mount_engine' do
           Rails.application.routes.append do
-            mount Dradis::Plugins::Projects::Engine => '/export/projects'
+            mount Dradis::Plugins::Projects::Engine => '/', as: :dradis_projects
           end
         end
 
-        initializer "dradis-projects.set_configs" do |app|
+        initializer 'dradis-projects.set_configs' do |app|
           options = app.config.dradis.projects
           options.template_exporter ||= Dradis::Plugins::Projects::Export::V4::Template
           options.template_uploader ||= Dradis::Plugins::Projects::Upload::V4::Template::Importer
         end
 
-
         # Because this plugin provides two export modules, we have to overwrite
         # the default .uploaders() method.
         #

data/lib/dradis/plugins/projects/gem_version.rb

@@ -8,11 +8,11 @@ module Dradis
 
       module VERSION
         MAJOR = 4
-        MINOR = 9
+        MINOR = 11
         TINY = 0
         PRE = nil
 
-        STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
+        STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dradis-projects
 version: !ruby/object:Gem::Version
-  version: 4.9.0
+  version: 4.11.0
 platform: ruby
 authors:
 - Daniel Martin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-31 00:00:00.000000000 Z
+date: 2024-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,11 +97,11 @@ dependencies:
 description: This plugin allows you to dump the contents of the repo into a zip archive
   and restore the state from one of them.
 email:
-- etd@nomejortu.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/pull_request_template.md"
 - ".gitignore"
 - ".ruby-version"
 - CHANGELOG.md
@@ -146,11 +146,11 @@ files:
 - spec/lib/dradis/plugins/projects/upload/v1/template_spec.rb
 - spec/lib/dradis/plugins/projects/upload/v2/template_spec.rb
 - spec/lib/dradis/plugins/projects/upload/v4/template_spec.rb
-homepage: http://dradisframework.org
+homepage: https://dradis.com/ce/
 licenses:
 - GPL-2
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -165,8 +165,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Project export/upload for the Dradis Framework.
 test_files: