foreman_openscap 13.1.2 → 13.2.0

data/app/assets/javascripts/foreman_openscap/locale/ko/foreman_openscap.js

@@ -45,7 +45,7 @@
         "기간별 %s 보고서"
       ],
       "%s selected hosts.": [
-        ""
+        "%s개 호스트가 선택되었습니다."
       ],
       "%s spool errors detected, inspect the appropriate file directly on proxy": [
         "%s spool 오류가 감지되었습니다. 프록시에서 직접 해당 파일을 검사하세요."
@@ -66,7 +66,7 @@
         "OpenSCAP 정책에 대한 보고서 요약"
       ],
       "ALL selected hosts.": [
-        ""
+        "선택한 모든 호스트"
       ],
       "Actions": [
         "동작 "
@@ -87,19 +87,19 @@
         "호스트에 정책 적용"
       ],
       "Assign": [
-        ""
+        "할당"
       ],
       "Assign Compliance Policy": [
         "컴플라이언스 정책 할당"
       ],
       "Assign OpenSCAP Proxy": [
-        ""
+        "OpenSCAP 프록시 할당"
       ],
       "Assign OpenSCAP Proxy for ": [
-        ""
+        "OpenSCAP 프록시 할당 대상"
       ],
       "Assign OpenSCAP Proxy to multiple hosts": [
-        ""
+        "여러 호스트에 OpenSCAP 프록시 할당"
       ],
       "Back": [
         "뒤로 "
@@ -291,7 +291,7 @@
         "bzipped ARF 보고서 다운로드"
       ],
       "Edit %s": [
-        "%s 편집 "
+        "%s 편집"
       ],
       "Effective Profile": [
         "효과적인 프로필"
@@ -318,8 +318,7 @@
         "%s 저장에 실패했습니다:"
       ],
       "Failed to assign OpenSCAP Proxy to %{failed} of %{total} host.": [
-        "",
-        ""
+        "%{total}개 호스트 중 %{failed}개 호스트에 OpenSCAP 프록시를 할당하지 못했습니다."
       ],
       "Failed to delete %s compliance reports": [
         "%s 컴플라이언스 보고서를 삭제하지 못했습니다."
@@ -409,10 +408,10 @@
         "이 규칙을 통과하는 호스트"
       ],
       "Hosts to explicitly exclude in the action. All other hosts will be included in the action, unless an included parameter is passed as well.": [
-        ""
+        "작업에서 명시적으로 제외할 호스트. 포함된 매개변수가 전달되지 않는 한 다른 모든 호스트는 작업에 포함됩니다."
       ],
       "Hosts to include in the action": [
-        ""
+        "작업에 포함할 호스트"
       ],
       "How the policy should be deployed": [
         "정책이 어떻게 배포되어야 하는가"
@@ -421,7 +420,7 @@
         "OpenSCAP 프록시 ID"
       ],
       "ID of the OpenSCAP Proxy to assign to the hosts": [
-        ""
+        "호스트에 할당할 OpenSCAP 프록시의 ID"
       ],
       "In Foreman, a compliance policy checklist is defined via %s.": [
         "Foreman에서는 컴플라이언스 정책 체크리스트는 %s을/를 통해 정의됩니다."
@@ -457,7 +456,7 @@
         "정책에 대한 최신 보고서: %s"
       ],
       "Line chart": [
-        ""
+        "선 그래프"
       ],
       "List ARF reports": [
         "ARF 보고서 목록"
@@ -475,16 +474,16 @@
         "맞춤형 파일 목록"
       ],
       "List of host ids to exclude and not perform the action on": [
-        ""
+        "제외하고 작업을 수행하지 않을 호스트 ID 목록"
       ],
       "List of host ids to perform the action on": [
-        ""
+        "작업을 수행할 호스트 ID 목록"
       ],
       "Loading": [
-        ""
+        "로딩 중"
       ],
       "Loading...": [
-        "로딩..."
+        "로딩 중..."
       ],
       "Locations": [
         "위치"
@@ -529,7 +528,7 @@
         "이 정책에 대한 ARF 보고서가 없습니다."
       ],
       "No OpenSCAP Proxies available. Please configure a Smart Proxy with the OpenSCAP feature.": [
-        ""
+        "사용 가능한 OpenSCAP 프록시가 없습니다. OpenSCAP 기능을 갖춘 Smart Proxy를 구성하십시오."
       ],
       "No OpenSCAP Proxy selected.": [
         "OpenSCAP 프록시가 선택되지 않았습니다."
@@ -553,7 +552,7 @@
         "컴플라이언트 보고서를 찾을 수 없습니다."
       ],
       "No data available": [
-        ""
+        "사용 가능한 데이터가 없음"
       ],
       "No hosts selected": [
         "선택된 호스트가 없음"
@@ -619,13 +618,13 @@
         "OpenSCAP Proxy"
       ],
       "OpenSCAP Proxy is set to %s": [
-        ""
+        "OpenSCAP 프록시가 %s(으)로 설정되었습니다."
       ],
       "OpenSCAP Proxy to use for fetching SCAP content and uploading ARF reports. Leave blank and override appropriate parameters when using proxy load balancer.": [
         "SCAP 콘텐츠를 가져오고 ARF 보고서를 업로드하는 데 사용할 OpenSCAP 프록시입니다. 프록시 로드 밸런서를 사용할 때는 공백으로 두고 적절한 매개변수를 재정의합니다."
       ],
       "OpenSCAP Proxy with id %s not found": [
-        ""
+        "ID가 %s인 OpenSCAP 프록시를 찾을 수 없습니다."
       ],
       "Openscap Proxy": [
         "Openscap 프록시"
@@ -763,7 +762,7 @@
         "요청 시간이 초과되었습니다. 설정 -> proxy_request_timeout을 늘려보세요."
       ],
       "Required %{msg_name} %{class} was not found, please ensure it is imported first.": [
-        "필수의 %{msg_name} %{class} 을/를 찾을 수 없습니다. 먼저 가져왔는지 확인하세요."
+        "필수의 %{msg_name} %{class}을/를 찾을 수 없습니다. 먼저 가져왔는지 확인하세요."
       ],
       "Requires %s Puppet class. This will assign the class to the hosts or selected hostgroups.": [
         "%s Puppet 클래스가 필요합니다. 이는 클래스를 호스트 또는 선택된 호스트그룹에 할당합니다."
@@ -829,7 +828,7 @@
         "스케줄 "
       ],
       "Search string describing which hosts to perform the action on": [
-        ""
+        "작업을 수행할 호스트를 설명하는 검색 문자열"
       ],
       "Select Action": [
         "작업 선택"
@@ -883,7 +882,7 @@
         "스마트 클래스 매개변수"
       ],
       "Snippet": [
-        "조각 모음 "
+        "스니펫"
       ],
       "Something went wrong while selecting compliance reports - %s": [
         "컴플라이언스 보고서를 선택하는 도중 문제가 발생했습니다 -  %s"
@@ -913,8 +912,7 @@
         "ARF 보고서를 성공적으로 삭제했습니다."
       ],
       "Successfully updated %{success} host.": [
-        "",
-        ""
+        "%{success}개 호스트를 성공적으로 업데이트했습니다."
       ],
       "Summary from %{time} ago to now": [
         "%{time} 전에서 현재까지의 요약"
@@ -959,7 +957,7 @@
         "선택한 호스트에서 작업이 시작되었습니다. 작업 세부 정보 페이지에서 상태를 확인할 수 있습니다."
       ],
       "The selected OpenSCAP Proxy does not have the OpenSCAP feature enabled.": [
-        ""
+        "선택한 OpenSCAP 프록시에 OpenSCAP 기능이 활성화되어 있지 않습니다."
       ],
       "There are significant differences in deployment options.": [
         "배포 옵션에는 상당한 차이가 있습니다."
@@ -977,7 +975,7 @@
         "이 프로필은 scap 콘텐츠의 프로필을 재정의하는 데 사용됩니다."
       ],
       "This will change previous proxy assignments on the selected hosts.": [
-        ""
+        "이렇게 하면 선택한 호스트에 대한 기존 프록시 할당이 변경됩니다."
       ],
       "Title": [
         "제목"

data/app/assets/javascripts/foreman_openscap/locale/pt_BR/foreman_openscap.js

@@ -483,7 +483,7 @@
         ""
       ],
       "Loading": [
-        ""
+        "Carregando"
       ],
       "Loading...": [
         "Carregando..."

data/app/assets/javascripts/foreman_openscap/locale/ru/foreman_openscap.js

@@ -482,7 +482,7 @@
         ""
       ],
       "Loading": [
-        ""
+        "Загружается"
       ],
       "Loading...": [
         "Загрузка..."

data/app/assets/javascripts/foreman_openscap/locale/sv_SE/foreman_openscap.js

@@ -482,7 +482,7 @@
         ""
       ],
       "Loading": [
-        ""
+        "Laddar"
       ],
       "Loading...": [
         ""

data/app/assets/javascripts/foreman_openscap/locale/zh_CN/foreman_openscap.js

@@ -45,7 +45,7 @@
         "一直以來的 %s 报告"
       ],
       "%s selected hosts.": [
-        ""
+        "%{failed} 所选的主机"
       ],
       "%s spool errors detected, inspect the appropriate file directly on proxy": [
         "发现了 %s 个 spool 错误，在代理上直接检查相关的文件"
@@ -66,7 +66,7 @@
         "OpenSCAP 策略报告摘要"
       ],
       "ALL selected hosts.": [
-        ""
+        "所有选定的主机。"
       ],
       "Actions": [
         "操作"
@@ -87,19 +87,19 @@
         "对主机应用策略"
       ],
       "Assign": [
-        ""
+        "分配"
       ],
       "Assign Compliance Policy": [
         "分配合规政策"
       ],
       "Assign OpenSCAP Proxy": [
-        ""
+        "分配 OpenSCAP 代理"
       ],
       "Assign OpenSCAP Proxy for ": [
-        ""
+        "分配 OpenSCAP 代理 "
       ],
       "Assign OpenSCAP Proxy to multiple hosts": [
-        ""
+        "为多个主机分配 OpenSCAP 代理"
       ],
       "Back": [
         "返回"
@@ -318,8 +318,7 @@
         "保存失败 %s:"
       ],
       "Failed to assign OpenSCAP Proxy to %{failed} of %{total} host.": [
-        "",
-        ""
+        "将 OpenSCAP 代理分配给 %{total} 主机的 %{failed} 失败。"
       ],
       "Failed to delete %s compliance reports": [
         "刪除 %s 合规报告失败"
@@ -409,10 +408,10 @@
         "主机通过了这个规则"
       ],
       "Hosts to explicitly exclude in the action. All other hosts will be included in the action, unless an included parameter is passed as well.": [
-        ""
+        "主机明确排除在操作之外。除非还传递了包含的参数，否则所有其他主机都将包含在操作中。"
       ],
       "Hosts to include in the action": [
-        ""
+        "操作中要包含的主机"
       ],
       "How the policy should be deployed": [
         "应如何部署策略"
@@ -421,7 +420,7 @@
         "OpenSCAP 代理服务器的 ID"
       ],
       "ID of the OpenSCAP Proxy to assign to the hosts": [
-        ""
+        "分配给主机的 OpenSCAP 代理的 ID"
       ],
       "In Foreman, a compliance policy checklist is defined via %s.": [
         "在 Foreman 中，合规策略检查清单通过 %s 定义。"
@@ -457,7 +456,7 @@
         "最新的政策报告：%s"
       ],
       "Line chart": [
-        ""
+        "折线图"
       ],
       "List ARF reports": [
         "列出 ARF 报告"
@@ -475,13 +474,13 @@
         "列出 Tailoring 文件"
       ],
       "List of host ids to exclude and not perform the action on": [
-        ""
+        "要排除的主机 ID 列表，不对其执行操作"
       ],
       "List of host ids to perform the action on": [
-        ""
+        "要执行操作的主机 ID 列表"
       ],
       "Loading": [
-        ""
+        "加载"
       ],
       "Loading...": [
         "载入中..."
@@ -529,7 +528,7 @@
         "此政策沒有 ARF 報告"
       ],
       "No OpenSCAP Proxies available. Please configure a Smart Proxy with the OpenSCAP feature.": [
-        ""
+        "没有可用的 OpenSCAP 代理。请使用 OpenSCAP 功能配置智能代理。"
       ],
       "No OpenSCAP Proxy selected.": [
         "没有选择 OpenSCAP 代理。"
@@ -553,7 +552,7 @@
         "没有找到合规报告。"
       ],
       "No data available": [
-        ""
+        "无可用数据"
       ],
       "No hosts selected": [
         "未选择主机"
@@ -619,13 +618,13 @@
         "OpenSCAP 代理"
       ],
       "OpenSCAP Proxy is set to %s": [
-        ""
+        "OpenSCAP 代理被设置为 %s"
       ],
       "OpenSCAP Proxy to use for fetching SCAP content and uploading ARF reports. Leave blank and override appropriate parameters when using proxy load balancer.": [
         "用来获取 SCAP 内容以及上传 ARF 报告的 OpenSCAP 代理。如果为空，则在使用代理负责均衡器时覆盖相应的参数。"
       ],
       "OpenSCAP Proxy with id %s not found": [
-        ""
+        "未找到 ID 为 %s 的 OpenSCAP 代理"
       ],
       "Openscap Proxy": [
         "Openscap 代理"
@@ -829,7 +828,7 @@
         "调度"
       ],
       "Search string describing which hosts to perform the action on": [
-        ""
+        "搜索字符串，描述要对其执行操作的主机"
       ],
       "Select Action": [
         "选择操作"
@@ -913,8 +912,7 @@
         "成功删除了 ARF 报告。"
       ],
       "Successfully updated %{success} host.": [
-        "",
-        ""
+        "成功更新了 %{success} 主机。"
       ],
       "Summary from %{time} ago to now": [
         "从 %{time} 到现在的摘要"
@@ -959,7 +957,7 @@
         "作业已在所选主机上启动，您可以在详情页中检查作业的状态。"
       ],
       "The selected OpenSCAP Proxy does not have the OpenSCAP feature enabled.": [
-        ""
+        "所选的 OpenSCAP 代理没有启用 OpenSCAP 功能。"
       ],
       "There are significant differences in deployment options.": [
         "部署选项之间存在重大差异。"
@@ -977,7 +975,7 @@
         "这个配置文件将用于覆盖 scap 内容中的配置文件"
       ],
       "This will change previous proxy assignments on the selected hosts.": [
-        ""
+        "这将更改所选主机上的以前的代理分配。"
       ],
       "Title": [
         "提示"

data/app/assets/javascripts/foreman_openscap/locale/zh_TW/foreman_openscap.js

@@ -482,7 +482,7 @@
         ""
       ],
       "Loading": [
-        ""
+        "載入中"
       ],
       "Loading...": [
         "載入中…"

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

@@ -7,9 +7,10 @@ module Api::V2
         render_error(:custom_error, :status => :unprocessable_entity, :locals => { :message => exception.message })
       end
 
-      before_action :find_editable_hosts, only: [:change_openscap_proxy]
+      before_action :find_editable_hosts, only: [:change_openscap_proxy, :assign_compliance_policy, :unassign_compliance_policy]
       before_action :find_openscap_proxy, only: [:change_openscap_proxy]
       before_action :validate_openscap_proxy_feature, only: [:change_openscap_proxy]
+      before_action :find_compliance_policy, only: [:assign_compliance_policy, :unassign_compliance_policy]
 
       def_param_group :bulk_host_ids do
         param :included, Hash, :desc => N_("Hosts to include in the action"), :required => true, :action_aware => true do
@@ -23,6 +24,33 @@ module Api::V2
         end
       end
 
+      api :PUT, "/compliance/hosts/bulk/assign_compliance_policy", N_("Assign compliance policy to multiple hosts")
+      param_group :bulk_host_ids
+      param :policy_id, :number, :required => true, :desc => N_("ID of the compliance policy to assign to the hosts")
+      def assign_compliance_policy
+        @policy.host_ids = @policy.host_ids + @hosts.pluck(:id)
+        if @policy.save
+          message = _("Assigned with compliance policy: %s") % @policy.name
+          process_response(true, {
+            :message => n_("Updated host: #{message}", "Updated hosts: #{message}", @hosts.count),
+          })
+        else
+          render_error(:custom_error, :status => :unprocessable_entity,
+                       :locals => { :message => @policy.errors.full_messages.to_sentence })
+        end
+      end
+
+      api :PUT, "/compliance/hosts/bulk/unassign_compliance_policy", N_("Unassign compliance policy from multiple hosts")
+      param_group :bulk_host_ids
+      param :policy_id, :number, :required => true, :desc => N_("ID of the compliance policy to unassign from the hosts")
+      def unassign_compliance_policy
+        @policy.unassign_hosts(@hosts)
+        message = _("Unassigned from compliance policy '%s'") % @policy.name
+        process_response(true, {
+          :message => n_("Updated host: #{message}", "Updated hosts: #{message}", @hosts.count),
+        })
+      end
+
       api :PUT, "/hosts/bulk/change_openscap_proxy", N_("Assign OpenSCAP Proxy to multiple hosts")
       param_group :bulk_host_ids
       param :openscap_proxy_id, :number, :required => true, :desc => N_("ID of the OpenSCAP Proxy to assign to the hosts")
@@ -84,6 +112,15 @@ module Api::V2
         render_error(:custom_error, :status => :unprocessable_entity,
                      :locals => { :message => _("The selected OpenSCAP Proxy does not have the OpenSCAP feature enabled.") })
       end
+
+      def find_compliance_policy
+        @policy = ::ForemanOpenscap::Policy.authorized(:assign_policies)
+          .find_by(:id => params.require(:policy_id))
+        return if @policy
+
+        render_error(:custom_error, :status => :unprocessable_entity,
+                     :locals => { :message => _("Compliance policy with id %s not found") % params[:policy_id] })
+      end
     end
   end
 end

data/app/controllers/policies_controller.rb

@@ -83,7 +83,7 @@ class PoliciesController < ApplicationController
       if policy.save
         success _("Updated hosts: Assigned with compliance policy: %s") % policy.name
         # We prefer to go back as this does not lose the current search
-        return redirect_to hosts_path
+        redirect_to hosts_path
       else
         return process_error :object => policy, :redirect => hosts_path
       end

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

@@ -11,6 +11,8 @@ module ForemanOpenscap
 
       base.validate :openscap_proxy_in_taxonomy, :if => Proc.new { |host| host.openscap_proxy_id.present? }
 
+      base.after_update :reset_compliance_status_on_hostgroup_change, :if => :saved_change_to_hostgroup_id?
+
       base.scoped_search :relation => :policies, :on => :name, :complete_value => true, :rename => :compliance_policy,
                     :only_explicit => true, :operators => ['= '], :ext_method => :search_by_policy_name
 
@@ -129,18 +131,22 @@ module ForemanOpenscap
       report_scope
     end
 
-    def compliance_status(options = {})
-      @compliance_status ||= get_status(ForemanOpenscap::ComplianceStatus).to_status(options)
+    def compliance_status(_options = {})
+      @compliance_status ||= get_status(ForemanOpenscap::ComplianceStatus).status
     end
 
-    def compliance_status_label(options = {})
-      @compliance_status_label ||= get_status(ForemanOpenscap::ComplianceStatus).to_label(options)
+    def compliance_status_label(_options = {})
+      @compliance_status_label ||= get_status(ForemanOpenscap::ComplianceStatus).to_label
     end
 
     def openscap_proxy_in_taxonomy
       validate_association_taxonomy(:openscap_proxy)
     end
 
+    def reset_compliance_status_on_hostgroup_change
+      ForemanOpenscap::ComplianceStatusResetter.to_inconclusive([id])
+    end
+
     module ClassMethods
       def search_by_removed_from_policy(key, operator, policy_name)
         policy = ForemanOpenscap::Policy.find_by :name => policy_name

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

@@ -8,12 +8,19 @@ module ForemanOpenscap
       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"
+
+      after_update :reset_compliance_status_on_ancestry_change, :if => :saved_change_to_ancestry?
     end
 
     def inherited_policies
       find_inherited_policies :policies
     end
 
+    def reset_compliance_status_on_ancestry_change
+      host_ids = ::Host.where(:hostgroup_id => subtree_ids).pluck(:id)
+      ForemanOpenscap::ComplianceStatusResetter.to_inconclusive(host_ids)
+    end
+
     def openscap_proxy
       return super if ancestry.nil? || self.openscap_proxy_id.present?
       ::SmartProxy.find_by(:id => inherited_openscap_proxy_id)

data/app/models/foreman_openscap/asset.rb

@@ -1,7 +1,9 @@
 module ForemanOpenscap
   class Asset < ApplicationRecord
     has_many :asset_policies, :dependent => :delete_all
-    has_many :policies, :through => :asset_policies
+    has_many :policies, :through => :asset_policies,
+                        :after_add => :reset_compliance_status,
+                        :after_remove => :reset_compliance_status
     belongs_to :assetable, :polymorphic => true
 
     scope :hosts, lambda { where(:assetable_type => 'Host::Base') }
@@ -20,6 +22,24 @@ module ForemanOpenscap
 
     private
 
+    def reset_compliance_status(_policy)
+      ForemanOpenscap::ComplianceStatusResetter.to_inconclusive(host_ids_reached_by_asset)
+    end
+
+    def host_ids_reached_by_asset
+      case assetable_type
+      when 'Host::Base'
+        [assetable_id]
+      when 'Hostgroup'
+        hostgroup = Hostgroup.find_by(:id => assetable_id)
+        return [] unless hostgroup
+
+        Host.where(:hostgroup_id => hostgroup.subtree_ids).pluck(:id)
+      else
+        []
+      end
+    end
+
     def fetch_asset(type)
       assetable if assetable_type == type
     end

data/app/models/foreman_openscap/compliance_status.rb

@@ -16,8 +16,8 @@ module ForemanOpenscap
       "#{ArfReport::BIT_NUM * ArfReport::METRIC.index(status)} & #{ArfReport::MAX}"
     end
 
-    def to_label(options = {})
-      case to_status
+    def to_label(_options = {})
+      case status
       when COMPLIANT
         N_('Compliant')
       when INCONCLUSIVE
@@ -29,8 +29,8 @@ module ForemanOpenscap
       end
     end
 
-    def to_global(options = {})
-      case to_status
+    def to_global(_options = {})
+      case status
       when COMPLIANT
         ::HostStatus::Global::OK
       when INCONCLUSIVE
@@ -40,17 +40,29 @@ module ForemanOpenscap
       end
     end
 
-    def relevant?(options = {})
+    def relevant?(_options = {})
       # May fail host status during migration
       return false unless ForemanOpenscap::Asset.table_exists?
-      host.combined_policies.present?
+      host.policies.any? || host_has_hostgroup_policies?
     end
 
-    def to_status(options = {})
+    def to_status(_options = {})
       latest_reports = host.combined_policies.flat_map { |p| host.last_report_for_policy p }
       return INCOMPLIANT if latest_reports.any?(&:failed?)
       return INCONCLUSIVE if latest_reports.any?(&:othered?)
       COMPLIANT
     end
+
+    private
+
+    def host_has_hostgroup_policies?
+      return false if host.hostgroup_id.blank?
+
+      ids = [host.hostgroup_id] + host.hostgroup.ancestor_ids
+      ForemanOpenscap::Policy.joins(:assets)
+                             .where('foreman_openscap_assets.assetable_type' => 'Hostgroup',
+                                    'foreman_openscap_assets.assetable_id' => ids)
+                             .exists?
+    end
   end
 end