foreman_openscap 0.5.4 → 0.6.0

data/app/views/policies/steps/_schedule_form.html.erb

@@ -6,6 +6,6 @@
                { :include_blank => _('Choose period') },
                { :onchange => 'period_selected(this)' }) %>
   <%= select_f(f, :weekday, days_of_week_hash, :first, :last, :include_blank => _('Choose weekday')) %>
-  <%= select_f(f, :day_of_month, (1..31).to_a, :to_i, :to_s, :help_inline => _('Number of a day in month, note that not all months have same count of days')) %>
+  <%= select_f(f, :day_of_month, (1..31).to_a, :to_i, :to_s, :help_inline => _('Number of a day in month, note that not all months have same count of days'), :include_blank => _('Choose day in month')) %>
   <%= text_f(f, :cron_line, :help_inline => _('You can specify custom cron line, e.g. "0  3  *  *  *", separate each of 5 values by space')) %>
 </div>

data/app/views/policies/steps/_step_form.html.erb

@@ -3,6 +3,7 @@
 <%= form_for @policy,
              :url => (@policy.id? ? policy_path(:id => @policy.id) : policies_path) do |f| %>
   <%= base_errors_for @policy %>
+  <%= f.hidden_field(:wizard_initiated, :value => @policy.wizard_initiated?) %>
   <%= f.hidden_field(:current_step, :value => @policy.next_step) unless @policy.current_step.blank? %>
   <% @policy.steps.each do | step | %>
     <%= render :partial => "policies/steps/#{step.downcase.tr(' ', '_')}_form", :locals => {:f => f, :step => step} %>

data/app/views/policies/welcome.html.erb

@@ -1,4 +1,4 @@
-<% title_actions display_link_if_authorized(_("New Compliance Policy"), hash_for_new_policy_path) %>
+<% title_actions display_link_if_authorized(_("New Compliance Policy"), hash_for_new_policy_path, :class => "btn btn-default") %>
 
 <% title _("Compliance policy configuration") %>
 <div id="welcome">

data/app/views/policy_dashboard/index.html.erb

@@ -6,10 +6,10 @@
   <ul>
     <% [{:template => 'policy_status_widget', :sizex => 8, :sizey => 1, :name => N_('Status table')},
         {:template => 'policy_chart_widget', :sizex => 4, :sizey => 1, :name => N_('Status chart')}].each do |w| %>
-      <% widget = Widget.new(w) %>
+      <% widget = compliance_widget(w) %>
       <%= content_tag(:li, widget_data(widget)) do %>
         <div class="widget <%= widget.name.parameterize %>">
-          <%= render_widget(widget) %>
+          <%= render(:partial => widget.template, :locals => widget.data) %>
         </div>
       <% end %>
     <% end %>

data/app/views/scap_contents/index.html.erb

@@ -1,6 +1,6 @@
 <% title _("SCAP Contents") %>
 
-<% title_actions(display_link_if_authorized(_("Upload New SCAP Content"), hash_for_new_scap_content_path),
-                 link_to(_("Help"), :action => "welcome")) %>
+<% title_actions(display_link_if_authorized(_("Upload New SCAP Content"), hash_for_new_scap_content_path, :class => 'btn btn-default'),
+                 link_to(_("Help"), { :action => "welcome" }, { :class => 'btn btn-info' })) %>
 
 <%= render :partial => 'list' %>

data/app/views/scap_contents/welcome.html.erb

@@ -1,4 +1,4 @@
-<% title_actions display_link_if_authorized(_("New SCAP content"), hash_for_new_scap_content_path) %>
+<% title_actions display_link_if_authorized(_("New SCAP content"), hash_for_new_scap_content_path, :class => "btn btn-default") %>
 
 <% title _("SCAP content configuration") %>
 <div id="welcome">

data/db/migrate/20160830113437_remove_deleted_policy.rb

@@ -0,0 +1,10 @@
+class RemoveDeletedPolicy < ActiveRecord::Migration
+  def up
+    ForemanOpenscap::AssetPolicy.all.collect(&:policy_id).uniq.each do |policy_id|
+      execute("DELETE FROM foreman_openscap_asset_policies WHERE policy_id = '#{policy_id}';") if ForemanOpenscap::Policy.find_by_id(policy_id).nil?
+    end
+  end
+
+  def down
+  end
+end

data/db/seeds.d/openscap_policy_notification.rb

@@ -1,3 +1,5 @@
+N_('Openscap policy summary')
+
 policy_notification = {
   :name => :openscap_policy_summary,
   :description => N_('A summary of reports for OpenSCAP policies'),

data/lib/foreman_openscap/data_migration.rb

@@ -64,7 +64,7 @@ module ForemanOpenscap
 
     def fetch_host_name(asset_id)
       asset = ForemanOpenscap::Asset.find(asset_id)
-      asset.host.to_label
+      ForemanOpenscap::Helper.find_name_or_uuid_by_host(asset.host)
     end
 
     def arfs_by_reported(time)

data/lib/foreman_openscap/engine.rb

@@ -39,7 +39,7 @@ module ForemanOpenscap
       Apipie.configuration.checksum_path += ['/compliance/']
     end
 
-    initializer 'foreman_openscap.register_plugin', :after => :finisher_hook do |app|
+    initializer 'foreman_openscap.register_plugin', :before => :finisher_hook do |app|
       Foreman::Plugin.register :foreman_openscap do
         requires_foreman '>= 1.11'
 
@@ -124,9 +124,19 @@ module ForemanOpenscap
                            "dashboard link hosts with no reports", "dashboard link hosts with alerts disabled",
                            "widgets not in dashboard show up in list"]
                      })
+        # strong params
+        parameter_filter Host::Managed, :openscap_proxy_id, :openscap_proxy
+        parameter_filter Log, :result
+
       end
     end
 
+    initializer 'foreman_openscap.register_gettext', after: :load_config_initializers do |_app|
+      locale_dir = File.join(File.expand_path('../../..', __FILE__), 'locale')
+      locale_domain = 'foreman_openscap'
+      Foreman::Gettext::Support.add_text_domain locale_domain, locale_dir
+    end
+
     #Include concerns in this config.to_prepare block
     config.to_prepare do
       Host::Managed.send(:include, ForemanOpenscap::OpenscapProxyExtensions)

data/lib/foreman_openscap/helper.rb

@@ -16,25 +16,21 @@ module ForemanOpenscap::Helper
   end
 
   def self.find_name_or_uuid_by_host(host)
-    if defined?(::Katello::System)
-      host.content_host.uuid
-    else
-      host.name
-    end
+    (host.respond_to?(:subscription_facet) && !host.subscription_facet.nil?) ? host.subscription_facet.try(:uuid) : host.name
   end
 
   private
 
   def self.find_host_by_name_or_uuid(cname)
-    if defined?(Katello::System)
-      host = Host.includes(:content_host).where(:katello_systems => {:uuid => cname}).first
+    if Facets.registered_facets.keys.include?(:subscription_facet)
+      host = Katello::Host::SubscriptionFacet.find_by_uuid(cname).try(:host)
       host ||= Host.find_by_name(cname)
     else
       host = Host.find_by_name(cname)
     end
+
     unless host
       Rails.logger.error "Could not find Host with name: #{cname}"
-      Rails.logger.error "Please check that Content host is linked to Foreman host" if defined?(Katello::System)
       fail ActiveRecord::RecordNotFound
     end
     host

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "0.5.4"
+  VERSION = "0.6.0"
 end

data/locale/Makefile

@@ -0,0 +1,60 @@
+#
+# Makefile for PO merging and MO generation. More info in the README.
+#
+# make all-mo (default) - generate MO files
+# make check - check translations using translate-tool
+# make tx-update - download and merge translations from Transifex
+# make clean - clean everything
+#
+DOMAIN = foreman_openscap
+VERSION = $(shell ruby -e 'require "rubygems";spec = Gem::Specification::load(Dir.glob("../*.gemspec")[0]);puts spec.version')
+POTFILE = $(DOMAIN).pot
+MOFILE = $(DOMAIN).mo
+POFILES = $(shell find . -name '$(DOMAIN).po')
+MOFILES = $(patsubst %.po,%.mo,$(POFILES))
+POXFILES = $(patsubst %.po,%.pox,$(POFILES))
+EDITFILES = $(patsubst %.po,%.edit.po,$(POFILES))
+
+%.mo: %.po
+	mkdir -p $(shell dirname $@)/LC_MESSAGES
+	msgfmt -o $(shell dirname $@)/LC_MESSAGES/$(MOFILE) $<
+
+# Generate MO files from PO files
+all-mo: $(MOFILES)
+
+# Check for malformed strings
+%.pox: %.po
+	msgfmt -c $<
+	pofilter --nofuzzy -t variables -t blank -t urls -t emails -t long -t newlines \
+		-t endwhitespace -t endpunc -t puncspacing -t options -t printf -t validchars --gnome $< > $@
+	cat $@
+	! grep -q msgid $@
+
+%.edit.po:
+	touch $@
+
+check: $(POXFILES)
+
+# Unify duplicate translations
+uniq-po:
+	for f in $(shell find ./ -name "*.po") ; do \
+		msguniq $$f -o $$f ; \
+	done
+
+tx-pull: $(EDITFILES)
+	tx pull -f
+	for f in $(EDITFILES) ; do \
+		sed -i 's/^\("Project-Id-Version: \).*$$/\1$(DOMAIN) $(VERSION)\\n"/' $$f; \
+	done
+
+tx-update: tx-pull
+	@echo
+	@echo Run rake plugin:gettext[$(DOMAIN)] from the Foreman installation, then make -C locale mo-files to finish
+	@echo
+
+mo-files: $(MOFILES)
+	git add $(POFILES) $(POTFILE) ../locale/*/LC_MESSAGES
+	git commit -m "i18n - pulling from tx"
+	@echo
+	@echo Changes commited!
+	@echo