foreman_openscap 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcc7365919b95567728c6bbf5f71c44e0bdbc4f7
-  data.tar.gz: 59df09c7a34dde0ee73b4b694cde4c88ac52aecc
+  metadata.gz: fdfe8a8e22b3b2215996af3ce7f9c120a2fcd34b
+  data.tar.gz: 68fa725ae1e957719df783588a1f5037a4608750
 SHA512:
-  metadata.gz: 53bc94afc3f4ba64384ab4687360145999361a66c2eaedfe28e7981e081af42b7c8b2948f7bd1c07c6caaac426b578ee7715e7fea7a69bf22c98a02bd13ced35
-  data.tar.gz: 144c25d86f781acd2a03316bbf94901c34ba6d6d7e7ea830674a7d2d13df477e80cffa45fe28ac89dcf1734e678163c135c8b0a225a65bd4d8bd307874d19d5e
+  metadata.gz: 87be9f111dc4b9bee30fe09f113839d159da3c5eeb7590892bc4746ad4d4aa7d3fb2c62029959224da41265f3a45e1492871288d2b448b275c2ce3b81f5ac84d
+  data.tar.gz: f2c48e5d2a5d1902c141b964428f5f255f65239796249bb200e62d77bcb40d6cae45c0b9b8773ed73996747534a99e6e6752afda7b992f2a6673aaa30b6317ca

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

@@ -15,7 +15,7 @@ function scap_content_selected(element){
 
 function previous_step(previous) {
   $('#policy_current_step').val(previous);
-  return false;
+  $('#new_policy').submit();
 }
 
 function period_selected(period) {

data/app/controllers/scaptimony_policies_controller.rb

@@ -13,7 +13,7 @@ class ScaptimonyPoliciesController < ApplicationController
                   .paginate(:page => params[:page], :per_page => params[:per_page])
                   .includes(:scap_content, :scap_content_profile)
     if @policies.empty? && Scaptimony::ScapContent.unconfigured?
-      redirect_to new_scaptimony_scap_content_path
+      redirect_to scaptimony_scap_contents_path
     end
   end
 
@@ -83,6 +83,16 @@ class ScaptimonyPoliciesController < ApplicationController
     end
   end
 
+  def welcome
+    @searchbar = true
+    if (model_of_controller.first.nil? rescue false)
+      @searchbar = false
+      render :welcome rescue nil and return
+    end
+  rescue
+    not_found
+  end
+
   private
   def find_by_id
     @policy = resource_base.find(params[:id])

data/app/controllers/scaptimony_scap_contents_controller.rb

@@ -9,9 +9,6 @@ class ScaptimonyScapContentsController < ApplicationController
 
   def index
     @contents = resource_base.search_for(params[:search])
-    if Scaptimony::ScapContent.all.count == 0
-      redirect_to :action => :new
-    end
   end
 
   def show
@@ -49,6 +46,16 @@ class ScaptimonyScapContentsController < ApplicationController
     end
   end
 
+  def welcome
+    @searchbar = true
+    if (model_of_controller.first.nil? rescue false)
+      @searchbar = false
+      render :welcome rescue nil and return
+    end
+  rescue
+    not_found
+  end
+
   private
   def find_by_id
     @scaptimony_scap_content = resource_base.find(params[:id])

data/app/helpers/scaptimony_policies_helper.rb

@@ -5,6 +5,39 @@ module ScaptimonyPoliciesHelper
     return []
   end
 
+  def scap_content_selector(form)
+    scap_contents = Scaptimony::ScapContent.all
+    if scap_contents.length > 1
+      select_f form, :scap_content_id, scap_contents, :id, :title,
+               {:include_blank => _("Choose existing SCAP Content")} ,
+               {:label => _("SCAP Content"),
+                :onchange => 'scap_content_selected(this);',
+                :'data-url' => method_path('scap_content_selected')}
+    else
+      select_f form, :scap_content_id, scap_contents, :id, :title,
+               {:label => _("SCAP Content"),
+                :onchange => 'scap_content_selected(this);',
+                :'data-url' => method_path('scap_content_selected')}
+    end
+  end
+
+  def scap_content_profile_selector(form)
+    if profiles_selection.length == 1
+      select_f form, :scap_content_profile_id, profiles_selection, :id, :title,
+               {:selected => @policy.scap_content_profile_id },
+               {:label => _("XCCDF Profile"),
+                :disabled => profiles_selection.empty? ? true : false,
+                :help_inline => :indicator}
+    else
+      select_f form, :scap_content_profile_id, profiles_selection, :id, :title,
+               {:selected => @policy.scap_content_profile_id,
+                :include_blank => _("Default XCCDF profile")},
+               {:label => _("XCCDF Profile"),
+                :disabled => profiles_selection.empty? ? true : false,
+                :help_inline => :indicator}
+    end
+  end
+
   def submit_or_cancel_policy(form, overwrite = nil, args = { })
     args[:cancel_path] ||= send("#{controller_name}_path")
     content_tag(:div, :class => "clearfix") do
@@ -13,8 +46,11 @@ module ScaptimonyPoliciesHelper
         options = {:class => "btn btn-primary"}
         options.merge! :'data-id' => form_to_submit_id(form) unless options.has_key?(:'data-id')
         previous = form.object.first_step? ? ' ' : previous_link(form)
-        link_to(_("Cancel"), args[:cancel_path], :class => "btn btn-default") + previous +
-            form.submit(text, options)
+        cancel_and_submit = content_tag(:div, :class => "pull-right") do
+          link_to(_("Cancel"), args[:cancel_path], :class => "btn btn-default") + ' ' +
+              form.submit(text, options)
+        end
+        (previous + cancel_and_submit).html_safe
       end
     end
   end
@@ -24,6 +60,9 @@ module ScaptimonyPoliciesHelper
   end
 
   def previous_link(form)
-    (' ' + form.submit(_('Previous'), :class => 'btn btn-default', :onclick => "previous_step('#{@policy.previous_step}')") + ' ').html_safe
+    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
   end
 end

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

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

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

@@ -25,11 +25,12 @@ module ForemanOpenscap
 
       validates :name, :presence => true, :uniqueness => true, :format => { without: /\s/ }
       validate :ensure_needed_puppetclasses
-      validates :period, :inclusion => {:in => %w[weekly monthly custom]}, :if => Proc.new { | policy | policy.step_index > 3 }
+      validates :period, :inclusion => {:in => %w[weekly monthly custom]},
+                :if => Proc.new { | policy | policy.new_record? ? policy.step_index > 3 : !policy.id.blank? }
       validates :weekday, :inclusion => {:in => Date::DAYNAMES.map(&:downcase)},
-                :if => Proc.new { | policy | policy.step_index > 3 && policy.period == 'weekly' }
+                :if => Proc.new { | policy | policy.new_record? ? policy.step_index > 3 && policy.period == 'weekly' : !policy.id.blank? }
       validates :day_of_month, :numericality => {:greater_than => 0, :less_than => 32},
-                :if => Proc.new { | policy | policy.step_index > 3 && policy.period == 'monthly' }
+                :if => Proc.new { | policy | policy.new_record? ? policy.step_index > 3 && policy.period == 'monthly' : !policy.id.blank? }
       validate :valid_cron_line
       validate :ensure_period_specification_present
 
@@ -94,7 +95,7 @@ module ForemanOpenscap
     end
 
     def wizard_completed?
-      current_step.blank?
+      new_record? && current_step.blank?
     end
 
     def step_index
@@ -223,7 +224,8 @@ module ForemanOpenscap
       puppetclass.class_params.where(:override => true, :key => SERVER_CLASS_PARAMETER).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
-          lookup_value.update_attribute(:value, url)
+          puppet_proxy_fqdn = URI.parse(url).host
+          lookup_value.update_attribute(:value, puppet_proxy_fqdn)
         end
       end
     end

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

@@ -22,21 +22,10 @@
       <%= textarea_f(f, :description, :rows => :auto ) %>
     </div>
     <div class="tab-pane" id="scap_content">
-      <%= select_f f, :scap_content_id, Scaptimony::ScapContent.all, :id, :title,
-        {:include_blank => _("Choose existing SCAP Content")},
-        {:label => _("SCAP Content"),
-          :onchange => 'scap_content_selected(this);',
-          :'data-url' => method_path('scap_content_selected')}
-      %>
+      <%= scap_content_selector(f) %>
       <span id="scap_content_profile_select">
-        <%= select_f f, :scap_content_profile_id, profiles_selection, :id, :title,
-          {:selected => @policy.scap_content_profile_id,
-            :include_blank => _("Default XCCDF profile")},
-          {:label => _("XCCDF Profile"),
-            :disabled => profiles_selection.empty? ? true : false,
-            :help_inline => :indicator}
-        %>
-      </span>
+    <%= scap_content_profile_selector(f) %>
+  </span>
     </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

@@ -1,10 +1,4 @@
 <%= fields_for @policy do |f| %>
-  <%= select_f f, :scap_content_profile_id, profiles_selection, :id, :title,
-    {:selected => @policy.scap_content_profile_id,
-      :include_blank => _("Default XCCDF profile")},
-    {:label => _("XCCDF Profile"),
-      :disabled => profiles_selection.empty? ? true : false,
-      :help_inline => :indicator}
-  %>
+  <%= scap_content_profile_selector(f) %>
 <% end %>
 

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

@@ -1,20 +1,9 @@
 <div class="tab-pane <%= show_partial_wizard(step) %>" id="scap_content">
   <%= wizard_header @policy.step_index, *@policy.steps %>
 
-  <%= select_f f, :scap_content_id, Scaptimony::ScapContent.all, :id, :title,
-               {:include_blank => _("Choose existing SCAP Content")},
-               {:label => _("SCAP Content"),
-                :onchange => 'scap_content_selected(this);',
-                :'data-url' => method_path('scap_content_selected')}
-  %>
+  <%= scap_content_selector(f) %>
   <span id="scap_content_profile_select">
-    <%= select_f f, :scap_content_profile_id, profiles_selection, :id, :title,
-                 {:selected => @policy.scap_content_profile_id,
-                  :include_blank => _("Default XCCDF profile")},
-                 {:label => _("XCCDF Profile"),
-                  :disabled => profiles_selection.empty?,
-                  :help_inline => :indicator}
-    %>
+    <%= scap_content_profile_selector(f) %>
   </span>
   <p class="alert alert-info"><%= _('Notice: Ensure the selected SCAP content exists on your hosts.') %></p>
 </div>

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

@@ -3,8 +3,12 @@
 <% title _("Compliance policy configuration") %>
 <div id="welcome">
   <p>
-  <%= _('A compliance policy is defined by security professionals who specify desired settings (often in the form of a checklist) that are to be used in the computing environment. Compliance audit is a process of figuring out whether a given object follows all the rules written out in a compliance policy.') %>
-
-  <%= _('In order to define compliance policy, you need to prepare checklist (SCAP content), list of systems and time schedule') %>
+    <%= _('A compliance policy is defined by security professionals who specify desired settings
+          (often in the form of a checklist) that are to be used in the computing environment. Compliance audit is a process of figuring out
+          whether a given object follows all the rules written out in a compliance policy.') %>
+  </p>
+  <p>
+    <%= (_('In Foreman, a compliance policy checklist is defined via %s, once SCAP content is present, you can create a policy,
+            assign select hostgroups and schedule to run.') % link_to(_('SCAP content'), scaptimony_scap_contents_path)).html_safe %>
   </p>
 </div>

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

@@ -1,5 +1,6 @@
 <% title _("SCAP Contents") %>
 
-<% title_actions display_link_if_authorized(_("Upload New SCAP Content"), hash_for_new_scaptimony_scap_content_path) %>
+<% title_actions(display_link_if_authorized(_("Upload New SCAP Content"), hash_for_new_scaptimony_scap_content_path),
+                 link_to(_("Help"), :action => "welcome")) %>
 
 <%= render :partial => 'list' %>

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

@@ -0,0 +1,15 @@
+<% title_actions display_link_if_authorized(_("New SCAP content"), hash_for_new_scaptimony_scap_content_path) %>
+
+<% title _("SCAP content configuration") %>
+<div id="welcome">
+  <p>
+  <%= _('The Security Content Automation Protocol (SCAP), combines a number of open standards that are used to enumerate software flaws and
+        configuration issues related to security. They measure systems to find vulnerabilities and offer methods to score those findings in order
+        to evaluate the possible impact. It is a method for using those open standards for automated vulnerability management, measurement,
+        and policy compliance evaluation. ') %><small><%= (_('Source: Wikipedia %s') % link_to(_('read more'), 'http://en.wikipedia.org/wiki/Security_Content_Automation_Protocol')).html_safe %></small>
+  </p>
+  <p>
+    <%= (_("In Foreman, scap_contents represent the SCAP security guides on your hosts, and create SCAP profiles for you to assign to hosts / hostgroups
+          via %s") % link_to('compliance policies', scaptimony_policies_path)).html_safe %>
+  </p>
+</div>

data/lib/foreman_openscap/version.rb

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

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
-- Šimon Lukašík
+- "Šimon Lukašík"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: scaptimony
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
 description: Foreman plug-in for managing security compliance reports
 email:
 - slukasik@redhat.com
@@ -45,75 +45,76 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/views/scaptimony_arf_reports/show.html.erb
-- app/views/scaptimony_arf_reports/_host_report.html.erb
-- app/views/scaptimony_arf_reports/index.html.erb
-- app/views/scaptimony_arf_reports/_list.html.erb
+- LICENSE
+- README.md
+- Rakefile
+- app/assets/javascript/foreman_openscap/period_selector.js
+- app/assets/javascript/foreman_openscap/policy_edit.js
+- app/assets/stylesheets/foreman_openscap/policy.css.scss
+- app/controllers/api/v2/compliance/arf_reports_controller.rb
+- app/controllers/scaptimony_arf_reports_controller.rb
+- app/controllers/scaptimony_dashboard_controller.rb
+- app/controllers/scaptimony_policies_controller.rb
+- app/controllers/scaptimony_policy_dashboard_controller.rb
+- app/controllers/scaptimony_scap_contents_controller.rb
+- app/helpers/arf_reports_helper.rb
+- app/helpers/concerns/foreman_openscap/hosts_helper_extensions.rb
+- app/helpers/scaptimony_policies_helper.rb
+- app/helpers/scaptimony_policy_dashboard_helper.rb
+- app/helpers/scaptimony_report_dashboard_helper.rb
+- app/models/concerns/foreman_openscap/arf_report_extensions.rb
+- app/models/concerns/foreman_openscap/asset_extensions.rb
+- app/models/concerns/foreman_openscap/host_extensions.rb
+- app/models/concerns/foreman_openscap/policy_extensions.rb
+- app/models/concerns/foreman_openscap/scap_content_extensions.rb
+- app/overrides/hosts/index/host_arf_report.rb
+- app/services/scaptimony/policy_dashboard/data.rb
+- app/services/scaptimony/policy_dashboard/loader.rb
+- app/services/scaptimony/policy_dashboard/manager.rb
+- app/services/scaptimony/report_dashboard/data.rb
 - app/views/dashboard/_foreman_openscap_host_reports_widget.html.erb
 - app/views/dashboard/_foreman_openscap_reports_breakdown_widget.html.erb
-- app/views/scaptimony_scap_contents/_form.html.erb
-- app/views/scaptimony_scap_contents/new.html.erb
-- app/views/scaptimony_scap_contents/index.html.erb
-- app/views/scaptimony_scap_contents/_list.html.erb
-- app/views/scaptimony_scap_contents/edit.html.erb
-- app/views/scaptimony_policy_dashboard/_policy_reports.html.erb
-- app/views/scaptimony_policy_dashboard/index.html.erb
-- app/views/scaptimony_policy_dashboard/_policy_status_widget.html.erb
-- app/views/scaptimony_policy_dashboard/_policy_chart_widget.html.erb
-- app/views/scaptimony_policies/welcome.html.erb
+- app/views/scaptimony_arf_reports/_host_report.html.erb
+- app/views/scaptimony_arf_reports/_list.html.erb
+- app/views/scaptimony_arf_reports/index.html.erb
+- app/views/scaptimony_arf_reports/show.html.erb
 - app/views/scaptimony_policies/_form.html.erb
+- app/views/scaptimony_policies/_list.html.erb
+- app/views/scaptimony_policies/_scap_content_results.html.erb
+- app/views/scaptimony_policies/create.html.erb
+- app/views/scaptimony_policies/edit.html.erb
+- app/views/scaptimony_policies/index.html.erb
+- app/views/scaptimony_policies/new.html.erb
 - app/views/scaptimony_policies/select_multiple_hosts.html.erb
 - app/views/scaptimony_policies/show.html.erb
-- app/views/scaptimony_policies/new.html.erb
-- app/views/scaptimony_policies/steps/_organizations_form.html.erb
+- app/views/scaptimony_policies/steps/_create_policy_form.html.erb
 - app/views/scaptimony_policies/steps/_hostgroups_form.html.erb
 - app/views/scaptimony_policies/steps/_locations_form.html.erb
+- app/views/scaptimony_policies/steps/_organizations_form.html.erb
 - app/views/scaptimony_policies/steps/_scap_content_form.html.erb
 - app/views/scaptimony_policies/steps/_schedule_form.html.erb
-- app/views/scaptimony_policies/steps/_create_policy_form.html.erb
 - app/views/scaptimony_policies/steps/_step_form.html.erb
-- app/views/scaptimony_policies/create.html.erb
-- app/views/scaptimony_policies/index.html.erb
-- app/views/scaptimony_policies/_list.html.erb
-- app/views/scaptimony_policies/_scap_content_results.html.erb
-- app/views/scaptimony_policies/edit.html.erb
-- app/overrides/hosts/index/host_arf_report.rb
-- app/helpers/scaptimony_policies_helper.rb
-- app/helpers/scaptimony_report_dashboard_helper.rb
-- app/helpers/scaptimony_policy_dashboard_helper.rb
-- app/helpers/concerns/foreman_openscap/hosts_helper_extensions.rb
-- app/helpers/arf_reports_helper.rb
-- app/controllers/scaptimony_policy_dashboard_controller.rb
-- app/controllers/scaptimony_policies_controller.rb
-- app/controllers/scaptimony_scap_contents_controller.rb
-- app/controllers/api/v2/compliance/arf_reports_controller.rb
-- app/controllers/scaptimony_dashboard_controller.rb
-- app/controllers/scaptimony_arf_reports_controller.rb
-- app/assets/javascript/foreman_openscap/period_selector.js
-- app/assets/javascript/foreman_openscap/policy_edit.js
-- app/assets/stylesheets/foreman_openscap/policy.css.scss
-- app/services/scaptimony/policy_dashboard/data.rb
-- app/services/scaptimony/policy_dashboard/manager.rb
-- app/services/scaptimony/policy_dashboard/loader.rb
-- app/services/scaptimony/report_dashboard/data.rb
-- app/models/concerns/foreman_openscap/arf_report_extensions.rb
-- app/models/concerns/foreman_openscap/host_extensions.rb
-- app/models/concerns/foreman_openscap/policy_extensions.rb
-- app/models/concerns/foreman_openscap/scap_content_extensions.rb
-- app/models/concerns/foreman_openscap/asset_extensions.rb
+- app/views/scaptimony_policies/welcome.html.erb
+- app/views/scaptimony_policy_dashboard/_policy_chart_widget.html.erb
+- app/views/scaptimony_policy_dashboard/_policy_reports.html.erb
+- app/views/scaptimony_policy_dashboard/_policy_status_widget.html.erb
+- app/views/scaptimony_policy_dashboard/index.html.erb
+- app/views/scaptimony_scap_contents/_form.html.erb
+- app/views/scaptimony_scap_contents/_list.html.erb
+- app/views/scaptimony_scap_contents/edit.html.erb
+- app/views/scaptimony_scap_contents/index.html.erb
+- app/views/scaptimony_scap_contents/new.html.erb
+- app/views/scaptimony_scap_contents/welcome.html.erb
 - config/routes.rb
 - db/seeds.d/openscap_feature.rb
-- lib/tasks/foreman_openscap_tasks.rake
+- lib/foreman_openscap.rb
 - lib/foreman_openscap/engine.rb
 - lib/foreman_openscap/helper.rb
 - lib/foreman_openscap/version.rb
-- lib/foreman_openscap.rb
-- LICENSE
-- Rakefile
-- README.md
-- test/unit/foreman_openscap_test.rb
-- test/test_plugin_helper.rb
+- lib/tasks/foreman_openscap_tasks.rake
 - test/factories/foreman_openscap_factories.rb
+- test/test_plugin_helper.rb
+- test/unit/foreman_openscap_test.rb
 homepage: https://github.com/OpenSCAP/foreman_openscap
 licenses:
 - GPL-3.0
@@ -124,17 +125,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Foreman plug-in for displaying OpenSCAP audit reports