smart_proxy_discovery 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c44e7552bc04515acee1e8328dffda3fd594d215
-  data.tar.gz: d1d3e26f7abd3962fe84d4ab7aeae107e32a349e
+  metadata.gz: e7ba59c0ad52b0cd69c9ab51fdfe85d833dd624e
+  data.tar.gz: 849a4f4ae8f9de1092d5e96569a358c7d49c67e1
 SHA512:
-  metadata.gz: 085cac6a876cca7bb6e9b0c2333e5100eee192fd82fec65040a5d10a9f0d240412247e535e5bf24365be947037a557f36d6c1f9ddb99918de6e5d6e2a2e0c37c
-  data.tar.gz: 00195756941fdd901fa70443085ba12999e39aee15013c16087f07bbd5f5f5bf3d14ac884b2d06dfa6574cf50051c7ab7cdc5a7341d801b92013d1b15aaf8e13
+  metadata.gz: b780662313b5efcd778a3d203e396294806a93aa68a681cc56217564c847bf65ba3de69c8990a57374573d068d4bba8bc6ee4f8a264cdaa4d35054b4f0c11faf
+  data.tar.gz: e266f8c9cfb8ea229de42a39db7d5865403998af0d085fa1c6132f8c0dffbb029da62df69582b9f2dedfbd9a49d503df5db0d06fe5a9cde29fb07e9048b0b152

data/lib/smart_proxy_discovery/discovery_api.rb

@@ -4,9 +4,29 @@ require 'smart_proxy_discovery/discovery_main'
 
 module Proxy::Discovery
 
-  class Api < ::Sinatra::Base
+  # This plugin has two separate Sinatra applications with different contexts
+  # (authorization helpers). Inbound communication is unauthorized,
+  class Dispatcher
+    def call(env)
+      if env['PATH_INFO'] == '/create'
+        InboundApi.new.call(env)
+      else
+        OutboundApi.new.call(env)
+      end
+    end
+  end
+
+  module ApiHelpers
+    def error_responder(error)
+      error_code = error.respond_to?(:http_code) ? error.http_code : 500
+      log_halt(error_code, "failed to update Foreman: #{error}")
+    end
+  end
+
+  # Inbound communication: Discovered Host -> Proxy Plugin -> Foreman
+  class InboundApi < ::Sinatra::Base
     helpers ::Proxy::Helpers
-    authorize_with_trusted_hosts
+    include ApiHelpers
 
     post '/create' do
       content_type :json
@@ -17,6 +37,14 @@ module Proxy::Discovery
       end
     end
 
+  end
+
+  # Outbound communication: Foreman -> Proxy Plugin -> Discovered Host
+  class OutboundApi < ::Sinatra::Base
+    helpers ::Proxy::Helpers
+    include ApiHelpers
+    authorize_with_trusted_hosts
+
     get '/:ip/facts' do
       content_type :json
       begin
@@ -34,12 +62,5 @@ module Proxy::Discovery
         error_responder(error)
       end
     end
-
-    private
-
-    def error_responder(error)
-      error_code = error.respond_to?(:http_code) ? error.http_code : 500
-      log_halt(error_code, "failed to update Foreman: #{error}")
-    end
   end
 end

data/lib/smart_proxy_discovery/discovery_main.rb

@@ -11,8 +11,11 @@ module Proxy::Discovery
 
     def create_discovered_host(request)
       foreman_request = Proxy::HttpRequest::ForemanRequest.new()
-      req = foreman_request.request_factory.create_post(CREATE_DISCOVERED_HOST_PATH, request.body)
-      foreman_request.send_request(req)
+      req = foreman_request.request_factory.create_post(CREATE_DISCOVERED_HOST_PATH, request.body.read)
+      response = foreman_request.send_request(req)
+      unless response.is_a? Net::HTTPSuccess
+        raise response
+      end
     end
 
     def refresh_facts(ip)

data/lib/smart_proxy_discovery/http_config.ru

@@ -1,5 +1,5 @@
 require 'smart_proxy_discovery/discovery_api'
 
 map '/discovery' do
-  run Proxy::Discovery::Api
+  run Proxy::Discovery::Dispatcher.new
 end

data/lib/smart_proxy_discovery/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   module Discovery
-    VERSION = '1.0.1'
+    VERSION = '1.0.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_discovery
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Shlomi Zadok
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -70,16 +70,22 @@ dependencies:
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 description: Smart proxy discovery plugin
 email: szadok@redhat.com
 executables: []