encrypted_cookie_store-instructure 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fbe4d543a0ab0dc63aee18e2c1984acbd94c229
-  data.tar.gz: 1a061703abd7f10a488ba13df95f68c0c26efc3b
+  metadata.gz: 16bc5314104030db889e71b9a6b4ccbd40f245e1
+  data.tar.gz: d47817a35a8ee124a2706e6ee1a6e1ff675b18bd
 SHA512:
-  metadata.gz: c39d31f946f28eee76e0a27ff3499fc6581d0ca0490ffc34cf897ef4098b3e6a39a7a4bfe4ba4b50a222ba77afcefa9342c073ab1a808ecfb3a5d71a7cb864db
-  data.tar.gz: 36acfa95153f029785e8a30017640cd2174770af9fb194c5fcae32f4e59590a0f17c3c4bdb439aa61a5ec7e54400586aa6620c671d3f453ae4d43b2695c7d066
+  metadata.gz: 04bc7d0af8da28a14faebedd2339474d6e8428c7e5c45346fc02cf6cea7e766c1915570b80e979e9025f32f24fe0baae034e5d7e1bd26b6c9d321e0199bc63d2
+  data.tar.gz: 1224858394a152b59a9d75805cc63984cb88a8df67f2f701c2dc7e48f6205b8ad69afb4f7d6ef6e3dbe47f6abe5291a0593a19f70435dc2a1dd367ac27393fbb

data/encrypted_cookie_store-instructure.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{encrypted_cookie_store-instructure}
-  s.version = "1.2.1"
+  s.version = "1.2.2"
 
   s.authors = ["Cody Cutrer", "Jacob Fugal", "James Williams"]
   s.date = %q{2013-12-20}

data/lib/encrypted_cookie_store.rb

@@ -13,6 +13,12 @@ module ActionDispatch
       end
       self.data_cipher_type = "aes-128-cbc".freeze
 
+      SESSION_KEY = if Rack.release >= '2'
+                      Rack::RACK_SESSION
+                    else
+                      Rack::Session::Abstract::ENV_SESSION_KEY
+                    end
+
       def initialize(app, options = {})
         @logger = options.delete(:logger)
         @digest = options.delete(:digest) || 'SHA1'
@@ -87,7 +93,7 @@ module ActionDispatch
       def unpacked_cookie_data(req)
         fetch_header(req, "action_dispatch.request.unsigned_session_cookie") do |k|
           v = stale_session_check! do
-            if data = unmarshal(get_cookie(req))
+            if data = unmarshal(get_cookie(req), get_header(req, SESSION_KEY).options)
               data.stringify_keys!
             end
             data ||= {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: encrypted_cookie_store-instructure
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Cody Cutrer