From de59e6ebad0cc829e60e2444f03230aef8228980 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 5 Aug 2015 17:24:48 -0700
Subject: move env access to the request object.

Accessing a request object has nice advantages over accessing a hash.
If you use a missing method name, you'll get an exception rather than a
`nil` (is one nice feature)
---
 .../metal/request_forgery_protection.rb            |  4 +-
 .../lib/action_dispatch/middleware/cookies.rb      | 58 +++++++++++++++++-----
 .../lib/action_dispatch/testing/test_process.rb    |  2 +-
 3 files changed, 48 insertions(+), 16 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_controller/metal/request_forgery_protection.rb b/actionpack/lib/action_controller/metal/request_forgery_protection.rb
index 9e09242872..99c2287fcb 100644
--- a/actionpack/lib/action_controller/metal/request_forgery_protection.rb
+++ b/actionpack/lib/action_controller/metal/request_forgery_protection.rb
@@ -161,11 +161,11 @@ module ActionController #:nodoc:
 
         class NullCookieJar < ActionDispatch::Cookies::CookieJar #:nodoc:
           def self.build(request)
-            key_generator = request.env[ActionDispatch::Cookies::GENERATOR_KEY]
+            key_generator = request.key_generator
             host          = request.host
             secure        = request.ssl?
 
-            new(key_generator, host, secure, options_for_env({}))
+            new(key_generator, host, secure, options_for_req(request))
           end
 
           def write(*)
diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb
index 07d97bd6bd..8cc9b2cc36 100644
--- a/actionpack/lib/action_dispatch/middleware/cookies.rb
+++ b/actionpack/lib/action_dispatch/middleware/cookies.rb
@@ -8,7 +8,39 @@ require 'active_support/json'
 module ActionDispatch
   class Request < Rack::Request
     def cookie_jar
-      env['action_dispatch.cookies'] ||= Cookies::CookieJar.build(env, host, ssl?, cookies)
+      env['action_dispatch.cookies'] ||= Cookies::CookieJar.build(self, host, ssl?, cookies)
+    end
+
+    def key_generator
+      env[Cookies::GENERATOR_KEY]
+    end
+
+    def signed_cookie_salt
+      env[Cookies::SIGNED_COOKIE_SALT]
+    end
+
+    def encrypted_cookie_salt
+      env[Cookies::ENCRYPTED_COOKIE_SALT]
+    end
+
+    def encrypted_signed_cookie_salt
+      env[Cookies::ENCRYPTED_SIGNED_COOKIE_SALT]
+    end
+
+    def secret_token
+      env[Cookies::SECRET_TOKEN]
+    end
+
+    def secret_key_base
+      env[Cookies::SECRET_KEY_BASE]
+    end
+
+    def cookies_serializer
+      env[Cookies::COOKIES_SERIALIZER]
+    end
+
+    def cookies_digest
+      env[Cookies::COOKIES_DIGEST]
     end
   end
 
@@ -216,21 +248,21 @@ 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] || '',
-          secret_token: env[SECRET_TOKEN],
-          secret_key_base: env[SECRET_KEY_BASE],
-          upgrade_legacy_signed_cookies: env[SECRET_TOKEN].present? && env[SECRET_KEY_BASE].present?,
-          serializer: env[COOKIES_SERIALIZER],
-          digest: env[COOKIES_DIGEST]
+      def self.options_for_req(req) #:nodoc:
+        { signed_cookie_salt: req.signed_cookie_salt || '',
+          encrypted_cookie_salt: req.encrypted_cookie_salt || '',
+          encrypted_signed_cookie_salt: req.encrypted_signed_cookie_salt || '',
+          secret_token: req.secret_token,
+          secret_key_base: req.secret_key_base,
+          upgrade_legacy_signed_cookies: req.secret_token.present? && req.secret_key_base.present?,
+          serializer: req.cookies_serializer,
+          digest: req.cookies_digest
         }
       end
 
-      def self.build(env, host, secure, cookies)
-        key_generator = env[GENERATOR_KEY]
-        options = options_for_env env
+      def self.build(req, host, secure, cookies)
+        key_generator = req.key_generator
+        options = options_for_req req
 
         new(key_generator, host, secure, options).tap do |hash|
           hash.update(cookies)
diff --git a/actionpack/lib/action_dispatch/testing/test_process.rb b/actionpack/lib/action_dispatch/testing/test_process.rb
index 494644cd46..c410d36a1e 100644
--- a/actionpack/lib/action_dispatch/testing/test_process.rb
+++ b/actionpack/lib/action_dispatch/testing/test_process.rb
@@ -19,7 +19,7 @@ module ActionDispatch
     end
 
     def cookies
-      @cookie_jar ||= Cookies::CookieJar.build(@request.env, @request.host, @request.ssl?, @request.cookies)
+      @cookie_jar ||= Cookies::CookieJar.build(@request, @request.host, @request.ssl?, @request.cookies)
     end
 
     def redirect_to_url
-- 
cgit v1.2.3