openscap 0.4.4 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6755fff46b8c00f6c8c1a8e04a65c8b9cd2dc370
-  data.tar.gz: 681a7c26c5b44410f12f077e8962055c0e4dc087
+  metadata.gz: 68763a1de74c96941fe0bc5d05e9f732d40543af
+  data.tar.gz: a078eeb8d275edf2266ec60beaf6e93e33816ca7
 SHA512:
-  metadata.gz: 10da3a43917ea9e91a8aeca225eb0f1a66e8668b03ef4cbdcbae53e2bfa548988d0bd842096a2988073702c38b13bbbed844dd2cec92d3e0049f99c7965b792a
-  data.tar.gz: 5f69ab678008e3f0abf948dab540db1c82a0d9fe4b1793676de2ffe7c8d7b26cd167ed276c683165bdfe76f1d8d1aca5eafca32dc0852c07c65c7368adcb18e4
+  metadata.gz: ddf72e5c02430a421eb6a9f330132d8a3c525c0ea349fd5559c7856c9122ad12da3d069a6a1e960d1ae2c615b69b4e39f746c176ffa3bb15060a0544e5df408f
+  data.tar.gz: 055c061de134281428336f53932a97bf0413729fc3a01a1d235b8d1fc668c393ae038e0965eb1970989204d6c9483c1d46a954094656545ba0ae2e64245e0c49

data/lib/openscap/all.rb

@@ -0,0 +1,12 @@
+#
+# Copyright (c) 2016 Red Hat Inc.
+#
+# This software is licensed to you under the GNU General Public License,
+# version 2 (GPLv2). There is NO WARRANTY for this software, express or
+# implied, including the implied warranties of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+# along with this software; if not, see
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+#
+
+Dir.glob(File.join(File.dirname(__FILE__), '{xccdf,ds,}', '*.rb'), &method(:require))

data/lib/openscap/ds/arf.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014 Red Hat Inc.
+# Copyright (c) 2014--2016 Red Hat Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -25,7 +25,7 @@ module OpenSCAP
           @source = OpenSCAP::Source.new(param)
           @session = OpenSCAP.ds_rds_session_new_from_source @source.raw
         else
-          fail OpenSCAP::OpenSCAPError, "Cannot initialize OpenSCAP::DS:Arf with '#{param}'"
+          raise OpenSCAP::OpenSCAPError, "Cannot initialize #{self.class.name} with '#{param}'"
         end
         OpenSCAP.raise! if @session.null?
       end
@@ -44,7 +44,7 @@ module OpenSCAP
 
       def test_result=(tr)
         source = tr.source
-        OpenSCAP.raise! unless OpenSCAP.ds_rds_session_replace_report_with_source(@session, source.raw) == 0
+        OpenSCAP.raise! unless OpenSCAP.ds_rds_session_replace_report_with_source(@session, source.raw).zero?
       end
 
       def report_request(id = nil)

data/lib/openscap/openscap.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014 Red Hat Inc.
+# Copyright (c) 2014--2016 Red Hat Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -31,7 +31,7 @@ module OpenSCAP
     else
       err += "\n#{msg}"
     end
-    fail OpenSCAPError, err
+    raise OpenSCAPError, err
   end
 
   attach_function :oscap_init, [], :void

data/lib/openscap/source.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014 Red Hat Inc.
+# Copyright (c) 2014--2016 Red Hat Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -18,7 +18,7 @@ module OpenSCAP
     def initialize(param)
       case param
       when nil
-        fail OpenSCAPError, 'No filename specified!'
+        raise OpenSCAPError, 'No filename specified!'
       when String
         @raw = OpenSCAP.oscap_source_new_from_file(param)
       when Hash
@@ -26,7 +26,7 @@ module OpenSCAP
       when FFI::Pointer
         @raw = param
       else
-        fail OpenSCAP::OpenSCAPError, "Cannot initialize OpenSCAP::Source with '#{param}'"
+        raise OpenSCAP::OpenSCAPError, "Cannot initialize #{self.class.name} with '#{param}'"
       end
       OpenSCAP.raise! if @raw.null?
     end
@@ -37,13 +37,13 @@ module OpenSCAP
 
     def validate!
       e = FFI::MemoryPointer.new(:char, 4096)
-      if 0 != OpenSCAP.oscap_source_validate(@raw, XmlReporterCallback, e)
+      unless OpenSCAP.oscap_source_validate(@raw, XmlReporterCallback, e).zero?
         OpenSCAP.raise! e.read_string
       end
     end
 
     def save(filepath = nil)
-      OpenSCAP.raise! unless OpenSCAP.oscap_source_save_as(@raw, filepath) == 0
+      OpenSCAP.raise! unless OpenSCAP.oscap_source_save_as(@raw, filepath).zero?
     end
 
     def destroy

data/lib/openscap/version.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014--2015 Red Hat Inc.
+# Copyright (c) 2014--2016 Red Hat Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -10,5 +10,5 @@
 #
 
 module OpenSCAP
-  VERSION = '0.4.4'
+  VERSION = '0.4.7'.freeze
 end

data/lib/openscap/xccdf/benchmark.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014 Red Hat Inc.
+# Copyright (c) 2014--2016 Red Hat Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -23,8 +23,8 @@ module OpenSCAP
         when OpenSCAP::Source
           @raw = OpenSCAP.xccdf_benchmark_import_source p.raw
         else
-          fail OpenSCAP::OpenSCAPError,
-               "Cannot initialize OpenSCAP::Xccdf::Benchmark with '#{p}'"
+          raise OpenSCAP::OpenSCAPError,
+                "Cannot initialize OpenSCAP::Xccdf::Benchmark with '#{p}'"
         end
         OpenSCAP.raise! if @raw.null?
       end

data/lib/openscap/xccdf/fix.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015 Red Hat Inc.
+# Copyright (c) 2015--2016 Red Hat Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -13,7 +13,7 @@ module OpenSCAP
   module Xccdf
     class Fix
       def initialize(raw)
-        fail OpenSCAP::OpenSCAPError, "Cannot initialize OpenSCAP::Xccdf::Reference with '#{raw}'" \
+        raise OpenSCAP::OpenSCAPError, "Cannot initialize #{self.class.name} with '#{raw}'" \
           unless raw.is_a?(FFI::Pointer)
         @raw = raw
       end

data/lib/openscap/xccdf/item.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015 Red Hat Inc.
+# Copyright (c) 2015--2016 Red Hat Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -19,7 +19,7 @@ module OpenSCAP
   module Xccdf
     class Item
       def self.build(t)
-        fail OpenSCAP::OpenSCAPError, "Cannot initialize OpenSCAP::Xccdf::Item with #{t}" \
+        raise OpenSCAP::OpenSCAPError, "Cannot initialize #{self.class.name} with #{t}" \
           unless t.is_a?(FFI::Pointer)
         # This is Abstract base class that enables you to build its child
         case OpenSCAP.xccdf_item_get_type t
@@ -28,13 +28,13 @@ module OpenSCAP
         when :rule
           OpenSCAP::Xccdf::Rule.new t
         else
-          fail OpenSCAP::OpenSCAPError, "Unknown Xccdf::Item type: #{OpenSCAP.xccdf_item_get_type t}"
+          raise OpenSCAP::OpenSCAPError, "Unknown #{self.class.name} type: #{OpenSCAP.xccdf_item_get_type t}"
         end
       end
 
       def initialize(t)
         if self.class == OpenSCAP::Xccdf::Item
-          fail OpenSCAP::OpenSCAPError, 'Cannot initialize Xccdf::Item abstract base class.'
+          raise OpenSCAP::OpenSCAPError, "Cannot initialize #{self.class.name} abstract base class."
         end
         @raw = t
       end
@@ -68,7 +68,7 @@ module OpenSCAP
         refs = []
         refs_it = OpenSCAP.xccdf_item_get_references(@raw)
         while OpenSCAP.oscap_reference_iterator_has_more refs_it
-          ref = OpenSCAP::Xccdf::Reference.new(OpenSCAP.oscap_reference_iterator_next refs_it)
+          ref = OpenSCAP::Xccdf::Reference.new(OpenSCAP.oscap_reference_iterator_next(refs_it))
           refs << ref
         end
         OpenSCAP.oscap_reference_iterator_free refs_it

data/lib/openscap/xccdf/policy.rb

@@ -0,0 +1,37 @@
+#
+# Copyright (c) 2016 Red Hat Inc.
+#
+# This software is licensed to you under the GNU General Public License,
+# version 2 (GPLv2). There is NO WARRANTY for this software, express or
+# implied, including the implied warranties of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+# along with this software; if not, see
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+#
+
+require 'openscap/exceptions'
+
+module OpenSCAP
+  module Xccdf
+    class Policy
+      attr_reader :raw
+
+      def initialize(p)
+        case p
+        when FFI::Pointer
+          @raw = p
+        else
+          raise OpenSCAP::OpenSCAPError,
+                "Cannot initialize OpenSCAP::Xccdf::Policy with '#{p}'"
+        end
+        OpenSCAP.raise! if @raw.null?
+      end
+
+      def id
+        OpenSCAP.xccdf_policy_get_id raw
+      end
+    end
+  end
+
+  attach_function :xccdf_policy_get_id, [:pointer], :string
+end

data/lib/openscap/xccdf/policy_model.rb

@@ -0,0 +1,66 @@
+#
+# Copyright (c) 2016 Red Hat Inc.
+#
+# This software is licensed to you under the GNU General Public License,
+# version 2 (GPLv2). There is NO WARRANTY for this software, express or
+# implied, including the implied warranties of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+# along with this software; if not, see
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+#
+
+require 'openscap/exceptions'
+require 'openscap/xccdf/benchmark'
+require 'openscap/xccdf/policy'
+
+module OpenSCAP
+  module Xccdf
+    class PolicyModel
+      attr_reader :raw
+
+      def initialize(b)
+        case b
+        when OpenSCAP::Xccdf::Benchmark
+          @raw = OpenSCAP.xccdf_policy_model_new(b.raw)
+        else
+          raise OpenSCAP::OpenSCAPError,
+                "Cannot initialize OpenSCAP::Xccdf::PolicyModel with '#{b}'"
+        end
+        OpenSCAP.raise! if @raw.null?
+      end
+
+      def policies
+        @policies ||= policies_init
+      end
+
+      def destroy
+        OpenSCAP.xccdf_policy_model_free @raw
+        @raw = nil
+      end
+
+      private
+
+      def policies_init
+        policies = {}
+        OpenSCAP.raise! unless OpenSCAP.xccdf_policy_model_build_all_useful_policies(raw).zero?
+        polit = OpenSCAP.xccdf_policy_model_get_policies raw
+        while OpenSCAP.xccdf_policy_iterator_has_more polit
+          policy_p = OpenSCAP.xccdf_policy_iterator_next polit
+          policy = OpenSCAP::Xccdf::Policy.new policy_p
+          policies[policy.id] = policy
+        end
+        OpenSCAP.xccdf_policy_iterator_free polit
+        policies
+      end
+    end
+  end
+
+  attach_function :xccdf_policy_model_new, [:pointer], :pointer
+  attach_function :xccdf_policy_model_free, [:pointer], :void
+  attach_function :xccdf_policy_model_build_all_useful_policies, [:pointer], :int
+
+  attach_function :xccdf_policy_model_get_policies, [:pointer], :pointer
+  attach_function :xccdf_policy_iterator_has_more, [:pointer], :bool
+  attach_function :xccdf_policy_iterator_next, [:pointer], :pointer
+  attach_function :xccdf_policy_iterator_free, [:pointer], :void
+end

data/lib/openscap/xccdf/profile.rb

@@ -21,7 +21,7 @@ module OpenSCAP
         when FFI::Pointer
           @raw = p
         else
-          fail OpenSCAP::OpenSCAPError, "Cannot initialize OpenSCAP::Xccdf::Profile with #{p}"
+          raise OpenSCAP::OpenSCAPError, "Cannot initialize #{self.class.name} with #{p}"
         end
       end
 

data/lib/openscap/xccdf/reference.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015 Red Hat Inc.
+# Copyright (c) 2015--2016 Red Hat Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -13,7 +13,7 @@ module OpenSCAP
   module Xccdf
     class Reference
       def initialize(raw)
-        fail OpenSCAP::OpenSCAPError, "Cannot initialize OpenSCAP::Xccdf::Reference with '#{raw}'" \
+        raise OpenSCAP::OpenSCAPError, "Cannot initialize #{self.class.name} with '#{raw}'" \
           unless raw.is_a?(FFI::Pointer)
         @raw = raw
       end

data/lib/openscap/xccdf/ruleresult.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014 Red Hat Inc.
+# Copyright (c) 2014--2016 Red Hat Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -20,7 +20,7 @@ module OpenSCAP
         when FFI::Pointer
           @rr = t
         else
-          fail OpenSCAP::OpenSCAPError, "Cannot initialize OpenSCAP::Xccdf::RuleResult with #{t}"
+          raise OpenSCAP::OpenSCAPError, "Cannot initialize #{self.class.name} with #{t}"
         end
       end
 
@@ -52,7 +52,7 @@ module OpenSCAP
 
       def validate_xccdf_result!(result_label)
         if OpenSCAP::XccdfResult[result_label] > OpenSCAP::XccdfResult[:fixed]
-          fail OpenSCAPError, "Could not recognize result type: '#{result_label}'"
+          raise OpenSCAPError, "Could not recognize result type: '#{result_label}'"
         end
       end
     end

data/lib/openscap/xccdf/session.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014 Red Hat Inc.
+# Copyright (c) 2014--2016 Red Hat Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -13,7 +13,7 @@ module OpenSCAP
   module Xccdf
     class Session
       def initialize(input_filename)
-        fail OpenSCAPError, 'No filename specified!' unless input_filename
+        raise OpenSCAPError, 'No filename specified!' unless input_filename
         @input_filename = input_filename
         @s = OpenSCAP.xccdf_session_new(input_filename)
         OpenSCAP.raise! if @s.null?
@@ -32,23 +32,23 @@ module OpenSCAP
           OpenSCAP.xccdf_session_set_datastream_id(@s, o[:datastream_id])
           OpenSCAP.xccdf_session_set_component_id(@s, o[:component_id])
         end
-        OpenSCAP.raise! if OpenSCAP.xccdf_session_load(@s) != 0
-        OpenSCAP.raise! unless OpenSCAP.xccdf_session_load_check_engine_plugins(@s) == 0
+        OpenSCAP.raise! unless OpenSCAP.xccdf_session_load(@s).zero?
+        OpenSCAP.raise! unless OpenSCAP.xccdf_session_load_check_engine_plugins(@s).zero?
       end
 
       def profile=(p)
         @profile = p
         if OpenSCAP.xccdf_session_set_profile_id(@s, p) == false
-          fail OpenSCAPError, "No profile '" + p + "' found"
+          raise OpenSCAPError, "No profile '" + p + "' found"
         end
       end
 
       def evaluate
-        OpenSCAP.raise! if OpenSCAP.xccdf_session_evaluate(@s) != 0
+        OpenSCAP.raise! unless OpenSCAP.xccdf_session_evaluate(@s).zero?
       end
 
       def remediate
-        OpenSCAP.raise! unless OpenSCAP.xccdf_session_remediate(@s) == 0
+        OpenSCAP.raise! unless OpenSCAP.xccdf_session_remediate(@s).zero?
       end
 
       def export_results(opts = {})
@@ -72,10 +72,10 @@ module OpenSCAP
       private
 
       def export
-        OpenSCAP.raise! unless OpenSCAP.xccdf_session_export_oval(@s) == 0
-        OpenSCAP.raise! unless OpenSCAP.xccdf_session_export_check_engine_plugins(@s) == 0
-        OpenSCAP.raise! unless OpenSCAP.xccdf_session_export_xccdf(@s) == 0
-        OpenSCAP.raise! unless OpenSCAP.xccdf_session_export_arf(@s) == 0
+        OpenSCAP.raise! unless OpenSCAP.xccdf_session_export_oval(@s).zero?
+        OpenSCAP.raise! unless OpenSCAP.xccdf_session_export_check_engine_plugins(@s).zero?
+        OpenSCAP.raise! unless OpenSCAP.xccdf_session_export_xccdf(@s).zero?
+        OpenSCAP.raise! unless OpenSCAP.xccdf_session_export_arf(@s).zero?
       end
 
       def export_targets(opts = {})

data/lib/openscap/xccdf/tailoring.rb

@@ -0,0 +1,62 @@
+#
+# Copyright (c) 2016 Red Hat Inc.
+#
+# This software is licensed to you under the GNU General Public License,
+# version 2 (GPLv2). There is NO WARRANTY for this software, express or
+# implied, including the implied warranties of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+# along with this software; if not, see
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+#
+
+require 'openscap/source'
+require 'openscap/xccdf/profile'
+
+module OpenSCAP
+  module Xccdf
+    class Tailoring
+      attr_reader :raw
+
+      def initialize(source, benchmark)
+        case source
+        when OpenSCAP::Source
+          @raw = OpenSCAP.xccdf_tailoring_import_source source.raw, benchmark
+        else
+          raise OpenSCAP::OpenSCAPError, "Cannot initialize #{self.class.name} with '#{source}'"
+        end
+        OpenSCAP.raise! if @raw.null?
+      end
+
+      def profiles
+        @profiles ||= profiles_init
+      end
+
+      def destroy
+        OpenSCAP.xccdf_tailoring_free @raw
+        @raw = nil
+      end
+
+      private
+
+      def profiles_init
+        profiles = {}
+        profit = OpenSCAP.xccdf_tailoring_get_profiles raw
+        while OpenSCAP.xccdf_profile_iterator_has_more profit
+          profile_p = OpenSCAP.xccdf_profile_iterator_next profit
+          profile = OpenSCAP::Xccdf::Profile.new profile_p
+          profiles[profile.id] = profile
+        end
+        OpenSCAP.xccdf_profile_iterator_free profit
+        profiles
+      end
+    end
+  end
+
+  attach_function :xccdf_tailoring_import_source, [:pointer, :pointer], :pointer
+  attach_function :xccdf_tailoring_free, [:pointer], :void
+
+  attach_function :xccdf_tailoring_get_profiles, [:pointer], :pointer
+  attach_function :xccdf_profile_iterator_has_more, [:pointer], :bool
+  attach_function :xccdf_profile_iterator_next, [:pointer], :pointer
+  attach_function :xccdf_profile_iterator_free, [:pointer], :void
+end

data/lib/openscap/xccdf/testresult.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014 Red Hat Inc.
+# Copyright (c) 2014--2016 Red Hat Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -29,7 +29,7 @@ module OpenSCAP
           @raw = OpenSCAP.xccdf_result_import_source(t)
           OpenSCAP.raise! if @raw.null?
         else
-          fail OpenSCAP::OpenSCAPError, "Cannot initialize TestResult with #{t}"
+          raise OpenSCAP::OpenSCAPError, "Cannot initialize #{self.class.name} with #{t}"
         end
         init_ruleresults
       end
@@ -49,7 +49,7 @@ module OpenSCAP
       def score!(benchmark)
         # recalculate the scores in the scope of given benchmark
         @score = nil
-        OpenSCAP.raise! unless OpenSCAP.xccdf_result_recalculate_scores(@raw, benchmark.raw) == 0
+        OpenSCAP.raise! unless OpenSCAP.xccdf_result_recalculate_scores(@raw, benchmark.raw).zero?
         score
       end
 

data/test/data/tailoring.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xccdf:Tailoring xmlns:xccdf="http://checklists.nist.gov/xccdf/1.2" id="xccdf_scap-workbench_tailoring_default">
+  <xccdf:benchmark href="/usr/share/xml/scap/ssg/content/ssg-firefox-ds.xml"/>
+  <xccdf:version time="2016-11-10T11:24:26">1</xccdf:version>
+  <xccdf:Profile id="xccdf_org.ssgproject.content_profile_stig-firefox-upstream_customized" extends="xccdf_org.ssgproject.content_profile_stig-firefox-upstream">
+    <xccdf:title xmlns:xhtml="http://www.w3.org/1999/xhtml" xml:lang="en-US">Upstream Firefox STIG [CUSTOMIZED]</xccdf:title>
+    <xccdf:description xmlns:xhtml="http://www.w3.org/1999/xhtml" xml:lang="en-US">This profile is developed under the DoD consensus model and DISA FSO Vendor STIG process,
+serving as the upstream development environment for the Firefox STIG.
+
+As a result of the upstream/downstream relationship between the SCAP Security Guide project
+and the official DISA FSO STIG baseline, users should expect variance between SSG and DISA FSO content.
+For official DISA FSO STIG content, refer to http://iase.disa.mil/stigs/app-security/browser-guidance/Pages/index.aspx.
+
+While this profile is packaged by Red Hat as part of the SCAP Security Guide package, please note
+that commercial support of this SCAP content is NOT available. This profile is provided as example
+SCAP content with no endorsement for suitability or production readiness. Support for this
+profile is provided by the upstream SCAP Security Guide community on a best-effort basis. The
+upstream project homepage is https://fedorahosted.org/scap-security-guide/.
+</xccdf:description>
+    <xccdf:select idref="xccdf_org.ssgproject.content_rule_firefox_preferences-non-secure_page_warning" selected="true"/>
+    <xccdf:select idref="xccdf_org.ssgproject.content_rule_firefox_preferences-javascript_status_bar_text" selected="true"/>
+    <xccdf:select idref="xccdf_org.ssgproject.content_rule_firefox_preferences-javascript_context_menus" selected="true"/>
+    <xccdf:select idref="xccdf_org.ssgproject.content_rule_firefox_preferences-javascript_status_bar_changes" selected="true"/>
+    <xccdf:select idref="xccdf_org.ssgproject.content_rule_firefox_preferences-javascript_window_resizing" selected="true"/>
+    <xccdf:select idref="xccdf_org.ssgproject.content_rule_firefox_preferences-javascript_window_changes" selected="true"/>
+    <xccdf:select idref="xccdf_org.ssgproject.content_rule_firefox_preferences-auto-update_of_firefox" selected="false"/>
+    <xccdf:select idref="xccdf_org.ssgproject.content_rule_firefox_preferences-autofill_passwords" selected="false"/>
+    <xccdf:select idref="xccdf_org.ssgproject.content_rule_firefox_preferences-autofill_forms" selected="false"/>
+    <xccdf:select idref="xccdf_org.ssgproject.content_rule_firefox_preferences-addons_plugin_updates" selected="false"/>
+  </xccdf:Profile>
+</xccdf:Tailoring>

data/test/ds/arf_test.rb

@@ -14,7 +14,7 @@ require 'openscap/ds/arf'
 require 'common/testcase'
 
 class TestArf < OpenSCAP::TestCase
-  REPORT = 'report.rds.xml'
+  REPORT = 'report.rds.xml'.freeze
 
   def test_arf_new_nil
     msg = nil
@@ -24,7 +24,7 @@ class TestArf < OpenSCAP::TestCase
     rescue OpenSCAP::OpenSCAPError => e
       msg = e.to_s
     end
-    assert msg.start_with?("Cannot initialize OpenSCAP::DS:Arf with ''"), 'Message was: ' + msg
+    assert msg.start_with?("Cannot initialize OpenSCAP::DS::Arf with ''"), 'Message was: ' + msg
   end
 
   def test_arf_new_wrong_format
@@ -60,15 +60,13 @@ class TestArf < OpenSCAP::TestCase
   def test_new_memory
     create_arf
     raw_data = File.read(REPORT)
-    assert raw_data.length > 0
+    refute raw_data.empty?
     arf = OpenSCAP::DS::Arf.new :content => raw_data, :path => REPORT
     arf.destroy
   end
 
   def test_new_bz_memory
-    create_arf
-    system('/usr/bin/bzip2 ' + REPORT)
-    bziped_file = REPORT + '.bz2'
+    bziped_file = new_arf_bz
     raw_data = File.open(bziped_file, 'rb').read
     assert !raw_data.empty?
     len = File.size(bziped_file)
@@ -77,8 +75,21 @@ class TestArf < OpenSCAP::TestCase
     arf.destroy
   end
 
+  def test_new_bz_file
+    bziped_file = new_arf_bz
+    arf = OpenSCAP::DS::Arf.new(bziped_file)
+    arf.destroy
+    FileUtils.rm bziped_file
+  end
+
   private
 
+  def new_arf_bz
+    create_arf
+    system('/usr/bin/bzip2 ' + REPORT)
+    REPORT + '.bz2'
+  end
+
   def new_arf
     create_arf
     OpenSCAP::DS::Arf.new(REPORT)

data/test/source_test.rb

@@ -32,7 +32,7 @@ class TestSource < OpenSCAP::TestCase
 
   def test_source_new_memory
     raw_data = File.read('../data/xccdf.xml')
-    assert raw_data.length > 0
+    refute raw_data.empty?
     s = OpenSCAP::Source.new(:content => raw_data, :path => '/mytestpath')
     s.destroy
   end

data/test/xccdf/benchmark_test.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014 Red Hat Inc.
+# Copyright (c) 2014--2016 Red Hat Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -41,7 +41,7 @@ class TestBenchmark < OpenSCAP::TestCase
     rescue OpenSCAP::OpenSCAPError => e
       msg = e.to_s
     end
-    assert msg.start_with?('Failed to import XCCDF content from'), msg
+    assert msg.start_with?("Find element 'TestResult' while expecting element: 'Benchmark'"), msg
   end
 
   def test_items_in_benchmark
@@ -94,6 +94,7 @@ class TestBenchmark < OpenSCAP::TestCase
                              :href      => 'http://iase.disa.mil/cci/index.html',
                              :html_link => "<a href='http://iase.disa.mil/cci/index.html'>1263</a>" }]
     assert_equal(expected_references, install_hids_rule.references.map(&:to_hash), 'Install hids references should be equal')
+    b.destroy
   end
 
   def test_items_fixes
@@ -108,6 +109,7 @@ class TestBenchmark < OpenSCAP::TestCase
     }]
     assert_equal(expected_content, login_defs_rule.fixes.map(&:content), 'Fix content should match')
     assert_equal(expected_hashes, login_defs_rule.fixes.map(&:to_hash), 'Fix hash should match')
+    b.destroy
   end
 
   private

data/test/xccdf/policy_test.rb

@@ -0,0 +1,29 @@
+#
+# Copyright (c) 2016 Red Hat Inc.
+#
+# This software is licensed to you under the GNU General Public License,
+# version 2 (GPLv2). There is NO WARRANTY for this software, express or
+# implied, including the implied warranties of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+# along with this software; if not, see
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+#
+
+require 'common/testcase'
+require 'openscap'
+require 'openscap/source'
+require 'openscap/xccdf/benchmark'
+require 'openscap/xccdf/policy'
+require 'openscap/xccdf/policy_model'
+
+class TestPolicy < OpenSCAP::TestCase
+  def test_new_policy_model
+    @s = OpenSCAP::Source.new '../data/xccdf.xml'
+    b = OpenSCAP::Xccdf::Benchmark.new @s
+    pm = OpenSCAP::Xccdf::PolicyModel.new b
+    assert !b.nil?
+    assert pm.policies.size == 1, pm.policies.to_s
+    assert pm.policies['xccdf_org.ssgproject.content_profile_common']
+    pm.destroy
+  end
+end

data/test/xccdf/session_ds_test.rb

@@ -119,7 +119,7 @@ class TestSessionDS < OpenSCAP::TestCase
 
   def assert_exported(files)
     # libopenscap compiled with --enable-debug creates debug files
-    FileUtils.rm_rf(Dir.glob 'oscap_debug.log.*')
+    FileUtils.rm_rf(Dir.glob('oscap_debug.log.*'))
     assert files.sort == Dir.glob('*').sort
   end
 end

data/test/xccdf/session_test.rb

@@ -37,6 +37,6 @@ class TestSession < OpenSCAP::TestCase
 
   def test_sds_false
     @s = OpenSCAP::Xccdf::Session.new('../data/xccdf.xml')
-    assert ! @s.sds?
+    refute @s.sds?
   end
 end

data/test/xccdf/tailoring_test.rb

@@ -0,0 +1,39 @@
+#
+# Copyright (c) 2014--2016 Red Hat Inc.
+#
+# This software is licensed to you under the GNU General Public License,
+# version 2 (GPLv2). There is NO WARRANTY for this software, express or
+# implied, including the implied warranties of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+# along with this software; if not, see
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+#
+
+require 'openscap'
+require 'openscap/source'
+require 'openscap/xccdf/tailoring'
+require 'common/testcase'
+
+class TailoringTest < OpenSCAP::TestCase
+  def test_new_from_file
+    tailoring = tailoring_from_file
+    tailoring.destroy
+    refute tailoring.raw
+  end
+
+  def test_profiles
+    profiles = tailoring_from_file.profiles
+    assert_equal 1, profiles.length
+    assert profiles.values.first.is_a?(OpenSCAP::Xccdf::Profile)
+  end
+
+  private
+
+  def tailoring_from_file
+    source = OpenSCAP::Source.new '../data/tailoring.xml'
+    tailoring = OpenSCAP::Xccdf::Tailoring.new source, nil
+    source.destroy
+    assert tailoring
+    tailoring
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openscap
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.7
 platform: ruby
 authors:
 - Simon Lukasik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-27 00:00:00.000000000 Z
+date: 2016-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -50,6 +50,7 @@ files:
 - README.md
 - Rakefile
 - lib/openscap.rb
+- lib/openscap/all.rb
 - lib/openscap/ds/arf.rb
 - lib/openscap/ds/sds.rb
 - lib/openscap/exceptions.rb
@@ -63,16 +64,20 @@ files:
 - lib/openscap/xccdf/fix.rb
 - lib/openscap/xccdf/group.rb
 - lib/openscap/xccdf/item.rb
+- lib/openscap/xccdf/policy.rb
+- lib/openscap/xccdf/policy_model.rb
 - lib/openscap/xccdf/profile.rb
 - lib/openscap/xccdf/reference.rb
 - lib/openscap/xccdf/rule.rb
 - lib/openscap/xccdf/ruleresult.rb
 - lib/openscap/xccdf/session.rb
+- lib/openscap/xccdf/tailoring.rb
 - lib/openscap/xccdf/testresult.rb
 - lib/openscap/xccdf/value.rb
 - test/common/testcase.rb
 - test/data/invalid.xml
 - test/data/sds-complex.xml
+- test/data/tailoring.xml
 - test/data/testresult.xml
 - test/data/xccdf.xml
 - test/ds/arf_test.rb
@@ -82,9 +87,11 @@ files:
 - test/source_test.rb
 - test/text_test.rb
 - test/xccdf/benchmark_test.rb
+- test/xccdf/policy_test.rb
 - test/xccdf/profile_test.rb
 - test/xccdf/session_ds_test.rb
 - test/xccdf/session_test.rb
+- test/xccdf/tailoring_test.rb
 - test/xccdf/testresult_test.rb
 homepage: https://github.com/OpenSCAP/ruby-openscap
 licenses: