openscap_parser 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bbc310b2adc402a398f0b9e8524199a91c06e0b74c2f2757a9fdae292c645c5
-  data.tar.gz: 1d8314602c86e916aff3b19b09d88a858892635beaee738bd79177bf38434abb
+  metadata.gz: ec101e20e8153fa638aa705ab0bfdcf48624a8c70e74670727454f3811adc175
+  data.tar.gz: 0b2fe6ab34ff284a586709cc6d4a91054d54e4f41749b1fdecffd8af3cc6a37e
 SHA512:
-  metadata.gz: f2d316e18f0d82b9597b24b306dbae8615a044648102c085170005d1eaa9737263c11ec6a3c4e8af4e355cc59a9e57f78f560fe46f11c0e2cabfd134220153d7
-  data.tar.gz: 59f11993820161a4ece0d23df623ea3412cfb90d1895a5dd7a11fd1fa519e8eb3afbd0812c9a4a78ba1d254c74bcb58578f849ec773ace989ca91b07cffa4fab
+  metadata.gz: b4dc7ff782e6d0b2dc61c066462291b039f649d70fc56adef4507c99d55e90626adc839c1ac23352e39b2401011f5e7196e8b63a066d1402b3754b2fee6d94e0
+  data.tar.gz: 0b9141c770ba031dadb3a720e80d61ef3077895c6d6356db39ee1be5b92338b13cf935e1e7a3f83cf4c77abb05a725cb34cef7d6e0fb0c5288ce8f66a45cd7d9

data/lib/openscap_parser/fix.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+require 'openscap_parser/xml_node'
+require 'openscap_parser/subs'
+
+module OpenscapParser
+  class Fix < XmlNode
+    include OpenscapParser::Subs
+
+    def id
+      @id ||= @parsed_xml['id']
+    end
+
+    def system
+      @system ||= @parsed_xml['system']
+    end
+
+    def complexity
+      @complexity ||= @parsed_xml['complexity']
+    end
+
+    def disruption
+      @disruption ||= @parsed_xml['disruption']
+    end
+
+    def strategy
+      @strategy ||= @parsed_xml['strategy']
+    end
+
+    def full_text(set_values)
+      full_text_lines(set_values).join('')
+    end
+
+    def full_text_lines(set_values)
+      map_child_nodes(set_values).map do |text_node|
+        text_node.respond_to?(:text) ? text_node.text : ''
+      end
+    end
+
+    def map_child_nodes(set_values = [])
+      map_sub_nodes @parsed_xml.children, set_values
+    end
+
+    def to_h
+      {
+        :id => id,
+        :system => system,
+        :complexity => complexity,
+        :disruption => disruption,
+        :strategy => strategy,
+        :text => text,
+        :subs => subs.map(&:to_h)
+      }
+    end
+  end
+end

data/lib/openscap_parser/fixes.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'openscap_parser/fix'
+
+module OpenscapParser
+  module Fixes
+    def self.included(base)
+      base.class_eval do
+        def fixes
+          @fixes ||= fix_nodes.map do |fix_node|
+            OpenscapParser::Fix.new(parsed_xml: fix_node)
+          end
+        end
+
+        def fix_nodes(xpath = ".//fix")
+          xpath_nodes(xpath)
+        end
+      end
+    end
+  end
+end

data/lib/openscap_parser/profile.rb

@@ -24,13 +24,6 @@ module OpenscapParser
         @parsed_xml.xpath("select[@selected='true']/@idref").map(&:text)
     end
 
-    def set_values
-      @set_values ||= @parsed_xml.xpath("set-value") &&
-        @parsed_xml.xpath("set-value").map do |set_value|
-        [set_value['idref'], set_value.text]
-      end.to_h
-    end
-
     def to_h
       { :id => id, :title => title, :description => description }
     end

data/lib/openscap_parser/rule.rb

@@ -2,6 +2,7 @@
 
 require 'openscap_parser/rule_identifier'
 require 'openscap_parser/rule_references'
+require 'openscap_parser/fixes'
 require 'openscap_parser/xml_file'
 
 # Mimics openscap-ruby Rule interface
@@ -9,6 +10,7 @@ module OpenscapParser
   class Rule < XmlNode
     include OpenscapParser::Util
     include OpenscapParser::RuleReferences
+    include OpenscapParser::Fixes
 
     def id
       @id ||= parsed_xml['id']
@@ -54,5 +56,17 @@ module OpenscapParser
     def identifier_node
       @identifier_node ||= parsed_xml.at_xpath('ident')
     end
+
+    def to_h
+      {
+        :id => id,
+        :selected => selected,
+        :severity => severity,
+        :title => title,
+        :description => description,
+        :rationale => rationale,
+        :identifier => rule_identifier.to_h
+      }
+    end
   end
 end

data/lib/openscap_parser/rule_identifier.rb

@@ -10,5 +10,12 @@ module OpenscapParser
     def system
       @system ||= @parsed_xml && @parsed_xml['system']
     end
+
+    def to_h
+      {
+        :label => label,
+        :system => system
+      }
+    end
   end
 end

data/lib/openscap_parser/rule_result.rb

@@ -22,6 +22,16 @@ module OpenscapParser
       @result ||= parsed_xml.at_xpath('result') &&
         parsed_xml.at_xpath('result').text || ''
     end
+
+    def to_h
+      {
+        :id => id,
+        :time => time,
+        :severity => severity,
+        :weight => weight,
+        :result => result
+      }
+    end
   end
 end
 

data/lib/openscap_parser/selectors.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'openscap_parser/set_values'
+
+module OpenscapParser
+  module Selectors
+    include OpenscapParser::SetValues
+  end
+end

data/lib/openscap_parser/set_value.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+require 'openscap_parser/xml_node'
+
+module OpenscapParser
+  class SetValue < XmlNode
+    def id
+      @id ||= @parsed_xml['idref']
+    end
+
+    def text
+      @text ||= @parsed_xml.text
+    end
+
+    def to_h
+      { :id => id, :text => text }
+    end
+  end
+end

data/lib/openscap_parser/set_values.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'openscap_parser/set_value'
+
+module OpenscapParser
+  module SetValues
+    def self.included(base)
+      base.class_eval do
+        def set_values
+          @set_values ||= set_value_nodes.map do |set_value_node|
+            OpenscapParser::SetValue.new(parsed_xml: set_value_node)
+          end
+        end
+
+        def set_value_nodes(xpath = ".//set-value")
+          xpath_nodes(xpath)
+        end
+      end
+    end
+  end
+end

data/lib/openscap_parser/sub.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+require 'openscap_parser/xml_node'
+
+module OpenscapParser
+  class Sub < XmlNode
+    def id
+      @id ||= @parsed_xml['idref']
+    end
+
+    def use
+      @use ||= @parsed_xml['use']
+    end
+
+    def to_h
+      { :id => id, :text => text, :use => use }
+    end
+  end
+end

data/lib/openscap_parser/subs.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'openscap_parser/sub'
+
+module OpenscapParser
+  module Subs
+    def self.included(base)
+      base.class_eval do
+        def subs
+          return [] unless sub_nodes
+          @subs ||= sub_nodes.map do |xml|
+            Sub.new(parsed_xml: xml)
+          end
+        end
+
+        def sub_nodes(xpath = './/sub')
+          @sub_nodes ||= xpath_nodes(xpath)
+        end
+
+        def map_sub_nodes(children, set_values)
+          children.map do |child|
+            next child if child.name == 'text'
+            next replace_sub(Sub.new(parsed_xml: child), set_values) if child.name == 'sub'
+            child
+          end
+        end
+
+        private
+
+        def replace_sub(sub, set_values)
+          set_value = set_values.find { |set_value| set_value.id == sub.id }
+          return unless set_value
+          set_value.parsed_xml.children.first
+        end
+      end
+    end
+  end
+end

data/lib/openscap_parser/tailoring_file.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'openscap_parser/tailorings'
+
 module OpenscapParser
   # A class to represent a tailoring XmlFile
   class TailoringFile < XmlFile

data/lib/openscap_parser/test_result.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
 require 'openscap_parser/rule_results'
+require 'openscap_parser/selectors'
 
 module OpenscapParser
   class TestResult < XmlNode
     include OpenscapParser::RuleResults
+    include OpenscapParser::Selectors
 
     def target
       @target ||= parsed_xml.at_xpath('target') &&

data/lib/openscap_parser/version.rb

@@ -1,3 +1,3 @@
 module OpenscapParser
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/openscap_parser/xml_node.rb

@@ -19,6 +19,10 @@ module OpenscapParser
       @parsed_xml.remove_namespaces!
     end
 
+    def text
+      @parsed_xml.text
+    end
+
     def xpath_node(xpath)
       parsed_xml && parsed_xml.at_xpath(xpath)
     end

data/openscap_parser.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{Parse OpenSCAP content}
   spec.description   = %q{This gem is a Ruby interface into SCAP content. It can parse SCAP datastream files (i.e. ssg-rhel7-ds.xml), scan result files output by oscap eval, and tailoring files.}
-  spec.homepage      = 'https://github.com/dLobatog/openscap_parser'
+  spec.homepage      = 'https://github.com/OpenSCAP/openscap_parser'
   spec.license       = 'MIT'
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openscap_parser
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Daniel Lobato Garcia
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-15 00:00:00.000000000 Z
+date: 2020-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -149,6 +149,8 @@ files:
 - lib/openscap_parser/benchmark.rb
 - lib/openscap_parser/benchmarks.rb
 - lib/openscap_parser/datastream_file.rb
+- lib/openscap_parser/fix.rb
+- lib/openscap_parser/fixes.rb
 - lib/openscap_parser/profile.rb
 - lib/openscap_parser/profiles.rb
 - lib/openscap_parser/rule.rb
@@ -158,6 +160,11 @@ files:
 - lib/openscap_parser/rule_result.rb
 - lib/openscap_parser/rule_results.rb
 - lib/openscap_parser/rules.rb
+- lib/openscap_parser/selectors.rb
+- lib/openscap_parser/set_value.rb
+- lib/openscap_parser/set_values.rb
+- lib/openscap_parser/sub.rb
+- lib/openscap_parser/subs.rb
 - lib/openscap_parser/tailoring.rb
 - lib/openscap_parser/tailoring_file.rb
 - lib/openscap_parser/tailorings.rb
@@ -174,7 +181,7 @@ files:
 - lib/ssg/unarchiver.rb
 - lib/tasks/ssg.rake
 - openscap_parser.gemspec
-homepage: https://github.com/dLobatog/openscap_parser
+homepage: https://github.com/OpenSCAP/openscap_parser
 licenses:
 - MIT
 metadata: {}
@@ -193,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Parse OpenSCAP content