smart_proxy_abrt 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44fda87ac645fddf05006c3dc12a6d8013b886f9
-  data.tar.gz: ca298f25ee58493637179a0012b116735041797d
+  metadata.gz: 09dbe529fdddce32c8da1b378b563a997ce3c8e3
+  data.tar.gz: 2d4f6b3d711844b98ba5175bd2acc12b7634ccbb
 SHA512:
-  metadata.gz: 110755c8734ea992f3b91eebaefcbd486c1346072c5c9df6a886efe7a35a85429f849e10ac2a5fd37a148426beb48df82eb179e5c57b450bb2f6aea54bad0d3e
-  data.tar.gz: b68cafef498f17ec98f6ce2ee2a035aa8d75c20e4f8daf9252ad13343485a2098ade573a96bb86eb7a8a39c99c8dce496ca0a880ead2393399d4f083ca00e710
+  metadata.gz: 52cf54adb841639326998ec48db2a1dc0bdde33d671146cd140b2753e9b6a752f46cf807a5b3102b37c6bc4ae5b9d867f1aee2df00109280eeb70a35f8ce230a
+  data.tar.gz: f9b3e52261b6a656141040b38676ad0ab884bc000e1217af41f378711b0fed2749445a5220093f043a12728f1684a7900a22045a6f8b14b4aa45c8e9f232e19a

data/bin/smart-proxy-abrt-send

@@ -9,7 +9,7 @@ $LOAD_PATH.unshift '/usr/share/foreman-proxy/modules'
 # We rely on the main smart_proxy module to initialize the plugins so that we
 # can access our module's settings. Also used from smart-proxy code: global
 # settings, logging, foreman requests.
-require 'smart_proxy'
+require 'smart_proxy_main'
 
 require 'smart_proxy_abrt'
 require 'smart_proxy_abrt/abrt_lib'
@@ -24,7 +24,7 @@ end
 include Proxy::Log
 
 # Don't run if ABRT plugin is disabled.
-if AbrtProxy::Plugin.settings.enabled != true
+if !AbrtProxy::Plugin.settings.enabled
   puts "ABRT plugin is disabled - exiting"
   exit true
 end

data/lib/smart_proxy_abrt/abrt_api.rb

@@ -9,15 +9,19 @@ module AbrtProxy
   class Api < ::Sinatra::Base
     include ::Proxy::Log
     helpers ::Proxy::Helpers
-    authorize_with_ssl_client
+    authorize_with_ssl_client unless AbrtProxy::Plugin.settings.insecure
 
     post '/reports/new/' do
-      begin
-        names = AbrtProxy::cert_names request
-      rescue AbrtProxy::Error::Unauthorized => e
-        log_halt 403, "Client authentication required: #{e.message}"
-      rescue AbrtProxy::Error::CertificateError => e
-        log_halt 403, "Could not determine common name from certificate: #{e.message}"
+      if AbrtProxy::Plugin.settings.insecure
+        names = [request.ip]
+      else
+        begin
+          names = AbrtProxy::cert_names request
+        rescue AbrtProxy::Error::Unauthorized => e
+          log_halt 403, "Client authentication required: #{e.message}"
+        rescue AbrtProxy::Error::CertificateError => e
+          log_halt 403, "Could not determine common name from certificate: #{e.message}"
+        end
       end
 
       begin

data/lib/smart_proxy_abrt/abrt_lib.rb

@@ -104,7 +104,7 @@ module AbrtProxy
 
   class AbrtRequest < Proxy::HttpRequest::ForemanRequest
     def post_report(report)
-      send_request(request_factory.create_post('/api/abrt_reports', report))
+      send_request(request_factory.create_post('api/abrt_reports', report))
     end
   end
 

data/lib/smart_proxy_abrt/abrt_plugin.rb

@@ -4,6 +4,7 @@ module AbrtProxy
   class Plugin < ::Proxy::Plugin
     plugin :abrt, AbrtProxy::VERSION
 
+    http_rackup_path File.expand_path("http_config.ru", File.expand_path("../", __FILE__))
     https_rackup_path File.expand_path("http_config.ru", File.expand_path("../", __FILE__))
 
     default_settings :spooldir => "/var/spool/foreman-proxy-abrt",

data/lib/smart_proxy_abrt/abrt_version.rb

@@ -1,3 +1,3 @@
 module AbrtProxy
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/settings.d/abrt.yml.example

@@ -24,3 +24,5 @@
 #:server_ssl_cert: /etc/foreman-proxy/faf_client_cert.pem
 #:server_ssl_key: /etc/foreman-proxy/faf_cleint_key.pem
 
+# Ignore SSL (for development only)
+#:insecure: true

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_abrt
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Martin Milata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: satyr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
 - !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'
 description: This smart proxy plugin, together with a Foreman plugin, add the capability
@@ -74,27 +74,27 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README
+- Rakefile
 - bin/smart-proxy-abrt-send
-- lib/smart_proxy_abrt/abrt_plugin.rb
-- lib/smart_proxy_abrt/http_config.ru
+- bundler.d/abrt.rb
+- extra/foreman-proxy-abrt-send.cron
+- lib/smart_proxy_abrt.rb
+- lib/smart_proxy_abrt/abrt_api.rb
 - lib/smart_proxy_abrt/abrt_lib.rb
+- lib/smart_proxy_abrt/abrt_plugin.rb
 - lib/smart_proxy_abrt/abrt_version.rb
-- lib/smart_proxy_abrt/abrt_api.rb
-- lib/smart_proxy_abrt.rb
+- lib/smart_proxy_abrt/http_config.ru
 - settings.d/abrt.yml.example
-- bundler.d/abrt.rb
+- test/abrt_api_test.rb
+- test/abrt_test.rb
+- test/fixtures/ureport-ondisk-host1-01
 - test/fixtures/ureport-ondisk-host1-02
+- test/fixtures/ureport-ondisk-host1-03
 - test/fixtures/ureport-ondisk-host2-01
-- test/fixtures/ureport-ondisk-host1-01
 - test/fixtures/ureport1.json
-- test/fixtures/ureport-ondisk-host1-03
 - test/test_helper.rb
-- test/abrt_api_test.rb
-- test/abrt_test.rb
-- extra/foreman-proxy-abrt-send.cron
-- README
-- LICENSE
-- Rakefile
 homepage: http://github.com/theforeman/smart_proxy_abrt
 licenses:
 - GPL-3
@@ -105,17 +105,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.1.11
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Automatic Bug Reporting Tool plugin for Foreman's smart proxy