github-migration/rails_upgrade
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Should use config.secret_token instead of config.cookie_secret.

Browse Source
This commit is contained in:
José Valim 2010-04-06 00:56:13 +02:00
parent c3b269e486
commit 55b5d52786
2 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/application_checker.rb
View File

@ -237,14 +237,28 @@ module Rails
end
# Checks for old cookie secret settings
def check_old_cookie_setting
lines = grep_for("ActionController::Base.session = {", "config/**/*")
def check_old_cookie_secret
lines = grep_for("ActionController::Base.cookie_verifier_secret = ", "config/**/*")
files = extract_filenames(lines)
if files
alert(
"Deprecated cookie secret setting",
"Previously, session store was set directly on ActionController::Base; now it's now config.cookie_secret.",
"Previously, cookie secret was set directly on ActionController::Base; it's now config.secret_token.",
"http://weblog.rubyonrails.org/",
files
)
end
end
def check_old_session_secret
lines = grep_for("ActionController::Base.session = {", "config/**/*")
files = extract_filenames(lines)
if files
alert(
"Deprecated session secret setting",
"Previously, session secret was set directly on ActionController::Base; it's now config.secret_token.",
"http://weblog.rubyonrails.org/",
files
)
@ -259,7 +273,7 @@ module Rails
if files
alert(
"Old session store setting",
"Previously, session store was set directly on ActionController::Base; now it's now config.session_store :whatever.",
"Previously, session store was set directly on ActionController::Base; it's now config.session_store :whatever.",
"http://weblog.rubyonrails.org/",
files
)

15
test/application_checker_test.rb
View File

@ -161,13 +161,20 @@ class ApplicationCheckerTest < ActiveSupport::TestCase
assert @checker.alerts.has_key?("Deprecated constant(s)")
end
def test_check_deprecated_cookie_settings
make_file("config/initializers/", "more_settings.rb", "ActionController::Base.session = {\n:whatever => 'woot'\n}")
@checker.check_old_cookie_setting
make_file("config/initializers/", "more_settings.rb", "ActionController::Base.cookie_verifier_secret = 'OMG'")
@checker.check_old_cookie_secret
assert @checker.alerts.has_key?("Deprecated cookie secret setting")
end
def test_check_deprecated_session_secret
make_file("config/initializers/", "more_settings.rb", "ActionController::Base.session = {\n:whatever => 'woot'\n}")
@checker.check_old_session_secret
assert @checker.alerts.has_key?("Deprecated session secret setting")
end
def test_check_deprecated_session_settings
make_file("config/initializers/", "more_settings.rb", "ActionController::Base.session_store = :cookie\nthings.awesome(:whatever)")