rack_warden 0.0.9 → 0.0.10

data/lib/rack_warden/views/rw_new_user.html.erb

@@ -1,11 +1,27 @@
-<% @section_title = "Create Account" %>
-<form action="<%=url('/auth/create', false)%>" method="post">
-	<p>Email <input type="text" name="user[email]" /></p>
-  <p>Username <input type="text" name="user[username]" /></p>
-  <p>Password <input type="password" name="user[password]" /></p>
+<h3>Create Account</h3>
+<p><%= @user.errors.to_yaml if @user && @user.errors %></p>
+<form action="<%=url_for('/create')%>" method="post" class="rw">
+	<style scoped="scoped">    
+	  .rw label {font-size: .95em; color: grey; display: block;}
+	  .rw input {font-size: 1.15em; margin-bottom: 20px; padding:7px;}
+	  .rw .g-recaptcha {margin-bottom: 20px;}
+	</style>
+	
+	<label for="user_email">Email</label>
+	<input type="text" name="user[email]" id="user_email" />
+  
+  <label for="user_username">Username</label>
+  <input type="text" name="user[username]" id="user_username" />
+  
+  <label for="user_password">Password</label>
+  <input type="password" name="user[password]" id="user_password" />
+  
+  <label for="user_password_confirmation">Confirm password</label>
+  <input type="password" name="user[password_confirmation]" id="user_password_confirmation" />
+  
   <% if recaptcha_sitekey && RackWarden::User.count > 0 %>
 	  <div class="g-recaptcha control text-control" data-sitekey="<%=recaptcha_sitekey%>"></div>
   <% end %>
+  
   <input type="submit" value="Create" />
-	<p><%= @user.errors.to_yaml if @user && @user.errors %></p>
 </form>

data/lib/rack_warden/views/rw_protected.xml.erb

@@ -0,0 +1,10 @@
+<blockquote>
+<xml>
+	<% RackWarden::User.all.each do |user| %>
+	<user>
+		<name><%=user.username%></name>
+		<password><%=user.encrypted_password%></name>
+	</user>
+	<% end %>
+</xml>
+</blockquote>

data/lib/rack_warden/views/rw_session.html.erb

@@ -0,0 +1,34 @@
+<p>
+	<h3>Session info</h3>
+</p>
+
+<p>
+	<b>Ruby Process:</b><br>
+	<%= $0 %>
+	<br><br>
+
+
+	<b>Middleware:</b><br>
+	<%#= TopApp.middleware %><br>
+	<%#= InnerApp.middleware %>
+	<%= settings.middleware %>
+	<br><br>
+	
+	<b>Session:</b><br>
+	<%= session.to_hash.to_yaml.to_html %>
+	<br><br>
+	
+	<b>Cookies:</b><br>
+	<%= env['rack.cookies'].to_yaml.to_html %>
+	<br><br>
+	
+	<b>Ruby ENV:</b><br>
+	<%= ENV.to_hash.to_yaml.to_html %>
+	<br><br>
+	
+	<b>Request env object:</b><br>
+	<%#= request.env.inspect.to_html %>
+	<br><br>		
+
+</p>
+<br>

data/lib/rack_warden/warden.rb

@@ -1,9 +1,9 @@
 module RackWarden
 	module WardenConfig
 		def self.included(base)
-			puts "RW WardenConfig base: #{base}"
-			base.instance_eval do
-			
+			App.logger.warn "RW loading Warden config into #{base}"
+
+			base.instance_eval do			
 			
 		    use Warden::Manager do |config|
 		      # Tell Warden how to save our User info into a session.
@@ -17,7 +17,7 @@ module RackWarden
 		      config.scope_defaults :default,
 		        # "strategies" is an array of named methods with which to
 		        # attempt authentication. We have to define this later.
-		        :strategies => [:password],
+		        :strategies => [:remember_me, :password],
 		        # The action is a route to send the user to when
 		        # warden.authenticate! returns a false answer. We'll show
 		        # this route below.
@@ -27,34 +27,165 @@ module RackWarden
 		      config.failure_app = self
 		    end
 		
-		    Warden::Manager.before_failure do |env,opts|
-		      env['REQUEST_METHOD'] = 'POST'
-		    end
-		
-		    Warden::Strategies.add(:password) do
-		      def valid?
-		        params['user'] && params['user']['username'] && params['user']['password']
-		      end
+			end # self.included
+		end # WardenConfig
+
+    module Warden::Strategies
+    
+    	# TODO: Add basic-auth stragety.
+    	# From Rack documentation - this is all you need for basic auth in Sinatra.
+	  	# use Rack::Auth::Basic, "Protected Area" do |username, password|
+	  	#   username == 'foo' && password == 'bar'
+	  	# end
+    
+
+
+	    add(:password) do
+	    	#App.logger.debug "RW WardenStrategies.add(password) self #{self.class}"
+	    	
+	      def valid?
+	        params['user'] && params['user']['username'] && params['user']['password']
+	      end
+	
+	      def authenticate!
+	      	# User-class based authenticator. See below for old local-based authenticator
+	      	App.logger.debug "RW authenticate! method self #{self.class}"
+	      	App.logger.debug "RW authenticating with password"
+	      	user = User.authenticate(params['user']['username'], params['user']['password'])
+	      	if user.is_a? User
+	      		success!(user)
+	        	App.logger.warn "RW user logged in '#{user.username}'"
+	        else
+	          fail!("Could not login")
+	          App.logger.warn "RW user failed regular login '#{params['user']['username']}'"		        	
+	        end
+	        
+	      end # authenticate!
+	    end	# Warden::Strategies password
+    
+    
+	    # Newer remember_me routine
+			add(:remember_me) do
+			  def valid?
+			  	App.logger.debug "RW checking existence of remember_token cookie: #{env['rack.request.cookie_hash']['rack_warden_remember_me']}"
+			    #env['rack.cookies']['rack_warden_remember_me']
+			    #env['rack.request.cookie_hash']['rack_warden_remember_me']
+			    env.remember_token
+			  end
+			
+	      def authenticate!
+	      	App.logger.debug "RW authenticate!(:remember_me) self #{self.class}"
+	      	App.logger.debug "RW authenticating with rack_warden_remember_me token: #{env.remember_token}"
+	      	user = User.first(:remember_token => env.remember_token)
+	      	if user.is_a?(User) && !user.remember_token.to_s.empty?
+						success!(user)
+	      		App.logger.warn "RW user logged in with remember_me token '#{user.username}'"
+	      	else
+	          App.logger.info "RW user failed remember_me token login '#{env.remember_token}'"
+	          nil	        	
+	        end
+	      end # authenticate!
+			end # remember_me
+			
+		end # Warden::Strategies
 		
-		      def authenticate!
-		      	criteria = params['user']['username']  #.to_s.downcase
-		        #user = ( User.first([{:username => '?'}, criteria]) + User.first([{:email => '?'}, criteria]) )
-		        #user = User.first(:conditions => ['username = ? collate NOCASE or email = ? collate NOCASE', criteria, criteria])  #(username: params['user']['username'])
-		        user = User.first(:conditions => ['username = ? or email = ?', criteria, criteria])  #(username: params['user']['username'])
 		
-		        if user.nil?
-		          fail!("The username you entered does not exist")
-		        elsif user.authenticate(params['user']['password'])
-		        	success!(user)
-		        else
-		          fail!("Could not log in")
-		        end
-		      end
-		    end
+		# See http://www.rubydoc.info/github/hassox/warden/Warden/Hooks for info on callback params.
+
+    class Warden::Manager
+	    
+	    before_failure do |env,opts|
+	      env['REQUEST_METHOD'] = 'POST'
+	    end
+			
+			after_authentication  do |user, auth, opts|
+				#App.logger.debug "RW after_authentication callback - self: #{self}"
+				#App.logger.debug "RW after_authentication callback - auth methods: #{auth.methods.sort}"
+				#App.logger.debug "RW after_authentication callback - opts: #{opts.inspect}"
+				#App.logger.debug "RW after_authentication callback - auth.manager: #{auth.manager.inspect}"
+				App.logger.debug "RW after_authentication callback - user: #{user.username}"
+      	
+      	if user.is_a?(User) && (user.remember_token || auth.params['user']['remember_me'] == '1')
+      		App.logger.debug "RW after_authenticate user.remember_me '#{user.username}'"
+      		user.remember_me
+					
+					# We have no path to response object here :(
+					#auth.response.set_cookie 'rack_warden_remember_me', :value => user.remember_token , :expires => user.remember_token_expires_at
+					# So we have to do this
+			  	auth.env.remember_token = { :value => user.remember_token , :expires => user.remember_token_expires_at }   #user.remember_me # sets its remember_token attribute to some large random value and returns the value.
+					App.logger.debug "RW cookie set auth.env.remember_token: #{auth.env.remember_token}"
+				end
+			end
+			
+			before_logout do |user, auth, opts|
+				App.logger.debug "RW before_logout callback - self: #{self}"
+				App.logger.debug "RW before_logout callback - auth: #{auth.instance_variables}"
+				App.logger.debug "RW before_logout callback - opts: #{opts.inspect}"
+			  
+			  #auth.response.set_cookie 'rack_warden_remember_me', nil
+			  App.logger.debug "RW cookie unset 'rack_warden_remember_token': #{auth.env.remember_token}"
+			  auth.env.remember_token = nil
+
+			  user.forget_me
+			end
+			
+		end # Warden::Manager
+				
+
+				# 	# Old password strategy.
+				#   Warden::Strategies.add(:password) do
+				#     def valid?
+				#       params['user'] && params['user']['username'] && params['user']['password']
+				#     end
+				# 
+				#     def authenticate!
+				#     
+				# 			# Original RackWarden authenticator. Works great, but doesn't allow extra User processing upon login.
+				# 			criteria = params['user']['username']  #.to_s.downcase
+				# 		  #user = ( User.first([{:username => '?'}, criteria]) + User.first([{:email => '?'}, criteria]) )
+				# 		  #user = User.first(:conditions => ['username = ? collate NOCASE or email = ? collate NOCASE', criteria, criteria])  #(username: params['user']['username'])
+				# 		  user = User.first(:conditions => ['username = ? or email = ?', criteria, criteria])  #(username: params['user']['username'])
+				# 		  if user.nil?
+				# 		    fail!("The username you entered does not exist")
+				# 		    App.logger.warn "RW user not found '#{criteria}'"
+				# 		  elsif user.authenticate(params['user']['password'])
+				# 		  	success!(user)
+				# 		  	App.logger.warn "RW user logged in '#{user.username}'"
+				# 		  else
+				# 		    fail!("Could not log in")
+				# 		    App.logger.warn "RW user failed login '#{user.username}'"
+				# 		  end
+				#       
+				#     end # authenticate!
+				#   end	# Warden::Strategies password		    
 		    
 		    
-			end
-    end
-  end
-end
+				#   # Older remember_me routine.
+				#   Warden::Strategies.add(:remember_me_old) do
+				#     def valid?
+				#       #env['rack.cookies']['rack_warden_remember_me']
+				#       cookies['rack_warden_remember_me']
+				#     end
+				# 
+				#     def authenticate!
+				#     	#user = User.first(:remember_token => env['rack.cookies']['rack_warden_remember_me'])
+				#     	user = User.first(:remember_token => cookies['rack_warden_remember_me'])
+				#     	#App.logger.debug "rack_warden_remember_me token: #{env['rack.cookies']['rack_warden_remember_me']}"
+				#     	App.logger.debug "rack_warden_remember_me token: #{cookies['rack_warden_remember_me']}"
+				#     	if user.is_a?(User) && user.remember_token
+				# 				success!(user)
+				#     		user.remember_me
+				#     		#cookies['rack_warden_remember_me'] = { :value => user.remember_token , :expires => user.remember_token_expires_at }
+				#     		App.logger.warn "RW user logged in with remember_me token '#{user.username}'"
+				#     	else
+				#         fail!("Could not login with remember_me token")
+				#         App.logger.warn "RW user failed remember_me token login '#{env['rack.cookies']['rack_warden_remember_me']}'"		        	
+				#       end
+				#     end # authenticate!
+				#   end # Warden::Strategies remember_me
+				    
+			#end # instance_eval
+    #end # self.included
+  end # WardenConfig
+end # RackWarden
 

data/rack_warden.gemspec

@@ -1,8 +1,6 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-# This breaks bundle-install
-#require 'sinatra/base'
 require 'rack_warden/version'
 
 Gem::Specification.new do |spec|
@@ -10,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = RackWarden::VERSION
   spec.authors       = ["William Richardson"]
   spec.email         = ["wbr@mac.com"]
-  spec.summary       = %q{A warden/sinatra mini-app providing authentication and user management for any rack-based app}
-  spec.description   = %q{A warden/sinatra mini-app providing authentication and user management for any rack-based app.}
+  spec.summary       = %q{Authentication and user management for any rack-based framework}
+  spec.description   = %q{A warden/sinatra mini-app providing authentication and user management for any rack-based framework.}
   spec.homepage      = ""
   spec.license       = "MIT"
 
@@ -19,17 +17,22 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "tux"
-  spec.add_development_dependency "thin"
     
-  spec.add_dependency "sinatra"
-  spec.add_dependency "sinatra-flash"
-  spec.add_dependency "bcrypt"
+
+	spec.add_dependency "backports"
+	spec.add_dependency "bcrypt"
   spec.add_dependency "data_mapper"
-  spec.add_dependency "sqlite3"
   spec.add_dependency "dm-sqlite-adapter"
+  spec.add_dependency "mail"
+  spec.add_dependency "multi_json"
+  spec.add_dependency "rack-contrib"
+  spec.add_dependency "rack-flash3"
+  spec.add_dependency "sinatra"
   spec.add_dependency "warden"
+  
+
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+	spec.add_development_dependency "thin"
+  spec.add_development_dependency "tux"
 end

metadata

@@ -1,51 +1,51 @@
 --- !ruby/object:Gem::Specification
 name: rack_warden
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - William Richardson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-10 00:00:00.000000000 Z
+date: 2015-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: backports
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bcrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: tux
+  name: data_mapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -53,13 +53,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thin
+  name: dm-sqlite-adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra-flash
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bcrypt
+  name: rack-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: data_mapper
+  name: rack-flash3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dm-sqlite-adapter
+  name: warden
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -151,13 +151,55 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: warden
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: tux
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -165,7 +207,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: A warden/sinatra mini-app providing authentication and user management
-  for any rack-based app.
+  for any rack-based framework.
 email:
 - wbr@mac.com
 executables: []
@@ -180,22 +222,36 @@ files:
 - config.ru
 - lib/rack_warden.rb
 - lib/rack_warden/app.rb
+- lib/rack_warden/core_patches.rb
+- lib/rack_warden/env.rb
 - lib/rack_warden/frameworks.rb
+- lib/rack_warden/frameworks/rack.rb
 - lib/rack_warden/frameworks/rails.rb
 - lib/rack_warden/frameworks/sinatra.rb
 - lib/rack_warden/helpers.rb
+- lib/rack_warden/mail.rb
 - lib/rack_warden/models.rb
 - lib/rack_warden/models/user.rb
 - lib/rack_warden/routes.rb
+- lib/rack_warden/sinatra/decompile.rb
+- lib/rack_warden/sinatra/json.rb
+- lib/rack_warden/sinatra/namespace.rb
+- lib/rack_warden/sinatra/respond_with.rb
 - lib/rack_warden/version.rb
+- lib/rack_warden/views/rw_account_widget.html.erb
+- lib/rack_warden/views/rw_activation.email.erb
 - lib/rack_warden/views/rw_admin.html.erb
 - lib/rack_warden/views/rw_dbinfo.html.erb
+- lib/rack_warden/views/rw_error.html.erb
+- lib/rack_warden/views/rw_flash_widget.html.erb
 - lib/rack_warden/views/rw_index.html.erb
 - lib/rack_warden/views/rw_layout.html.erb
 - lib/rack_warden/views/rw_layout_admin.html.erb
 - lib/rack_warden/views/rw_login.html.erb
 - lib/rack_warden/views/rw_new_user.html.erb
 - lib/rack_warden/views/rw_protected.html.erb
+- lib/rack_warden/views/rw_protected.xml.erb
+- lib/rack_warden/views/rw_session.html.erb
 - lib/rack_warden/warden.rb
 - rack_warden.gemspec
 homepage: ''
@@ -221,6 +277,5 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: A warden/sinatra mini-app providing authentication and user management for
-  any rack-based app
+summary: Authentication and user management for any rack-based framework
 test_files: []