bowtie-io 1.0.16 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a97826b0932a0dd0383188792fc77d18cbc8e218
-  data.tar.gz: ef4d2a1f753ddc01c0f61ee16a6ebae5c6fef061
+  metadata.gz: 657b30783f55c76a446e535831f6ae903b2c31a4
+  data.tar.gz: 184b70e7b4d90610c89ea884a578f694c7192478
 SHA512:
-  metadata.gz: b043877992ad2aa6be09535cbcaf219a36b6aef092630be7d6b466a69cff00599a89fa4c0029633a3287f483d260ea4b2287f3f9f528f5a2c948289dc09741d8
-  data.tar.gz: 8bf6aeee6d694677d4a0c9c20e1e62098af6be899e49e32803e4d73c1bfada85d6c97e376668d5eb05591099bc444a684fe2e9e768ac0eecf41a66020eb19804
+  metadata.gz: 8818332cfe38000f7f2b9fd81f35545cbed654696130fa3e1425960018bf5092be31dbe7e6a938960fbe729e1ebb00bab6e914f959019c82fa84e171cdc3f5d9
+  data.tar.gz: 9d8e5ccdb5f63dd8e7042ffd5971b8973b67fdb3a9e87384443cddcc33f2323ba0e0466ae0256c7df1c760614bea7bac71ec0d3cd9fd12c0b802b38471feffa3

data/lib/bowtie.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'json'
 require 'jekyll'
 require 'rack'
-require 'rack/streaming_proxy'
+require 'rack/proxy'
 require 'restclient'
 
 module Bowtie

data/lib/bowtie/commands/serve.rb

@@ -57,7 +57,7 @@ module Bowtie
               index: 'index.html'
 
             # Backend API proxy through BowTie
-            run Bowtie::Middleware::Proxy.new(nil)
+            run Bowtie::Middleware::Proxy.new
           end
         end
       end

data/lib/bowtie/middleware/proxy.rb

@@ -1,16 +1,16 @@
 module Bowtie::Middleware
   class Proxy
     def initialize(*args)
-      @platform = Platform.new(*args)
-      @backend  = Backend.new(*args)
+      @platform = Platform.new
+      @backend  = Backend.new
     end
 
     def call(env)
       status, headers, body = @platform.call(env)
 
       if status.to_i == 305
-        env[:proxy_addon_headers] = JSON.load(headers['X-Bowtie-Client-Proxy-Headers'])
-        env[:proxy_location] = headers['Location']
+        env[:proxy_addon_headers] = JSON.load(headers['X-Bowtie-Client-Proxy-Headers'].first)
+        env[:proxy_location] = headers['Location'].first
         @backend.call(env)
       else
         [status, headers, body]
@@ -19,29 +19,50 @@ module Bowtie::Middleware
   end
 
   private
-  class Backend < Rack::StreamingProxy::Proxy
-    def destination_uri(rack_request)
-      rack_request.env[:proxy_location]
+  class Backend < Rack::Proxy
+    def self.extract_http_request_headers(env)
+      addon_headers = env[:proxy_addon_headers].inject({}) { |h,v| h[v[0]] = v[1].to_s; h }
+      super(env).merge!(addon_headers)
+    end
+
+    protected
+    def perform_request(env)
+      @backend = URI(env[:proxy_location])
+
+      env['REQUEST_URI'] = @backend.request_uri
+      env['HTTP_HOST']   = @backend.host
+
+      super(env)
     end
   end
 
-  class Platform < Rack::StreamingProxy::Proxy
-    def destination_uri(rack_request)
-      fqdn     = Bowtie::Settings['client']['fqdn']
-      base_url = "https://#{fqdn}"
-      path     = rack_request.path
-
-      rack_request.env[:proxy_addon_headers] = {
-        'X-Forwarded-Host'        => rack_request.host_with_port,
-        'X-Forwarded-Port'        => rack_request.port,
-        'X-Forwarded-Proto'       => 'http',
-        'X-Forwarded-Scheme'      => 'http',
-        'X-Bowtie-Client-Version' => Bowtie::VERSION
-      }
-
-      uri = URI.join(base_url, path)
-      uri.query = rack_request.query_string
-      uri.to_s
+  class Platform < Rack::Proxy
+    def rewrite_env(env)
+      rack_request = Rack::Request.new(env)
+
+      env['HTTPS']       = 'on'
+      env['SERVER_PORT'] = 443
+      env['HTTP_HOST']   = Bowtie::Settings['client']['fqdn']
+
+      env['HTTP_X_FORWARDED_HOST']        = rack_request.host_with_port
+      env['HTTP_X_FORWARDED_PROTO']       = rack_request.port.to_s
+      env['HTTP_X_FORWARDED_SCHEME']      = 'http'
+      env['HTTP_X_BOWTIE_CLIENT_VERSION'] = Bowtie::VERSION
+
+      env
+    end
+
+    def rewrite_response(triplet)
+      status, headers, body = triplet
+
+      headers.delete('Transfer-Encoding')
+
+      [status, headers, body]
+    end
+
+    protected
+    def perform_request(env)
+       super(env)
     end
   end
 end

data/lib/bowtie/version.rb

@@ -1,3 +1,3 @@
 module Bowtie
-  VERSION = '1.0.16'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bowtie-io
 version: !ruby/object:Gem::Version
-  version: 1.0.16
+  version: 1.2.0
 platform: ruby
 authors:
 - James Kassemi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-14 00:00:00.000000000 Z
+date: 2015-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: bowtie-io-rack-streaming-proxy
+  name: rack-proxy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 0.5.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 0.5.17
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement