openscap 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c8eddf3fa5a4c04f1655827ba4f4b8422f32f314a20f888b36c5ef85e2e04cf
-  data.tar.gz: 3e9d497efc4543111a4fee03d8db323c85b96360e31e23cd9ebc4387ec354d17
+  metadata.gz: 0bc547f7f6f44dcfc10ef4e815f6c26e7bab650247eae7241a4bc95abce56083
+  data.tar.gz: 5b0d572d1112b46c8559fe2111a5c296481293b673a0fafa4b7857baacd385cd
 SHA512:
-  metadata.gz: 601b6ee58372cd9f943918611c5f10df28cf1245d1149547d2889531e4b623b3787fb70cc06c1b4a17d4fca7e4202dd27dcacc7a69eba5c99d156fcc7e2529f3
-  data.tar.gz: 3a47312203579d8735b19032cfe427f76ede2467bbfb63b806dbd47edd79a8442ebd40fc61062fb4ece7b51742c38350e73c69d8677aafed5a5d8aef0d473db2
+  metadata.gz: 9f3f7b7bd3c070f859516235223d605f5601d16a89761ca5d1ff91ce2039636743747458e6c59b5d66be9bbf9ed40cf0a2914e2d18aa57ddd15eb9b971e23833
+  data.tar.gz: 6cca96b95d1a55adbeb61138a949f01f07e216e90e0d8619e1e40de674f1014b7108faa2fc0a8cbab59c86a4bc9448bab570fb7e61adc090b8d07f6fada62709

data/lib/openscap/ds/arf.rb

@@ -43,16 +43,6 @@ module OpenSCAP
         source = OpenSCAP::Source.new source_p
         OpenSCAP::DS::Sds.new(source)
       end
-
-      def html
-        html_p = OpenSCAP.ds_rds_session_get_html_report @session
-        OpenSCAP.raise! if OpenSCAP.error?
-        return nil if html_p.null?
-
-        html = html_p.read_string
-        OpenSCAP::LibC.free html_p
-        html
-      end
     end
   end
 
@@ -61,5 +51,4 @@ module OpenSCAP
   attach_function :ds_rds_session_select_report, %i[pointer string], :pointer
   attach_function :ds_rds_session_replace_report_with_source, %i[pointer pointer], :int
   attach_function :ds_rds_session_select_report_request, %i[pointer string], :pointer
-  attach_function :ds_rds_session_get_html_report, [:pointer], :pointer
 end

data/lib/openscap/ds/sds.rb

@@ -34,12 +34,6 @@ module OpenSCAP
         checklist
       end
 
-      def html_guide(profile = nil)
-        html = OpenSCAP.ds_sds_session_get_html_guide(@raw, profile)
-        OpenSCAP.raise! if html.nil?
-        html
-      end
-
       def destroy
         OpenSCAP.ds_sds_session_free(@raw)
         @raw = nil
@@ -50,5 +44,4 @@ module OpenSCAP
   attach_function :ds_sds_session_new_from_source, [:pointer], :pointer
   attach_function :ds_sds_session_free, [:pointer], :void
   attach_function :ds_sds_session_select_checklist, %i[pointer string string string], :pointer
-  attach_function :ds_sds_session_get_html_guide, %i[pointer string], :string
 end

data/lib/openscap/openscap.rb

@@ -4,7 +4,7 @@ require 'ffi'
 
 module OpenSCAP
   extend FFI::Library
-  ffi_lib ['libopenscap.so.8', 'libopenscap.so.25', 'openscap']
+  ffi_lib ['libopenscap.so.8', 'libopenscap.so.25', 'libopenscap.so.33', 'openscap']
 
   def self.error?
     oscap_err

data/lib/openscap/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OpenSCAP
-  VERSION = '0.5.1'
+  VERSION = '0.6.0'
 end

data/lib/openscap/xccdf/fix.rb

@@ -9,24 +9,18 @@ module OpenSCAP
         @raw = raw
       end
 
-      def id
-        OpenSCAP.xccdf_fix_get_id @raw
-      end
-
-      def platform
-        OpenSCAP.xccdf_fix_get_platform @raw
-      end
-
-      def fix_system
-        OpenSCAP.xccdf_fix_get_system @raw
-      end
-
-      def content
-        OpenSCAP.xccdf_fix_get_content @raw
-      end
+      def id = OpenSCAP.xccdf_fix_get_id @raw
+      def platform = OpenSCAP.xccdf_fix_get_platform @raw
+      def system = OpenSCAP.xccdf_fix_get_system @raw
+      def content = OpenSCAP.xccdf_fix_get_content @raw
+      def reboot = OpenSCAP.xccdf_fix_get_reboot @raw
+      def strategy = OpenSCAP.xccdf_fix_get_strategy @raw
+      def disruption = OpenSCAP.xccdf_fix_get_disruption @raw
+      def complexity = OpenSCAP.xccdf_fix_get_complexity @raw
+      alias fix_system system
 
       def to_hash
-        { id:, platform:, system: fix_system, content: }
+        { id:, platform:, system:, content: }
       end
     end
   end
@@ -34,4 +28,28 @@ module OpenSCAP
   attach_function :xccdf_fix_get_platform, [:pointer], :string
   attach_function :xccdf_fix_get_system, [:pointer], :string
   attach_function :xccdf_fix_get_content, [:pointer], :string
+  attach_function :xccdf_fix_get_reboot, [:pointer], :bool
+
+  XccdfStrategy = enum(
+    :unknown, 0, # Strategy not defined
+    :configure,  # Adjust target config or settings
+    :disable,    # Turn off or deinstall something
+    :enable,     # Turn on or install something
+    :patch,      # Apply a patch, hotfix, or update
+    :policy,	   # Remediation by changing policies/procedures
+    :restrict,	 # Adjust permissions or ACLs
+    :update,	   # Install upgrade or update the system
+    :combination # Combo of two or more of the above
+  )
+  attach_function :xccdf_fix_get_strategy, [:pointer], XccdfStrategy
+  XccdfLevel = enum(
+    :not_defined, 0,
+    :unknown, 1,
+    :info,
+    :low,
+    :medium,
+    :high
+  )
+  attach_function :xccdf_fix_get_disruption, [:pointer], XccdfLevel
+  attach_function :xccdf_fix_get_complexity, [:pointer], XccdfLevel
 end

data/lib/openscap/xccdf/fixtext.rb

@@ -9,11 +9,19 @@ module OpenSCAP
         @raw = raw
       end
 
-      def text
-        Text.new(OpenSCAP.xccdf_fixtext_get_text(@raw)).text
-      end
+      def content = Text.new(OpenSCAP.xccdf_fixtext_get_text(@raw)).text
+      def fixref = OpenSCAP.xccdf_fixtext_get_fixref @raw
+      def reboot = OpenSCAP.xccdf_fixtext_get_reboot @raw
+      def strategy = OpenSCAP.xccdf_fixtext_get_strategy @raw
+      def disruption = OpenSCAP.xccdf_fixtext_get_disruption @raw
+      def complexity = OpenSCAP.xccdf_fixtext_get_complexity @raw
     end
   end
 
   attach_function :xccdf_fixtext_get_text, [:pointer], :pointer
+  attach_function :xccdf_fixtext_get_fixref, [:pointer], :string
+  attach_function :xccdf_fixtext_get_reboot, [:pointer], :bool
+  attach_function :xccdf_fixtext_get_strategy, [:pointer], XccdfStrategy
+  attach_function :xccdf_fixtext_get_disruption, [:pointer], XccdfLevel
+  attach_function :xccdf_fixtext_get_complexity, [:pointer], XccdfLevel
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: openscap
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Simon Lukasik
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-02 00:00:00.000000000 Z
+date: 2025-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -68,7 +67,6 @@ homepage: https://github.com/isimluk/ruby-openscap
 licenses:
 - GPL-2.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -83,8 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A FFI wrapper around the OpenSCAP library
 test_files: []