smart_proxy_dynflow 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53fbc5bf21449f93f01689aaee5cf3fd4e16ed3b
-  data.tar.gz: c4af878d4ee62d00b5c7502381a31a10c141420a
+  metadata.gz: 7fdf29f36672a7e1ef81b0f3c9203d4e2d8e002b
+  data.tar.gz: 76f9c607b27caa6c7c82479a5979bc8a3e6bc8a6
 SHA512:
-  metadata.gz: 6f4b68f7f6eda877644238e3d958659976e38accb04949a7cea8da455a0176396a2e600bec0bd7eef7db05ca260ba9eb469a626d8c84411b31f16f7ca75497d0
-  data.tar.gz: 619aed2e59e49bd216d0e67ad6e192f5b4ef24c945e42f308d4bf8bf5d440b9b44dc87033c87bf7b3d5beeb2f8396020d99f944b29eb7443cb366aa51b70b5b8
+  metadata.gz: a7c84a6a1ef2fd66b804130cf05c83dd77151e6e0fb2541cbc74fe5932bbdd3ce493bfe4385b5af843478773ef9639c3a570f9150b02f9398d3e49aa6abd1f53
+  data.tar.gz: 147474da3ada8c3f12ecbaf128c31fa078006ca7d4b4b9b0bc90a2cdb5d94286d281bfa6cbf2bc94b2a345fa7c0ec84666eb731479012c69e981d900ead5d2b4

data/lib/smart_proxy_dynflow/api.rb

@@ -1,21 +1,24 @@
 require 'sinatra/base'
 require 'proxy/helpers'
 require 'sinatra/authorization'
+
 module Proxy
   class Dynflow
     class Api < ::Sinatra::Base
       helpers ::Proxy::Helpers
       helpers ::Proxy::Dynflow::Helpers
-      extend ::Sinatra::Authorization
-
-      authorize_with_trusted_hosts
-      authorize_with_ssl_client
 
       before do
         logger = Proxy::LogBuffer::Decorator.instance
         content_type :json
+        if request.env['HTTP_AUTHORIZATION'] && request.env['PATH_INFO'].end_with?('/done')
+          # Halt running before callbacks if a token is provided and the request is notifying about task being done
+          return
+        end
       end
 
+      helpers Sinatra::Authorization
+
       post "/*" do
         relay_request
       end

data/lib/smart_proxy_dynflow/callback.rb

@@ -17,6 +17,8 @@ module Proxy
                   when 'POST'
                     request_factory.create_post path, request.body.read
                 end
+          req['X-Forwarded-For'] = request.env['HTTP_HOST']
+          req['AUTHORIZATION'] = request.env['HTTP_AUTHORIZATION']
           response = send_request req
           Proxy::LogBuffer::Decorator.instance.debug "Proxy request status #{response.code} - #{response}"
           response

data/lib/smart_proxy_dynflow/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   class Dynflow
-    VERSION = '0.1.7'
+    VERSION = '0.1.8'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dynflow
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-15 00:00:00.000000000 Z
+date: 2017-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Dynflow runtime for Foreman smart proxy