diff options
| author | Andrey Chernih <andrey.chernih@gmail.com> | 2013-02-08 22:22:16 +0400 |
|---|---|---|
| committer | Andrey Chernih <andrey.chernih@gmail.com> | 2013-02-08 22:22:16 +0400 |
| commit | 4127332a5f516188df7b35f3f8886723b8c4859d (patch) | |
| tree | c684546ec75a985d94925704dc048cb6f510e292 /actionpack/lib/action_dispatch/middleware | |
| parent | 01e67316d8c802df3928b53d0e0ce9153044f5ad (diff) | |
| download | rails-4127332a5f516188df7b35f3f8886723b8c4859d.tar.gz rails-4127332a5f516188df7b35f3f8886723b8c4859d.tar.bz2 rails-4127332a5f516188df7b35f3f8886723b8c4859d.zip | |
Fix #9168 Initialize NullCookieJar with all options needed for KeyGenerator
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/cookies.rb | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb index 0f02d230d4..2ee2838920 100644 --- a/actionpack/lib/action_dispatch/middleware/cookies.rb +++ b/actionpack/lib/action_dispatch/middleware/cookies.rb @@ -110,13 +110,17 @@ module ActionDispatch # $& => example.local DOMAIN_REGEXP = /[^.]*\.([^.]*|..\...|...\...)$/ + def self.options_for_env(env) #:nodoc: + { signed_cookie_salt: env[SIGNED_COOKIE_SALT] || '', + encrypted_cookie_salt: env[ENCRYPTED_COOKIE_SALT] || '', + encrypted_signed_cookie_salt: env[ENCRYPTED_SIGNED_COOKIE_SALT] || '', + token_key: env[TOKEN_KEY] } + end + def self.build(request) env = request.env key_generator = env[GENERATOR_KEY] - options = { signed_cookie_salt: env[SIGNED_COOKIE_SALT], - encrypted_cookie_salt: env[ENCRYPTED_COOKIE_SALT], - encrypted_signed_cookie_salt: env[ENCRYPTED_SIGNED_COOKIE_SALT], - token_key: env[TOKEN_KEY] } + options = options_for_env env host = request.host secure = request.ssl? |