stubby 0.0.5 → 0.0.6

data/lib/stubby/extensions/http.rb

@@ -41,7 +41,10 @@ module Extensions
       set :static, false
 
       adapter "http-redirect" do
-        redirect to(instruction_params["to"])
+        r = URI.parse(instruction_params["to"])
+        r.path = request.path if r.path.blank?
+
+        redirect to(r.to_s)
       end
 
       adapter "file" do
@@ -68,14 +71,11 @@ module Extensions
       end
 
       adapter "http-proxy" do
-        url.scheme = "http"
-        run_proxy
-
+        run_proxy("http")
       end
 
       adapter "https-proxy" do
-        url.scheme = "https"
-        run_proxy
+        run_proxy("https")
       end
 
       %w(get post put patch delete options link unlink).each do |method|
@@ -95,23 +95,25 @@ module Extensions
         end
       end
 
-      def run_proxy
-        if url.path.empty?
-          # Proxy all requests, preserve incoming path
-          out = url.dup
-          out.path = request.path
-          r = HTTPI::Request.new
-          r.url = out.to_s
-        else
-          # Proxy to the given path
-          r = HTTPI::Request.new
-          r.url = url.to_s
-        end
+      def run_proxy(scheme)
+        to = url.dup
+        to.scheme = scheme
+        to.path = request.path if to.path.empty?
+        to.query = request.query_string
 
+        puts "#{to.to_s} scheme: #{request.scheme}"
+
+        r = HTTPI::Request.new
+        r.url = to.to_s
+      
+        r.headers["HOST"] = request.host
         r.headers["STUBBY_ENV"] = settings.stubby_session.environment
         r.headers["STUBBY_KEY"] = settings.stubby_session.key(instruction)
         r.headers["STUBBY_USER"] = settings.stubby_session.user_key
-
+        r.headers["X_FORWARDED_PROTO"] = request.scheme
+        r.headers["X_FORWARDED_FOR"] = request.ip
+        r.headers.merge! Hash[(env.select { |k,v| v.is_a? String }.collect { |k,v| [k.gsub("HTTP_", ""), v] })]
+        r.headers["CONNECTION"] = "close"
         request.body.rewind
         r.body = request.body.read
 
@@ -120,6 +122,8 @@ module Extensions
         response.headers.delete "connection"
         
         status(response.code)
+        puts "response: #{response.headers}"
+
         headers(response.headers)
         body(response.body)
       end
@@ -160,11 +164,6 @@ module Extensions
           set :port, port
           set :stubby_session, session
 
-          #super(session, {
-          #  :SSLEnable => true,
-          #  :SSLCertName => %w[CN localhost]
-          #})
-
           Rack::Handler::Thin.run(self, {
             :Host => STUBBY_MASTER,
             :Port => 443

data/lib/stubby/extensions/smtp.rb

@@ -12,18 +12,22 @@ module Extensions
           HTTPI.post("http://#{STUBBY_MASTER}:9000/stubs/transient/activate.json",
             options: MultiJson.dump(smtp_stub), key: "_smtp")
           
-          MailCatcher.run! smtp_ip: STUBBY_MASTER,
-            smtp_port: 25,
-            http_ip: STUBBY_MASTER,
-            http_port: 9001,
-            daemon: false
+          while true
+            begin
+              MailCatcher.run! smtp_ip: STUBBY_MASTER,
+                smtp_port: 25,
+                http_ip: STUBBY_MASTER,
+                http_port: 9001,
+                daemon: false
+            rescue
+              puts $!
+            end
+          end
         }
 
         trap("INT", important: true){
           stop!
         }
-
-        sleep
       end
 
       def smtp_stub

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stubby
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-27 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubydns