smart_proxy_openscap 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52077a3d7e9a009b0ab9d8abba663b3ab7191b78
-  data.tar.gz: db0401879d67124ea9361d48800dad7a66675d37
+  metadata.gz: 66166081c04c172ed14641a8d6a91297b62e282e
+  data.tar.gz: 90f5415c44875a56d909ecd1fa6a643a4e7641af
 SHA512:
-  metadata.gz: 8133075f66c34e22e0da4c431dd49bcd4a3530f8fb8a2f8d7b564b3e781d06eb251ce4db830ad1d87a739d646d55427ec18a60ee06f196b3b318eb55a7a6ac36
-  data.tar.gz: 12d22393be694c5f68e3b3ce5fa48afc592c5baee07fab7c3c760e358755bb96d07f32e84eaaf4a4a238b432c3d41ac98994d16f906c7b08c63032b0d0a60e6d
+  metadata.gz: 5fb6cb5c0749fc59afb091bf8b1febf908fb77234c6b99bbaeaf5acdbc1aa4b410df63b641b49c461aa61cb381675ec0d3aa55ac0e274bac1d9b78fa84e11627
+  data.tar.gz: 2f2ee200b535c56397fbfee9bbc73ac5391f7879f2a2b2e36640acc3ca8b47a892a1e2aec1bb1cf7f4ff0c377a9b06c40a9bcaa7eb19cc89a2dffebf805eea50

data/bin/smart-proxy-openscap-send

@@ -13,6 +13,7 @@ $LOAD_PATH.unshift '/usr/share/foreman-proxy/lib'
 $LOAD_PATH.unshift '/usr/share/foreman-proxy/modules'
 
 require 'smart_proxy'
+require 'smart_proxy_main'
 require 'smart_proxy_openscap'
 require 'smart_proxy_openscap/openscap_lib'
 

data/lib/smart_proxy_openscap/openscap_api.rb

@@ -64,6 +64,15 @@ module Proxy::OpenSCAP
       end
     end
 
+    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
+      rescue FileNotFound => e
+        log_halt 500, "Could not find requested file, #{e.message}"
+      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])

data/lib/smart_proxy_openscap/openscap_version.rb

@@ -10,6 +10,6 @@
 
 module Proxy
   module OpenSCAP
-    VERSION = '0.5.0'
+    VERSION = '0.5.1'
   end
 end

data/lib/smart_proxy_openscap/storage.rb

@@ -36,6 +36,10 @@ module Proxy::OpenSCAP
       raise NotImplementedError
     end
 
+    def delete_arf_file
+      raise NotImplementedError
+    end
+
     private
 
     def validate_id(id)

data/lib/smart_proxy_openscap/storage_fs.rb

@@ -26,6 +26,13 @@ module Proxy::OpenSCAP
       arf_object.html.force_encoding('UTF-8')
     end
 
+    def delete_arf_file
+      path = "#{@path_to_dir}/#{@namespace}/#{@cname}/#{@id}"
+      raise FileNotFound, "Can't find path #{path}" if !File.directory?(path) || File.zero?(path)
+      FileUtils.rm_r path
+      {:id => @id, :deleted => true}.to_json
+    end
+
     private
 
     def store_arf(spool_arf_dir, data)

data/test/get_report_xml_html_test.rb

@@ -49,4 +49,10 @@ class OpenSCAPGetArfTest < Test::Unit::TestCase
     assert_equal(500, last_response.status, "Error response should be 500")
     assert(last_response.server_error?)
   end
+
+  def test_delete_arf_file
+    delete "/arf/#{@arf_id}/#{@cname}/#{@date}/#{@filename}"
+    assert last_response.ok?
+    refute  File.exists?("#{@results_path}/reports/arf/#{@cname}/#{@arf_id}")
+  end
 end

metadata

@@ -1,85 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_openscap
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
-- Šimon Lukašík
+- "Šimon Lukašík"
 - Shlomi Zadok
 - Marek Hulan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-01 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 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'
   type: :development
   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'
   type: :development
   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'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !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:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.3
 description: |-
@@ -91,8 +91,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .rubocop.yml
-- .rubocop_todo.yml
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - COPYING
 - Gemfile
 - README.md
@@ -134,17 +134,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.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: OpenSCAP plug-in for Foreman's smart-proxy.