dradis-projects 4.14.0 → 4.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc08cdd25606e30fbe5140b94caae58fcdb47c444df31990c05c31108ae61632
-  data.tar.gz: 79ce2d61a16d95fa88bee80cbad4d74322e26106b14096979e2c9131ff6b991c
+  metadata.gz: 37d6e976fe4ffd84c283a90f731eebe6bc4c080834e05054ca9c89402afcb994
+  data.tar.gz: d4415dd2c527f90ad4ed2e3faa28d7cedab9f319a7ffb1a176b88e50282a08dd
 SHA512:
-  metadata.gz: 80f82da31dc43851eb9057c3a5430ca5256d85392af99fd044533de7b4e270e900e5937b05c7d5320c02ec9f6caa5d978f4997d1c48a2f98fd6f45e825e52907
-  data.tar.gz: 74947d4a7c06e1edaffa5610f25e0d7a9a372c5a00100ee6b5b82c0e90f7220bcd5d9218c30e05e6fb58bf2e57d6e68349c4af545104071c5dbd3d954d37b54d
+  metadata.gz: 9fc6816b6ed95bda3c4b53b77b61ba8cbc941e0515450e55397cd41eac01ccf41f5ea2faf14a583b6cc9ab3882e20e038f856234374b19495a4130e993ea74e3
+  data.tar.gz: f6a1d560f01235671ec3698ad03e365b814ccac8333f8ac808396b6b7264c197a1f69f37bb931d585955da7a158ca4d6708a7d7d83049d3a3224b5db59552cab

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+v4.15.0 (December 2024)
+  - Update tag position values on template upload
+
 v4.14.0 (October 2024)
   - No changes
 

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

@@ -8,7 +8,7 @@ module Dradis
 
       module VERSION
         MAJOR = 4
-        MINOR = 14
+        MINOR = 15
         TINY = 0
         PRE = nil
 

data/lib/dradis/plugins/projects/upload/v4/template.rb

@@ -383,11 +383,14 @@ module Dradis::Plugins::Projects::Upload::V4
       def parse_tags(template)
         logger.info { 'Processing Tags...' }
 
-        template.xpath('dradis-template/tags/tag').each do |xml_tag|
+        template.xpath('dradis-template/tags/tag').each.with_index(1) do |xml_tag, index|
           name = xml_tag.at_xpath('name').text()
           tag_params = { name: name }
           tag_params[:project_id] = project.id if Tag.has_attribute?(:project_id)
+
           tag = Tag.where(tag_params).first_or_create
+          tag.update(position: index) unless tag.position == index
+
           logger.info { "New tag detected: #{name}" }
 
           xml_tag.xpath('./taggings/tagging').each do |xml_tagging|

data/spec/fixtures/files/attachments_url.xml

@@ -12,4 +12,4 @@ Test Issue
 !/nodes/5/attachments/hello.jpg!
 
 ]]></text><activities></activities><comments></comments></issue></issues><methodologies></methodologies><categories>
-<category><id>2</id><name>Issue description</name></category></categories><tags><tag><id>1</id><name>!9467bd_critical</name><taggings></taggings></tag><tag><id>2</id><name>!d62728_high</name><taggings></taggings></tag><tag><id>3</id><name>!ff7f0e_medium</name><taggings></taggings></tag><tag><id>4</id><name>!6baed6_low</name><taggings></taggings></tag><tag><id>5</id><name>!2ca02c_info</name><taggings></taggings></tag></tags></dradis-template>
+<category><id>2</id><name>Issue description</name></category></categories><tags/></dradis-template>

data/spec/fixtures/files/with_tags.xml

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dradis-template version="2">
+  <nodes>
+    <node>
+      <id>5</id>
+      <label>Uploaded files</label>
+      <parent-id />
+      <position>0</position>
+      <properties><![CDATA[{
+}]]></properties>
+      <type-id>0</type-id>
+      <notes></notes>
+      <evidence></evidence>
+      <activities></activities>
+    </node>
+  </nodes>
+  <issues>
+    <issue>
+      <id>2</id>
+      <author>admin@securityroots.com</author>
+      <text><![CDATA[#[Title]#
+        Test Issue
+        #[Description]#
+        hello world]]>
+      </text>
+      <activities></activities>
+      <comments></comments>
+    </issue>
+  </issues>
+  <methodologies></methodologies>
+  <categories>
+    <category>
+      <id>2</id>
+      <name>Issue description</name>
+    </category>
+  </categories>
+  <tags>
+    <tag>
+      <id>1</id>
+      <name>!2ca02c_info</name>
+      <taggings></taggings>
+    </tag>
+    <tag>
+      <id>2</id>
+      <name>!ff7f0e_medium</name>
+      <taggings></taggings>
+    </tag>
+    <tag>
+      <id>3</id>
+      <name>!d62728_high</name>
+      <taggings></taggings>
+    </tag>
+    <tag>
+      <id>4</id>
+      <name>!6baed6_low</name>
+      <taggings></taggings>
+    </tag>
+    <tag>
+      <id>5</id>
+      <name>!9467bd_critical</name>
+      <taggings></taggings>
+    </tag>
+  </tags>
+</dradis-template>

data/spec/lib/dradis/plugins/projects/upload/v4/template_spec.rb

@@ -7,6 +7,13 @@ describe 'Dradis::Plugins::Projects::Upload::V4::Template::Importer' do
   let(:project) { create(:project) }
   let(:user) { create(:user) }
   let(:importer_class) { Dradis::Plugins::Projects::Upload::Template }
+  let(:importer) do
+    importer_class::Importer.new(
+      default_user_id: user.id,
+      plugin: importer_class,
+      project_id: project.id
+    )
+  end
 
   context 'uploading a template with attachments url' do
     let(:file_path) do
@@ -14,12 +21,6 @@ describe 'Dradis::Plugins::Projects::Upload::V4::Template::Importer' do
     end
 
     it 'converts the urls' do
-      importer = importer_class::Importer.new(
-        default_user_id: user.id,
-        plugin: importer_class,
-        project_id: project.id
-      )
-
       importer.import(file: file_path)
 
       p_id = project.id
@@ -40,12 +41,6 @@ describe 'Dradis::Plugins::Projects::Upload::V4::Template::Importer' do
     end
 
     it 'returns false' do
-      importer = importer_class::Importer.new(
-        default_user_id: user.id,
-        plugin: importer_class,
-        project_id: project.id
-      )
-
       expect(importer.import(file: file_path)).to be false
     end
   end
@@ -87,12 +82,6 @@ describe 'Dradis::Plugins::Projects::Upload::V4::Template::Importer' do
     end
 
     before do
-      importer = importer_class::Importer.new(
-        default_user_id: user.id,
-        plugin: importer_class,
-        project_id: project.id
-      )
-
       importer.import(file: file_path)
     end
 
@@ -132,17 +121,9 @@ describe 'Dradis::Plugins::Projects::Upload::V4::Template::Importer' do
       File.join(File.dirname(__FILE__), '../../../../../../', 'fixtures', 'files')
     end
 
-    before do
-      @importer = importer_class::Importer.new(
-        default_user_id: user.id,
-        plugin: importer_class,
-        project_id: project.id
-      )
-    end
-
     context 'uploading a template without states' do
       it 'imports issues with the published state' do
-        @importer.import(file: File.join(dir, 'with_comments.xml'))
+        importer.import(file: File.join(dir, 'with_comments.xml'))
         issue = project.issues.first
         expect(issue.state).to eq('published')
       end
@@ -151,7 +132,7 @@ describe 'Dradis::Plugins::Projects::Upload::V4::Template::Importer' do
     context 'uploading a template with states' do
       context 'valid states' do
         it 'imports issues with states from the template' do
-          @importer.import(file: File.join(dir, 'with_states.xml'))
+          importer.import(file: File.join(dir, 'with_states.xml'))
           issue = project.issues.first
           expect(issue.state).to eq('ready_for_review')
         end
@@ -159,10 +140,36 @@ describe 'Dradis::Plugins::Projects::Upload::V4::Template::Importer' do
 
       context 'invalid states' do
         it 'does not import the issue' do
-          @importer.import(file: File.join(dir, 'with_invalid_states.xml'))
+          importer.import(file: File.join(dir, 'with_invalid_states.xml'))
           expect(project.issues.count).to eq(0)
         end
       end
     end
   end
+
+  describe 'tags' do
+    let(:file_path) do
+      File.join(
+        File.dirname(__FILE__),
+        '../../../../../../',
+        'fixtures',
+        'files',
+        'with_tags.xml'
+      )
+    end
+
+    it 'updates project tags according to the order in the template' do
+      importer.import(file: file_path)
+
+      tag_values = project.tags.pluck(:name, :position)
+      expected_values = [
+        ["!2ca02c_info", 1],
+        ["!ff7f0e_medium", 2],
+        ["!d62728_high", 3],
+        ["!6baed6_low", 4],
+        ["!9467bd_critical", 5]
+      ]
+      expect(tag_values).to eq(expected_values)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dradis-projects
 version: !ruby/object:Gem::Version
-  version: 4.14.0
+  version: 4.15.0
 platform: ruby
 authors:
 - Daniel Martin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-21 00:00:00.000000000 Z
+date: 2024-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -141,6 +141,7 @@ files:
 - spec/fixtures/files/with_comments.xml
 - spec/fixtures/files/with_invalid_states.xml
 - spec/fixtures/files/with_states.xml
+- spec/fixtures/files/with_tags.xml
 - spec/lib/dradis/plugins/projects/export/v2/template_spec.rb
 - spec/lib/dradis/plugins/projects/export/v4/template_spec.rb
 - spec/lib/dradis/plugins/projects/upload/v1/template_spec.rb
@@ -176,6 +177,7 @@ test_files:
 - spec/fixtures/files/with_comments.xml
 - spec/fixtures/files/with_invalid_states.xml
 - spec/fixtures/files/with_states.xml
+- spec/fixtures/files/with_tags.xml
 - spec/lib/dradis/plugins/projects/export/v2/template_spec.rb
 - spec/lib/dradis/plugins/projects/export/v4/template_spec.rb
 - spec/lib/dradis/plugins/projects/upload/v1/template_spec.rb