smart_proxy_openscap 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 036b916c4c925ac4cd054d81b3af2529b348064ff419e510443adbb8206d76af
-  data.tar.gz: 07a87fb60a80a69ca4d0645a2ff63c124ef28d073dc86ce54cbc667d959b5c00
+  metadata.gz: 02ab6e238370db54d999386c79f2735991d9e1c4b23b3a0e9fc86471e82d238a
+  data.tar.gz: e75f6b653f970415b622304c9526543d81514488be71e3bf62b077bfe41df427
 SHA512:
-  metadata.gz: 02c63d56b4fde7076aa00b51629c5d472cf7f39e5cfaa174f5b84a821ff218151e6a71fe82d57082b5a8a997f4671535426e39de69ac7b39e997c1f9630387b9
-  data.tar.gz: f66b98c2d9db0bbb0f5f5958632a1d924f09dbc063a69c1aa768419298bd0e555367ee6cd0b200ced5dbd837d3d1d3dcf585b0fed66a90e5a1ba9d24068b6fec
+  metadata.gz: 42d35a3f634b32d1936e6cee7cfc94d764bf43a856004fe6907f6a3b1097dd4d2175f59f295a89ff06240fb1948bf29fffb1659a0a1633f593c9cb67f0f8ed91
+  data.tar.gz: 80171b3bcbf413ba40a76875febf710e64faca2b84febf048056cb3b1777ccd7d228aced737a87e51906bffaf163fd60728b1c968117d9edf663442cef18c76a

data/bin/smart-proxy-openscap-send

@@ -1,7 +1,61 @@
-#!/bin/bash
+#!/usr/bin/env ruby
+#
+# Copyright (c) 2014--2015 Red Hat Inc.
+#
+# This software is licensed to you under the GNU General Public License,
+# version 3 (GPLv3). 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 GPLv3
+# along with this software; if not, see http://www.gnu.org/licenses/gpl.txt
+#
 
-if command -v scl &>/dev/null;then
-  scl enable tfm smart-proxy-openscap-send-inner
-else
-  smart-proxy-openscap-send-inner
-fi
+$LOAD_PATH.unshift '/usr/share/foreman-proxy/lib'
+$LOAD_PATH.unshift '/usr/share/foreman-proxy/modules'
+
+require 'smart_proxy'
+require 'smart_proxy_main'
+require 'smart_proxy_openscap'
+require 'smart_proxy_openscap/openscap_lib'
+
+loaded_settings = Proxy::OpenSCAP.plugin_settings
+
+# Don't run if OpenSCAP plugin is disabled or settings are missing.
+if !loaded_settings.enabled || loaded_settings.nil? || loaded_settings.empty?
+  exit 436
+end
+
+module Proxy
+  module Log
+    @@logger = ::Logger.new(Proxy::OpenSCAP.fullpath(Proxy::OpenSCAP.plugin_settings.openscap_send_log_file), 6, 1024*1024*10)
+    @@logger.level = ::Logger.const_get(Proxy::SETTINGS.log_level.upcase)
+  end
+end
+include Proxy::Log
+
+if !Proxy::SETTINGS.foreman_url
+  logger.error "Foreman URL not configured"
+  exit 437
+end
+
+lockfile = File.join(loaded_settings.spooldir, "spool.lock")
+
+Signal.trap("TERM") {
+  FileUtils.rm(lockfile) if File.exist?(lockfile)
+  exit
+}
+
+if File.exist? lockfile
+  logger.debug "Lock file #{lockfile} for openscap spool exists, not sending spool to server"
+  exit
+end
+
+begin
+  FileUtils.touch lockfile
+  Proxy::OpenSCAP::send_spool_to_foreman(loaded_settings)
+rescue StandardError => e
+  logger.error e
+  puts "#{e} See #{Proxy::OpenSCAP.fullpath(loaded_settings.openscap_send_log_file)}"
+  exit 438
+ensure
+  FileUtils.rm lockfile
+end

data/lib/smart_proxy_openscap/arf_parser.rb

@@ -87,7 +87,8 @@ module Proxy
           {
             :id => fix.id,
             :system => fix.system,
-            :full_text => fix.full_text(set_values)
+            :full_text => fix.full_text(set_values),
+            :reboot => fix.instance_variable_get('@parsed_xml')['reboot'] # TODO: add this to openscap_parser lib
           }
         end
       end

data/lib/smart_proxy_openscap/content_parser.rb

@@ -3,19 +3,21 @@ require 'openscap_parser/tailoring_file'
 
 module Proxy::OpenSCAP
   class ContentParser
+    include ::Proxy::Log
+
     def validate(file_type, scap_file)
-      msg = 'Invalid SCAP file type'
+      msg = 'Invalid XML format'
       errors = []
-      file = nil
       begin
         case file_type
         when 'scap_content'
-          file = ::OpenscapParser::DatastreamFile.new(scap_file)
+          ::OpenscapParser::DatastreamFile.new(scap_file)
         when 'tailoring_file'
-          file = ::OpenscapParser::TailoringFile.new(scap_file)
+          ::OpenscapParser::TailoringFile.new(scap_file)
         end
-        errors << msg unless file.valid?
       rescue Nokogiri::XML::SyntaxError => e
+        logger.error msg
+        logger.error e.backtrace.join("\n")
         errors << msg
       end
       { errors: errors }

data/lib/smart_proxy_openscap/profiles_parser.rb

@@ -22,7 +22,7 @@ module Proxy
 
         raise OpenSCAPException, error_msg if profiles.empty?
 
-        result = profiles.reduce({}) do |memo, profile|
+        profiles.reduce({}) do |memo, profile|
           memo.tap { |acc| acc[profile.id] = profile.title }
         end.to_json
       end

data/lib/smart_proxy_openscap/version.rb

@@ -10,6 +10,6 @@
 
 module Proxy
   module OpenSCAP
-    VERSION = '0.9.1'
+    VERSION = '0.10.0'
   end
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_openscap
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Šimon Lukašík
 - Shlomi Zadok
 - Marek Hulan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-14 00:00:00.000000000 Z
+date: 2024-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -114,10 +114,8 @@ files:
 - Rakefile
 - bin/smart-proxy-arf-html
 - bin/smart-proxy-openscap-send
-- bin/smart-proxy-openscap-send-inner
 - bin/smart-proxy-policy-guide
 - bundler.d/openscap.rb
-- extra/rubygem-smart_proxy_openscap.spec
 - extra/smart-proxy-openscap-send.cron
 - lib/smart_proxy_openscap.rb
 - lib/smart_proxy_openscap/arf_html.rb
@@ -175,7 +173,7 @@ homepage: https://github.com/theforeman/smart_proxy_openscap
 licenses:
 - GPL-3.0-or-later
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -191,8 +189,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - bzip2
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.5.9
+signing_key:
 specification_version: 4
 summary: OpenSCAP plug-in for Foreman's smart-proxy.
 test_files: []

data/bin/smart-proxy-openscap-send-inner

@@ -1,61 +0,0 @@
-#!/usr/bin/env ruby
-#
-# Copyright (c) 2014--2015 Red Hat Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 3 (GPLv3). 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 GPLv3
-# along with this software; if not, see http://www.gnu.org/licenses/gpl.txt
-#
-
-$LOAD_PATH.unshift '/usr/share/foreman-proxy/lib'
-$LOAD_PATH.unshift '/usr/share/foreman-proxy/modules'
-
-require 'smart_proxy'
-require 'smart_proxy_main'
-require 'smart_proxy_openscap'
-require 'smart_proxy_openscap/openscap_lib'
-
-loaded_settings = Proxy::OpenSCAP.plugin_settings
-
-# Don't run if OpenSCAP plugin is disabled or settings are missing.
-if !loaded_settings.enabled || loaded_settings.nil? || loaded_settings.empty?
-  exit 436
-end
-
-module Proxy
-  module Log
-    @@logger = ::Logger.new(Proxy::OpenSCAP.fullpath(Proxy::OpenSCAP.plugin_settings.openscap_send_log_file), 6, 1024*1024*10)
-    @@logger.level = ::Logger.const_get(Proxy::SETTINGS.log_level.upcase)
-  end
-end
-include Proxy::Log
-
-if !Proxy::SETTINGS.foreman_url
-  logger.error "Foreman URL not configured"
-  exit 437
-end
-
-lockfile = File.join(loaded_settings.spooldir, "spool.lock")
-
-Signal.trap("TERM") {
-  FileUtils.rm(lockfile) if File.exist?(lockfile)
-  exit
-}
-
-if File.exist? lockfile
-  logger.debug "Lock file #{lockfile} for openscap spool exists, not sending spool to server"
-  exit
-end
-
-begin
-  FileUtils.touch lockfile
-  Proxy::OpenSCAP::send_spool_to_foreman(loaded_settings)
-rescue StandardError => e
-  logger.error e
-  puts "#{e} See #{Proxy::OpenSCAP.fullpath(loaded_settings.openscap_send_log_file)}"
-  exit 438
-ensure
-  FileUtils.rm lockfile
-end

data/extra/rubygem-smart_proxy_openscap.spec

@@ -1,101 +0,0 @@
-%global gem_name smart_proxy_openscap
-
-%global foreman_proxy_bundlerd_dir /usr/share/foreman-proxy/bundler.d
-%global foreman_proxy_pluginconf_dir /etc/foreman-proxy/settings.d
-%global spool_dir /var/spool/foreman-proxy/openscap
-%global proxy_user foreman-proxy
-
-Name: rubygem-%{gem_name}
-Version: 0.3.0
-Release: 1%{?dist}
-Summary: OpenSCAP plug-in for Foreman's smart-proxy.
-Group: Applications/Internet
-License: GPLv2+
-URL: http://github.com/openscap/smart_proxy_openscap
-Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
-#Requires: ruby(release)
-Requires: ruby(rubygems)
-Requires: foreman-proxy >= 1.7.0-0.develop.201410221520
-Requires: crontabs
-#BuildRequires: ruby(release)
-BuildRequires: rubygems-devel
-BuildRequires: ruby
-BuildArch: noarch
-Provides: rubygem(%{gem_name}) = %{version}
-Obsoletes: rubygem-foreman-proxy_openscap
-
-%description
-A plug-in to the Foreman's smart-proxy which receives bzip2ed ARF files
-and forwards them to the Foreman.
-
-%prep
-gem unpack %{SOURCE0}
-%setup -q -D -T -n  %{gem_name}-%{version}
-gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
-
-%build
-# Create the gem as gem install only works on a gem file
-gem build %{gem_name}.gemspec
-
-# %%gem_install compiles any C extensions and installs the gem into ./%gem_dir
-# by default, so that we can move it into the buildroot in %%install
-%gem_install
-
-%install
-mkdir -p %{buildroot}%{gem_dir}
-cp -a .%{gem_dir}/* \
-       %{buildroot}%{gem_dir}/
-mv %{buildroot}%{gem_instdir}/%{gem_name}.gemspec %{buildroot}/%{gem_spec}
-rm %{buildroot}%{gem_instdir}/extra/*.spec # this specfile
-
-# executables
-mkdir -p %{buildroot}%{_bindir}
-mv  %{buildroot}%{gem_instdir}/bin/* \
-	%{buildroot}%{_bindir}
-
-# bundler file
-mkdir -p %{buildroot}%{foreman_proxy_bundlerd_dir}
-mv %{buildroot}%{gem_instdir}/bundler.d/openscap.rb \
-   %{buildroot}%{foreman_proxy_bundlerd_dir}
-
-# sample config
-mkdir -p %{buildroot}%{foreman_proxy_pluginconf_dir}
-mv %{buildroot}%{gem_instdir}/settings.d/openscap.yml.example \
-   %{buildroot}%{foreman_proxy_pluginconf_dir}/
-
-# crontab
-mkdir -p %{buildroot}%{_sysconfdir}/cron.d/
-mv %{buildroot}%{gem_instdir}/extra/smart-proxy-openscap-send.cron \
-   %{buildroot}%{_sysconfdir}/cron.d/%{name}
-
-# create spool directory
-mkdir -p %{buildroot}%{spool_dir}
-
-%files
-%dir %{gem_instdir}
-%{gem_libdir}
-%exclude %{gem_cache}
-%{gem_spec}
-
-%attr(-,%{proxy_user},%{proxy_user}) %{spool_dir}
-%{foreman_proxy_bundlerd_dir}/openscap.rb
-%{_bindir}/smart-proxy-openscap-send
-%doc %{foreman_proxy_pluginconf_dir}/openscap.yml.example
-%config(noreplace) %attr(0644, root, root) %{_sysconfdir}/cron.d/%{name}
-
-%{gem_docdir}
-%{gem_instdir}/README.md
-%{gem_instdir}/COPYING
-
-%changelog
-* Tue Jan 20 2015 Šimon Lukašík <slukasik@redhat.com> - 0.3.0-1
-- new upstream release
-
-* Tue Jan 20 2015 Šimon Lukašík <slukasik@redhat.com> - 0.1.0-2
-- renamed to smart_proxy_openscap
-
-* Fri Oct 24 2014 Šimon Lukašík <slukasik@redhat.com> - 0.1.0-1
-- rebuilt
-
-* Fri Jul 18 2014 Šimon Lukašík <slukasik@redhat.com> - 0.0.1-1
-- Initial package