smart_proxy_openscap 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
----
-SHA1:
-  metadata.gz: a3045f38873e1f2bcde54bde9421175602bb9f34
-  data.tar.gz: 24414ceac6a0c7d5a3462d2de1ab11e6a45f5806
-SHA512:
-  metadata.gz: d1cceeb3e1ed7a8e469fafef6f703a89db4352d22d6f765dd6455fea2ed097addd0bee56c08495b210b78039d2960e715e0c08d547c95c3cf6584dca7072db90
-  data.tar.gz: 498837268ecc6d1c12bdf4906fda81ade22b1846358acc84a5813dd7e3242d5086805cda2b637b417cee04d47fcc48fbcbb6344499dcfca31dd954d102fa1a38
+--- 
+SHA512: 
+  data.tar.gz: 1e3762a0add8f215482859c23933ef292a73c2512d18100d06ae47a452c4607a7ae65787a9c7adec74ceee8bf432461190eca7e23e61f8e8023939491285ab62
+  metadata.gz: 6833ac54593b8ce05f55570e9aba27df9c42041721dd5e8e84ceb70ee0331cb643b092297e76f8ce515f3ba87c05acf521e76617ae2133c46da6c411e11c1739
+SHA1: 
+  data.tar.gz: 451634ad2aaf6c9b1f7cf19c3a99a18dea15d097
+  metadata.gz: 50bd53594454c8b43afd26904e978a01a8a8004c

data/Gemfile

@@ -6,3 +6,7 @@ group :development do
   gem 'rubocop'
   gem 'smart_proxy', :github => "theforeman/smart-proxy", :branch => 'develop'
 end
+
+# load local gemfile
+local_gemfile = File.join(File.dirname(__FILE__), 'Gemfile.local.rb')
+self.instance_eval(Bundler.read_file(local_gemfile)) if File.exist?(local_gemfile)

data/README.md

@@ -26,7 +26,7 @@ Learn more about [Foreman-OpenSCAP](https://github.com/theforeman/foreman_opensc
 - Add smart_proxy_openscap to your smart proxy `bundler.d/openscap.rb` gemfile:
  
   ```
-  ~$ gem 'smart_proxy_openscap', :git => https://github.com/theforeman/smart_proxy_openscap.git
+  ~$ gem 'smart_proxy_openscap', :git => 'https://github.com/theforeman/smart_proxy_openscap.git'
   ```
 
 If you don't install through RPM and you are using bundler, you may need to create 

data/lib/smart_proxy_openscap/http_config.ru

@@ -9,7 +9,12 @@
 #
 
 require 'smart_proxy_openscap/openscap_api'
+require 'smart_proxy_openscap/openscap_import_api'
 
 map '/compliance' do
   run Proxy::OpenSCAP::Api
 end
+
+map '/compliance-importer' do
+  run Proxy::OpenSCAP::ImportApi
+end

data/lib/smart_proxy_openscap/openscap_api.rb

@@ -37,18 +37,15 @@ module Proxy::OpenSCAP
 
       begin
         post_to_foreman = ForemanForwarder.new.post_arf_report(cn, policy, date, request.body.string)
-        Proxy::OpenSCAP::StorageFS.new(Proxy::OpenSCAP::Plugin.settings.reportsdir, cn, post_to_foreman['id'], date)
-          .store_archive(request.body.string)
+        Proxy::OpenSCAP::StorageFS.new(Proxy::OpenSCAP::Plugin.settings.reportsdir, cn, post_to_foreman['id'], date).store_archive(request.body.string)
       rescue Proxy::OpenSCAP::StoreReportError => e
-        Proxy::OpenSCAP::StorageFS.new(Proxy::OpenSCAP::Plugin.settings.failed_dir, cn, post_to_foreman['id'], date)
-          .store_failed(request.body.string)
+        Proxy::OpenSCAP::StorageFS.new(Proxy::OpenSCAP::Plugin.settings.failed_dir, cn, post_to_foreman['id'], date).store_failed(request.body.string)
         logger.error "Failed to save Report in reports directory (#{Proxy::OpenSCAP::Plugin.settings.reportsdir}). Failed with: #{e.message}.
                       Saving file in #{Proxy::OpenSCAP::Plugin.settings.failed_dir}. Please copy manually to #{Proxy::OpenSCAP::Plugin.settings.reportsdir}"
       rescue *HTTP_ERRORS => e
         ### If the upload to foreman fails then store it in the spooldir
         logger.error "Failed to upload to Foreman, saving in spool. Failed with: #{e.message}"
-        Proxy::OpenSCAP::StorageFS.new(Proxy::OpenSCAP::Plugin.settings.spooldir, cn, policy, date)
-          .store_spool(request.body.string)
+        Proxy::OpenSCAP::StorageFS.new(Proxy::OpenSCAP::Plugin.settings.spooldir, cn, policy, date).store_spool(request.body.string)
       rescue Proxy::OpenSCAP::StoreSpoolError => e
         log_halt 500, e.message
       end
@@ -57,8 +54,7 @@ module Proxy::OpenSCAP
     get "/arf/:id/:cname/:date/:digest/xml" do
       content_type 'application/x-bzip2'
       begin
-        Proxy::OpenSCAP::StorageFS.new(Proxy::OpenSCAP::Plugin.settings.reportsdir, params[:cname], params[:id], params[:date])
-          .get_arf_xml(params[:digest])
+        Proxy::OpenSCAP::StorageFS.new(Proxy::OpenSCAP::Plugin.settings.reportsdir, params[:cname], params[:id], params[:date]).get_arf_xml(params[:digest])
       rescue FileNotFound => e
         log_halt 500, "Could not find requested file, #{e.message}"
       end
@@ -66,17 +62,15 @@ module Proxy::OpenSCAP
 
     delete "/arf/:id/:cname/:date/:digest" do
       begin
-        Proxy::OpenSCAP::StorageFS.new(Proxy::OpenSCAP::Plugin.settings.reportsdir, params[:cname], params[:id], params[:date])
-          .delete_arf_file
+        Proxy::OpenSCAP::StorageFS.new(Proxy::OpenSCAP::Plugin.settings.reportsdir, params[:cname], params[:id], params[:date]).delete_arf_file
       rescue FileNotFound => e
-        log_halt 500, "Could not find requested file, #{e.message}"
+        logger.debug "Could not find requested file, #{e.message} - Assuming deleted"
       end
     end
 
     get "/arf/:id/:cname/:date/:digest/html" do
       begin
-        Proxy::OpenSCAP::StorageFS.new(Proxy::OpenSCAP::Plugin.settings.reportsdir, params[:cname], params[:id], params[:date])
-          .get_arf_html(params[:digest])
+        Proxy::OpenSCAP::StorageFS.new(Proxy::OpenSCAP::Plugin.settings.reportsdir, params[:cname], params[:id], params[:date]).get_arf_html(params[:digest])
       rescue FileNotFound => e
         log_halt 500, "Could not find requested file, #{e.message}"
       end

data/lib/smart_proxy_openscap/openscap_import_api.rb

@@ -0,0 +1,32 @@
+module Proxy::OpenSCAP
+  class ImportApi < ::Sinatra::Base
+    include ::Proxy::Log
+    helpers ::Proxy::Helpers
+    authorize_with_trusted_hosts
+
+    require 'smart_proxy_openscap/openscap_lib'
+
+    post "/arf/:cname/:policy_id/:date" do
+      cn = params[:cname]
+      date = params[:date]
+      policy = params[:policy_id]
+      log_halt(500, "Insufficient data") if (cn.nil? || date.nil?)
+
+      post_to_foreman = ForemanForwarder.new.post_arf_report(cn, policy, date, request.body.string)
+      begin
+        Proxy::OpenSCAP::StorageFS.new(Proxy::OpenSCAP::Plugin.settings.reportsdir, cn, post_to_foreman['id'], date).store_archive(request.body.string)
+      rescue Proxy::OpenSCAP::StoreReportError => e
+        Proxy::OpenSCAP::StorageFS.new(Proxy::OpenSCAP::Plugin.settings.failed_dir, cn, post_to_foreman['id'], date).store_failed(request.body.string)
+        logger.error "Failed to save Report in reports directory (#{Proxy::OpenSCAP::Plugin.settings.reportsdir}). Failed with: #{e.message}.
+                        Saving file in #{Proxy::OpenSCAP::Plugin.settings.failed_dir}. Please copy manually to #{Proxy::OpenSCAP::Plugin.settings.reportsdir}"
+      rescue *HTTP_ERRORS => e
+        ### If the upload to foreman fails then store it in the spooldir
+        logger.error "Failed to upload to Foreman, saving in spool. Failed with: #{e.message}"
+        Proxy::OpenSCAP::StorageFS.new(Proxy::OpenSCAP::Plugin.settings.spooldir, cn, policy, date).store_spool(request.body.string)
+      rescue Proxy::OpenSCAP::StoreSpoolError => e
+        log_halt 500, e.message
+      end
+      {:success => true, :arf_id => post_to_foreman['id']}.to_json
+    end
+  end
+end

data/lib/smart_proxy_openscap/openscap_plugin.rb

@@ -8,7 +8,7 @@
 # along with this software; if not, see http://www.gnu.org/licenses/gpl.txt
 #
 
-require 'smart_proxy_openscap/openscap_version'
+require 'smart_proxy_openscap/version'
 
 module Proxy::OpenSCAP
   class Plugin < ::Proxy::Plugin
@@ -18,9 +18,9 @@ module Proxy::OpenSCAP
     https_rackup_path File.expand_path("http_config.ru", File.expand_path("../", __FILE__))
 
     default_settings :spooldir => '/var/spool/foreman-proxy/openscap',
-                     :openscap_send_log_file => 'logs/openscap-send.log',
-                     :contentdir => 'openscap/content',
-                     :reportsdir => 'openscap/reports',
-                     :failed_dir => 'openscap/failed'
+                     :openscap_send_log_file => File.join(APP_ROOT, 'logs/openscap-send.log'),
+                     :contentdir => File.join(APP_ROOT, 'openscap/content'),
+                     :reportsdir => File.join(APP_ROOT, 'openscap/reports'),
+                     :failed_dir => File.join(APP_ROOT, 'openscap/failed')
   end
 end

data/lib/smart_proxy_openscap/openscap_report_parser.rb

@@ -7,6 +7,8 @@ require 'openscap/xccdf/rule'
 require 'openscap/xccdf/fix'
 require 'openscap/xccdf/benchmark'
 require 'json'
+require 'iconv' if RUBY_VERSION.start_with? '1.8'
+
 module Proxy::OpenSCAP
   class Parse
     def initialize(arf_data)
@@ -81,9 +83,15 @@ module Proxy::OpenSCAP
     #   Sets the replacement string to the given value. The default replacement
     #   string is "\uFFFD" for Unicode encoding forms, and "?" otherwise.
     def ascii8bit_to_utf8(string)
+      return ascii8bit_to_utf8_legacy(string) if RUBY_VERSION.start_with? '1.8'
       string.to_s.encode('utf-8', :invalid => :replace, :undef => :replace, :replace => '_')
     end
 
+    # String#encode appeared first in 1.9, so we need a workaround for 1.8
+    def ascii8bit_to_utf8_legacy(string)
+      Iconv.conv('UTF-8//IGNORE', 'UTF-8', string.to_s)
+    end
+
     def hash_a8b(ary)
       ary.map do |hash|
         Hash[hash.map { |key, value| [ascii8bit_to_utf8(key), ascii8bit_to_utf8(value)] }]

data/lib/smart_proxy_openscap/storage_fs.rb

@@ -46,7 +46,7 @@ module Proxy::OpenSCAP
       begin
         FileUtils.mkdir_p @path
       rescue StandardError => e
-        logger.error "Could not create '#{dir}' directory: #{e.message}"
+        logger.error "Could not create '#{@path}' directory: #{e.message}"
         raise e
       end
       @path

data/lib/smart_proxy_openscap/{openscap_version.rb → version.rb}

@@ -10,6 +10,6 @@
 
 module Proxy
   module OpenSCAP
-    VERSION = '0.5.3'
+    VERSION = '0.5.4'
   end
 end

data/smart_proxy_openscap.gemspec

@@ -1,4 +1,4 @@
-require File.expand_path('../lib/smart_proxy_openscap/openscap_version', __FILE__)
+require File.expand_path('../lib/smart_proxy_openscap/version', __FILE__)
 
 Gem::Specification.new do |s|
   s.name = 'smart_proxy_openscap'

data/test/test_helper.rb

@@ -9,3 +9,4 @@ require 'smart_proxy_for_testing'
 
 # create log directory in our (not smart-proxy) directory
 FileUtils.mkdir_p File.dirname(Proxy::SETTINGS.log_file)
+APP_ROOT = "#{File.dirname(__FILE__)}/.."

metadata

@@ -1,98 +1,78 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: smart_proxy_openscap
-version: !ruby/object:Gem::Version
-  version: 0.5.3
+version: !ruby/object:Gem::Version 
+  version: 0.5.4
 platform: ruby
-authors:
-- Šimon Lukašík
+authors: 
+- !binary |
+  xaBpbW9uIEx1a2HFocOtaw==
+
 - Shlomi Zadok
 - Marek Hulan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2016-06-02 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - &id002 
+      - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rack-test
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: mocha
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: webmock
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: openscap
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.3
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.4.3
+  type: :runtime
+  version_requirements: *id006
 description: |-
   A plug-in to the Foreman's smart-proxy which receives
     bzip2ed ARF files and forwards them to the Foreman.
 email: slukasik@redhat.com
-executables:
+executables: 
 - smart-proxy-openscap-send
 extensions: []
+
 extra_rdoc_files: []
-files:
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
+
+files: 
+- .rubocop.yml
+- .rubocop_todo.yml
 - COPYING
 - Gemfile
 - README.md
@@ -108,13 +88,14 @@ files:
 - lib/smart_proxy_openscap/openscap_api.rb
 - lib/smart_proxy_openscap/openscap_content_parser.rb
 - lib/smart_proxy_openscap/openscap_exception.rb
+- lib/smart_proxy_openscap/openscap_import_api.rb
 - lib/smart_proxy_openscap/openscap_lib.rb
 - lib/smart_proxy_openscap/openscap_plugin.rb
 - lib/smart_proxy_openscap/openscap_report_parser.rb
-- lib/smart_proxy_openscap/openscap_version.rb
 - lib/smart_proxy_openscap/spool_forwarder.rb
 - lib/smart_proxy_openscap/storage.rb
 - lib/smart_proxy_openscap/storage_fs.rb
+- lib/smart_proxy_openscap/version.rb
 - settings.d/openscap.yml.example
 - smart_proxy_openscap.gemspec
 - test/data/arf_report
@@ -125,27 +106,27 @@ files:
 - test/scap_content_parser_api_test.rb
 - test/test_helper.rb
 homepage: http://github.com/OpenSCAP/smart_proxy_openscap
-licenses:
+licenses: 
 - GPL-3
 metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+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'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id002
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id002
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.0.17
 signing_key: 
 specification_version: 4
 summary: OpenSCAP plug-in for Foreman's smart-proxy.
 test_files: []
+