smart_proxy_openscap 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eba9e5346ce33339c77df129260e227b806cffbf
-  data.tar.gz: 7ee409ced62aca3253f700e10eecac2f69558dde
+  metadata.gz: e2d3e917fd247cee23a8752c368a63c557bf35ed
+  data.tar.gz: 06c6dd924478a4708c0a5f93325e6b0692cae444
 SHA512:
-  metadata.gz: ffd1259c6fddf38830fbb757d41b0255bfd3a31dac90eb95da39077754e520df7734da4c4d34d165826cc5f754a4d5895deeaf23af3e01d952a2072b3e9e469b
-  data.tar.gz: d2290459e3c99040ddb098ea0a1a0f714f052914e132020218b6b7a6b84d493dc71bd205bfe1a4508337caa2e35bfce1ae9e991d9c1da9d855c102c26927ca8c
+  metadata.gz: 72f165b675321bea26b01215722d1309269f1038242b7204f09fa3dace8e602cf6b2b961435fa3a546bb0cb312c320025b48b3bc521a6b185248769d9a7f29e7
+  data.tar.gz: 8a9c96d17704f853f34b7c6a9f05a0a900c690ea39558ab4f449dbdb33386ce2a27cc081dc92b2ee07a16cb5ba45f1811349e2a69fea85fb6b1ab1a8adcdad99

data/lib/smart_proxy_openscap/openscap_api.rb

@@ -14,7 +14,7 @@ module Proxy::OpenSCAP
   class Api < ::Sinatra::Base
     include ::Proxy::Log
     helpers ::Proxy::Helpers
-    authorize_with_trusted_hosts
+    authorize_with_ssl_client
 
     put "/arf/:policy" do
       # first let's verify client's certificate
@@ -43,16 +43,5 @@ module Proxy::OpenSCAP
 
       {"created" => true}.to_json
     end
-
-    get "/policies/:policy_id/content" do
-      content_type 'application/xml'
-      begin
-        Proxy::OpenSCAP::get_policy_content(params[:policy_id])
-      rescue OpenSCAPException => e
-        log_halt e.http_code, "Error fetching xml file: #{e.message}"
-      rescue StandardError => e
-        log_halt 500, "Error occurred: #{e.message}"
-      end
-    end
   end
 end

data/lib/smart_proxy_openscap/openscap_lib.rb

@@ -13,29 +13,10 @@ require 'fileutils'
 require 'json'
 require 'proxy/error'
 require 'proxy/request'
-require 'smart_proxy_openscap/openscap_exception'
 
 module Proxy::OpenSCAP
   extend ::Proxy::Log
 
-  def self.get_policy_content(policy_id)
-    policy_store_dir = File.join(Proxy::OpenSCAP::Plugin.settings.contentdir, policy_id.to_s)
-    policy_scap_file = File.join(policy_store_dir, "#{policy_id}_scap_content.xml")
-    begin
-      FileUtils.mkdir_p(policy_store_dir) # will fail silently if exists
-    rescue Errno::EACCES => e
-      logger.error "No permission to create directory #{policy_store_dir}"
-      raise e
-    rescue StandardError => e
-      logger.error "Could not create '#{policy_store_dir}' directory: #{e.message}"
-      raise e
-    end
-
-    scap_file = policy_content_file(policy_scap_file)
-    scap_file ||= save_or_serve_scap_file(policy_id, policy_scap_file)
-    scap_file
-  end
-
   def self.common_name(request)
     client_cert = request.env['SSL_CLIENT_CERT']
     raise Proxy::Error::Unauthorized, "Client certificate required!" if client_cert.to_s.empty?
@@ -84,42 +65,6 @@ module Proxy::OpenSCAP
     end
   end
 
-  def self.fetch_scap_content_xml(policy_id, policy_scap_file)
-    foreman_request = Proxy::HttpRequest::ForemanRequest.new
-    policy_content_path = "/api/v2/compliance/policies/#{policy_id}/content"
-    req = foreman_request.request_factory.create_get(policy_content_path)
-    response = foreman_request.send_request(req)
-    unless response.is_a? Net::HTTPSuccess
-      raise OpenSCAPException.new(response)
-    end
-    response.body
-  end
-
-
-  def self.policy_content_file(policy_scap_file)
-    return nil if !File.file?(policy_scap_file) || File.zero?(policy_scap_file)
-    File.open(policy_scap_file, 'rb').read
-  end
-
-  def self.save_or_serve_scap_file(policy_id, policy_scap_file)
-    lock = Proxy::HttpDownloads.try_locking(policy_scap_file)
-    response = fetch_scap_content_xml(policy_id, policy_scap_file)
-    if lock.nil?
-      return response
-    else
-      begin
-        File.open(policy_scap_file, 'wb') do |file|
-          file << response
-        end
-      ensure
-        Proxy::HttpDownloads.unlock(lock)
-      end
-      scap_file = policy_content_file(policy_scap_file)
-      raise FileNotFound if scap_file.nil?
-      return scap_file
-    end
-  end
-
   class ForemanForwarder < Proxy::HttpRequest::ForemanRequest
     def do(arf_dir)
       Dir.foreach(arf_dir) { |cname|
@@ -171,10 +116,11 @@ module Proxy::OpenSCAP
       begin
         data = File.read(arf_file_path)
         response = send_request(foreman_api_path, data)
-        # Raise an HTTP error if the response is not 2xx (success).
         response.value
+        raise StandardError, "Received #{response.code}: #{response.message}" unless response.code.to_i == 200
         res = JSON.parse(response.body)
         raise StandardError, "Received result: #{res['result']}" unless res['result'] == 'OK'
+        raise StandardError, "Sent bytes: #{data.length}, but foreman received: #{res['received']}" unless data.length == res['received']
         File.delete arf_file_path
       rescue StandardError => e
         logger.debug response.body if response

data/lib/smart_proxy_openscap/openscap_plugin.rb

@@ -18,7 +18,6 @@ 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'
+                     :openscap_send_log_file => '/var/log/foreman-proxy/openscap-send.log'
   end
 end

data/lib/smart_proxy_openscap/openscap_version.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014--2015 Red Hat Inc.
+# Copyright (c) 2014 Red Hat Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 3 (GPLv3). There is NO WARRANTY for this software, express or
@@ -10,6 +10,6 @@
 
 module Proxy
   module OpenSCAP
-    VERSION = '0.3.1'
+    VERSION = '0.4.0'
   end
 end

data/settings.d/openscap.yml.example

@@ -7,7 +7,3 @@
 # Directory where OpenSCAP audits are stored
 # before they are forwarded to Foreman
 #:spooldir: /var/spool/foreman-proxy/openscap
-
-# Directory where OpenSCAP content XML are stored
-# So we will not request the XML from Foreman each time
-#:contentdir: /var/lib/openscap/content

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_openscap
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - "Šimon Lukašík"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies: []
 description: |-
   A plug-in to the Foreman's smart-proxy which receives
@@ -28,7 +28,6 @@ files:
 - lib/smart_proxy_openscap.rb
 - lib/smart_proxy_openscap/http_config.ru
 - lib/smart_proxy_openscap/openscap_api.rb
-- lib/smart_proxy_openscap/openscap_exception.rb
 - lib/smart_proxy_openscap/openscap_lib.rb
 - lib/smart_proxy_openscap/openscap_plugin.rb
 - lib/smart_proxy_openscap/openscap_version.rb

data/lib/smart_proxy_openscap/openscap_exception.rb

@@ -1,20 +0,0 @@
-module Proxy::OpenSCAP
-  class OpenSCAPException < Exception
-    attr_accessor :response
-    attr_accessor :message
-    def initialize(response = nil)
-      @response = response
-      @message = response.message if response
-    end
-
-    def http_code
-      @response.code || 500
-    end
-
-    def http_body
-      @response.body if @response
-    end
-  end
-
-  class FileNotFound < StandardError; end
-end