smart_proxy_abrt 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df8fa42c5653d24dc901ba4fb3f0ed7825dc7360
-  data.tar.gz: 8c90a1213d9731990e7fe4b35eab8e6b199ea7a8
+  metadata.gz: 6ee13f97ca61bfe1beb9600243860112720ab77e
+  data.tar.gz: f7ac725e23e1043c4fee869faa2c17b2200fdb67
 SHA512:
-  metadata.gz: 78d8ea31d80fe41f6cc79a1de8f06a1f87bd650d5e692487f57c8df927d3b00cfe65a6e974c0ffb9a88637882cf3728ce424f5a0a81912d13a6b596095f51ebb
-  data.tar.gz: 58648ba8d92b9dce46e95a91ec8ddafb3e9e98f86f0cf94dedfae8e9c16a6edeebf1c7df8f1458d3133b8884e15459aef805c115d43d6486edf107359cf5b4be
+  metadata.gz: 9049b481899587f4bc23a12967df0563e984e4ee5bb76c1cb10e649d2dca1fae9b9774a82c5e042aad13cae8d2f4dd51fa6189418c59e6c68a3e283189fe45d7
+  data.tar.gz: 351de1e2a5545fb1f42684b48af2cc222671d65aabce30f4f40f7b72da48ab72cc0d4e7e54825166d70df10f66fa10e2cdbbbfa9fc16cf1bd474d14362691aae

data/lib/smart_proxy_abrt/abrt_api.rb

@@ -12,7 +12,7 @@ module AbrtProxy
 
     post '/reports/new/' do
       begin
-        cn = AbrtProxy::common_name request
+        names = AbrtProxy::cert_names request
       rescue AbrtProxy::Error::Unauthorized => e
         log_halt 403, "Client authentication required: #{e.message}"
       rescue AbrtProxy::Error::CertificateError => e
@@ -48,7 +48,7 @@ module AbrtProxy
         if Proxy::SETTINGS.foreman_url
           foreman_url = Proxy::SETTINGS.foreman_url
           foreman_url += "/" if foreman_url[-1] != "/"
-          foreman_url += "hosts/#{cn}/abrt_reports"
+          foreman_url += "hosts/#{names[-1]}/abrt_reports"
           response["reported_to"] = [{ "reporter" => "Foreman",
                                        "type" => "url",
                                        "value" => foreman_url }]
@@ -58,7 +58,7 @@ module AbrtProxy
 
       #save report to disk
       begin
-        AbrtProxy::HostReport.save cn, ureport
+        AbrtProxy::HostReport.save names, ureport
       rescue => e
         log_halt 500, "Failed to save the report: #{e}"
       end

data/lib/smart_proxy_abrt/abrt_lib.rb

@@ -74,7 +74,7 @@ module AbrtProxy
     response
   end
 
-  def self.common_name(request)
+  def self.cert_names(request)
     client_cert = request.env['SSL_CLIENT_CERT']
     raise AbrtProxy::Error::Unauthorized, "Client certificate required" if client_cert.to_s.empty?
 
@@ -84,11 +84,28 @@ module AbrtProxy
       raise AbrtProxy::Error::CertificateError, e.message
     end
 
-    cn = client_cert.subject.to_a.detect { |name, value| name == 'CN' }
-    cn = cn[1] unless cn.nil?
-    raise AbrtProxy::Error::CertificateError, "Common Name not found in the certificate" unless cn
+    begin
+      cn = client_cert.subject.to_a.find { |name, value| name == 'CN' }
+      names = [cn[1]]
+    rescue NoMethodError
+      raise AbrtProxy::Error::CertificateError, "Common Name not found in the certificate"
+    end
+
+    alt_name_ext = client_cert.extensions.find { |ext| ext.oid == 'subjectAltName' }
+    if alt_name_ext
+      names += alt_name_ext.value.
+                            split(/, ?/).
+                            select { |s| s.start_with? 'URI:CN=' }.
+                            map { |s| s.sub(/^URI:CN=/, '') }
+    end
 
-    return cn
+    return names
+  end
+
+  class AbrtRequest < Proxy::HttpRequest::ForemanRequest
+    def post_report(report)
+      send_request(request_factory.create_post('/api/abrt_reports', report))
+    end
   end
 
   class HostReport
@@ -127,6 +144,7 @@ module AbrtProxy
       @by_hash[hash] = ar unless hash.nil?
       @files = [fname]
       @host = json["host"]
+      @althosts = json["althosts"]
     end
 
     def merge(other)
@@ -150,7 +168,7 @@ module AbrtProxy
     def send_to_foreman
       foreman_report = create_foreman_report
       logger.debug "Sending #{foreman_report}"
-      Proxy::HttpRequest::ForemanRequest.new.send_request("/api/abrt_reports", foreman_report.to_json)
+      AbrtRequest.new.post_report(foreman_report.to_json)
     end
 
     def unlink
@@ -160,12 +178,12 @@ module AbrtProxy
       end
     end
 
-    def self.save(host, report, reported_at=nil)
+    def self.save(hostnames, report, reported_at=nil)
       # create the spool dir if it does not exist
       FileUtils.mkdir_p HostReport.spooldir
 
       reported_at ||= Time.now.utc
-      on_disk_report = { "host" => host, "report" => report , "reported_at" => reported_at.to_s }
+      on_disk_report = { "host" => hostnames[0], "report" => report , "reported_at" => reported_at.to_s, "althosts" => hostnames[1..-1] }
 
       # write report to temporary file
       temp_fname = unique_filename "new-"
@@ -209,6 +227,7 @@ module AbrtProxy
     def create_foreman_report
       { "abrt_report" => {
             "host"        => @host,
+            "althosts"    => @althosts,
             "reports"     => format_reports
         }
       }

data/lib/smart_proxy_abrt/abrt_version.rb

@@ -1,3 +1,3 @@
 module AbrtProxy
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/test/abrt_api_test.rb

@@ -19,7 +19,7 @@ class AbrtApiTest < Test::Unit::TestCase
     @post_data = {
       "file" => Rack::Test::UploadedFile.new(ureport_file, "application/json")
     }
-    AbrtProxy.stubs(:common_name).returns('localhost')
+    AbrtProxy.stubs(:cert_names).returns(['localhost'])
   end
 
   def assert_dir_contains_report(dir)

data/test/abrt_test.rb

@@ -84,7 +84,7 @@ class AbrtTest < Test::Unit::TestCase
   end
 
   def test_hostreport_send_to_foreman
-    Proxy::HttpRequest::ForemanRequest.any_instance.expects(:send_request).once
+    AbrtProxy::AbrtRequest.any_instance.expects(:post_report).once
 
     reports = []
     Dir[File.join(@tmpdir, "ureport-ondisk-host1-*")].each do |file|
@@ -117,7 +117,7 @@ class AbrtTest < Test::Unit::TestCase
     Dir[File.join(@tmpdir, "*")].each { |file| File.unlink file }
     ureport = IO.read "test/fixtures/ureport1.json"
     ureport = JSON.parse ureport
-    AbrtProxy::HostReport.save "localhost", ureport
+    AbrtProxy::HostReport.save ["localhost"], ureport
 
     hr = AbrtProxy::HostReport.new Dir[File.join(@tmpdir, "*")][0]
     assert_equal "localhost", hr.host

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_abrt
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Martin Milata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: satyr