foreman_scap_client 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b4d4dd8bf085915d51de9a3b8993afcc6c7c259
-  data.tar.gz: f4be78a5d61d4f0933e7c90efbaf8a9fd55b242d
+  metadata.gz: e6c1d19a0f82e39918df95112962273ca7733a6e
+  data.tar.gz: 0232aea565a95cf1061fcf0bdd3df1ee49902d07
 SHA512:
-  metadata.gz: 75fccbb8a011963834e16f114b59243b6148db0b986c7b7007f7057fc09f7f11e3e5dc7462f7ae1e9f395833502c85c4b85f6ed51727981e2a311b3dae67f4ab
-  data.tar.gz: ad33e2a6fd14a931c2128fccc683c8f0b45a7f7741459ec5a8d5f44af536842949d9aecb686b266223b4529adcc9a84c2ba986b71aef1582331b4d92bbf5aec0
+  metadata.gz: 2829749f7251c1a03b6113b0b86bcdde1e39e13ceac3676dad97cad28e9baa1e897b5f4083615ce10a72701979f5102c46a8d9d8ac6da87351e417d7cad17e05
+  data.tar.gz: 0cde9ba514953ce1eef31159edfc2be849469bfdca30ebfa88862cca1b1f22619a0cfbf8631ba85f67d67caddbc04c1bd8a5f51a538935c71343e42813616a69

data/lib/foreman_scap_client/client.rb

@@ -3,6 +3,7 @@ require 'tmpdir'
 require 'net/http'
 require 'net/https'
 require 'uri'
+require 'open-uri'
 
 module ForemanScapClient
   CONFIG_FILE = '/etc/foreman_scap_client/config.yaml'
@@ -10,7 +11,7 @@ module ForemanScapClient
   class Client
     def run(policy_id)
       @policy_id = policy_id
-
+      ensure_scan_file
       Dir.mktmpdir do |dir|
         @tmp_dir = dir
         scan
@@ -75,19 +76,7 @@ module ForemanScapClient
     def upload
       uri = URI.parse(upload_uri)
       puts "Uploading results to #{uri}"
-      https = Net::HTTP.new(uri.host, uri.port)
-      https.use_ssl = true
-      https.verify_mode = OpenSSL::SSL::VERIFY_PEER
-      https.ca_file = config[:ca_file]
-      begin
-        https.cert = OpenSSL::X509::Certificate.new File.read(config[:host_certificate])
-        https.key = OpenSSL::PKey::RSA.new File.read(config[:host_private_key])
-      rescue StandardError => e
-        puts 'Unable to load certs'
-        puts e.message
-        exit(3)
-      end
-
+      https = generate_https_object(uri)
       request = Net::HTTP::Put.new uri.path
       request.body = File.read(results_bzip_path)
       request['Content-Type'] = 'text/xml'
@@ -111,5 +100,44 @@ module ForemanScapClient
       foreman_proxy_port = config[:port]
       "https://#{foreman_proxy_fqdn}:#{foreman_proxy_port}"
     end
+
+    def generate_https_object(uri)
+      https = Net::HTTP.new(uri.host, uri.port)
+      https.use_ssl = true
+      https.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      https.ca_file = config[:ca_file]
+      begin
+        https.cert = OpenSSL::X509::Certificate.new File.read(config[:host_certificate])
+        https.key = OpenSSL::PKey::RSA.new File.read(config[:host_private_key])
+      rescue StandardError => e
+        puts 'Unable to load certs'
+        puts e.message
+        exit(3)
+      end
+      https
+    end
+
+    def ensure_scan_file
+      return if File.exist?(config[@policy_id][:content_path])
+      puts "File #{config[@policy_id][:content_path]} is missing. Downloading it from proxy"
+      begin
+        FileUtils.mkdir_p(File.dirname(config[@policy_id][:content_path]))
+        uri = URI.parse(download_uri(config[@policy_id][:download_path]))
+        puts "Download scap content xml from: #{uri}"
+        request = generate_https_object(uri).get(uri.path)
+        request.value
+        scap_content_xml = request.body
+        open(config[@policy_id][:content_path], 'wb') do |file|
+          file << scap_content_xml
+        end
+      rescue StandardError => e
+        puts "SCAP file is missing and download failed with error: #{e.message}"
+        exit(5)
+      end
+    end
+
+    def download_uri(download_path)
+      foreman_proxy_uri + "#{download_path}"
+    end
   end
 end

data/lib/foreman_scap_client/version.rb

@@ -1,3 +1,3 @@
 module ForemanScapClient
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,42 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: foreman_scap_client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Marek Hulan
-- Šimon Lukašík
+- "Šimon Lukašík"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 description: Client script that runs openscap scan and uploads the result to foreman
@@ -49,13 +49,13 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.md
 - bin/foreman_scap_client
 - config/config.yaml.example
 - lib/foreman_scap_client.rb
 - lib/foreman_scap_client/client.rb
 - lib/foreman_scap_client/version.rb
-- LICENSE
-- README.md
 homepage: https://github.com/openscap/foreman_scap_client
 licenses:
 - GPL-3.0
@@ -66,18 +66,18 @@ 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:
-- /usr/bin/bzip2
+- "/usr/bin/bzip2"
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Client script that runs openscap scan and uploads the result to foreman proxy