openscap 0.4.8 → 0.5.0

data/lib/openscap/xccdf/item.rb

@@ -1,26 +1,20 @@
-#
-# 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
-# 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.
-#
+# frozen_string_literal: true
 
 require 'openscap/exceptions'
 require 'openscap/text'
+require 'openscap/xccdf/item_common'
 require 'openscap/xccdf/group'
 require 'openscap/xccdf/rule'
-require 'openscap/xccdf/reference'
 
 module OpenSCAP
   module Xccdf
     class Item
+      include ItemCommon # reflects OpenSCAP's struct xccdf_item (thus operates with Benchmark, Profile, Group, Rule, and Value)
+
       def self.build(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
         when :group
@@ -33,79 +27,36 @@ module OpenSCAP
       end
 
       def initialize(t)
-        if self.class == OpenSCAP::Xccdf::Item
-          raise OpenSCAP::OpenSCAPError, "Cannot initialize #{self.class.name} abstract base class."
-        end
-        @raw = t
-      end
-
-      def id
-        OpenSCAP.xccdf_item_get_id @raw
-      end
+        raise OpenSCAP::OpenSCAPError, "Cannot initialize #{self.class.name} abstract base class." if instance_of?(OpenSCAP::Xccdf::Item)
 
-      def title(prefered_lang = nil)
-        textlist = OpenSCAP::TextList.new(OpenSCAP.xccdf_item_get_title(@raw))
-        title = textlist.plaintext(prefered_lang)
-        textlist.destroy
-        title
-      end
-
-      def description(prefered_lang = nil)
-        textlist = OpenSCAP::TextList.new(OpenSCAP.xccdf_item_get_description(@raw))
-        description = textlist.plaintext(prefered_lang)
-        textlist.destroy
-        description
+        @raw = t
       end
 
-      def rationale(prefered_lang = nil)
-        textlist = OpenSCAP::TextList.new(OpenSCAP.xccdf_item_get_rationale(@raw))
-        rationale = textlist.plaintext(prefered_lang)
-        textlist.destroy
-        rationale
+      def rationale(prefered_lang = nil, markup: false)
+        TextList.extract(OpenSCAP.xccdf_item_get_rationale(@raw), lang: prefered_lang, markup:)
       end
 
-      def references
-        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))
-          refs << ref
+      def warnings
+        @warnings ||= [].tap do |warns|
+          OpenSCAP._iterate over: OpenSCAP.xccdf_item_get_warnings(@raw), as: 'xccdf_warning' do |pointer|
+            warns << {
+              category: OpenSCAP.xccdf_warning_get_category(pointer),
+              text: Text.new(OpenSCAP.xccdf_warning_get_text(pointer))
+            }
+          end
         end
-        OpenSCAP.oscap_reference_iterator_free refs_it
-        refs
       end
 
-      def sub_items
-        @sub_items ||= sub_items_init
-      end
+      def sub_items = {}
 
       def destroy
         OpenSCAP.xccdf_item_free @raw
         @raw = nil
       end
-
-      private
-
-      def sub_items_init
-        collect = {}
-        items_it = OpenSCAP.xccdf_item_get_content @raw
-        while OpenSCAP.xccdf_item_iterator_has_more items_it
-          item_p = OpenSCAP.xccdf_item_iterator_next items_it
-          item = OpenSCAP::Xccdf::Item.build item_p
-          collect.merge! item.sub_items
-          collect[item.id] = item
-        end
-        OpenSCAP.xccdf_item_iterator_free items_it
-        collect
-      end
     end
   end
 
-  attach_function :xccdf_item_get_id, [:pointer], :string
-  attach_function :xccdf_item_get_content, [:pointer], :pointer
   attach_function :xccdf_item_free, [:pointer], :void
-  attach_function :xccdf_item_get_title, [:pointer], :pointer
-  attach_function :xccdf_item_get_description, [:pointer], :pointer
   attach_function :xccdf_item_get_rationale, [:pointer], :pointer
 
   XccdfItemType = enum(:benchmark, 0x0100,
@@ -116,11 +67,25 @@ module OpenSCAP
                        :value, 0x4000)
   attach_function :xccdf_item_get_type, [:pointer], XccdfItemType
 
-  attach_function :xccdf_item_iterator_has_more, [:pointer], :bool
-  attach_function :xccdf_item_iterator_next, [:pointer], :pointer
-  attach_function :xccdf_item_iterator_free, [:pointer], :void
+  enum :xccdf_warning_category_t, [
+    :not_specified, # empty value
+    :general, # General-purpose warning
+    :functionality, # Warning about possible impacts to functionality
+    :performance, # Warning about changes to target system performance
+    :hardware, # Warning about hardware restrictions or possible impacts to hardware
+    :legal, # Warning about legal implications
+    :regulatory,	# Warning about regulatory obligations
+    :management, # Warning about impacts to the mgmt or administration of the target system
+    :audit, # Warning about impacts to audit or logging
+    :dependency # Warning about dependencies between this Rule and other parts of the target system
+  ]
+  attach_function :xccdf_item_get_warnings, [:pointer], :pointer
+  attach_function :xccdf_warning_iterator_has_more, [:pointer], :bool
+  attach_function :xccdf_warning_iterator_next, [:pointer], :pointer
+  attach_function :xccdf_warning_iterator_free, [:pointer], :void
+  attach_function :xccdf_warning_get_category, [:pointer], :xccdf_warning_category_t
+  attach_function :xccdf_warning_get_text, [:pointer], :pointer
 
-  attach_function :xccdf_item_get_references, [:pointer], :pointer
   attach_function :oscap_reference_iterator_has_more, [:pointer], :bool
   attach_function :oscap_reference_iterator_next, [:pointer], :pointer
   attach_function :oscap_reference_iterator_free, [:pointer], :void

data/lib/openscap/xccdf/item_common.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'openscap/text'
+require 'openscap/xccdf/reference'
+
+module OpenSCAP
+  module Xccdf
+    module ItemCommon
+      def id
+        OpenSCAP.xccdf_item_get_id @raw
+      end
+
+      def version
+        OpenSCAP.xccdf_item_get_version @raw
+      end
+
+      def title lang: nil
+        TextList.extract OpenSCAP.xccdf_item_get_title(@raw), lang:, markup: false
+      end
+
+      def description prefered_lang: nil, markup: true
+        TextList.extract(OpenSCAP.xccdf_item_get_description(@raw), lang: prefered_lang, markup:)
+      end
+
+      def references
+        refs = []
+        OpenSCAP._iterate over: OpenSCAP.xccdf_item_get_references(@raw), as: 'oscap_reference' do |pointer|
+          refs << OpenSCAP::Xccdf::Reference.new(pointer)
+        end
+        refs
+      end
+    end
+  end
+
+  attach_function :xccdf_item_get_id, [:pointer], :string
+  attach_function :xccdf_item_get_title, [:pointer], :pointer
+  attach_function :xccdf_item_get_description, [:pointer], :pointer
+  attach_function :xccdf_item_get_references, [:pointer], :pointer
+  attach_function :xccdf_item_get_version, [:pointer], :string
+end

data/lib/openscap/xccdf/policy.rb

@@ -1,13 +1,4 @@
-#
-# 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.
-#
+# frozen_string_literal: true
 
 require 'openscap/exceptions'
 
@@ -30,8 +21,18 @@ module OpenSCAP
       def id
         OpenSCAP.xccdf_policy_get_id raw
       end
+
+      def profile
+        Profile.new OpenSCAP.xccdf_policy_get_profile @raw
+      end
+
+      def selects_item?(item_idref)
+        OpenSCAP.xccdf_policy_is_item_selected @raw, item_idref
+      end
     end
   end
 
   attach_function :xccdf_policy_get_id, [:pointer], :string
+  attach_function :xccdf_policy_get_profile, [:pointer], :pointer
+  attach_function :xccdf_policy_is_item_selected, %i[pointer string], :bool
 end

data/lib/openscap/xccdf/policy_model.rb

@@ -1,13 +1,4 @@
-#
-# 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.
-#
+# frozen_string_literal: true
 
 require 'openscap/exceptions'
 require 'openscap/xccdf/benchmark'
@@ -27,6 +18,12 @@ module OpenSCAP
                 "Cannot initialize OpenSCAP::Xccdf::PolicyModel with '#{b}'"
         end
         OpenSCAP.raise! if @raw.null?
+
+        begin
+          yield self
+        ensure
+          destroy
+        end if block_given?
       end
 
       def policies
@@ -38,18 +35,21 @@ module OpenSCAP
         @raw = nil
       end
 
+      def each_policy(&)
+        OpenSCAP.raise! unless OpenSCAP.xccdf_policy_model_build_all_useful_policies(raw).zero?
+        OpenSCAP._iterate over: OpenSCAP.xccdf_policy_model_get_policies(@raw),
+                          as: 'xccdf_policy' do |pointer|
+          yield OpenSCAP::Xccdf::Policy.new pointer
+        end
+      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
+        each_policy do |policy|
           policies[policy.id] = policy
         end
-        OpenSCAP.xccdf_policy_iterator_free polit
         policies
       end
     end

data/lib/openscap/xccdf/profile.rb

@@ -1,19 +1,12 @@
-#
-# Copyright (c) 2014 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.
-#
+# frozen_string_literal: true
 
 require 'openscap/text'
+require 'openscap/xccdf/item_common'
 
 module OpenSCAP
   module Xccdf
     class Profile
+      include ItemCommon
       attr_reader :raw
 
       def initialize(p)
@@ -25,19 +18,17 @@ module OpenSCAP
         end
       end
 
-      def id
-        OpenSCAP.xccdf_profile_get_id raw
+      def status_current
+        pointer = OpenSCAP.xccdf_profile_get_status_current @raw
+        Status.new pointer unless pointer.null?
       end
 
-      def title(prefered_lang = nil)
-        textlist = OpenSCAP::TextList.new(OpenSCAP.xccdf_profile_get_title(@raw))
-        title = textlist.plaintext(prefered_lang)
-        textlist.destroy
-        title
+      def abstract?
+        OpenSCAP.xccdf_profile_get_abstract @raw
       end
     end
   end
 
-  attach_function :xccdf_profile_get_id, [:pointer], :string
-  attach_function :xccdf_profile_get_title, [:pointer], :pointer
+  attach_function :xccdf_profile_get_status_current, [:pointer], :pointer
+  attach_function :xccdf_profile_get_abstract, [:pointer], :bool
 end

data/lib/openscap/xccdf/reference.rb

@@ -1,13 +1,4 @@
-#
-# 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
-# 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.
-#
+# frozen_string_literal: true
 
 module OpenSCAP
   module Xccdf
@@ -15,6 +6,7 @@ module OpenSCAP
       def initialize(raw)
         raise OpenSCAP::OpenSCAPError, "Cannot initialize #{self.class.name} with '#{raw}'" \
           unless raw.is_a?(FFI::Pointer)
+
         @raw = raw
       end
 
@@ -32,9 +24,9 @@ module OpenSCAP
 
       def to_hash
         {
-          :title => title,
-          :href => href,
-          :html_link => html_link
+          title:,
+          href:,
+          html_link:
         }
       end
     end

data/lib/openscap/xccdf/rule.rb

@@ -1,13 +1,4 @@
-#
-# Copyright (c) 2015 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.
-#
+# frozen_string_literal: true
 
 require 'openscap/exceptions'
 require 'openscap/xccdf/item'
@@ -20,33 +11,29 @@ module OpenSCAP
       def severity
         severity = OpenSCAP.xccdf_rule_get_severity(@raw)
         severity_mapping = {
-          :xccdf_level_not_defined => 'Not defined',
-          :xccdf_unknown => 'Unknown',
-          :xccdf_info => 'Info',
-          :xccdf_low => 'Low',
-          :xccdf_medium => 'Medium',
-          :xccdf_high => 'High'
+          xccdf_level_not_defined: 'Not defined',
+          xccdf_unknown: 'Unknown',
+          xccdf_info: 'Info',
+          xccdf_low: 'Low',
+          xccdf_medium: 'Medium',
+          xccdf_high: 'High'
         }
-        severity_mapping[severity] ? severity_mapping[severity] : severity_mapping[:xccdf_unknown]
+        severity_mapping[severity] || severity_mapping[:xccdf_unknown]
       end
 
       def fixes
         fixes = []
-        items_it = OpenSCAP.xccdf_rule_get_fixes(@raw)
-        while OpenSCAP.xccdf_fix_iterator_has_more items_it
-          fixes << OpenSCAP::Xccdf::Fix.new(OpenSCAP.xccdf_fix_iterator_next(items_it))
+        OpenSCAP._iterate over: OpenSCAP.xccdf_rule_get_fixes(@raw), as: 'xccdf_fix' do |pointer|
+          fixes << OpenSCAP::Xccdf::Fix.new(pointer)
         end
-        OpenSCAP.xccdf_fix_iterator_free items_it
         fixes
       end
 
       def idents
         idents = []
-        idents_it = OpenSCAP.xccdf_rule_get_idents(@raw)
-        while OpenSCAP.xccdf_ident_iterator_has_more idents_it
-          idents << OpenSCAP::Xccdf::Ident.new(OpenSCAP.xccdf_ident_iterator_next(idents_it))
+        OpenSCAP._iterate over: OpenSCAP.xccdf_rule_get_idents(@raw), as: 'xccdf_ident' do |pointer|
+          idents << OpenSCAP::Xccdf::Ident.new(pointer)
         end
-        OpenSCAP.xccdf_ident_iterator_free idents_it
         idents
       end
     end

data/lib/openscap/xccdf/ruleresult.rb

@@ -1,13 +1,4 @@
-#
-# 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.
-#
+# frozen_string_literal: true
 
 require 'openscap/exceptions'
 require 'openscap/text'

data/lib/openscap/xccdf/session.rb

@@ -1,19 +1,11 @@
-#
-# 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.
-#
+# frozen_string_literal: true
 
 module OpenSCAP
   module Xccdf
     class Session
       def initialize(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?
@@ -25,8 +17,8 @@ module OpenSCAP
 
       def load(opts = {})
         o = {
-          :datastream_id => nil,
-          :component_id => nil
+          datastream_id: nil,
+          component_id: nil
         }.merge(opts)
         if sds?
           OpenSCAP.xccdf_session_set_datastream_id(@s, o[:datastream_id])
@@ -38,9 +30,7 @@ module OpenSCAP
 
       def profile=(p)
         @profile = p
-        if OpenSCAP.xccdf_session_set_profile_id(@s, p) == false
-          raise OpenSCAPError, "No profile '" + p + "' found"
-        end
+        raise OpenSCAPError, "No profile '#{p}' found" if OpenSCAP.xccdf_session_set_profile_id(@s, p) == false
       end
 
       def evaluate
@@ -53,12 +43,12 @@ module OpenSCAP
 
       def export_results(opts = {})
         o = {
-          :rds_file => nil,
-          :xccdf_file => nil,
-          :report_file => nil,
-          :oval_results => false,
-          :oval_variables => false,
-          :engines_results => false
+          rds_file: nil,
+          xccdf_file: nil,
+          report_file: nil,
+          oval_results: false,
+          oval_variables: false,
+          engines_results: false
         }.merge!(opts)
         export_targets o
         export
@@ -102,13 +92,13 @@ module OpenSCAP
 
   attach_function :xccdf_session_is_sds, [:pointer], :bool
 
-  attach_function :xccdf_session_set_profile_id, [:pointer, :string], :bool
-  attach_function :xccdf_session_set_datastream_id, [:pointer, :string], :void
-  attach_function :xccdf_session_set_component_id, [:pointer, :string], :void
-  attach_function :xccdf_session_set_arf_export, [:pointer, :string], :bool
-  attach_function :xccdf_session_set_xccdf_export, [:pointer, :string], :bool
-  attach_function :xccdf_session_set_report_export, [:pointer, :string], :bool
-  attach_function :xccdf_session_set_oval_variables_export, [:pointer, :bool], :void
-  attach_function :xccdf_session_set_oval_results_export, [:pointer, :bool], :void
-  attach_function :xccdf_session_set_check_engine_plugins_results_export, [:pointer, :bool], :void
+  attach_function :xccdf_session_set_profile_id, %i[pointer string], :bool
+  attach_function :xccdf_session_set_datastream_id, %i[pointer string], :void
+  attach_function :xccdf_session_set_component_id, %i[pointer string], :void
+  attach_function :xccdf_session_set_arf_export, %i[pointer string], :bool
+  attach_function :xccdf_session_set_xccdf_export, %i[pointer string], :bool
+  attach_function :xccdf_session_set_report_export, %i[pointer string], :bool
+  attach_function :xccdf_session_set_oval_variables_export, %i[pointer bool], :void
+  attach_function :xccdf_session_set_oval_results_export, %i[pointer bool], :void
+  attach_function :xccdf_session_set_check_engine_plugins_results_export, %i[pointer bool], :void
 end

data/lib/openscap/xccdf/status.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module OpenSCAP
+  module Xccdf
+    class Status
+      def initialize(raw)
+        raise OpenSCAP::OpenSCAPError, "Cannot initialize #{self.class.name} with '#{raw}'" \
+          unless raw.is_a?(FFI::Pointer)
+
+        @raw = raw
+      end
+
+      def status
+        OpenSCAP.xccdf_status_get_status @raw
+      end
+
+      def date
+        unix_t = OpenSCAP.xccdf_status_get_date @raw
+        Time.at unix_t
+      end
+    end
+  end
+
+  enum :xccdf_status_type_t, [
+    :not_specified, # empty value
+    :accepted,
+    :deprecated,
+    :draft,
+    :incomplete,
+    :interim
+  ]
+
+  attach_function :xccdf_status_get_status, [:pointer], :xccdf_status_type_t
+  attach_function :xccdf_status_get_date, [:pointer], :time_t
+end

data/lib/openscap/xccdf/tailoring.rb

@@ -1,13 +1,4 @@
-#
-# 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.
-#
+# frozen_string_literal: true
 
 require 'openscap/source'
 require 'openscap/xccdf/profile'
@@ -40,19 +31,16 @@ module OpenSCAP
 
       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
+        OpenSCAP._iterate over: OpenSCAP.xccdf_tailoring_get_profiles(@raw), as: 'xccdf_profile' do |pointer|
+          profile = OpenSCAP::Xccdf::Profile.new pointer
           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_import_source, %i[pointer pointer], :pointer
   attach_function :xccdf_tailoring_free, [:pointer], :void
 
   attach_function :xccdf_tailoring_get_profiles, [:pointer], :pointer

data/lib/openscap/xccdf/testresult.rb

@@ -1,13 +1,4 @@
-#
-# 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.
-#
+# frozen_string_literal: true
 
 require 'openscap/source'
 require 'openscap/exceptions'
@@ -17,8 +8,7 @@ require 'openscap/xccdf/ruleresult'
 module OpenSCAP
   module Xccdf
     class TestResult
-      attr_reader :rr
-      attr_reader :raw
+      attr_reader :rr, :raw
 
       def initialize(t)
         case t
@@ -67,27 +57,22 @@ module OpenSCAP
 
       def init_ruleresults
         @rr = {}
-        rr_it = OpenSCAP.xccdf_result_get_rule_results(@raw)
-        while OpenSCAP.xccdf_rule_result_iterator_has_more(rr_it)
-          rr_raw = OpenSCAP.xccdf_rule_result_iterator_next(rr_it)
-          rr = OpenSCAP::Xccdf::RuleResult.new rr_raw
+        OpenSCAP._iterate over: OpenSCAP.xccdf_result_get_rule_results(@raw),
+                          as: 'xccdf_rule_result' do |pointer|
+          rr = OpenSCAP::Xccdf::RuleResult.new pointer
           @rr[rr.id] = rr
         end
-        OpenSCAP.xccdf_rule_result_iterator_free(rr_it)
       end
 
       def score_init
         scores = {}
-        scorit = OpenSCAP.xccdf_result_get_scores(@raw)
-        while OpenSCAP.xccdf_score_iterator_has_more(scorit)
-          s = OpenSCAP.xccdf_score_iterator_next(scorit)
+        OpenSCAP._iterate over: OpenSCAP.xccdf_result_get_scores(@raw), as: 'xccdf_score' do |s|
           scores[OpenSCAP.xccdf_score_get_system(s)] = {
-            :system => OpenSCAP.xccdf_score_get_system(s),
-            :value => OpenSCAP.xccdf_score_get_score(s),
-            :max => OpenSCAP.xccdf_score_get_maximum(s)
+            system: OpenSCAP.xccdf_score_get_system(s),
+            value: OpenSCAP.xccdf_score_get_score(s),
+            max: OpenSCAP.xccdf_score_get_maximum(s)
           }
         end
-        OpenSCAP.xccdf_score_iterator_free(scorit)
         scores
       end
     end
@@ -97,8 +82,8 @@ module OpenSCAP
   attach_function :xccdf_result_free, [:pointer], :void
   attach_function :xccdf_result_get_id, [:pointer], :string
   attach_function :xccdf_result_get_profile, [:pointer], :string
-  attach_function :xccdf_result_recalculate_scores, [:pointer, :pointer], :int
-  attach_function :xccdf_result_export_source, [:pointer, :string], :pointer
+  attach_function :xccdf_result_recalculate_scores, %i[pointer pointer], :int
+  attach_function :xccdf_result_export_source, %i[pointer string], :pointer
 
   attach_function :xccdf_result_get_rule_results, [:pointer], :pointer
   attach_function :xccdf_rule_result_iterator_has_more, [:pointer], :bool