foreman_openscap 9.0.3 → 9.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f47e20cecbc1294a564f405e94da207c92060f948a056aa0ef22d14b226eada
-  data.tar.gz: cd21764970990472b08da16879541b9a049662ff91d4af42bb7c24f238c1e725
+  metadata.gz: '067348f069de3a505ff49bf8bddfb32ac0119374646235e546e4142442312fbc'
+  data.tar.gz: 5e4a33a0523ce68282648384180523e45b091eb8b4ef9a043fa3b13469d6b59f
 SHA512:
-  metadata.gz: f300139aa92a12754ad23da61402e93fe5654cb831ecbbeef04f595c7654a38838d44c257066ae59a7e2c6e8aac44e1341ce7fb0ad9655102cb8bb1675fbbdf2
-  data.tar.gz: 21fb172c6a58710a62da0fcca139d868001ab9eabcc7525557af8bbf930195cda66fd7362a6677155644b1b82b0318cb265efc3986f8ebf764f5e16da0432dad
+  metadata.gz: 758ddac232cf116aa8e8365d8241008f12a2daf1d0a98cf5070f50df913587659c7446b6145372f22e6fd5c038e8956a04d233c550458b37d14bbfba20cfbfdb
+  data.tar.gz: c60ae37836fc25b7651453ea37d1714543ca335faf9047d723ff0444fbfe493e571444e337e290425912eb450658d0504d21cceb1e5b35f9bad6f04c86d7bbd4

data/app/controllers/api/v2/compliance/scap_contents_controller.rb

@@ -1,5 +1,3 @@
-require 'foreman_openscap/bulk_upload'
-
 module Api::V2
   module Compliance
     class ScapContentsController < ::Api::V2::BaseController

data/{lib → app/services}/foreman_openscap/bulk_upload.rb

@@ -7,21 +7,28 @@ module ForemanOpenscap
       @result = OpenStruct.new(:errors => [], :results => [])
     end
 
-    def files_from_guide
-      `rpm -ql scap-security-guide | grep ds.xml`.split
+    def security_guide_packages
+      %w(scap-security-guide)
     end
 
-    def scap_guide_installed?
-      `rpm -qa | grep scap-security-guide`.present?
+    def files_from_guide(package)
+      `rpm -ql #{package} | grep ds.xml`.split
+    end
+
+    def package_installed?(package)
+      `rpm -qa | grep #{package}`.present?
     end
 
     def upload_from_scap_guide
-      unless scap_guide_installed?
-        @result.errors.push(_("Can't find scap-security-guide RPM, are you sure it is installed on your server?"))
+      package = security_guide_packages.find { |p| package_installed? p }
+      unless package
+        joined_packages = security_guide_packages.join(', ')
+        msg = _("Can't find %{packages} RPM(s), are you sure it is installed on your server?")
+        @result.errors.push(msg % {packages: joined_packages})
         return @result
       end
 
-      upload_from_files(files_from_guide, true)
+      upload_from_files(files_from_guide(package), true)
     end
 
     def upload_from_files(files_array, from_scap_guide = false)

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "9.0.3".freeze
+  VERSION = "9.0.5".freeze
 end

data/lib/tasks/foreman_openscap_tasks.rake

@@ -1,6 +1,5 @@
 # Tasks
 namespace :foreman_openscap do
-  require 'foreman_openscap/bulk_upload'
   require 'foreman_openscap/message_cleaner'
 
   namespace :bulk_upload do

data/test/lib/foreman_openscap/bulk_upload_test.rb

@@ -2,7 +2,6 @@ require 'test_plugin_helper'
 
 class BulkUploadTest < ActiveSupport::TestCase
   setup do
-    require 'foreman_openscap/bulk_upload'
     ForemanOpenscap::ScapContent.all.map(&:destroy)
   end
 
@@ -48,14 +47,14 @@ class BulkUploadTest < ActiveSupport::TestCase
 
   test 'should handle case when scap security guide is not installed' do
     upload = ForemanOpenscap::BulkUpload.new
-    upload.stubs(:scap_guide_installed?).returns(false)
+    upload.stubs(:package_installed?).returns(false)
     res = upload.upload_from_scap_guide
-    assert_equal "Can't find scap-security-guide RPM, are you sure it is installed on your server?", res.errors.first
+    assert_equal "Can't find scap-security-guide RPM(s), are you sure it is installed on your server?", res.errors.first
   end
 
   test 'should upload files from guide' do
     upload = ForemanOpenscap::BulkUpload.new
-    upload.stubs(:scap_guide_installed?).returns(true)
+    upload.stubs(:package_installed?).returns(true)
     upload.stubs(:files_from_guide).returns(["#{ForemanOpenscap::Engine.root}/test/files/scap_contents/ssg-fedora-ds.xml"])
     assert_difference('ForemanOpenscap::ScapContent.count', 1) do
       upload.upload_from_scap_guide

data/webpack/components/OpenscapRemediationWizard/Footer.js

@@ -0,0 +1,54 @@
+import React from 'react';
+import {
+  Button,
+  WizardFooter,
+  WizardContextConsumer,
+} from '@patternfly/react-core';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { WIZARD_TITLES } from './constants';
+
+export const Footer = () => (
+  <WizardFooter>
+    <WizardContextConsumer>
+      {({ activeStep, onNext, onBack, onClose, goToStepByName }) => {
+        const isValid =
+          activeStep && activeStep.enableNext !== undefined
+            ? activeStep.enableNext
+            : true;
+
+        return (
+          <>
+            {!activeStep.isFinishedStep ? (
+              <Button
+                ouiaId="oscap-rem-wiz-next-button"
+                variant="primary"
+                type="submit"
+                onClick={onNext}
+                isDisabled={!isValid}
+              >
+                {activeStep.name === WIZARD_TITLES.reviewRemediation
+                  ? __('Run')
+                  : __('Next')}
+              </Button>
+            ) : null}
+            <Button
+              ouiaId="oscap-rem-wiz-back-button"
+              variant="secondary"
+              onClick={onBack}
+              isDisabled={activeStep.name === WIZARD_TITLES.snippetSelect}
+            >
+              {__('Back')}
+            </Button>
+            <Button
+              ouiaId="oscap-rem-wiz-cancel-button"
+              variant="link"
+              onClick={onClose}
+            >
+              {__('Cancel')}
+            </Button>
+          </>
+        );
+      }}
+    </WizardContextConsumer>
+  </WizardFooter>
+);

data/webpack/components/OpenscapRemediationWizard/constants.js

@@ -1,3 +1,5 @@
+import { translate as __ } from 'foremanReact/common/I18n';
+
 export const OPENSCAP_REMEDIATION_MODAL_ID = 'openscapRemediationModal';
 export const HOSTS_PATH = '/hosts';
 export const FAIL_RULE_SEARCH = 'fails_xccdf_rule';
@@ -12,3 +14,10 @@ export const JOB_INVOCATION_API_REQUEST_KEY = 'OPENSCAP_REX_JOB_INVOCATIONS';
 
 export const SNIPPET_SH = 'urn:xccdf:fix:script:sh';
 export const SNIPPET_ANSIBLE = 'urn:xccdf:fix:script:ansible';
+
+export const WIZARD_TITLES = {
+  snippetSelect: __('Select snippet'),
+  reviewHosts: __('Review hosts'),
+  reviewRemediation: __('Review remediation'),
+  finish: __('Done'),
+};

data/webpack/components/OpenscapRemediationWizard/index.js

@@ -7,12 +7,17 @@ import { sprintf, translate as __ } from 'foremanReact/common/I18n';
 import { API_OPERATIONS, get } from 'foremanReact/redux/API';
 
 import OpenscapRemediationWizardContext from './OpenscapRemediationWizardContext';
+import { Footer } from './Footer';
 import {
   selectLogResponse,
   selectLogError,
   selectLogStatus,
 } from './OpenscapRemediationSelectors';
-import { REPORT_LOG_REQUEST_KEY, FAIL_RULE_SEARCH } from './constants';
+import {
+  REPORT_LOG_REQUEST_KEY,
+  FAIL_RULE_SEARCH,
+  WIZARD_TITLES,
+} from './constants';
 import { SnippetSelect, ReviewHosts, ReviewRemediation, Finish } from './steps';
 
 const OpenscapRemediationWizard = ({
@@ -66,7 +71,7 @@ const OpenscapRemediationWizard = ({
 
   const reviewHostsStep = {
     id: 2,
-    name: __('Review hosts'),
+    name: WIZARD_TITLES.reviewHosts,
     component: <ReviewHosts />,
     canJumpTo: Boolean(snippet && method === 'job'),
     enableNext: Boolean(snippet && method),
@@ -74,7 +79,7 @@ const OpenscapRemediationWizard = ({
   const steps = [
     {
       id: 1,
-      name: __('Select snippet'),
+      name: WIZARD_TITLES.snippetSelect,
       component: <SnippetSelect />,
       canJumpTo: true,
       enableNext: Boolean(snippet && method),
@@ -82,7 +87,7 @@ const OpenscapRemediationWizard = ({
     ...(snippet && method === 'job' ? [reviewHostsStep] : []),
     {
       id: 3,
-      name: __('Review remediation'),
+      name: WIZARD_TITLES.reviewRemediation,
       component: <ReviewRemediation />,
       canJumpTo: Boolean(snippet && method),
       enableNext: method === 'job',
@@ -90,7 +95,7 @@ const OpenscapRemediationWizard = ({
     },
     {
       id: 4,
-      name: __('Done'),
+      name: WIZARD_TITLES.finish,
       component: <Finish onClose={onWizardClose} />,
       isFinishedStep: true,
     },
@@ -128,6 +133,7 @@ const OpenscapRemediationWizard = ({
             isOpen={isRemediationWizardOpen}
             steps={steps}
             onClose={onWizardClose}
+            footer={<Footer />}
           />
         </OpenscapRemediationWizardContext.Provider>
       )}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 9.0.3
+  version: 9.0.5
 platform: ruby
 authors:
 - slukasik@redhat.com
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-17 00:00:00.000000000 Z
+date: 2025-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -116,6 +116,7 @@ files:
 - app/models/foreman_openscap/scap_content_profile.rb
 - app/models/foreman_openscap/tailoring_file.rb
 - app/services/foreman_openscap/arf_report_status_calculator.rb
+- app/services/foreman_openscap/bulk_upload.rb
 - app/services/foreman_openscap/client_config/ansible.rb
 - app/services/foreman_openscap/client_config/base.rb
 - app/services/foreman_openscap/client_config/manual.rb
@@ -286,7 +287,6 @@ files:
 - db/seeds.d/openscap_feature.rb
 - db/seeds.d/openscap_policy_notification.rb
 - lib/foreman_openscap.rb
-- lib/foreman_openscap/bulk_upload.rb
 - lib/foreman_openscap/data_migration.rb
 - lib/foreman_openscap/engine.rb
 - lib/foreman_openscap/helper.rb
@@ -296,71 +296,39 @@ files:
 - locale/Makefile
 - locale/action_names.rb
 - locale/cs_CZ/LC_MESSAGES/foreman_openscap.mo
-- locale/cs_CZ/foreman_openscap.edit.po
 - locale/cs_CZ/foreman_openscap.po
-- locale/cs_CZ/foreman_openscap.po.time_stamp
 - locale/de/LC_MESSAGES/foreman_openscap.mo
-- locale/de/foreman_openscap.edit.po
 - locale/de/foreman_openscap.po
-- locale/de/foreman_openscap.po.time_stamp
 - locale/en/LC_MESSAGES/foreman_openscap.mo
-- locale/en/foreman_openscap.edit.po
 - locale/en/foreman_openscap.po
-- locale/en/foreman_openscap.po.time_stamp
 - locale/en_GB/LC_MESSAGES/foreman_openscap.mo
-- locale/en_GB/foreman_openscap.edit.po
 - locale/en_GB/foreman_openscap.po
-- locale/en_GB/foreman_openscap.po.time_stamp
 - locale/es/LC_MESSAGES/foreman_openscap.mo
-- locale/es/foreman_openscap.edit.po
 - locale/es/foreman_openscap.po
-- locale/es/foreman_openscap.po.time_stamp
 - locale/foreman_openscap.pot
 - locale/fr/LC_MESSAGES/foreman_openscap.mo
-- locale/fr/foreman_openscap.edit.po
 - locale/fr/foreman_openscap.po
-- locale/fr/foreman_openscap.po.time_stamp
 - locale/gl/LC_MESSAGES/foreman_openscap.mo
-- locale/gl/foreman_openscap.edit.po
 - locale/gl/foreman_openscap.po
-- locale/gl/foreman_openscap.po.time_stamp
 - locale/it/LC_MESSAGES/foreman_openscap.mo
-- locale/it/foreman_openscap.edit.po
 - locale/it/foreman_openscap.po
-- locale/it/foreman_openscap.po.time_stamp
 - locale/ja/LC_MESSAGES/foreman_openscap.mo
-- locale/ja/foreman_openscap.edit.po
 - locale/ja/foreman_openscap.po
-- locale/ja/foreman_openscap.po.time_stamp
 - locale/ka/LC_MESSAGES/foreman_openscap.mo
-- locale/ka/foreman_openscap.edit.po
 - locale/ka/foreman_openscap.po
-- locale/ka/foreman_openscap.po.time_stamp
 - locale/ko/LC_MESSAGES/foreman_openscap.mo
-- locale/ko/foreman_openscap.edit.po
 - locale/ko/foreman_openscap.po
-- locale/ko/foreman_openscap.po.time_stamp
 - locale/pt_BR/LC_MESSAGES/foreman_openscap.mo
-- locale/pt_BR/foreman_openscap.edit.po
 - locale/pt_BR/foreman_openscap.po
-- locale/pt_BR/foreman_openscap.po.time_stamp
 - locale/ru/LC_MESSAGES/foreman_openscap.mo
-- locale/ru/foreman_openscap.edit.po
 - locale/ru/foreman_openscap.po
-- locale/ru/foreman_openscap.po.time_stamp
 - locale/sv_SE/LC_MESSAGES/foreman_openscap.mo
-- locale/sv_SE/foreman_openscap.edit.po
 - locale/sv_SE/foreman_openscap.po
-- locale/sv_SE/foreman_openscap.po.time_stamp
 - locale/zanata.xml
 - locale/zh_CN/LC_MESSAGES/foreman_openscap.mo
-- locale/zh_CN/foreman_openscap.edit.po
 - locale/zh_CN/foreman_openscap.po
-- locale/zh_CN/foreman_openscap.po.time_stamp
 - locale/zh_TW/LC_MESSAGES/foreman_openscap.mo
-- locale/zh_TW/foreman_openscap.edit.po
 - locale/zh_TW/foreman_openscap.po
-- locale/zh_TW/foreman_openscap.po.time_stamp
 - package.json
 - test/factories/arf_report_factory.rb
 - test/factories/asset_factory.rb
@@ -418,6 +386,7 @@ files:
 - webpack/components/IndexTable/IndexTableHelper.js
 - webpack/components/IndexTable/index.js
 - webpack/components/LinkButton.js
+- webpack/components/OpenscapRemediationWizard/Footer.js
 - webpack/components/OpenscapRemediationWizard/OpenscapRemediationSelectors.js
 - webpack/components/OpenscapRemediationWizard/OpenscapRemediationWizardContext.js
 - webpack/components/OpenscapRemediationWizard/ViewSelectedHostsLink.js
@@ -457,7 +426,7 @@ homepage: https://github.com/theforeman/foreman_openscap
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -472,8 +441,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
-signing_key: 
+rubygems_version: 3.3.27
+signing_key:
 specification_version: 4
 summary: Foreman plug-in for displaying OpenSCAP audit reports
 test_files: