coalescing_panda 5.1.2 → 5.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db38b8cdb32e3f3d41eab15a3df4542cb9feeb9b
-  data.tar.gz: 4cb1f0ec31e628852a3cfe2100b2ca31a91f94cd
+  metadata.gz: f317383eecefd1a67bcb72a09bd5630c1f3ecbbc
+  data.tar.gz: daa6e6ad5e3c7f93edb15ded3e974d23db9df7f4
 SHA512:
-  metadata.gz: d05f38b6ab1f690c9b581c59da23814f6b2b505be56bf2ab057b3099dd15497d98de974ce9f43f779e6b59e863e825fb690d146121915da348484af391798518
-  data.tar.gz: 3663adb9a48a839fed284a7132083335578074ce210b382cbac8e6cb4a0a98aa59d0033ad4cc6b8116205143b13a787d5ed56fa65ca7eef0f7e38b9ec23e551c
+  metadata.gz: 2a4e7e139bb2872b008da9486d5d828b4600793f8a28379720191a0f1d498af8b58ec0c5e6c0058fbe7910b6796fdc2c3c5a31f5c69f24cd9173a830fcd462a5
+  data.tar.gz: 555eb486c630dd9434da5c61ac86925cf3a05ad7567b50ef0b657f48010c1d0fb5b217715ff3ca8d9f53d5760539ea8a18a65e5fcb44dc14c5e9d0c06ec1e0fa

data/lib/coalescing_panda/session_replacement.rb

@@ -20,6 +20,10 @@ module CoalescingPanda
           @link_nonce_type = value
         end
       end
+
+      def session_expiration_period_minutes
+        superclass.try(:session_expiration_period_minutes) || 15
+      end
     end
 
     def save_session
@@ -32,13 +36,14 @@ module CoalescingPanda
       if params[:session_token]
         payload = JSON.parse(session_cryptor.decrypt_and_verify(params[:session_token])).with_indifferent_access
         matched_session = find_or_create_session(key: payload[:session_key])
-
         if matched_session.present?
           if payload[:token_type] == 'nonce' && matched_session.data[:link_nonce] == payload[:nonce]
             @current_session = matched_session
             @current_session.data[:link_nonce] = nil
           elsif payload[:token_type] == 'fixed_ip' && matched_session.data[:remote_ip] == request.remote_ip &&
-            DateTime.parse(matched_session.data[:last_ip_token_requested]) > 15.minutes.ago
+            DateTime.parse(matched_session.data[:last_ip_token_requested]) > session_expiration_period_minutes.minutes.ago
+            @current_session = matched_session
+          elsif payload[:token_type] == 'expiring' && DateTime.parse(matched_session.data[:last_token_requested]) > session_expiration_period_minutes.minutes.ago
             @current_session = matched_session
           end
         end
@@ -111,6 +116,8 @@ module CoalescingPanda
         elsif type == 'fixed_ip'
           current_session_data[:remote_ip] ||= request.remote_ip
           current_session_data[:last_ip_token_requested] = DateTime.now.iso8601
+        elsif type == 'expiring'
+          current_session_data[:last_token_requested] = DateTime.now.iso8601
         else
           raise StandardError, "Unsupported link_nonce_type: '#{type}'"
         end
@@ -123,6 +130,10 @@ module CoalescingPanda
       self.class.link_nonce_type
     end
 
+    def session_expiration_period_minutes
+      self.session_expiration_period_minutes
+    end
+
     private
 
     def session_cryptor

data/lib/coalescing_panda/version.rb

@@ -1,3 +1,3 @@
 module CoalescingPanda
-  VERSION = '5.1.2'
+  VERSION = '5.1.5'
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: coalescing_panda
 version: !ruby/object:Gem::Version
-  version: 5.1.2
+  version: 5.1.5
 platform: ruby
 authors:
 - Nathan Mills
 - Cody Tanner
 - Jake Sorce
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-16 00:00:00.000000000 Z
+date: 2020-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -396,7 +396,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - nathanm@instructure.com
 - ctanner@instructure.com
@@ -563,7 +563,7 @@ files:
 homepage: http://www.instructure.com
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -578,9 +578,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.6.14.4
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Canvas LTI and OAUTH2 mountable engine
 test_files: