foreman_openscap 9.0.2 → 9.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12a8280c09f6c28ea1fd3d1151451570d78cd6240cf08cea57e318fc2a41a1a8
-  data.tar.gz: c52e418ee98781d49e02b3b7fda75efd5588e1e31db4e4fc40c1816761e00066
+  metadata.gz: 7f47e20cecbc1294a564f405e94da207c92060f948a056aa0ef22d14b226eada
+  data.tar.gz: cd21764970990472b08da16879541b9a049662ff91d4af42bb7c24f238c1e725
 SHA512:
-  metadata.gz: ae202672762b8b5482a8cba0d26262dc82e1c406e98f9dbdcc11552957f2deb74aa9f0f2b323a5be982cbdd11670ba639ec750a854b19d84641eb71325ec1432
-  data.tar.gz: 3fbe7db48cdccd165299768aa7f4c3b4e00acc2661eed02ccca6f34a42569087886f06dd4d0d9ac9b37106fa68a78f9e6f72327f0fd3e09083ec593649a18097
+  metadata.gz: f300139aa92a12754ad23da61402e93fe5654cb831ecbbeef04f595c7654a38838d44c257066ae59a7e2c6e8aac44e1341ce7fb0ad9655102cb8bb1675fbbdf2
+  data.tar.gz: 21fb172c6a58710a62da0fcca139d868001ab9eabcc7525557af8bbf930195cda66fd7362a6677155644b1b82b0318cb265efc3986f8ebf764f5e16da0432dad

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.3".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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 9.0.2
+  version: 9.0.3
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-10 00:00:00.000000000 Z
+date: 2024-07-17 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
@@ -409,7 +406,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
@@ -525,5 +521,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

data/test/unit/services/tailoring_files_proxy_check_test.rb

@@ -1,27 +0,0 @@
-require 'test_plugin_helper'
-
-class TailoringFilesProxyCheckTest < ActiveSupport::TestCase
-  test 'should find proxies with old versions' do
-    ForemanOpenscap::OpenscapProxyVersionCheck.any_instance.stubs(:openscap_proxy_versions)
-                                              .returns('old-proxy.test.com' => "0.5.4", "outdate-proxy.test.com" => "0.6.0")
-    check = ForemanOpenscap::OpenscapProxyVersionCheck.new.run
-    refute check.pass?
-    refute check.message.empty?
-  end
-
-  test 'should not find any outdated proxies' do
-    ForemanOpenscap::OpenscapProxyVersionCheck.any_instance.stubs(:openscap_proxy_versions)
-                                              .returns({})
-    check = ForemanOpenscap::OpenscapProxyVersionCheck.new.run
-    assert check.pass?
-    assert check.message.empty?
-  end
-
-  test 'should fail when proxy cannot be reached' do
-    ProxyStatus::Version.any_instance.stubs(:version).raises(Foreman::WrappedException.new(nil, 'test message'))
-    ForemanOpenscap::OpenscapProxyVersionCheck.any_instance.stubs(:get_openscap_proxies).returns([FactoryBot.create(:openscap_proxy)])
-    check = ForemanOpenscap::OpenscapProxyVersionCheck.new.run
-    refute check.pass?
-    refute check.message.empty?
-  end
-end