foreman_openscap 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdfe8a8e22b3b2215996af3ce7f9c120a2fcd34b
-  data.tar.gz: 68fa725ae1e957719df783588a1f5037a4608750
+  metadata.gz: e0b2635b4110d762e082b3b0deea79656f308712
+  data.tar.gz: 6488a4c319870ff0347bfedf2d1ad27659dab5a9
 SHA512:
-  metadata.gz: 87be9f111dc4b9bee30fe09f113839d159da3c5eeb7590892bc4746ad4d4aa7d3fb2c62029959224da41265f3a45e1492871288d2b448b275c2ce3b81f5ac84d
-  data.tar.gz: f2c48e5d2a5d1902c141b964428f5f255f65239796249bb200e62d77bcb40d6cae45c0b9b8773ed73996747534a99e6e6752afda7b992f2a6673aaa30b6317ca
+  metadata.gz: 257acb224a1ffaeed43d9cba4216038920357ea2fed6c493d52b8d0efa0b639f58021cd159681d4eef6970de6067bfdbc358cd5cebf8d60af5b28c6627269797
+  data.tar.gz: 351b39d8450200c2884d63a419741a93900600b229c7fa492db305b74c9bfd7b74701ed206705472842490d17b0d1932925e34a1c718e0dd6403a99a47042e0b

data/app/assets/javascript/foreman_openscap/policy_edit.js

@@ -8,7 +8,9 @@ function scap_content_selected(element){
     url: url,
     complete: function() { $(element).indicator_hide();},
     success: function(request) {
+      $('#file-location').remove();
       $('#scap_content_profile_select').html(request);
+      $('#scap_content .alert-info').append($('#file-location'));
     }
   })
 }

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

@@ -33,8 +33,8 @@ module ForemanOpenscap
 
     def assign_locations_organizations
       if host
-        self.location_ids = [host.location] if SETTINGS[:locations_enabled]
-        self.organization_ids = [host.organization] if SETTINGS[:organizations_enabled]
+        self.location_ids = [host.location_id] if SETTINGS[:locations_enabled]
+        self.organization_ids = [host.organization_id] if SETTINGS[:organizations_enabled]
       end
     end
 

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

@@ -22,6 +22,7 @@ module ForemanOpenscap
       SCAP_PUPPET_CLASS = 'foreman_scap_client'
       POLICIES_CLASS_PARAMETER = 'policies'
       SERVER_CLASS_PARAMETER = 'server'
+      PORT_CLASS_PARAMETER = 'port'
 
       validates :name, :presence => true, :uniqueness => true, :format => { without: /\s/ }
       validate :ensure_needed_puppetclasses
@@ -50,9 +51,11 @@ module ForemanOpenscap
     end
 
     def hostgroup_ids=(ids)
+      hostgroup_assets = []
       ids.reject(&:empty?).map do |id|
-        self.assets << assets.where(:assetable_type => 'Hostgroup', :assetable_id => id).first_or_create!
+        hostgroup_assets << assets.where(:assetable_type => 'Hostgroup', :assetable_id => id).first_or_create!
       end
+      self.assets = hostgroup_assets
     end
 
     def hostgroups
@@ -221,11 +224,18 @@ module ForemanOpenscap
     end
 
     def populate_overrides(puppetclass, hostgroup)
-      puppetclass.class_params.where(:override => true, :key => SERVER_CLASS_PARAMETER).each do |override|
+      puppetclass.class_params.where(:override => true).each do |override|
         if hostgroup.puppet_proxy && (url = hostgroup.puppet_proxy.url).present?
-          lookup_value = LookupValue.where(:match => "hostgroup=#{hostgroup.to_label}", :lookup_key_id => override.id).first_or_initialize
-          puppet_proxy_fqdn = URI.parse(url).host
-          lookup_value.update_attribute(:value, puppet_proxy_fqdn)
+          case override.key
+            when SERVER_CLASS_PARAMETER
+              lookup_value = LookupValue.where(:match => "hostgroup=#{hostgroup.to_label}", :lookup_key_id => override.id).first_or_initialize
+              puppet_proxy_fqdn = URI.parse(url).host
+              lookup_value.update_attribute(:value, puppet_proxy_fqdn)
+            when PORT_CLASS_PARAMETER
+              lookup_value = LookupValue.where(:match => "hostgroup=#{hostgroup.to_label}", :lookup_key_id => override.id).first_or_initialize
+              puppet_proxy_port = URI.parse(url).port
+              lookup_value.update_attribute(:value, puppet_proxy_port)
+          end
         end
       end
     end

data/app/views/scaptimony_policies/_form.html.erb

@@ -24,8 +24,14 @@
     <div class="tab-pane" id="scap_content">
       <%= scap_content_selector(f) %>
       <span id="scap_content_profile_select">
-    <%= scap_content_profile_selector(f) %>
-  </span>
+        <%= scap_content_profile_selector(f) %>
+      </span>
+      <div class="alert alert-info">
+        <%= icon_text("info-sign", _('Notice: Ensure the selected SCAP content exists on your hosts.')) %>
+        <div id="file-location">
+          <b><%= _('SCAP content file should be /var/lib/openscap/content/%s.xml on your clients.') % @policy.scap_content.digest %></b>
+        </div>
+      </div>
     </div>
     <div class="tab-pane" id="scap_schedule">
       <%= select_f(f, :period, %w[Weekly Monthly Custom], :downcase, :to_s,

data/app/views/scaptimony_policies/_scap_content_results.html.erb

@@ -2,3 +2,6 @@
   <%= scap_content_profile_selector(f) %>
 <% end %>
 
+<div id="file-location">
+  <b><%= _('SCAP content file should be /var/lib/openscap/content/%s.xml on your clients.') % @scap_content.digest %></b>
+</div>

data/app/views/scaptimony_policies/steps/_scap_content_form.html.erb

@@ -5,6 +5,8 @@
   <span id="scap_content_profile_select">
     <%= scap_content_profile_selector(f) %>
   </span>
-  <p class="alert alert-info"><%= _('Notice: Ensure the selected SCAP content exists on your hosts.') %></p>
+  <div class="alert alert-info">
+    <%= icon_text("info-sign", _('Notice: Ensure the selected SCAP content exists on your hosts.')) %>
+  </div>
 </div>
 

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - "Šimon Lukašík"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -143,3 +143,4 @@ test_files:
 - test/unit/foreman_openscap_test.rb
 - test/test_plugin_helper.rb
 - test/factories/foreman_openscap_factories.rb
+has_rdoc: