actionpack 1.13.5 → 1.13.6

data/CHANGELOG

@@ -1,3 +1,9 @@
+*1.13.6* (November 24th, 2007)
+
+* Correct Broken Fix for session_fixation attacks
+
+* Ensure that cookies handle array values correctly.  Closes #9937 [queso]
+
 *1.13.5* (October 12th, 2007)
 
 * Backport: allow array and hash query parameters. Array route parameters are converted/to/a/path as before.  #6765, #7047, #7462 [bgipsy, Jeremy McAnally, Dan Kubb, brendan, Diego Algorta Casamayou]

data/lib/action_controller/cgi_process.rb

@@ -36,13 +36,14 @@ module ActionController #:nodoc:
   end
 
   class CgiRequest < AbstractRequest #:nodoc:
-    attr_accessor :cgi, :session_options, :cookie_only
+    attr_accessor :cgi, :session_options
     class SessionFixationAttempt < StandardError; end #:nodoc:
 
     DEFAULT_SESSION_OPTIONS = {
       :database_manager => CGI::Session::PStore,
       :prefix           => "ruby_sess.",
       :session_path     => "/",
+      :session_key      => "_session_id",
       :cookie_only      => true
     } unless const_defined?(:DEFAULT_SESSION_OPTIONS)
 
@@ -50,10 +51,13 @@ module ActionController #:nodoc:
       @cgi = cgi
       @session_options = session_options
       @env = @cgi.send(:env_table)
-      @cookie_only = session_options.delete :cookie_only
       super()
     end
 
+    def cookie_only?
+      session_options_with_string_keys['cookie_only']
+    end
+
     def query_string
       if (qs = @cgi.query_string) && !qs.empty?
         qs
@@ -114,7 +118,7 @@ module ActionController #:nodoc:
           @session = Hash.new
         else
           stale_session_check! do
-            if @cookie_only && request_parameters[session_options_with_string_keys['session_key']]
+            if cookie_only? && request_parameters[session_options_with_string_keys['session_key']]
               raise SessionFixationAttempt
             end
             case value = session_options_with_string_keys['new_session']

data/lib/action_controller/cookies.rb

@@ -47,7 +47,10 @@ module ActionController #:nodoc:
     # Returns the value of the cookie by +name+ -- or nil if no such cookie exists. You set new cookies using either the cookie method
     # or cookies[]= (for simple name/value cookies without options).
     def [](name)
-      @cookies[name.to_s].value.first if @cookies[name.to_s] && @cookies[name.to_s].respond_to?(:value)
+      cookie = @cookies[name.to_s]
+      if cookie && cookie.respond_to?(:value)
+        cookie.size > 1 ? cookie.value : cookie.value.to_s
+      end 
     end
 
     def []=(name, options)

data/lib/action_pack/version.rb

@@ -2,7 +2,7 @@ module ActionPack #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 13
-    TINY  = 5
+    TINY  = 6
     
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/controller/cookie_test.rb

@@ -22,7 +22,7 @@ class CookieTest < Test::Unit::TestCase
       cookies["user_name"] = { "value" => "david", "expires" => Time.local(2005, 10, 10) }
       cookies["login"]     = "XJ-122"
     end
-
+    
     def access_frozen_cookies
       cookies["will"] = "work"
     end
@@ -91,6 +91,14 @@ class CookieTest < Test::Unit::TestCase
     assert_equal nil, jar["something_else"]
   end
 
+  def test_cookiejar_accessor_with_array_value
+    a = %w{1 2 3}
+    @request.cookies["pages"] = CGI::Cookie.new("name" => "pages", "value" => a, "expires" => Time.local(2025, 10, 10))
+    @controller.request = @request
+    jar = ActionController::CookieJar.new(@controller)
+    assert_equal a, jar["pages"]
+  end
+  
   def test_delete_cookie_with_path
     get :delete_cookie_with_path
     assert_equal "/beaten", @response.headers["cookie"].first.path

data/test/controller/session_fixation_test.rb

@@ -0,0 +1,92 @@
+require File.dirname(__FILE__) + '/../abstract_unit'
+
+class SessionFixationTest < Test::Unit::TestCase
+  class MockCGI < CGI #:nodoc:
+    attr_accessor :stdoutput, :env_table
+
+    def initialize(env, data = '')
+      self.env_table = env
+      self.stdoutput = StringIO.new
+      super(StringIO.new(data))
+    end
+  end
+
+  class TestController < ActionController::Base
+    session :session_key => '_myapp_session_id', :secret => 'secret', :except => :default_session_key
+    session :cookie_only => false, :only => :allow_session_fixation
+
+    def default_session_key
+      render :text => "default_session_key"
+    end
+
+    def custom_session_key
+      render :text => "custom_session_key: #{params[:id]}"
+    end
+
+    def allow_session_fixation
+      render :text => "allow_session_fixation"
+    end
+
+    def rescue_action(e) raise end
+  end
+
+  def setup
+    @controller = TestController.new
+  end
+
+  def test_should_be_able_to_make_a_successful_request
+    cgi = mock_cgi_for_request_to(:custom_session_key, :id => 1)
+
+    assert_nothing_raised do
+      @controller.send(:process, mock_request(cgi), ActionController::CgiResponse.new(cgi))
+    end
+    assert_equal 'custom_session_key: 1', @controller.response.body
+    assert_not_nil @controller.session
+  end
+
+  def test_should_catch_session_fixation_attempt
+    cgi = mock_cgi_for_request_to(:custom_session_key, :_myapp_session_id => 42)
+
+    assert_raises ActionController::CgiRequest::SessionFixationAttempt do
+      @controller.send(:process, mock_request(cgi), ActionController::CgiResponse.new(cgi))
+    end
+    assert_nil @controller.session
+  end
+
+  def test_should_not_catch_session_fixation_attempt_when_cookie_only_setting_is_disabled
+    cgi = mock_cgi_for_request_to(:allow_session_fixation, :_myapp_session_id => 42)
+
+    assert_nothing_raised do
+      @controller.send(:process, mock_request(cgi), ActionController::CgiResponse.new(cgi))
+    end
+    assert !@controller.response.body.blank?
+    assert_not_nil @controller.session
+  end
+
+  def test_should_catch_session_fixation_attempt_with_default_session_key
+    ActionController::Base.session_store = :p_store # using the default session_key is not possible with cookie store
+    cgi = mock_cgi_for_request_to(:default_session_key, :_session_id => 42)
+
+    assert_raises ActionController::CgiRequest::SessionFixationAttempt do
+      @controller.send(:process, mock_request(cgi) , ActionController::CgiResponse.new(cgi))
+    end
+    assert @controller.response.body.blank?
+    assert_nil @controller.session
+  end
+
+private
+
+  def mock_cgi_for_request_to(action, params = {})
+    MockCGI.new({
+      "REQUEST_METHOD" => "GET",
+      "QUERY_STRING"   => "action=#{action}&#{params.to_query}",
+      "REQUEST_URI"    => "/",
+      "SERVER_PORT"    => "80",
+      "HTTP_HOST"      => "testdomain.com" }, '')
+  end
+
+  def mock_request(cgi)
+    ActionController::CgiRequest.new(cgi, {})
+  end
+
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: actionpack
 version: !ruby/object:Gem::Version 
-  version: 1.13.5
-date: 2007-10-12 00:00:00 -05:00
+  version: 1.13.6
+date: 2007-11-24 00:00:00 +13:00
 summary: Web-flow and rendering framework putting the VC in MVC.
 require_paths: 
 - lib
@@ -203,6 +203,7 @@ files:
 - test/controller/routing_test.rb
 - test/controller/selector_test.rb
 - test/controller/send_file_test.rb
+- test/controller/session_fixation_test.rb
 - test/controller/session_management_test.rb
 - test/controller/test_test.rb
 - test/controller/url_rewriter_test.rb