devise-proxy 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/config.ru

@@ -7,12 +7,12 @@ $LOAD_PATH.unshift lib_path
 require 'devise-proxy'
 
 # For development only.
-# use Rack::Reloader 
+# use Rack::Reloader
 
 config_file = File.join(current_dir, 'config', 'devise-proxy.yml')
 if File.exists? config_file
 	conf = YAML::load(File.open(config_file))
-	run DeviseProxy::Proxy.new(conf['backend']['hostname'], conf['backend']['port'])	
+	run DeviseProxy::Proxy.new(conf)	
 else
 	puts "\nPlease create a config file prior to starting the proxy using the provided .sample file, at:\n\n\t#{config_file}\n\n"
 	exit 1

data/config/devise-proxy.yml.sample

@@ -1,3 +1,6 @@
-backend:
+authentication:
   hostname: localhost
   port: 3000
+forwarding:
+  hostname: localhost
+  port: 3000

data/devise-proxy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "devise-proxy"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Preston Lee"]
-  s.date = "2012-10-29"
+  s.date = "2012-10-30"
   s.description = "A standalone Rack Middleware application that authenticates a username/password against a devise-powered backend application before forwarding the original HTTP request to the same application. Authentication is done on *every* request, so it is advisable to use devise-proxy sparingly."
   s.email = "conmotto@gmail.com"
   s.extra_rdoc_files = [

data/lib/devise-proxy/proxy.rb

@@ -11,15 +11,24 @@ module DeviseProxy
 		attr_accessor :port
 		attr_accessor :authenticator
 
-	  def initialize(remote_host, remote_port)
-			@host = remote_host
-			@port = remote_port
-			@authenticator = DeviseProxy::Authenticator.new(@host, port)
+	  def initialize(options = {})
+			opts = {
+				'authentication' => {
+					'hostname' => 'localhost',
+					'port' => 3000},
+				'forwarding' => {
+					'hostname' => 'localhost',
+					'port' => 3000}
+				}.merge!(options)
+			@host = opts['forwarding']['hostname']
+			@port = opts['forwarding']['port']
+			# puts "CREDS: #{opts['authentication']['hostname']}:#{opts['authentication']['port']}"
+			@authenticator = DeviseProxy::Authenticator.new(opts['authentication']['hostname'], opts['authentication']['port'])
 		end
 
 	  def call(env)
 	    req = Rack::Request.new(env)
-			puts req.to_yaml
+			# puts req.to_yaml
 			
 			puts "User agent: #{env['HTTP_USER_AGENT']}"
 
@@ -35,40 +44,47 @@ module DeviseProxy
 				
 				puts "Client password credentials email: #{email}, password, #{password}"
 
-				# Authenticate against the backend:
-				auth =  @authenticator.authenticate(email, password)
-				allowed = auth[0].to_s == '201'
-				puts "Authenticated #{allowed ? 'approved.' : 'denied!'}\n\n"
-
-				result = [403, auth[1], [auth[2]]]
-				if allowed
-
-			    method = req.request_method.downcase
-			    method[0..0] = method[0..0].upcase
-
-			    sub_request = Net::HTTP.const_get(method).new("#{req.path}#{"?" if req.query_string}#{req.query_string}")
-
-			    if sub_request.request_body_permitted? and req.body
-			      sub_request.body_stream = req.body
-			      sub_request.content_length = req.content_length
-			      sub_request.content_type = req.content_type
-			    end
-
-			    sub_request["X-Forwarded-For"] = (req.env["X-Forwarded-For"].to_s.split(/, +/) + [req.env['REMOTE_ADDR']]).join(", ")
-			    sub_request["Accept-Encoding"] = req.accept_encoding
-			    sub_request["Referer"] = req.referer
-
-			    sub_response = Net::HTTP.start(@host, @port) do |http|
-			      http.request(sub_request)
-			    end
-
-			    headers = {}
-			    sub_response.each_header do |k,v|
-			      headers[k] = v unless k.to_s =~ /cookie|content-length|transfer-encoding/i
-			    end
-
-			    result = [sub_response.code.to_i, headers, [sub_response.read_body]]
+				result = [502, {'Content-Type' => 'text/plain'}, ["HTTP 502 - Ah crap! The authenticating proxy seems to be having issues. :-/"]]
+				begin
+					# Authenticate against the backend:
+					auth =  @authenticator.authenticate(email, password)
+					allowed = auth[0].to_s == '201'
+					puts "Authenticated #{allowed ? 'approved.' : 'denied!'}\n\n"
+
+					result = [403, auth[1], [auth[2]]]
+					if allowed
+
+				    method = req.request_method.downcase
+				    method[0..0] = method[0..0].upcase
+
+				    sub_request = Net::HTTP.const_get(method).new("#{req.path}#{"?" if req.query_string}#{req.query_string}")
+
+				    if sub_request.request_body_permitted? and req.body
+				      sub_request.body_stream = req.body
+				      sub_request.content_length = req.content_length
+				      sub_request.content_type = req.content_type
+				    end
+
+				    sub_request["X-Forwarded-For"] = (req.env["X-Forwarded-For"].to_s.split(/, +/) + [req.env['REMOTE_ADDR']]).join(", ")
+				    sub_request["Accept-Encoding"] = req.accept_encoding
+				    sub_request["Referer"] = req.referer
+
+				    sub_response = Net::HTTP.start(@host, @port) do |http|
+				      http.request(sub_request)
+				    end
+						
+				    headers = {}
+				    sub_response.each_header do |k,v|
+				      headers[k] = v unless k.to_s =~ /cookie|content-length|transfer-encoding/i
+				    end
+
+				    result = [sub_response.code.to_i, headers, [sub_response.read_body]]
+					end
+				rescue
+					# Probably an I/O issue connecting to the authentication service.
 				end
+				
+
 			else
 				# The client needs to retry, next time sending proxy credentials!
 				headers = {}

data/test/test_devise-proxy.rb

@@ -6,7 +6,7 @@ class TestDeviseProxy < Test::Unit::TestCase
 
 		setup do
 			@host = 'localhost'
-			@port = '3000'			
+			@port = 3000	
 		end
 		
 		should "create multiple authenticators cleanly" do
@@ -16,7 +16,7 @@ class TestDeviseProxy < Test::Unit::TestCase
 	  end
 
 		should 'create proxy cleanly' do
-			proxy = DeviseProxy::Proxy.new(@host, @port)
+			proxy = DeviseProxy::Proxy.new({})
 			assert_equal proxy.host, @host
 			assert_equal proxy.port, @port
 		end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise-proxy
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-29 00:00:00.000000000 Z
+date: 2012-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -115,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4515847689756379363
+      hash: 1399324303159525473
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: