abide_dev_utils 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6f05434761a55369ffb231c1573ba627aa5c9ebef29d198ccfa16c422d05c48
-  data.tar.gz: 534968456e7eefca691fa6a3cdc46a170dc3ee12060261225fc35adadbc27d18
+  metadata.gz: 1e93a77cf4142b06ee4d41863ef2d0b737d21d37306b57082aa316f2731de5e9
+  data.tar.gz: 9b49e05aa575884d54efed8fd70b5662712845c083a8b59caeccf406a19f5633
 SHA512:
-  metadata.gz: b9907ee602b3367d4692b5c2102f0c769614f33d22980d5b8c0a14ea7dd15ac19947800eed399e6d68215ea2c21ab670b233209bf62e79399795fc5cc0ca68c2
-  data.tar.gz: edbeac0d044795300b42ac1ddd70623abc9c9e7d322ecf1e5d6356c8b4f875a31e31e02c96397b0bc9ee1a6a815fa342401916d9f87696f0ad68f0bd9d887b75
+  metadata.gz: 51316ad752020f3b2297acbdc4bb328c5275d03e499721ee12381aaac5da3a6e77ecb9efeb0ffa4b3b6bb512154dbb4b36bf249f4816944a0110d3ceeb871b2b
+  data.tar.gz: 40b83d7be09ccb1349650617548276f6f34e266fe2e590e8c1b28b8e9c44f4499c93652abf9e254d77469fec9c98e9394a1ae2f4b2d3f0921827c3ce302dfb7e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    abide_dev_utils (0.12.1)
+    abide_dev_utils (0.12.2)
       amatch (~> 0.4)
       cmdparse (~> 3.0)
       facterdb (>= 1.18)

data/lib/abide_dev_utils/cem/generate/reference.rb

@@ -120,7 +120,11 @@ module AbideDevUtils
           private
 
           def heading_builder
-            @md.add_h2("#{@control.number} - #{@control.title}")
+            if @framework == 'stig'
+              @md.add_h2(@control.id)
+            else
+              @md.add_h2("#{@control.number} - #{@control.title}")
+            end
           end
 
           def control_has_valid_params?
@@ -216,12 +220,13 @@ module AbideDevUtils
             end
             return if out_str.empty?
 
-            out_str.unshift("    #{@control.title.dump}:")
+            @control.title.nil? ? out_str.unshift("    #{@control.id.dump}:") : out_str.unshift("    #{@control.title.dump}:")
             out_str.unshift('  control_configs:')
             out_str.unshift("#{@module_name}::config:")
             @md.add_ul('Hiera Configuration Example:')
             @md.add_code_block(out_str.join("\n"), language: 'yaml')
           rescue StandardError => e
+            require 'pry'; binding.pry
             err_msg = [
               "Failed to generate config example for control #{@control.id}",
               "Error: #{e.message}",

data/lib/abide_dev_utils/cem/mapping/mapper.rb

@@ -6,13 +6,13 @@ require 'abide_dev_utils/cem/hiera_data/mapping_data/mixins'
 module AbideDevUtils
   module CEM
     module Mapping
-      ALL_TYPES = %w[hiera_title_num number hiera_title vulnid title].freeze
+      ALL_TYPES = %w[hiera_title_num number hiera_title title vulnid ruleid].freeze
       FRAMEWORK_TYPES = {
         'cis' => %w[hiera_title_num number hiera_title title],
-        'stig' => %w[hiera_title_num number hiera_title vulnid title],
+        'stig' => %w[vulnid ruleid],
       }.freeze
       CIS_TYPES = %w[hiera_title_num number hiera_title title].freeze
-      STIG_TYPES = %w[hiera_title_num number hiera_title vulnid title].freeze
+      STIG_TYPES = %w[vulnid ruleid].freeze
 
       # Represents a single map data file
       class MapData
@@ -168,6 +168,8 @@ module AbideDevUtils
             'hiera_title'
           when %r{^V-[0-9]{6}$}
             'vulnid'
+          when %r{^SV-[0-9]+r[0-9]+_rule$}
+            'ruleid'
           else
             'title'
           end

data/lib/abide_dev_utils/cli/jira.rb

@@ -22,6 +22,7 @@ module Abide
         add_command(JiraGetIssueCommand.new)
         add_command(JiraNewIssueCommand.new)
         add_command(JiraFromCoverageCommand.new)
+        add_command(JiraFromXccdfCommand.new)
       end
     end
 
@@ -113,5 +114,26 @@ module Abide
         end
       end
     end
+
+    class JiraFromXccdfCommand < CmdParse::Command
+      CMD_NAME = 'from_xccdf'
+      CMD_SHORT = 'Creates a parent issue with subtasks from a xccdf file'
+      CMD_LONG = 'Creates a parent issue with subtasks for a benchmark and any uncovered controls'
+      def initialize
+        super(CMD_NAME, takes_commands: false)
+        short_desc(CMD_SHORT)
+        long_desc(CMD_LONG)
+        argument_desc(PATH: 'An XCCDF file from the abide puppet ticket coverage command', PROJECT: 'A Jira project')
+        options.on('-d', '--dry-run', 'Print to console instead of saving objects') { |_| @data[:dry_run] = true }
+      end
+
+      def execute(path, project)
+        Abide::CLI::VALIDATE.file(path)
+        @data[:dry_run] = false if @data[:dry_run].nil?
+        client = JIRA.client(options: {})
+        proj = JIRA.project(client, project)
+        JIRA.new_issues_from_xccdf(client, proj, path, dry_run: @data[:dry_run])
+      end
+    end
   end
 end

data/lib/abide_dev_utils/jira.rb

@@ -135,6 +135,36 @@ module AbideDevUtils
       end
     end
 
+    def self.new_issues_from_xccdf(client, project, xccdf_path, dry_run: false)
+      dr_prefix = dry_run ? 'DRY RUN: ' : ''
+      i_attrs = all_project_issues_attrs(project)
+
+      xccdf = AbideDevUtils::XCCDF::Benchmark.new(xccdf_path)
+
+      summaries = summaries_from_xccdf(xccdf)
+      summaries.each do |profile_summary, control_summaries|
+        if summary_exist?(profile_summary, i_attrs)
+          AbideDevUtils::Output.simple("#{dr_prefix}Skipping #{profile_summary} as it already exists")
+          next
+        end
+
+        parent = new_issue(client, project.attrs['key'], profile_summary, dry_run: dry_run)
+        AbideDevUtils::Output.simple("#{dr_prefix}Created parent issue #{profile_summary}")
+        parent_issue = issue(client, parent.attrs['key']) unless parent.respond_to?(:dummy)
+        AbideDevUtils::Output.simple("#{dr_prefix}Creating subtasks, this can take a while...")
+        progress = AbideDevUtils::Output.progress(title: "#{dr_prefix}Creating Subtasks", total: nil)
+        control_summaries.each do |control_summary|
+          next if summary_exist?(control_summary, i_attrs)
+
+          progress.title = "#{dr_prefix}#{control_summary}"
+          new_subtask(client, parent_issue, control_summary, dry_run: dry_run)
+          progress.increment
+        end
+        final_text = "#{dr_prefix}Created #{control_summaries.count} subtasks for #{profile_summary}"
+        puts "\r\033[K#{final_text}\n"
+      end
+    end
+
     # def self.new_issues_from_comply_report(client, project, report, dry_run: false)
     #   dr_prefix = dry_run ? 'DRY RUN: ' : ''
     #   i_attrs = all_project_issues_attrs(project)
@@ -177,6 +207,21 @@ module AbideDevUtils
       summaries.transform_keys { |k| "#{COV_PARENT_SUMMARY_PREFIX}#{benchmark}-#{k}"}
     end
 
+    def self.summaries_from_xccdf(xccdf)
+      summaries = {}
+      facter_os = xccdf.facter_benchmark.join('-')
+      xccdf.profiles.each do |profile|
+        summaries["#{COV_PARENT_SUMMARY_PREFIX}#{facter_os} - #{profile.level} #{profile.title}"] = profile.controls.collect do |control|
+          summary = "#{COV_CHILD_SUMMARY_PREFIX}#{control.vulnid} - #{control.title}"
+          if summary.length > 255
+            summary = summary[0..251] + '...'
+          end
+          summary
+        end
+      end
+      summaries
+    end
+
     # def self.summaries_from_comply_report(report)
     #   summaries = {}
     #   report.each do |_, v|

data/lib/abide_dev_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AbideDevUtils
-  VERSION = "0.12.1"
+  VERSION = "0.12.2"
 end

data/lib/abide_dev_utils/xccdf.rb

@@ -157,7 +157,8 @@ module AbideDevUtils
             raise AbideDevUtils::Errors::ControlPartsError, control
           end
           rule_id = group.xpath('Rule/@id').first.value
-          return [vuln_id, rule_id]
+          title = group.xpath('Rule/title').text
+          return [vuln_id, rule_id, title]
         else
           raise AbideDevUtils::Errors::ControlPartsError, control
         end
@@ -658,8 +659,8 @@ module AbideDevUtils
     class StigControl < XccdfElement
       def initialize(control, benchmark)
         super(control, benchmark)
-        @vulnid, @ruleid = control_parts(control_profile_text(control))
-        properties :vulnid, :ruleid
+        @vulnid, @ruleid, @title = control_parts(control_profile_text(control))
+        properties :vulnid, :ruleid, :title
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abide_dev_utils
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
 platform: ruby
 authors:
 - abide-team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-22 00:00:00.000000000 Z
+date: 2022-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri