warden 1.0.2 → 1.0.3

data/History.rdoc

@@ -1,3 +1,6 @@
+== Version 1.0.3
+* Do not renew session on user fetch
+
 == Version 1.0.2
 * Added :intercept_401 to Warden::Config
 

data/lib/warden/proxy.rb

@@ -152,15 +152,15 @@ module Warden
 
       # Get the default options from the master configuration for the given scope
       opts = (@config[:scope_defaults][scope] || {}).merge(opts)
+      opts[:event] ||= :set_user
       @users[scope] = user
 
-      unless opts[:store] == false
+      if opts[:store] != false && opts[:event] != :fetch
         options = env[ENV_SESSION_OPTIONS]
         options[:renew] = true if options
         session_serializer.store(user, scope)
       end
 
-      opts[:event] ||= :set_user
       manager._run_callbacks(:after_set_user, user, self, opts)
       @users[scope]
     end

data/lib/warden/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Warden
-  VERSION = "1.0.2".freeze
+  VERSION = "1.0.3".freeze
 end

data/spec/warden/proxy_spec.rb

@@ -194,13 +194,13 @@ describe Warden::Proxy do
 
     SID_REGEXP = /rack\.session=([^;]*);/
 
-    it "should renew session" do
+    it "should renew session when user is set" do
       app = lambda do |env|
         env["rack.session"]["counter"] ||= 0
         env["rack.session"]["counter"] += 1
         if env["warden.on"]
-          env["warden"].authenticate!(:pass) 
-          env['warden'].should be_authenticated
+          env["warden"].authenticate!(:pass)
+          env["warden"].should be_authenticated
         end
         valid_response
       end
@@ -218,23 +218,10 @@ describe Warden::Proxy do
       sid = cookie.match(SID_REGEXP)[1]
       sid.should_not be_nil
 
-      # Do another request, but now passing the session id cookie
-      env = env_with_params("/", {}, "HTTP_COOKIE" => cookie)
-      response = app.call(env)
-      env["rack.session"]["counter"].should == 2
-
-      # Depending on rack version, a cookie will be returned with the
-      # same session id or no cookie is given back (becase it did not change).
-      # If we don't get any of these two behaviors, raise an error.
-      new_cookie = response[1]["Set-Cookie"]
-      if new_cookie && new_cookie.match(SID_REGEXP)[1] != sid
-        raise "Expected a cookie to not be sent or session id to match"
-      end
-
       # Do another request, giving a cookie but turning on warden authentication
       env = env_with_params("/", {}, "HTTP_COOKIE" => cookie, "warden.on" => true)
       response = app.call(env)
-      @env["rack.session"]["counter"].should == 3
+      @env["rack.session"]["counter"].should == 2
 
       # Regardless of rack version, a cookie should be sent back
       new_cookie = response[1]["Set-Cookie"]
@@ -245,6 +232,43 @@ describe Warden::Proxy do
       new_sid.should_not be_nil
       new_sid.should_not == sid
     end
+
+    it "should not renew session when user is fetch" do
+      app = lambda do |env|
+        env["rack.session"]["counter"] ||= 0
+        env["rack.session"]["counter"] += 1
+        env["warden"].authenticate!(:pass)
+        env["warden"].should be_authenticated
+        valid_response
+      end
+
+      # Setup a rack app with Pool session.
+      app = setup_rack(app, :session => Rack::Session::Pool).to_app
+      response = app.call(@env)
+      @env["rack.session"]["counter"].should == 1
+
+      # Ensure a cookie was given back
+      cookie = response[1]["Set-Cookie"]
+      cookie.should_not be_nil
+
+      # Ensure a session id was given
+      sid = cookie.match(SID_REGEXP)[1]
+      sid.should_not be_nil
+
+      # Do another request, passing the cookie. The user should be fetched from cookie.
+      env = env_with_params("/", {}, "HTTP_COOKIE" => cookie)
+      response = app.call(env)
+      @env["rack.session"]["counter"].should == 2
+
+      # Depending on rack version, a cookie will be returned with the
+      # same session id or no cookie is given back (becase it did not change).
+      # If we don't get any of these two behaviors, raise an error.
+      # Regardless of rack version, a cookie should be sent back
+      new_cookie = response[1]["Set-Cookie"]
+      if new_cookie && new_cookie.match(SID_REGEXP)[1] != sid
+        raise "Expected a cookie to not be sent or session id to match"
+      end
+    end
   end
 
   describe "authentication cache" do

data/warden.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{warden}
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Neighman"]
-  s.date = %q{2010-11-09}
+  s.date = %q{2010-12-11}
   s.email = %q{has.sox@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: warden
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-09 00:00:00 +01:00
+date: 2010-12-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency