foreman_openscap 0.11.2 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 416e356bc2870ed24cb951ba6dcd4d82b8a5ccb3
-  data.tar.gz: 53fc14379e71a0ff3ce51711a71974b33993c01d
+  metadata.gz: 3b91634164e03c056c272fef3a22a2f58f21b02e
+  data.tar.gz: 80c1aa22804f8f686704615a6182245c2ff31387
 SHA512:
-  metadata.gz: 94376bb05a0efba455dbd86ee1044e065b357e43f76572ed78659056128da0c1f2a4cb5be0b241a0372d4d87cddc27665566f170a731adcc223807da8deab881
-  data.tar.gz: 36ed74e3c3df1e3d46b47827c2af362c1a7744b5fdc7ec639713f56eace072994f64125a40bd6c141fa2261d1e999208a42a2b1750bcdc8e5b77559430f29480
+  metadata.gz: ad65329f24a0e80071520bc72051cf7e3f29a5f9ba28243d94eba2aeb616d190913e136903f8b80b9896334d036f538f5a98a93c2b66ac639aeae277d9666b47
+  data.tar.gz: d0296cbbcf9842d42728991a88ad2c30778c978b2a8b177d136be1519b1274c7592c35b39794d8f3db93ed307d7c1ba28be83a2de471b4632b97d616541bedf9

data/app/controllers/concerns/foreman_openscap/hosts_and_hostgroups_controller_extensions.rb

@@ -0,0 +1,23 @@
+module ForemanOpenscap
+  module HostsAndHostgroupsControllerExtensions
+    extend ActiveSupport::Concern
+    included do
+      before_action :detect_proxy_without_scap, :only => :edit
+    end
+
+    def detect_proxy_without_scap
+      unless openscap_proxy_id.nil?
+        error = "The #{openscap_proxy_id[:name]} proxy does not have Openscap feature enabled. Either set correct OpenSCAP Proxy or unset it."
+        return error(error, :now => true) unless scap_enabled_proxy?(openscap_proxy_id)
+      end
+    end
+
+    def scap_enabled_proxy?(proxy_id)
+      SmartProxy.find_by!(id: proxy_id).feature_names.include?('Openscap')
+    end
+
+    def openscap_proxy_id
+      @host.try(:openscap_proxy) || @hostgroup.try(:openscap_proxy)
+    end
+  end
+end

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

@@ -142,7 +142,7 @@ module ForemanOpenscap
 
       scoped_search :relation => :openscap_proxy, :on => :name, :complete_value => true, :only_explicit => true, :rename => :openscap_proxy
 
-      scoped_search :relation => :sources, :on => :value, :complete_value => true, :rename => :xccdf_rule_name,
+      scoped_search :relation => :sources, :on => :value, :rename => :xccdf_rule_name,
                     :only_explicit => true, :operators => ['= ']
 
       scoped_search :relation => :sources, :on => :value, :rename => :xccdf_rule_failed,

data/lib/foreman_openscap/engine.rb

@@ -219,6 +219,8 @@ module ForemanOpenscap
       Hostgroup.send(:include, ForemanOpenscap::HostgroupExtensions)
       SmartProxy.send(:include, ForemanOpenscap::SmartProxyExtensions)
       HostsController.send(:prepend, ForemanOpenscap::HostsControllerExtensions)
+      HostsController.send(:include, ForemanOpenscap::HostsAndHostgroupsControllerExtensions)
+      HostgroupsController.send(:include, ForemanOpenscap::HostsAndHostgroupsControllerExtensions)
       Log.send(:include, ForemanOpenscap::LogExtensions)
       BookmarkControllerValidator.send(:prepend, ForemanOpenscap::BookmarkControllerValidatorExtensions)
       ProxyStatus.status_registry.add(ProxyStatus::OpenscapSpool)

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "0.11.2".freeze
+  VERSION = "0.11.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.3
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-28 00:00:00.000000000 Z
+date: 2019-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -54,6 +54,7 @@ files:
 - app/controllers/concerns/foreman/controller/parameters/tailoring_file.rb
 - app/controllers/concerns/foreman_openscap/arf_reports_controller_common_extensions.rb
 - app/controllers/concerns/foreman_openscap/body_log_extensions.rb
+- app/controllers/concerns/foreman_openscap/hosts_and_hostgroups_controller_extensions.rb
 - app/controllers/concerns/foreman_openscap/hosts_controller_extensions.rb
 - app/controllers/openscap_proxies_controller.rb
 - app/controllers/policies_controller.rb