openscap_parser 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65cd8f383c3d40c907ecab37235ac6c50eeddced32dc9173b7b4b8e7526c869a
-  data.tar.gz: a1150af6f99b020a31f174b83a1b405b1375dd0e37300ced57daa633988a8be1
+  metadata.gz: 159fcf26b6fe71666a9d057d89d772589ac8436d783b7773556121b6b5c11654
+  data.tar.gz: f8181135885961c284b2dabfd4de0408d8888e7cf4271da699f0e42fc0e30bf6
 SHA512:
-  metadata.gz: 696960d718a5eefbd435af227822ce48144c07be20df1a85ec2a93c1328bba7d8f92e823b57feafe38f479a3c3b0a3f26d365595cf247cf13de3f2160b11ccda
-  data.tar.gz: a40766e4211f052ad1ab60c1e41dbb2bb70ab26ee221aeaa5eca664287a86b5cd1cf199f1fe47a3be23372b5723c11cf394c68db13203333abf3e0639dd1f841
+  metadata.gz: be89da681f6a355591027ce73b0dd3a68bcbd73bcc442a2d4e21c2a51485a9e841d493bafef8757aff5f85025e0a5251d3b1519801b2fdb1343fe070b165fe6b
+  data.tar.gz: 8949839744c203ec9074e3069097a3d98739eb65c7a76841c117f456eb02c55c3eee1576cf3b550501012b52f549d8aaaac0f601350d5f92e37a79e2a6602117

data/lib/openscap_parser/benchmark.rb

@@ -5,6 +5,7 @@ require 'openscap_parser/xml_file'
 require 'openscap_parser/rules'
 require 'openscap_parser/profiles'
 require 'openscap_parser/rule_references'
+require 'openscap_parser/groups'
 
 # Mimics openscap-ruby Benchmark interface
 module OpenscapParser
@@ -13,6 +14,7 @@ module OpenscapParser
     include OpenscapParser::Rules
     include OpenscapParser::RuleReferences
     include OpenscapParser::Profiles
+    include OpenscapParser::Groups
 
     def id
       @id ||= @parsed_xml['id']

data/lib/openscap_parser/group.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+module OpenscapParser
+  class Group < XmlNode
+    include OpenscapParser::Util
+
+    def id
+      @id ||= parsed_xml['id']
+    end
+
+    def title
+      @title ||= parsed_xml.at_css('title') &&
+        parsed_xml.at_css('title').text
+    end
+
+    def description
+      @description ||= newline_to_whitespace(
+        parsed_xml.at_css('description') &&
+          parsed_xml.at_css('description').text || ''
+      )
+    end
+
+    def rationale
+      @rationale ||= newline_to_whitespace(
+        parsed_xml.at_css('rationale') &&
+          parsed_xml.at_css('rationale').text || ''
+      )
+    end
+
+    def requires
+      @requires ||= parsed_xml.xpath('./requires') &&
+        parsed_xml.xpath('./requires/@idref').flat_map do |r|
+          r.to_s&.split
+        end
+    end
+
+    def conflicts
+      @conflicts ||= parsed_xml.xpath('./conflicts') &&
+        parsed_xml.xpath('./conflicts/@idref').flat_map do |c|
+          c.to_s&.split
+        end
+    end
+
+    def selected
+      @selected ||= parsed_xml['selected']
+    end
+
+    def parent_id
+      @parent_id = parsed_xml.xpath('../@id').to_s
+    end
+
+    def parent_type
+      if parsed_xml.xpath("name(..)='Group'")
+        @parent_type = 'Group'
+      else
+        @parent_type = 'Benchmark'
+      end
+    end
+
+    def to_h
+      {
+        :id => id,
+        :title => title,
+        :description => description,
+        :requires => requires,
+        :conflicts => conflicts,
+        :rationale => rationale,
+        :selected => selected,
+        :parent_id => parent_id,
+        :parent_type => parent_type
+      }
+    end
+  end
+end

data/lib/openscap_parser/groups.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'openscap_parser/group'
+
+module OpenscapParser
+  # Methods related to finding and saving rule references
+  module Groups
+    def self.included(base)
+      base.class_eval do
+        def groups
+          @groups ||= group_nodes.map do |group_node|
+            OpenscapParser::Group.new(parsed_xml: group_node)
+          end
+        end
+
+        def group_nodes(xpath = './/Group')
+          xpath_nodes(xpath)
+        end
+      end
+    end
+  end
+end

data/lib/openscap_parser/rule.rb

@@ -29,6 +29,20 @@ module OpenscapParser
         parsed_xml.at_css('title').text
     end
 
+    def requires
+      @requires ||= parsed_xml.xpath('./requires') &&
+        parsed_xml.xpath('./requires/@idref').flat_map do |r|
+          r.to_s&.split
+        end
+    end
+
+    def conflicts
+      @conflicts ||= parsed_xml.xpath('./conflicts') &&
+        parsed_xml.xpath('./conflicts/@idref').flat_map do |c|
+          c.to_s&.split
+        end
+    end
+
     def description
       @description ||= newline_to_whitespace(
         parsed_xml.at_css('description') &&
@@ -57,15 +71,31 @@ module OpenscapParser
       @identifier_node ||= parsed_xml.at_xpath('ident')
     end
 
+    def parent_id
+      parsed_xml.xpath('../@id').to_s
+    end
+
+    def parent_type
+      if parsed_xml.xpath("name(..)='Group'")
+        @parent_type = 'Group'
+      else
+        @parent_type = 'Benchmark'
+      end
+    end
+
     def to_h
       {
         :id => id,
         :selected => selected,
         :severity => severity,
         :title => title,
+        :requires => requires,
+        :conflicts => conflicts,
         :description => description,
         :rationale => rationale,
-        :identifier => rule_identifier.to_h
+        :identifier => rule_identifier.to_h,
+        :parent_id => parent_id,
+        :parent_type => parent_type
       }
     end
   end

data/lib/openscap_parser/version.rb

@@ -1,3 +1,3 @@
 module OpenscapParser
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

data/lib/openscap_parser.rb

@@ -6,6 +6,7 @@ require 'openscap_parser/benchmarks'
 require 'openscap_parser/test_results'
 require 'openscap_parser/profiles'
 require 'openscap_parser/rules'
+require 'openscap_parser/groups'
 require 'openscap_parser/rule_results'
 require 'openscap_parser/tailorings'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openscap_parser
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Daniel Lobato Garcia
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-15 00:00:00.000000000 Z
+date: 2022-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -151,6 +151,8 @@ files:
 - lib/openscap_parser/datastream_file.rb
 - lib/openscap_parser/fix.rb
 - lib/openscap_parser/fixes.rb
+- lib/openscap_parser/group.rb
+- lib/openscap_parser/groups.rb
 - lib/openscap_parser/oval_report.rb
 - lib/openscap_parser/profile.rb
 - lib/openscap_parser/profiles.rb
@@ -204,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.16
 signing_key: 
 specification_version: 4
 summary: Parse OpenSCAP content