foreman_openscap 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6beda936505b017451aaf916fc4295f10f323be1
-  data.tar.gz: f696a2b12c6861fd6fbc934e9451b2d77fb3879d
+  metadata.gz: 7e87dce0b8251a238c5e9893119aa4a98db7a3a0
+  data.tar.gz: ed41c816b9194e86b8c6a7a4fc627e0a205a9680
 SHA512:
-  metadata.gz: e786d37b5a9980b2351f6b49f854a794270ab8ac4099dc15931fe7236cd823f4a97717632627b3ddde8fa1cc9a23b476dbee8c4d27f631bfb67185a4a7ddf3fb
-  data.tar.gz: e967277fca2f7f84855637cedeab78a9e4ea488e9111841a141f3cd3833f342e23b0ef14b9cd240cf1595eabad521f73c0a1868bc5185f70329acc822d1c9268
+  metadata.gz: eeea587bb391f44a7f1d1a645c9060850e9a408df25f141d671f7ab48c8fb3e0d298ab02ee795f17661e56d1cea8f2085052dc2faefedf256ef112c4a0346d42
+  data.tar.gz: 37deb96efe064794ae14ba33876509598baaf5a3c73a32604134f074492144ee4656010da49c21770dee01c1d26511fb54847574b6d5e70d73ff063497d79acf

data/README.md

@@ -155,6 +155,10 @@ if you have commit permissions, the commit and the tag gets pushed to origin rem
 
 if you're the gem owner, gem is built and uploaded to rubygems.org
 
+## Found a bug?
+
+We use the issue tracker at [http://projects.theforeman.org/projects/foreman_openscap/issues](http://projects.theforeman.org/projects/foreman_openscap/issues), it supports github SSO so it's straightforward to open new issues there. If you think you found a bug, please take search through existing issues and if you haven't found any, free free to open a new one. Thank you.
+
 ## Copyright
 
 Copyright (c) 2014--2015 Red Hat, Inc.

data/app/assets/javascripts/foreman_openscap/openscap_proxy.js

@@ -0,0 +1,7 @@
+function findSpoolLogs() {
+    var table,
+        string = 'Failed to parse Arf Report';
+    $("div#table-proxy-status-logs_filter input").val(string);
+    table = $('#table-proxy-status-logs').DataTable();
+    table.search(string).draw();
+}

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

@@ -13,6 +13,21 @@ function scap_content_selected(element){
   })
 }
 
+function tailoring_file_selected(element) {
+  var attrs = attribute_hash(['tailoring_file_id']);
+  var url = $(element).attr('data-url');
+  tfm.tools.showSpinner();
+  $.ajax({
+    data: attrs,
+    type: 'post',
+    url: url,
+    complete: function() { reloadOnAjaxComplete($(element));},
+    success: function(request) {
+      $('#tailoring_file_profile_select').html(request);
+    }
+  })
+}
+
 function previous_step(previous) {
   $('#policy_current_step').val(previous);
   $('#new_policy').submit();

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

@@ -17,8 +17,8 @@ module Api
           '::ForemanOpenscap::ArfReport'
         end
 
-        def get_resource
-          instance_variable_get :"@arf_report" or fail 'no resource loaded'
+        def get_resource(message = 'no resource loaded')
+          instance_variable_get :"@arf_report" or fail message
         end
 
         api :GET, '/compliance/arf_reports', N_('List ARF reports')

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

@@ -4,7 +4,7 @@ module Api::V2
       include Foreman::Controller::SmartProxyAuth
       include Foreman::Controller::Parameters::PolicyApi
 
-      add_smart_proxy_filters :content, :features => 'Openscap'
+      add_smart_proxy_filters [:content, :tailoring], :features => 'Openscap'
 
       before_filter :find_resource, :except => %w(index create)
 
@@ -14,8 +14,8 @@ module Api::V2
         '::ForemanOpenscap::Policy'
       end
 
-      def get_resource
-        instance_variable_get :"@policy" or fail 'no resource loaded'
+      def get_resource(message = 'no resource loaded')
+        instance_variable_get :"@policy" or fail message
       end
 
       def policy_url(policy = nil)
@@ -46,6 +46,8 @@ module Api::V2
           param :day_of_month, Integer, :desc => N_('Policy schedule day of month (only if period == "monthly")')
           param :cron_line, String, :desc => N_('Policy schedule cron line (only if period == "custom")')
           param :hostgroup_ids, Array, :desc => N_('Apply policy to host groups')
+          param :tailoring_file_id, Integer, :desc => N_('Tailoring file ID')
+          param :tailoring_file_profile_id, Integer, :desc => N_('Tailoring file profile ID')
           param_group :taxonomies, ::Api::V2::BaseController
         end
       end
@@ -83,6 +85,16 @@ module Api::V2
                   :filename => @scap_content.original_filename
       end
 
+      api :GET, '/compliance/policies/:id/tailoring', N_("Show a policy's Tailoring file")
+      param :id, :identifier, :required => true
+
+      def tailoring
+        @tailoring_file = @policy.tailoring_file
+        send_data @tailoring_file.scap_file,
+                  :type => 'application/xml',
+                  :filename => @tailoring_file.original_filename
+      end
+
       private
       def find_resource
         not_found and return if params[:id].blank?
@@ -91,7 +103,7 @@ module Api::V2
 
       def action_permission
         case params[:action]
-        when 'content'
+        when 'content', 'tailoring'
           :view
         else
           super

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

@@ -8,8 +8,8 @@ module Api::V2
         '::ForemanOpenscap::ScapContent'
       end
 
-      def get_resource
-        instance_variable_get :"@scap_content" or fail 'no resource loaded'
+      def get_resource(message = 'no resource loaded')
+        instance_variable_get :"@scap_content" or fail message
       end
 
       api :GET, '/compliance/scap_contents', N_('List SCAP contents')

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

@@ -0,0 +1,92 @@
+module Api::V2
+  module Compliance
+    class TailoringFilesController < ::Api::V2::BaseController
+      include Foreman::Controller::Parameters::TailoringFile
+      before_filter :find_resource, :except => %w(index create)
+      before_filter :openscap_proxy_check, :only => %w(create)
+
+      def resource_name
+        '::ForemanOpenscap::TailoringFile'
+      end
+
+      def get_resource(message = 'no resource loaded')
+        instance_variable_get :"@tailoring_file" or fail message
+      end
+
+      api :GET, '/compliance/tailoring_files', N_('List Tailoring files')
+      param_group :search_and_pagination, ::Api::V2::BaseController
+
+      def index
+        @tailoring_files = resource_scope_for_index(:permission => :view_tailoring_files)
+      end
+
+      api :GET, '/compliance/tailoring_files/:id/xml', N_('Show a Tailoring file as XML')
+      param :id, :identifier, :required => true
+
+      def xml
+        send_data @tailoring_file.scap_file,
+                  :type     => 'application/xml',
+                  :filename => @tailoring_file.original_filename || "#{@tailoring_file.name}.xml"
+      end
+
+      api :GET, '/compliance/tailoring_files/:id', N_('Show a Tailoring file')
+      param :id, :identifier, :required => true
+      def show
+      end
+
+      def_param_group :tailoring_file do
+        param :tailoring_file, Hash, :required => true, :action_aware => true do
+          param :name, String, :required => true, :desc => N_('Tailoring file name')
+          param :scap_file, String, :required => true, :desc => N_('XML containing tailoring file')
+          param :original_filename, String, :desc => N_('Original file name of the XML file')
+          param_group :taxonomies, ::Api::V2::BaseController
+        end
+      end
+
+      api :POST, '/compliance/tailoring_files', N_('Create a Tailoring file')
+      param_group :tailoring_file, :as => :create
+
+      def create
+        @tailoring_file = ForemanOpenscap::TailoringFile.new(tailoring_file_params)
+        process_response @tailoring_file.save
+      end
+
+      api :PUT, '/compliance/tailoring_files/:id', N_('Update a Tailoring file')
+      param :id, :identifier, :required => true
+      param_group :tailoring_file
+
+      def update
+        process_response @tailoring_file.update_attributes(tailoring_file_params)
+      end
+
+      api :DELETE, '/compliance/tailoring_files/:id', N_('Deletes a Tailoring file')
+      param :id, :identifier, :required => true
+
+      def destroy
+        process_response @tailoring_file.destroy
+      end
+
+      private
+      def find_resource
+        not_found and return if params[:id].blank?
+        instance_variable_set("@tailoring_file", resource_scope.find(params[:id]))
+      end
+
+      def action_permission
+        case params[:action]
+        when 'xml'
+          :view
+        else
+          super
+        end
+      end
+
+      def openscap_proxy_check
+        unless ForemanOpenscap::TailoringFile.any?
+          check = ForemanOpenscap::OpenscapProxyVersionCheck.new.run
+          render_error :custom_error, :status => :unprocessable_entity, :locals => { :message => check.message } unless check.pass?
+        end
+      end
+    end
+  end
+end

data/app/controllers/concerns/foreman/controller/parameters/policy_api.rb

@@ -4,8 +4,8 @@ module Foreman::Controller::Parameters::PolicyApi
   class_methods do
     def filter_params_list
       [:description, :name, :period, :scap_content_id, :scap_content_profile_id,
-       :weekday, :day_of_month, :cron_line, :location_ids => [], :organization_ids => [],
-       :hostgroup_ids => []]
+       :weekday, :day_of_month, :cron_line, :tailoring_file_id, :tailoring_file_profile_id,
+       :location_ids => [], :organization_ids => [], :hostgroup_ids => []]
     end
 
     def policy_params_filter

data/app/controllers/concerns/foreman/controller/parameters/tailoring_file.rb

@@ -0,0 +1,15 @@
+module Foreman::Controller::Parameters::TailoringFile
+  extend ActiveSupport::Concern
+
+  class_methods do
+    def tailoring_file_params_filter
+      Foreman::ParameterFilter.new(::ForemanOpenscap::TailoringFile).tap do |filter|
+        filter.permit :name, :scap_file, :original_filename, :location_ids => [], :organization_ids => []
+      end
+    end
+  end
+
+  def tailoring_file_params
+    self.class.tailoring_file_params_filter.filter_params(params, parameter_filter_context)
+  end
+end

data/app/controllers/openscap_proxies_controller.rb

@@ -0,0 +1,31 @@
+class OpenscapProxiesController < ApplicationController
+  before_action :find_proxy, :only => [:openscap_spool]
+
+  def openscap_spool
+    last_error = @smart_proxy ? find_spool_error : nil
+    render :partial => 'smart_proxies/openscap_spool', :locals => { :last_error => last_error }
+  end
+
+  private
+
+  def action_permission
+    case params[:action]
+    when 'openscap_spool'
+      :view
+    else
+      super
+    end
+  end
+
+  def find_proxy
+    @smart_proxy = SmartProxy.find params[:id]
+  end
+
+  def find_spool_error
+    @smart_proxy.statuses[:logs].
+      logs.
+      log_entries.
+      reverse.
+      find { |entry| entry["level"] == "ERROR" && entry["message"].start_with?("Failed to parse Arf Report") }
+  end
+end

data/app/controllers/policies_controller.rb

@@ -4,16 +4,16 @@ class PoliciesController < ApplicationController
 
   before_filter :find_by_id, :only => [:show, :edit, :update, :parse, :destroy]
   before_filter :find_multiple, :only => [:select_multiple_hosts, :update_multiple_hosts, :disassociate_multiple_hosts, :remove_policy_from_multiple_hosts]
+  before_filter :find_tailoring_file, :only => [:tailoring_file_selected]
 
   def model_of_controller
     ::ForemanOpenscap::Policy
   end
 
   def index
-    @policies = resource_base
-                  .search_for(params[:search], :order => params[:order])
-                  .paginate(:page => params[:page], :per_page => params[:per_page])
-                  .includes(:scap_content, :scap_content_profile)
+    @policies = resource_base.search_for(params[:search], :order => params[:order]).
+                paginate(:page => params[:page], :per_page => params[:per_page]).
+                includes(:scap_content, :scap_content_profile, :tailoring_file)
     if @policies.empty? && ForemanOpenscap::ScapContent.unconfigured?
       redirect_to scap_contents_path
     end
@@ -70,6 +70,11 @@ class PoliciesController < ApplicationController
     end
   end
 
+  def tailoring_file_selected
+    @policy ||= ::ForemanOpenscap::Policy.new
+    render :partial => 'tailoring_file_selected', :locals => { :policy => @policy, :tailoring_file => @tailoring_file }
+  end
+
   def select_multiple_hosts; end
 
   def update_multiple_hosts
@@ -99,21 +104,15 @@ class PoliciesController < 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])
   end
 
+  def find_tailoring_file
+    @tailoring_file = ForemanOpenscap::TailoringFile.find(params[:tailoring_file_id]) if params[:tailoring_file_id].present?
+  end
+
   def find_multiple
     # Lets search by name or id and make sure one of them exists first
     if params[:host_ids].present?
@@ -136,7 +135,7 @@ class PoliciesController < ApplicationController
 
   def action_permission
     case params[:action]
-    when 'parse'
+    when 'parse', 'tailoring_file_selected'
       :view
     else
       super

data/app/controllers/scap_contents_controller.rb

@@ -48,16 +48,6 @@ class ScapContentsController < 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
     @scap_content = resource_base.find(params[:id])

data/app/controllers/tailoring_files_controller.rb

@@ -0,0 +1,75 @@
+class TailoringFilesController < ApplicationController
+  include Foreman::Controller::AutoCompleteSearch
+  include Foreman::Controller::Parameters::TailoringFile
+
+  before_filter :find_tailoring_file, :only => [:destroy, :update, :edit, :xml]
+  before_filter :handle_file_upload, :only => [:create, :update]
+
+  def model_of_controller
+    ::ForemanOpenscap::TailoringFile
+  end
+
+  def index
+    @tailoring_files = resource_base.search_for(params[:search], :order => params[:order]).
+                       paginate(:page => params[:page], :per_page => params[:per_page])
+  end
+
+  def new
+    @tailoring_file = ::ForemanOpenscap::TailoringFile.new
+  end
+
+  def create
+    @tailoring_file = ForemanOpenscap::TailoringFile.new(tailoring_file_params)
+    if @tailoring_file.save
+      process_success
+    else
+      process_error
+    end
+  end
+
+  def edit
+  end
+
+  def update
+    if @tailoring_file.update_attributes(tailoring_file_params)
+      process_success
+    else
+      process_error
+    end
+  end
+
+  def destroy
+    if @tailoring_file.destroy
+      process_success
+    else
+      process_error :object => @tailoring_file
+    end
+  end
+
+  def xml
+    send_data @tailoring_file.scap_file,
+              :type     => 'application/xml',
+              :filename => @tailoring_file.original_filename || "#{@tailoring_file.name}.xml"
+  end
+
+  private
+
+  def find_tailoring_file
+    @tailoring_file = resource_base.find(params[:id])
+  end
+
+  def handle_file_upload
+    return unless params[:tailoring_file] && raw_file = params[:tailoring_file][:scap_file]
+    params[:tailoring_file][:original_filename] = raw_file.original_filename
+    params[:tailoring_file][:scap_file] = raw_file.tempfile.read if raw_file.respond_to?(:tempfile) && raw_file.tempfile.respond_to?(:read)
+  end
+
+  def action_permission
+    case params[:action]
+    when 'xml'
+      :view
+    else
+      super
+    end
+  end
+end