foreman_openscap 8.0.0 → 8.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cff46602347754ec7072e88a2033eafc6815b7898909fe6b4e0fc1bd7502749a
-  data.tar.gz: ae676b964339af51be73f77bdf2be8da05fc7d4250a73fc9d727c5324edc7086
+  metadata.gz: 8bbb0c081fe2e68b2a02f8c835f5bbbef162c1f2fa973bc591ad60e27da60884
+  data.tar.gz: 5067c304b892af1d53e7d0ae54e03e831c51f6027e0978058051a1d63e48e5b7
 SHA512:
-  metadata.gz: 4ff495ee8c3ca45fc5e658e1def666fe971ff6fc2cb8a43f245c6ecbfb579ac0506b2215770eb2c30a95d5e74ae1128f831dfd356f91593fa0b5718940d0b14a
-  data.tar.gz: 4696593f4916854a2e5b616d8c40dafdaa25b974b07d0067fa0188fdbf8b6541be5768e549735853c348b4f4f5be48b839a16a6183d4ce2f346ca9155ac8c58a
+  metadata.gz: 95885c08136b4a8255767661ca869e899c1a115e99912cf613964edce482885b7e6cabc0690e4330fe95745af8fc743fb0314837a540ae2d6fae226311367c78
+  data.tar.gz: cef966ada1688c607047f829d512fb329972edaf9d415466f4259d647a9a0758a3e729532c0dbf7bbc732d6272b0aaeeaa607e358de58148a808a9606000dc9d

data/app/lib/proxy_api/openscap.rb

@@ -1,5 +1,16 @@
 module ::ProxyAPI
   class Openscap < ::ProxyAPI::Resource
+    HTTP_ERRORS = [
+      EOFError,
+      Errno::ECONNRESET,
+      Errno::EINVAL,
+      Net::HTTPBadResponse,
+      Net::HTTPHeaderSyntaxError,
+      Net::ProtocolError,
+      Timeout::Error,
+      ProxyAPI::ProxyException
+    ].freeze
+
     def initialize(args)
       @url = args[:url] + '/compliance/'
       super args

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

@@ -109,11 +109,15 @@ module ForemanOpenscap
 
     included do
       if ForemanOpenscap.with_katello?
-        has_one :lifecycle_environment, :through => :host
+        has_one :content_facet, :through => :host
+        has_many :content_view_environment_content_facets, through: :content_facet, class_name: 'Katello::ContentViewEnvironmentContentFacet'
+        has_many :content_view_environments, through: :content_view_environment_content_facets
+        has_many :content_views, through: :content_view_environments
+        has_many :lifecycle_environments, through: :content_view_environments
 
         has_many :host_collections, :through => :host
 
-        scoped_search :relation => :lifecycle_environment, :on => :name, :complete_value => true, :rename => :lifecycle_environment
+        scoped_search :relation => :lifecycle_environments, :on => :name, :complete_value => true, :rename => :lifecycle_environment
         scoped_search :relation => :host_collections, :on => :name, :complete_value => true, :rename => :host_collection,
                       :operators => ['= ', '!= '], :ext_method => :search_by_host_collection_name
       end

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

@@ -10,11 +10,7 @@ module ForemanOpenscap
     end
 
     def proxy_url
-      @proxy_url ||= SmartProxy.with_features('Openscap').find do |proxy|
-        available = ProxyAPI::AvailableProxy.new(:url => proxy.url)
-        available.available?
-      end.try(:url)
-      @proxy_url
+      @proxy_url ||= SmartProxy.with_features('Openscap').find(&:ping)&.url
     end
 
     def create_profiles

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

@@ -5,8 +5,8 @@ module ForemanOpenscap
     include InheritedPolicies
 
     included do
-      has_one :asset, :as => :assetable, :class_name => "::ForemanOpenscap::Asset", dependent: :destroy
-      has_many :asset_policies, :through => :asset, :class_name => "::ForemanOpenscap::AssetPolicy"
+      has_many :assets, :as => :assetable, :class_name => "::ForemanOpenscap::Asset", dependent: :destroy
+      has_many :asset_policies, :through => :assets, :class_name => "::ForemanOpenscap::AssetPolicy"
       has_many :policies, :through => :asset_policies, :class_name => "::ForemanOpenscap::Policy"
     end
 

data/app/models/foreman_openscap/asset.rb

@@ -1,6 +1,6 @@
 module ForemanOpenscap
   class Asset < ApplicationRecord
-    has_many :asset_policies
+    has_many :asset_policies, :dependent => :delete_all
     has_many :policies, :through => :asset_policies
     belongs_to :assetable, :polymorphic => true
 

data/app/validators/foreman_openscap/data_stream_validator.rb

@@ -22,7 +22,7 @@ module ForemanOpenscap
           errors['errors'].each { |error| data_stream_content.errors.add(:scap_file, _(error)) }
           return false
         end
-      rescue *ProxyAPI::AvailableProxy::HTTP_ERRORS => e
+      rescue *ProxyAPI::Openscap::HTTP_ERRORS => e
         data_stream_content.errors.add(:base, _('No available proxy to validate. Returned with error: %s') % e)
         return false
       end

data/db/migrate/20240426143215_remove_orphaned_asset_policies.rb

@@ -0,0 +1,6 @@
+class RemoveOrphanedAssetPolicies < ActiveRecord::Migration[6.0]
+  def up
+    orphaned_asset_policy_ids = ForemanOpenscap::AssetPolicy.left_outer_joins(:asset).where(asset: { id: nil }).pluck(:asset_id)
+    ForemanOpenscap::AssetPolicy.where(asset_id: orphaned_asset_policy_ids).delete_all
+  end
+end

data/lib/foreman_openscap/data_migration.rb

@@ -6,14 +6,15 @@ require 'tempfile'
 module ForemanOpenscap
   class DataMigration
     def initialize(proxy_id)
-      @proxy = ::SmartProxy.find(proxy_id)
-      puts "Found proxy #{@proxy.to_label}"
-      @url = @proxy.url
+      @proxy = ::SmartProxy.with_features('Openscap').where(id: proxy_id).first
+      if @proxy
+        puts "Found proxy #{@proxy.to_label}"
+        @url = @proxy.url
+      end
     end
 
     def available?
-      return false unless @proxy && @url
-      ::ProxyAPI::AvailableProxy.new(:url => @url).available? && foreman_available?
+      @proxy&.ping && foreman_available?
     end
 
     def migrate
@@ -47,7 +48,7 @@ module ForemanOpenscap
       foreman_status_url = Setting[:foreman_url] + '/status'
       response = JSON.parse(RestClient.get(foreman_status_url))
       return true if response["status"] == "ok"
-    rescue *::ProxyAPI::AvailableProxy::HTTP_ERRORS
+    rescue *::ProxyAPI::Openscap::HTTP_ERRORS
       return false
     end
 

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "8.0.0".freeze
+  VERSION = "8.0.2".freeze
 end

data/test/unit/concerns/hostgroup_extensions_test.rb

@@ -0,0 +1,10 @@
+require 'test_plugin_helper'
+
+class HostgroupExtensionsTest < ActiveSupport::TestCase
+  test "should remove all linked assets on hostgroup destroy" do
+    hostgroup = FactoryBot.create(:hostgroup)
+    FactoryBot.create_list(:asset, 3, :assetable_id => hostgroup.id, :assetable_type => 'Hostgroup')
+    asset_scope = ::ForemanOpenscap::Asset.where(:assetable_id => hostgroup.id, :assetable_type => 'Hostgroup')
+    assert_difference("asset_scope.count", -3) { hostgroup.destroy }
+  end
+end

data/test/unit/scap_content_test.rb

@@ -17,7 +17,6 @@ class ScapContentTest < ActiveSupport::TestCase
 
     test 'scap content should fail if no openscap proxy' do
       SmartProxy.stubs(:with_features).returns([])
-      ProxyAPI::AvailableProxy.any_instance.stubs(:available?).returns(false)
       scap_content = ForemanOpenscap::ScapContent.new(:title => 'Fedora', :scap_file => @scap_file)
       refute(scap_content.save)
       assert_includes(scap_content.errors.messages[:base], 'No proxy with OpenSCAP feature was found.')
@@ -26,8 +25,8 @@ class ScapContentTest < ActiveSupport::TestCase
     test 'proxy_url should return the first available proxy it finds' do
       available_proxy = SmartProxy.with_features('Openscap').first
       unavailable_proxy = FactoryBot.create(:smart_proxy, :url => 'http://proxy.example.com:8443', :features => [FactoryBot.create(:feature, :name => 'Openscap')])
-      available_proxy.stubs(:proxy_url).returns(available_proxy.url)
-      unavailable_proxy.stubs(:proxy_url).returns(nil)
+      SmartProxy.expects(:with_features).with('Openscap').returns([unavailable_proxy, available_proxy])
+      SmartProxy.any_instance.expects(:ping).twice.returns(false).then.returns(true)
       scap_content = ForemanOpenscap::ScapContent.new(:title => 'Fedora', :scap_file => @scap_file)
       assert_equal(available_proxy.url, scap_content.proxy_url)
     end

data/webpack/components/OpenscapRemediationWizard/ViewSelectedHostsLink.js

@@ -6,7 +6,7 @@ import { Button } from '@patternfly/react-core';
 
 import { translate as __ } from 'foremanReact/common/I18n';
 import { foremanUrl } from 'foremanReact/common/helpers';
-import { getHostsPageUrl } from 'foremanReact/Root/Context/ForemanContext';
+import { useForemanHostsPageUrl } from 'foremanReact/Root/Context/ForemanContext';
 
 const ViewSelectedHostsLink = ({
   hostIdsParam,
@@ -14,7 +14,7 @@ const ViewSelectedHostsLink = ({
   defaultFailedHostsSearch,
 }) => {
   const search = isAllHostsSelected ? defaultFailedHostsSearch : hostIdsParam;
-  const url = foremanUrl(`${getHostsPageUrl(false)}?search=${search}`);
+  const url = foremanUrl(`${useForemanHostsPageUrl()}?search=${search}`);
   return (
     <Button
       component="a"

data/webpack/components/OpenscapRemediationWizard/steps/ReviewHosts.js

@@ -1,3 +1,4 @@
+/* eslint-disable camelcase */
 import React, { useContext, useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import {
@@ -6,6 +7,7 @@ import {
   ToolbarContent,
   ToolbarGroup,
   ToolbarItem,
+  Button,
 } from '@patternfly/react-core';
 import { Td } from '@patternfly/react-table';
 import { toArray } from 'lodash';
@@ -18,6 +20,7 @@ import { useBulkSelect } from 'foremanReact/components/PF4/TableIndexPage/Table/
 import { getPageStats } from 'foremanReact/components/PF4/TableIndexPage/Table/helpers';
 import { STATUS } from 'foremanReact/constants';
 import { useAPI } from 'foremanReact/common/hooks/API/APIHooks';
+import { useForemanHostDetailsPageUrl } from 'foremanReact/Root/Context/ForemanContext';
 
 import OpenscapRemediationWizardContext from '../OpenscapRemediationWizardContext';
 import WizardHeader from '../WizardHeader';
@@ -157,14 +160,29 @@ const ReviewHosts = () => {
     rowData: PropTypes.object.isRequired,
   };
 
+  const hostDetailsURL = useForemanHostDetailsPageUrl();
   const columns = {
     name: {
       title: __('Name'),
-      wrapper: ({ id, name }) => <a href={foremanUrl(`hosts/${id}`)}>{name}</a>,
+      wrapper: ({ name, display_name: displayName }) => (
+        <Button
+          component="a"
+          variant="link"
+          target="_blank"
+          href={foremanUrl(`${hostDetailsURL}${name}`)}
+        >
+          {displayName}
+        </Button>
+      ),
       isSorted: true,
+      weight: 50,
+      isRequired: true,
     },
-    operatingsystem_name: {
+    os_title: {
       title: __('OS'),
+      wrapper: hostDetails => hostDetails?.operatingsystem_name,
+      isSorted: true,
+      weight: 200,
     },
   };
 

data/webpack/components/OpenscapRemediationWizard/steps/ReviewRemediation.js

@@ -16,12 +16,15 @@ import { ExternalLinkSquareAltIcon } from '@patternfly/react-icons';
 
 import { translate as __ } from 'foremanReact/common/I18n';
 import { foremanUrl } from 'foremanReact/common/helpers';
-import { getHostsPageUrl } from 'foremanReact/Root/Context/ForemanContext';
+import {
+  useForemanHostsPageUrl,
+  useForemanHostDetailsPageUrl,
+} from 'foremanReact/Root/Context/ForemanContext';
 
 import OpenscapRemediationWizardContext from '../OpenscapRemediationWizardContext';
 import WizardHeader from '../WizardHeader';
 import ViewSelectedHostsLink from '../ViewSelectedHostsLink';
-import { HOSTS_PATH, FAIL_RULE_SEARCH } from '../constants';
+import { FAIL_RULE_SEARCH } from '../constants';
 import { findFixBySnippet } from '../helpers';
 
 import './ReviewRemediation.scss';
@@ -120,7 +123,7 @@ const ReviewRemediation = () => {
             iconPosition="right"
             target="_blank"
             component="a"
-            href={foremanUrl(`${getHostsPageUrl(true)}/${hostName}`)}
+            href={foremanUrl(`${useForemanHostDetailsPageUrl()}${hostName}`)}
           >
             {hostName}
           </Button>{' '}
@@ -133,7 +136,7 @@ const ReviewRemediation = () => {
             target="_blank"
             component="a"
             href={foremanUrl(
-              `${HOSTS_PATH}/?search=${FAIL_RULE_SEARCH} = ${source}`
+              `${useForemanHostsPageUrl()}?search=${FAIL_RULE_SEARCH} = ${source}`
             )}
           >
             {__('Other hosts failing this rule')}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.0.2
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-26 00:00:00.000000000 Z
+date: 2024-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -105,7 +105,6 @@ files:
 - app/helpers/policies_helper.rb
 - app/helpers/policy_dashboard_helper.rb
 - app/helpers/tailoring_files_helper.rb
-- app/lib/proxy_api/available_proxy.rb
 - app/lib/proxy_api/migration.rb
 - app/lib/proxy_api/openscap.rb
 - app/mailers/foreman_openscap/policy_mailer.rb
@@ -326,6 +325,7 @@ files:
 - db/migrate/20210409095625_add_oval_policy_reference_to_cve.rb
 - db/migrate/20210819143316_drop_unused_tables.rb
 - db/migrate/20230912122310_add_fixes_to_message.rb
+- db/migrate/20240426143215_remove_orphaned_asset_policies.rb
 - db/seeds.d/75-job_templates.rb
 - db/seeds.d/openscap_feature.rb
 - db/seeds.d/openscap_policy_notification.rb
@@ -449,6 +449,7 @@ files:
 - test/unit/arf_report_test.rb
 - test/unit/compliance_status_test.rb
 - test/unit/concerns/host_extensions_test.rb
+- test/unit/concerns/hostgroup_extensions_test.rb
 - test/unit/concerns/openscap_proxy_extenstions_test.rb
 - test/unit/message_cleaner_test.rb
 - test/unit/openscap_host_test.rb
@@ -635,6 +636,7 @@ test_files:
 - test/unit/arf_report_test.rb
 - test/unit/compliance_status_test.rb
 - test/unit/concerns/host_extensions_test.rb
+- test/unit/concerns/hostgroup_extensions_test.rb
 - test/unit/concerns/openscap_proxy_extenstions_test.rb
 - test/unit/message_cleaner_test.rb
 - test/unit/openscap_host_test.rb

data/app/lib/proxy_api/available_proxy.rb

@@ -1,44 +0,0 @@
-module ::ProxyAPI
-  class AvailableProxy
-    HTTP_ERRORS = [
-      EOFError,
-      Errno::ECONNRESET,
-      Errno::EINVAL,
-      Net::HTTPBadResponse,
-      Net::HTTPHeaderSyntaxError,
-      Net::ProtocolError,
-      Timeout::Error,
-      ProxyAPI::ProxyException
-    ].freeze
-
-    def initialize(args)
-      @args = args
-    end
-
-    def available?
-      begin
-        return true if has_scap_feature? && minimum_version
-      rescue *HTTP_ERRORS
-        return false
-      end
-      false
-    end
-
-    private
-
-    def has_scap_feature?
-      @features ||= ::ProxyAPI::Features.new(@args).features
-      @features.include?('openscap')
-    end
-
-    def openscap_proxy_version
-      @versions ||= ::ProxyAPI::Version.new(@args).proxy_versions['modules']
-      @versions['openscap'] if @versions && @versions['openscap']
-    end
-
-    def minimum_version
-      return false unless openscap_proxy_version
-      openscap_proxy_version.to_f >= 0.5
-    end
-  end
-end