foreman_openscap 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1feb561a50f25dc010a75ac0cc3ef91b62c92e06
-  data.tar.gz: 61ed2b4a83b4983901a761cab721be88fd7cacf0
+  metadata.gz: 2b0b56c6f69891762fa3bbcbd59f7de1883a2c3c
+  data.tar.gz: 9c3e7c7ce9fa65769ef3a8a46ca360e0efe2dae8
 SHA512:
-  metadata.gz: d6326a6c5e111b39324e357d69f08be04562923bebd7bfc9bcfa9d6118156e86341cc8b4abd30bdaf29ed478a11659abd97966879d62f4acfc9796a49f234a3c
-  data.tar.gz: b77dac15c66aae94c00ebb8f037eeaa5e8ed1ee7fff03cc50bd8aa56927024df1a307559ff6c132f26ff11438bf015fab4956c267c08e522c55bc7457489d0ee
+  metadata.gz: 4732cb483607a6d37de0ee738517d0e12ab3ab718f9fb43308f831a9f3cb19934667d5ba8fb434bd1244c929acf35e0890f5a24b9736c4d1fe22b09ff1fa8b65
+  data.tar.gz: 3e440693f385abe344f79b7b810c3b16d7603587268b3427566143dfed4b58867ea7500d2283aa520c29b4d2326d4d88a4f8a5a0849ef40948e964077374b69e

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

@@ -10,5 +10,36 @@ module ForemanOpenscap
       @openscap_proxy = @hostgroup.openscap_proxy
       super
     end
+
+    def select_multiple_openscap_proxy
+      find_multiple
+    end
+
+    def update_multiple_openscap_proxy
+      if (id = params['smart_proxy']['id'])
+        find_multiple
+        smart_proxy = ::SmartProxy.find(id)
+        @hosts.each do |host|
+          host.openscap_proxy = smart_proxy
+          host.save!
+        end
+        notice _("Updated hosts: Assigned with OpenSCAP Proxy: %s") % smart_proxy.name
+        redirect_to hosts_path
+      else
+        error _('No OpenSCAP Proxy selected.')
+        redirect_to(select_multiple_openscap_proxy_hosts_path)
+      end
+    end
+
+    private
+
+    def action_permission
+      case params[:action]
+      when 'select_multiple_openscap_proxy', 'update_multiple_openscap_proxy'
+        :edit
+      else
+        super
+      end
+    end
   end
 end

data/app/helpers/concerns/foreman_openscap/hosts_helper_extensions.rb

@@ -2,7 +2,8 @@ module ForemanOpenscap
   module HostsHelperExtensions
     def multiple_actions
       super + [[_('Assign Compliance Policy'), select_multiple_hosts_policies_path],
-                                       [_('Unassign Compliance Policy'), disassociate_multiple_hosts_policies_path]]
+                                       [_('Unassign Compliance Policy'), disassociate_multiple_hosts_policies_path],
+                                       [_('Change OpenSCAP Proxy'), select_multiple_openscap_proxy_hosts_path]]
     end
 
     def name_column(record)

data/app/helpers/policies_helper.rb

@@ -88,7 +88,7 @@ module PoliciesHelper
   end
 
   def previous_link(form)
-    previous = content_tag(:span, :class => 'glyphicon glyphicon-chevron-left')
+    previous = content_tag(:span, "", :class => 'glyphicon glyphicon-chevron-left')
     content_tag(:div, :class => 'pull-left') do
       link_to(previous.html_safe, '#', :class => 'btn btn-default', :onclick => "previous_step('#{@policy.previous_step}')")
     end

data/app/lib/proxy_api/openscap.rb

@@ -21,7 +21,10 @@ module ::ProxyAPI
       raise ::ProxyAPI::ProxyException.new(url, e, N_("Request timed out. Please try increasing Settings -> proxy_request_timeout"))
     rescue RestClient::ResourceNotFound => e
       raise ::ProxyAPI::ProxyException.new(url, e,
-                                           N_("Could not validate %s. Please make sure you have appropriate proxy version to use this functionality") % scap_file.class)
+                                           N_("Could not validate %s. Please make sure you have appropriate proxy version to use this functionality") % type.humanize)
+    rescue => e
+      raise ::ProxyAPI::ProxyException.new(url, e,
+                                           N_("Could not validate %{file_type}. Error %{error}") % { :file_type => type.humanize, :error => e.message })
     end
 
     def policy_html_guide(scap_file, policy)

data/app/models/foreman_openscap/policy.rb

@@ -1,10 +1,10 @@
 require 'rack/utils'
 module ForemanOpenscap
   class Policy < ApplicationRecord
+    audited
     include Authorizable
     include Taxonomix
     attr_writer :current_step, :wizard_initiated
-    audited
 
     belongs_to :scap_content
     belongs_to :scap_content_profile

data/app/models/foreman_openscap/scap_content.rb

@@ -1,9 +1,9 @@
 module ForemanOpenscap
   class ScapContent < ApplicationRecord
+    audited :except => [:scap_file]
     include Authorizable
     include Taxonomix
     include DataStreamContent
-    audited :except => [:scap_file]
 
     has_many :scap_content_profiles, :dependent => :destroy
     has_many :policies

data/app/models/foreman_openscap/tailoring_file.rb

@@ -1,9 +1,9 @@
 module ForemanOpenscap
   class TailoringFile < ApplicationRecord
+    audited :except => [:scap_file]
     include Authorizable
     include Taxonomix
     include DataStreamContent
-    audited :except => [:scap_file]
 
     has_many :policies
     has_many :scap_content_profiles, :dependent => :destroy

data/app/views/hosts/select_multiple_openscap_proxy.html.erb

@@ -0,0 +1,8 @@
+<%= render 'selected_hosts', :hosts => @hosts %>
+
+<%= form_for :smart_proxy,
+             :url => update_multiple_openscap_proxy_hosts_path(:host_ids => params[:host_ids]) do |f| %>
+    <%= selectable_f f, :id, [[_("Select OpenSCAP Proxy"), "None"],
+                             ] + SmartProxy.with_features(['Openscap']).map{|e| [e.name, e.id]},{},
+                        :onchange => "toggle_multiple_ok_button(this)" %>
+<% end %>

data/config/routes.rb

@@ -93,6 +93,8 @@ Foreman::Application.routes.draw do
   resources :hosts do
     collection do
       post 'openscap_proxy_changed'
+      post 'select_multiple_openscap_proxy'
+      post 'update_multiple_openscap_proxy'
     end
   end
 

data/lib/foreman_openscap/engine.rb

@@ -92,7 +92,10 @@ module ForemanOpenscap
           permission :destroy_scap_contents, { :scap_contents => [:destroy],
                                                'api/v2/compliance/scap_contents' => [:destroy] },
                      :resource_type => 'ForemanOpenscap::ScapContent'
-          permission :edit_hosts, { :hosts => [:openscap_proxy_changed] }, :resource_type => "Host"
+          permission :edit_hosts, { :hosts => %i[openscap_proxy_changed
+                                                 select_multiple_openscap_proxy
+                                                 update_multiple_openscap_proxy] },
+                     :resource_type => "Host"
           permission :edit_hostgroups, { :hostgroups => [:openscap_proxy_changed] }, :resource_type => "Hostgroup"
           permission :create_tailoring_files, { :tailoring_files => %i[create new],
                                                 'api/v2/compliance/tailoring_files' => [:create] },

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "0.9.2".freeze
+  VERSION = "0.9.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-13 00:00:00.000000000 Z
+date: 2018-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -138,6 +138,7 @@ files:
 - app/views/foreman_openscap/policy_mailer/_list.erb
 - app/views/foreman_openscap/policy_mailer/_policy.erb
 - app/views/foreman_openscap/policy_mailer/policy_summary.erb
+- app/views/hosts/select_multiple_openscap_proxy.html.erb
 - app/views/job_templates/run_openscap_scans.erb
 - app/views/policies/_form.html.erb
 - app/views/policies/_list.html.erb
@@ -233,59 +234,33 @@ files:
 - lib/tasks/foreman_openscap_tasks.rake
 - locale/Makefile
 - 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_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/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
 - test/factories/arf_report_factory.rb
 - test/factories/asset_factory.rb
 - test/factories/compliance_host_factory.rb
@@ -323,7 +298,7 @@ files:
 - test/unit/services/report_dashboard/data_test.rb
 - test/unit/services/tailoring_files_proxy_check_test.rb
 - test/unit/tailoring_file_test.rb
-homepage: https://github.com/OpenSCAP/foreman_openscap
+homepage: https://github.com/theforeman/foreman_openscap
 licenses:
 - GPL-3.0
 metadata: {}