X-Git-Url: https://code.delx.au/cgiproxy/blobdiff_plain/80e465ea4142082c2402e597d7630cca6cb96da6..40070216e54515585ee0a6b6ab6675cee49083d2:/ruby/proxy.rb

diff --git a/ruby/proxy.rb b/ruby/proxy.rb
index 27e5538..9563f88 100644
--- a/ruby/proxy.rb
+++ b/ruby/proxy.rb
@@ -11,7 +11,7 @@ class NilClass
 end
 
 
-def getParams(url)
+def get_params(url)
 	if !ENV["PATH_INFO"].empty?
 		url += ENV["PATH_INFO"]
 	end
@@ -23,7 +23,7 @@ def getParams(url)
 
 	use_ssl = url.scheme == 'https'
 
-	filename = url.path
+	filename = url.path.split("/")[-1]
 	path = url.path
 	if !ENV["QUERY_STRING"].empty?
 		path += "?" + ENV["QUERY_STRING"]
@@ -32,7 +32,7 @@ def getParams(url)
 	return url.host, url.port, use_ssl, filename, path
 end
 
-def createRequest(method, path)
+def create_request(method, path, ff_header)
 	if method == "GET"
 		req = Net::HTTP::Get.new(path)
 	elsif method == "POST"
@@ -41,11 +41,8 @@ def createRequest(method, path)
 	else
 		raise RuntimeError, "No support for method: #{method}"
 	end
-	return req
-end
 
-def insertHeaders(req, ffHeader)
-	if ffHeader
+	if ff_header
 		req["X-Forwarded-For"] = ENV["REMOTE_ADDR"]
 	end
 	req["Host"] = ENV["HTTP_HOST"]
@@ -60,38 +57,42 @@ def insertHeaders(req, ffHeader)
 	req["Accept-Charset"] = ENV["HTTP_ACCEPT_CHARSET"]
 	req["Accept-Encoding"] = ENV["HTTP_ACCEPT_ENCODING"]
 	req["Accept-Language"] = ENV["HTTP_ACCEPT_LANGUAGE"]
+
+	return req
 end
 
-def doRequest(req, host, port, use_ssl)
+def do_proxy(req, host, port, use_ssl, filename, output_dir)
 	# Make the request
 	http = Net::HTTP.new(host, port)
 	http.use_ssl = use_ssl
-	res = http.request(req)
+	res = http.request req do |res|
 
-	# Tweak the headers a little
-	res.delete("transfer-encoding")
-	res.delete("transfer-length")
-	res["connection"] = "close"
+		# Tweak the headers a little
+		res.delete("transfer-encoding")
+		res.delete("transfer-length")
+		res["connection"] = "close"
 
-	return res
-end
+		if res.code != "200"
+			res["Status"] = "#{res.code} #{res.message}"
+		end
+		res.each_capitalized_name do |key|
+			res.get_fields(key).each do |value|
+				print "#{key}: #{value}\r\n"
+			end
+		end
+		print "\r\n"
 
-def printResult(res)
-	if res.code != "200"
-		res["Status"] = "#{res.code} #{res.message}"
-	end
-	res.each_capitalized_name do |key|
-		res.get_fields(key).each do |value|
-			print "#{key}: #{value}\r\n"
+		out = nil
+		if output_dir
+			out = File.open("#{output_dir}/#{filename}", 'w')
+		end
+		res.read_body do |chunk|
+			print chunk
+			if out
+				out.write chunk
+			end
 		end
 	end
-	print "\r\n"
-	print res.body
-end
-
-def writeFile(res, filename, outputDir)
-	filename = filename.split("/")[-1]
-	File.open("#{outputDir}/#{filename}", 'w') {|f| f.write(res.body) }
 end
 
 def debug(msg)
@@ -100,12 +101,9 @@ def debug(msg)
 	}
 end
 
-def proxyTo(basePath, ffHeader=True, outputDir=None)
-	host, port, use_ssl, filename, path = getParams(basePath)
-	req = createRequest(ENV["REQUEST_METHOD"], path)
-	insertHeaders(req, ffHeader)
-	res = doRequest(req, host, port, use_ssl)
-	writeFile(res, filename, outputDir)
-	printResult(res)
+def proxy_to(base_path, ff_header=True, output_dir=nil)
+	host, port, use_ssl, filename, path = get_params(base_path)
+	req = create_request(ENV["REQUEST_METHOD"], path, ff_header)
+	do_proxy(req, host, port, use_ssl, filename, output_dir)
 end