Enable more complete datastream parsing

Signed-off-by: Andrew Kofink <akofink@redhat.com>

Author: akofink

lib/openscap_parser.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require 'openscap_parser/profiles'
+require 'openscap_parser/profile'
 require 'openscap_parser/rule'
 require 'openscap_parser/rule_result'
 require 'openscap_parser/rule_results'

lib/openscap_parser/ds.rb

@@ -4,33 +4,17 @@
 module OpenscapParser
   class Ds
     include OpenscapParser::XmlFile
+    include OpenscapParser::Rules
+    include OpenscapParser::Profiles
 
     def initialize(report)
       parsed_xml report
     end
 
-    def profiles
-      @profiles ||= profile_nodes
-    end
-
     def valid?
       return true if @parsed_xml.root.name == 'data-stream-collection' && namespaces.keys.include?('xmlns:ds')
       return true if @parsed_xml.root.name == 'Tailoring' && namespaces.keys.include?('xmlns:xccdf')
       false
     end
-
-    private
-
-    def profile_nodes
-      @parsed_xml.xpath(".//Profile").map do |node|
-        id_node = node.attribute('id')
-        id = id_node.value if id_node
-        title_node = node.at_xpath('./title')
-        title = title_node.text if title_node
-        desc_node = node.at_xpath('./description')
-        description = desc_node.text if desc_node
-        { :id => id, :title => title, :description => description }
-      end
-    end
   end
 end

lib/openscap_parser/profiles.rb

@@ -7,10 +7,8 @@ module Profiles
     def self.included(base)
       base.class_eval do
         def profiles
-          @profiles ||= profile_nodes.inject({}) do |profiles, profile_node|
-            profiles[profile_node['id']] = profile_node.at_css('title').text
-
-            profiles
+          @profiles ||= profile_nodes.map do |profile_node|
+            OpenscapParser::Profile.new(profile_xml: profile_node)
           end
         end
 

lib/openscap_parser/rule.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'openscap_parser/rule_identifier'
+require 'openscap_parser/rule_reference'
+
 # Mimics openscap-ruby Rule interface
 module OpenscapParser
   class Rule
@@ -11,6 +14,10 @@ def id
       @id ||= @rule_xml['id']
     end
 
+    def selected
+      @selected ||= @rule_xml['selected']
+    end
+
     def severity
       @severity ||= @rule_xml['severity']
     end
@@ -35,16 +42,21 @@ def rationale
     end
 
     def references
-      @references ||= @rule_xml.css('reference').map do |node|
-        { href: node['href'], label: node.text }
+      @references ||= reference_nodes.map do |node|
+        RuleReference.new(reference_xml: node)
       end
     end
 
+    def reference_nodes
+      @reference_nodes ||= @rule_xml.xpath('reference')
+    end
+
     def identifier
-      @identifier ||= {
-        label: @rule_xml.at_css('ident') && @rule_xml.at_css('ident').text,
-        system: (ident = @rule_xml.at_css('ident')) && ident['system']
-      }
+      @identifier ||= RuleIdentifier.new(identifier_xml: @identifier_node)
+    end
+
+    def identifier_node
+      @identifier_node ||= @rule_xml.at_xpath('ident')
     end
 
     private

lib/openscap_parser/rule_identifier.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+# RuleIdentifier interface as an object
+module OpenscapParser
+  class RuleIdentifier
+    def initialize(identifier_xml: nil)
+      @identifier_xml = identifier_xml
+    end
+
+    def label
+      @label ||= @identifier_xml && @identifier_xml.text
+    end
+
+    def system
+      @system ||= @identifier_xml && @identifier_xml['system']
+    end
+  end
+end

lib/openscap_parser/rule_reference.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+# RuleReference interface as an object
+module OpenscapParser
+  class RuleReference
+    def initialize(reference_xml: nil)
+      @reference_xml = reference_xml
+    end
+
+    def href
+      @href ||= @reference_xml && @reference_xml['href']
+    end
+
+    def label
+      @label ||= @reference_xml && @reference_xml.text
+    end
+  end
+end

test/ds_test.rb

@@ -18,7 +18,7 @@ class DsTest < MiniTest::Test
         "Red Hat Corporate Profile for Certified Cloud Providers (RH CCP)",
         "PCI-DSS v3 Control Baseline for Red Hat Enterprise Linux 7"
       ]
-      assert_equal(profile_titles, parser.profiles.map { |profile| profile[:title] })
+      assert_equal(profile_titles, parser.profiles.map(&:title))
     end
   end
 
@@ -29,7 +29,7 @@ class DsTest < MiniTest::Test
         "Standard System Security Profile [CUSTOMIZED]",
         "Common Profile for General-Purpose Systems [CUSTOMIZED]"
       ]
-      assert_equal(profile_titles, parser.profiles.map { |profile| profile[:title] })
+      assert_equal(profile_titles, parser.profiles.map(&:title))
     end
   end
 

test/openscap_parser_test.rb

@@ -1,28 +1,23 @@
 # frozen_string_literal: true
 
 require 'test_helper'
+require 'openscap_parser/rule_reference'
 
 class OpenscapParserTest < Minitest::Test
   def setup
     fake_report = file_fixture('xccdf_report.xml').read
-    @profile = {
-      'xccdf_org.ssgproject.content_profile_standard' =>
-      'Standard System Security Profile for Fedora'
-    }
+    @profile_ref_id = 'xccdf_org.ssgproject.content_profile_standard'
     @report_parser = ::OpenscapParser::Base.new(fake_report)
   end
 
   context 'profile' do
     should 'be able to parse it' do
-      assert_equal(@profile, @report_parser.profiles)
+      assert_equal(@profile_ref_id, @report_parser.profiles.first.id)
     end
 
     should 'not save more than one profile when there are no test results' do
       fake_report = file_fixture('rhel-xccdf-report.xml').read
-      @profile = {
-        'xccdf_org.ssgproject.content_profile_rht-ccp' =>
-        'Red Hat Corporate Profile for Certified Cloud Providers (RH CCP)'
-      }
+      @profile_ref_id = 'xccdf_org.ssgproject.content_profile_rht-ccp'
       @report_parser = ::OpenscapParser::Base.new(fake_report)
       assert_equal 1, @report_parser.test_result_profiles.count
     end
@@ -55,19 +50,17 @@ def setup
     end
 
     should 'parse rule references' do
-      rule = @report_parser.rule_objects.find do |r|
-        r.title == 'Disable At Service (atd)'
+      rule = @report_parser.rules.find do |r|
+        r.id == 'xccdf_org.ssgproject.content_rule_service_atd_disabled'
       end
 
       references = [
-        {:href=>"http://iase.disa.mil/stigs/cci/Pages/index.aspx",
-         :label=>"CCI-000381"},
-        {:href=>'http://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.'\
-          '800-53r4.pdf',
-         :label=>"CM-7"}
+        ["http://iase.disa.mil/stigs/cci/Pages/index.aspx", "CCI-000381"],
+        ['http://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.'\
+         '800-53r4.pdf', "CM-7"]
       ]
 
-      assert_equal references, rule.references
+      assert_equal references, rule.references.map { |rr| [rr.href, rr.label] }
     end
 
     should 'parse rule description without newlines' do