foreman_openscap 9.0.2 → 9.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12a8280c09f6c28ea1fd3d1151451570d78cd6240cf08cea57e318fc2a41a1a8
-  data.tar.gz: c52e418ee98781d49e02b3b7fda75efd5588e1e31db4e4fc40c1816761e00066
+  metadata.gz: db9d5beb1a4f3e676150bd6c7982feccee708f920dd68cb422b0736824a10cee
+  data.tar.gz: cb3c657f011aac5d73fc6595a5b9abed49033928223a53974c20f69cd8f97eed
 SHA512:
-  metadata.gz: ae202672762b8b5482a8cba0d26262dc82e1c406e98f9dbdcc11552957f2deb74aa9f0f2b323a5be982cbdd11670ba639ec750a854b19d84641eb71325ec1432
-  data.tar.gz: 3fbe7db48cdccd165299768aa7f4c3b4e00acc2661eed02ccca6f34a42569087886f06dd4d0d9ac9b37106fa68a78f9e6f72327f0fd3e09083ec593649a18097
+  metadata.gz: 4a7f09d5b4102cb8d1b95b2ed9e6b2005b84e5a28a9896411be2655bc073d5f4cb59b55096a42072e3450e685753534bdf0afcf7a91f4f567e412269092593a5
+  data.tar.gz: 9fddaa152d91a99f7efaa986ffdaf64926c56378f170ea2a82213648c10c163e97c081f122100f1cb823537f8ad540623dc1bfe54f355817f198948ba299dc17

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

@@ -6,7 +6,6 @@ module Api::V2
       include ForemanOpenscap::Api::V2::ScapApiControllerExtensions
 
       before_action :find_resource, :except => %w[index create]
-      before_action :openscap_proxy_check, :only => %w[create]
 
       api :GET, '/compliance/tailoring_files', N_('List Tailoring files')
       param_group :search_and_pagination, ::Api::V2::BaseController
@@ -77,13 +76,6 @@ module Api::V2
           super
         end
       end
-
-      def openscap_proxy_check
-        unless ForemanOpenscap::TailoringFile.any?
-          check = ForemanOpenscap::OpenscapProxyVersionCheck.new.run
-          render_error :custom_error, :status => :unprocessable_entity, :locals => { :message => check.message } unless check.pass?
-        end
-      end
     end
   end
 end

data/app/models/concerns/foreman_openscap/host_extensions.rb

@@ -102,9 +102,7 @@ module ForemanOpenscap
     end
 
     def policies_enc_raw
-      check = ForemanOpenscap::OpenscapProxyAssignedVersionCheck.new(self).run
-      method = check.pass? ? :to_enc : :to_enc_legacy
-      combined_policies.map(&method)
+      combined_policies.map(&:to_enc)
     end
 
     def combined_policies

data/app/models/foreman_openscap/policy.rb

@@ -196,10 +196,6 @@ module ForemanOpenscap
       }.merge(period_enc)
     end
 
-    def to_enc_legacy
-      to_enc.tap { |hash| hash['download_path'] = "/compliance/policies/#{self.id}/content" }
-    end
-
     def should_validate?(step_name)
       if new_record? && wizard_initiated?
         step_index > step_to_i(step_name)

data/app/views/tailoring_files/welcome.html.erb

@@ -8,14 +8,7 @@
     <%= (_('In Foreman, tailoring_files represent the custom modifications to default XCCDF profiles and they can be applied to hosts
     via %s') % link_to('compliance policies', policies_path)).html_safe %>
   </p>
-  <% proxy_check = run_tailoring_proxy_check %>
   <div class="blank-slate-pf-main-action">
-    <%= new_link(_('New Tailoring File'), {}, { :class => "btn-lg", :disabled => !proxy_check.pass? }) %>
+    <%= new_link(_('New Tailoring File'), {}, { :class => "btn-lg" }) %>
   </div>
-
-  <p>
-  <% unless proxy_check.pass? %>
-    <%= alert :class => 'alert-warning', :header => '', :text => proxy_check.message.html_safe %>
-  <% end %>
-  </p>
 </div>

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "9.0.2".freeze
+  VERSION = "9.0.4".freeze
 end

data/test/functional/api/v2/compliance/tailoring_files_controller_test.rb

@@ -24,8 +24,6 @@ class Api::V2::Compliance::TailoringFilesControllerTest < ActionController::Test
   test "should create tailoring_file" do
     tf = FactoryBot.build(:tailoring_file)
     tf_params = { :name => tf.name, :original_filename => tf.original_filename, :scap_file => tf.scap_file }
-    ForemanOpenscap::OpenscapProxyVersionCheck.any_instance.stubs(:openscap_proxy_versions)
-                                              .returns({})
     post :create, :params => tf_params, :session => set_session_user
     assert_response :success
   end
@@ -50,13 +48,4 @@ class Api::V2::Compliance::TailoringFilesControllerTest < ActionController::Test
     assert_response :ok
     refute ForemanOpenscap::ScapContent.exists?(tailoring_file.id)
   end
-
-  test "should not create tailoring file when there is outdated proxy version" do
-    tf = FactoryBot.build(:tailoring_file)
-    tf_params = { :name => tf.name, :original_filename => tf.original_filename, :scap_file => tf.scap_file }
-    ForemanOpenscap::OpenscapProxyVersionCheck.any_instance.stubs(:openscap_proxy_versions)
-                                              .returns('test-proxy' => '0.5.4')
-    post :create, :params => tf_params, :session => set_session_user
-    assert_response :unprocessable_entity
-  end
 end

data/test/unit/concerns/host_extensions_test.rb

@@ -9,16 +9,7 @@ class HostExtensionsTest < ActiveSupport::TestCase
     @host = FactoryBot.create(:compliance_host, :policies => [@policy])
   end
 
-  test "should have download_path in enc without digest" do
-    ForemanOpenscap::OpenscapProxyAssignedVersionCheck.any_instance.stubs(:openscap_proxy_versions)
-                                                      .returns('test-proxy' => '0.5.4')
-    enc_out = JSON.parse @host.policies_enc
-    assert_equal 5, enc_out.first['download_path'].split('/').length
-  end
-
   test "should have download_path in enc with digest" do
-    ForemanOpenscap::OpenscapProxyAssignedVersionCheck.any_instance.stubs(:openscap_proxy_versions)
-                                                      .returns({})
     enc_out = JSON.parse @host.policies_enc
     assert_equal 6, enc_out.first['download_path'].split('/').length
   end

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.2
+  version: 9.0.4
 platform: ruby
 authors:
 - slukasik@redhat.com
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-10 00:00:00.000000000 Z
+date: 2024-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -91,7 +91,6 @@ files:
 - app/helpers/foreman_openscap_helper.rb
 - app/helpers/policies_helper.rb
 - app/helpers/policy_dashboard_helper.rb
-- app/helpers/tailoring_files_helper.rb
 - app/lib/proxy_api/migration.rb
 - app/lib/proxy_api/openscap.rb
 - app/mailers/foreman_openscap/policy_mailer.rb
@@ -127,8 +126,6 @@ files:
 - app/services/foreman_openscap/hostgroup_overrider_common.rb
 - app/services/foreman_openscap/lookup_key_overrider.rb
 - app/services/foreman_openscap/lookup_key_overrides_common.rb
-- app/services/foreman_openscap/openscap_proxy_assigned_version_check.rb
-- app/services/foreman_openscap/openscap_proxy_version_check.rb
 - app/services/foreman_openscap/policy_dashboard/data.rb
 - app/services/foreman_openscap/report_dashboard/data.rb
 - app/services/proxy_status/openscap_spool.rb
@@ -299,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
@@ -409,7 +374,6 @@ files:
 - test/unit/services/hostgroup_overrider_test.rb
 - test/unit/services/lookup_key_overrider_test.rb
 - test/unit/services/report_dashboard/data_test.rb
-- test/unit/services/tailoring_files_proxy_check_test.rb
 - test/unit/tailoring_file_test.rb
 - webpack/components/ConfirmModal.js
 - webpack/components/ConfirmModal.scss
@@ -422,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
@@ -461,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
@@ -476,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.26
+signing_key:
 specification_version: 4
 summary: Foreman plug-in for displaying OpenSCAP audit reports
 test_files:
@@ -525,5 +490,4 @@ test_files:
 - test/unit/services/hostgroup_overrider_test.rb
 - test/unit/services/lookup_key_overrider_test.rb
 - test/unit/services/report_dashboard/data_test.rb
-- test/unit/services/tailoring_files_proxy_check_test.rb
 - test/unit/tailoring_file_test.rb

data/app/helpers/tailoring_files_helper.rb

@@ -1,5 +0,0 @@
-module TailoringFilesHelper
-  def run_tailoring_proxy_check
-    ForemanOpenscap::OpenscapProxyVersionCheck.new.run
-  end
-end

data/app/services/foreman_openscap/openscap_proxy_assigned_version_check.rb

@@ -1,14 +0,0 @@
-module ForemanOpenscap
-  class OpenscapProxyAssignedVersionCheck < OpenscapProxyVersionCheck
-    def initialize(host)
-      @host = host
-      super()
-    end
-
-    private
-
-    def get_openscap_proxies
-      @host.openscap_proxy ? [@host.openscap_proxy] : []
-    end
-  end
-end

data/app/services/foreman_openscap/openscap_proxy_version_check.rb

@@ -1,62 +0,0 @@
-module ForemanOpenscap
-  class OpenscapProxyVersionCheck
-    def initialize
-      @versions = {}
-      @message = ''
-      @down = []
-    end
-
-    def run
-      @versions = openscap_proxy_versions.select do |key, value|
-        Gem::Version.new(value) < Gem::Version.new("0.6.1")
-      end
-      self
-    end
-
-    def pass?
-      !any_outdated? && !any_unreachable?
-    end
-
-    def any_outdated?
-      !@versions.empty?
-    end
-
-    def any_unreachable?
-      !@down.empty?
-    end
-
-    def message
-      if pass?
-        @message
-      else
-        build_message
-      end
-    end
-
-    private
-
-    def build_message
-      @message = _('This feature is temporarily disabled. ')
-      @message << _('The following Smart Proxies need to be updated to unlock the feature: %s. ') % @versions.keys.to_sentence if any_outdated?
-      @message << _('The following proxies could not be reached: %s. Please make sure they are available so Foreman can check their versions.') % @down.to_sentence if any_unreachable?
-      @message
-    end
-
-    def get_openscap_proxies
-      SmartProxy.with_features "Openscap"
-    end
-
-    def openscap_proxy_versions
-      get_openscap_proxies.inject({}) do |memo, proxy|
-        begin
-          status = ProxyStatus::Version.new(proxy).version
-          openscap_version = status["modules"]["openscap"]
-          memo[proxy.name] = openscap_version
-        rescue Foreman::WrappedException
-          @down << proxy.name
-        end
-        memo
-      end
-    end
-  end
-end