kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Revert "Add support for multi-subdomain session by setting cookie host in session cookie so you can share session between www.example.com, example.com and user.example.com. [#4818 state:resolved]"

Browse source 
It does not work for domains like co.uk and com.br.

This reverts commit c4d6245e87.
This commit is contained in:
José Valim 2010-06-10 20:05:48 +02:00
parent d93b45e8d3
commit 330a89072a
4 changed files with 2 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
actionpack/CHANGELOG
View file

@ -1,10 +1,7 @@
*Rails 3.0.0 [Release Candidate] (unreleased)* Rails 3.0.0 [Release Candidate] (unreleased)*
* Add support for multi-subdomain session by setting cookie host in session cookie so you can share session between www.example.com, example.com and user.example.com. #4818 [Guillermo Álvarez]
* Removed textilize, textilize_without_paragraph and markdown helpers. [Santiago Pastorino] * Removed textilize, textilize_without_paragraph and markdown helpers. [Santiago Pastorino]
*Rails 3.0.0 [beta 4] (June 8th, 2010)* *Rails 3.0.0 [beta 4] (June 8th, 2010)*
* Remove middleware laziness [José Valim] * Remove middleware laziness [José Valim]

7
actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
View file

@ -121,12 +121,7 @@ module ActionDispatch
unless options[:expire_after].nil? unless options[:expire_after].nil?
cookie[:expires] = Time.now + options.delete(:expire_after) cookie[:expires] = Time.now + options.delete(:expire_after)
end end
if options[:domain] == :all
top_level_domain = env["HTTP_HOST"].split('.')[-2..-1].join('.')
options[:domain] = ".#{top_level_domain}"
end
request = ActionDispatch::Request.new(env) request = ActionDispatch::Request.new(env)
set_cookie(request, cookie.merge!(options)) set_cookie(request, cookie.merge!(options))
end end

8
actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
View file

@ -34,14 +34,6 @@ module ActionDispatch
# integrity defaults to 'SHA1' but may be any digest provided by OpenSSL, # integrity defaults to 'SHA1' but may be any digest provided by OpenSSL,
# such as 'MD5', 'RIPEMD160', 'SHA256', etc. # such as 'MD5', 'RIPEMD160', 'SHA256', etc.
# #
# * <tt>:domain</tt>: Restrict the session cookie to certain domain level.
# If you use a schema like www.example.com and wants to share session
# with user.example.com set <tt>:domain</tt> to <tt>:all</tt>
#
# :domain => nil # Does not sets cookie domain. (default)
# :domain => :all # Allow the cookie for the top most level
# domain and subdomains.
#
# To generate a secret key for an existing application, run # To generate a secret key for an existing application, run
# "rake secret" and set the key in config/environment.rb. # "rake secret" and set the key in config/environment.rb.
# #

29
actionpack/test/dispatch/session/cookie_store_test.rb
View file

@ -185,35 +185,6 @@ class CookieStoreTest < ActionController::IntegrationTest
end end
end end
def test_session_store_with_explicit_domain
with_test_route_set(:domain => "example.es") do
get '/set_session_value'
assert_match /domain=example\.es/, headers['Set-Cookie']
headers['Set-Cookie']
end
end
def test_session_store_without_domain
with_test_route_set do
get '/set_session_value'
assert_no_match /domain\=/, headers['Set-Cookie']
end
end
def test_session_store_with_nil_domain
with_test_route_set(:domain => nil) do
get '/set_session_value'
assert_no_match /domain\=/, headers['Set-Cookie']
end
end
def test_session_store_with_all_domains
with_test_route_set(:domain => :all) do
get '/set_session_value'
assert_match /domain=\.example\.com/, headers['Set-Cookie']
end
end
private private
# Overwrite get to send SessionSecret in env hash # Overwrite get to send SessionSecret in env hash