coalescing_panda 5.1.0 → 5.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca4769293181b5ee47471cc9051ad0b678915f71
-  data.tar.gz: 60c8585ff7f5d28057b703a9ae7c5a85ab6dbdb7
+  metadata.gz: bcdc3ee528ad33450c36b9bacd2935ddc508b021
+  data.tar.gz: faa4fe4cdba14da7d260ceff84fe45fbd26dbdd2
 SHA512:
-  metadata.gz: 6103b51481915a9d2719a87ff81c042a783d0111108e4c270fc3261a61008ab3683beaae3b2a9490450248fe882f4be75776d360219fe2dadb7377cc301f229f
-  data.tar.gz: f434c3a048769d55b72fe0ba190c7033ce0429b0acbf3ec0ec1a2ea2bc920262de49ef9336feb5e236d1767237bd79dd4ccf6bf14765c79358faa24fa329e91c
+  metadata.gz: 7a0a02279da82108e5c7ed472932e6e59948b0d64845c35ef7bfa02dd85b0efc33288c24aa02cf3b952f9915c2f9801c1fef833e9a9e72fe62739e19b72b6756
+  data.tar.gz: d48d2df6835e58324d4b750cb34c46000a3739faba5e465845ee935b354e183d2a0e0c2922cde1f705dc9b481e6c9fbbb7954e87db10f5994852b834d266f872

data/lib/coalescing_panda/controller_helpers.rb

@@ -158,9 +158,8 @@ module CoalescingPanda
     end
 
     def valid_session?
-      [
-        current_session&.persisted?,
-      ].all?
+      return false unless current_session(create_missing: false)&.persisted?
+      true
     rescue SessionNonceMismatch
       false
     end

data/lib/coalescing_panda/misc_helper.rb

@@ -4,9 +4,9 @@ module CoalescingPanda
 
     def self.to_boolean(v)
       if Rails.version < '5.0'
-        ActiveRecord::Type::Boolean.new.type_cast_from_user("0")
+        ActiveRecord::Type::Boolean.new.type_cast_from_user(v)
       else
-        ActiveRecord::Type::Boolean.new.deserialize('0')
+        ActiveRecord::Type::Boolean.new.deserialize(v)
       end
     end
   end

data/lib/coalescing_panda/session_replacement.rb

@@ -20,19 +20,22 @@ 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
       current_session.try(:save)
     end
 
-    def current_session
+    def current_session(create_missing: true)
       return @current_session if @current_session.present?
 
       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
@@ -40,6 +43,8 @@ module CoalescingPanda
           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
             @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
         raise SessionNonceMismatch, "Session Not Found" unless @current_session.present?
@@ -47,7 +52,7 @@ module CoalescingPanda
         @current_session = find_or_create_session(key: session_key)
       end
 
-      @current_session ||= find_or_create_session(key: :create)
+      @current_session ||= find_or_create_session(key: :create) if create_missing
 
       @current_session
     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.0'
+  VERSION = '5.1.4'
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: coalescing_panda
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.1.4
 platform: ruby
 authors:
 - Nathan Mills
 - Cody Tanner
 - Jake Sorce
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-14 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: