Support for https

diff --git a/ruby/proxy.rb b/ruby/proxy.rb
index 11b14d2bfa3489be0a300e5ca98d5c1bb7b272dc..10002f1ff9cb2f1532e1d5ae7644dc767d293d30 100755 (executable)
--- a/ruby/proxy.rb
+++ b/ruby/proxy.rb
@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'net/http'
 #!/usr/bin/env ruby
 
 require 'net/http'

+require 'net/https'

 require 'uri'
 
 class NilClass
 require 'uri'
 
 class NilClass


@@ -16,16 +17,18 @@ def getParams(url)
        end
 
        url = URI.parse(url);
        end
 
        url = URI.parse(url);

-       if url.scheme != "http"
+       if !["http", "https"].include? url.scheme

                raise RuntimeError, "Unsupported scheme: #{url.scheme}"
        end
 
                raise RuntimeError, "Unsupported scheme: #{url.scheme}"
        end
 

+       use_ssl = url.scheme == 'https'
+

        path = url.path
        if !ENV["QUERY_STRING"].empty?
                path += "?" + ENV["QUERY_STRING"]
        end
 
        path = url.path
        if !ENV["QUERY_STRING"].empty?
                path += "?" + ENV["QUERY_STRING"]
        end
 

-       return url.host, url.port, path
+       return url.host, url.port, use_ssl, path

 end
 
 def createRequest(method, path)
 end
 
 def createRequest(method, path)


@@ -58,11 +61,11 @@ def insertHeaders(req, ffHeader)
        req["Accept-Language"] = ENV["HTTP_ACCEPT_LANGUAGE"]
 end
 
        req["Accept-Language"] = ENV["HTTP_ACCEPT_LANGUAGE"]
 end
 

-def doRequest(req, host, port)
+def doRequest(req, host, port, use_ssl)

        # Make the request
        # Make the request

-       res = Net::HTTP.start(host, port) do |http|
-               http.request(req)
-       end
+       http = Net::HTTP.new(host, port)
+       http.use_ssl = use_ssl
+       res = http.request(req)

 
        # Tweak the headers a little
        res.delete("transfer-encoding")
 
        # Tweak the headers a little
        res.delete("transfer-encoding")


@@ -92,10 +95,10 @@ def debug(msg)
 end
 
 def proxyTo(basePath, ffHeader=True)
 end
 
 def proxyTo(basePath, ffHeader=True)

-       host, port, path = getParams(basePath)
+       host, port, use_ssl, path = getParams(basePath)

        req = createRequest(ENV["REQUEST_METHOD"], path)
        insertHeaders(req, ffHeader)
        req = createRequest(ENV["REQUEST_METHOD"], path)
        insertHeaders(req, ffHeader)

-       res = doRequest(req, host, port)
+       res = doRequest(req, host, port, use_ssl)

        printResult(res)
 end
 
        printResult(res)
 end