panda_pal 4.1.0.beta2 → 5.0.0.beta.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2c6ac3694136d009439988eff1703cd4df593166
-  data.tar.gz: 0d41152d271eb99d7d248062a4f3500c8c146af1
+SHA256:
+  metadata.gz: 689e3885a1cc8e9ae58ed8f07e0089af4d2b82668f8a6cf9f41e053530762d5d
+  data.tar.gz: eb7fea8c5df5b973db4dc0be811f3e5961a0e9b3efd4a012ffde72bdb36f6888
 SHA512:
-  metadata.gz: b253820d23c08f25c61de72d420da969647e6c2cda98d3957bfd076c7e26b1752d383ea7c3d38018945eadb4b36fb880ccd2f0e5fdf5d0e38ce808aa8e3cf23f
-  data.tar.gz: b9bae0c7b68314c457beeefc7f78d7f97fc6810be4aa94eb826779e9856c62b8ec9f80eb5fae43edb3870256773e2e5a30c3e56e7e29cab981ac0246cd28544a
+  metadata.gz: 8b994a6c7a7bf474d7e38bfa36efc00d4bfb57913e684f626bf2f457615dcf37346ffed346f0937ebdf50bed19ca2875080f1b69a794358a94f4e7fcc7e518f3
+  data.tar.gz: 399ea543b5c5765348e0ea9f11517d48b384de5939556c25e780a9d312950b5e1bdb58da931b070151c68bdb4a6e574e9844d3977a4594481346aa6c76beaba1

data/README.md

@@ -28,38 +28,6 @@ Use one of these 6 options in `PandaPal.lti_options` hash.
 5. Leave this property off, and you will get the dynamic host with the root path ('http://appdomain.com/') by default.
 6. If you really do not want this property use the option `launch_url: false` for it to be left off.
 
-### Task Scheduling
-`PandaPal` includes an integration with `sidekiq-scheduler`. You can define tasks on an Organization class Stub like so:
-```ruby
-# <your_app>/app/models/organization.rb
-module PandaPal
-  class Organization
-    # Will invoke CanvasSyncStarterWorker.perform_async() according to the cron schedule
-    scheduled_task '0 15 05 * * *', :identifier, worker: CanvasSyncStarterWorker
-
-    # Will invoke the method 'organization_method' on the Organization
-    scheduled_task '0 15 05 * * *', :organization_method_and_identifier
-
-    # If you need to invoke the same method on multiple schedules
-    scheduled_task '0 15 05 * * *', :identifier, worker: :organization_method
-
-    # You can also use a block
-    scheduled_task '0 15 05 * * *', :identifier do
-      # Do Stuff
-    end
-
-    # You can use a Proc (called in the context of the Organization) to determine the schedule
-    scheduled_task -> { settings[:cron] }, :identifier
-
-    # You can specify a timezone. If a TZ is not coded and settings[:timezone] is present, it will be appended automatically
-    scheduled_task '0 15 05 * * * America/Denver', :identifier, worker: :organization_method
-
-    # Setting settings[:task_schedules][:identifier] will override the code cron schedule. Setting it to false will disable the Task
-    # :identifer values _must_ be unique, but can be nil, in which case they will be determined by where (lineno etc) scheduled_task is called
-  end
-end
-```
-
 # Organization Attributes
   id: Primary Key
   name: Name of the organization. Used to on requests to select the tenant
@@ -258,43 +226,9 @@ In your panda_pal initializer (i.e. config/initializers/panda_pal.rb or config/i
 You can specify options that can include a structure for your settings.  If specified, PandaPal will
 enforce this structure on any new / updated organizations.
 
-```ruby
-PandaPal.lti_options = {
-  title: 'LBS Gradebook',
-  settings_structure: {
-    allow_additional: true, # Allow additional properties that aren't included in the :properties Hash.
-    allow_additional: { type: 'String' }, # You can also set :allow_additional to a settings specification that will be used to validate each additional setting
-    validate: ->(value, spec, **kwargs) {
-      # kwargs currently includes:
-      #   :errors => [An array to push errors to]
-      #   :path => [An array representation of the current path in the settings object]
-
-      # To add errors, you may:
-      # Push strings to the kwargs[:errors] Array:
-      kwargs[:errors] << "Your error message at <path>" unless value < 10
-      # Or return a string or string array:
-      value.valid? ? nil : "Your error message at <path>" # <path> will be replaced with the actual path that the error occurred at
-    },
-    properties: {
-      canvas_api_token: { type: 'String', required: true, },
-      catalog: { # :validate, :allow_additional, :properties keys are all supported at this level as well
-        type: 'Hash',
-        required: false,
-        validate: -> (*args) {},
-        allow_additional: false,
-        properties: {
-
-        },
-      }
-    }
-  },
-}
-```
-
-#### Legacy Settings Structure:
 Here is an example options specification:
 
-```ruby
+```
 PandaPal.lti_options = {
   title: 'LBS Gradebook',
   settings_structure: YAML.load("
@@ -347,7 +281,62 @@ Safari is weird, and you'll potentially run into issues getting `POST` requests
 
 This will allow `PandaPal` to apply an iframe cookie fix that will allow CSRF validation to work.
 
-## Running Specs:
-Initialize the Specs DB:
-`cd spec/dummy; bundle exec rake db:drop; bundle exec rake db:create; bundle exec rake db:schema:load`
-Then `bundle exec rspec`
+
+### PandaPal 5
+
+It has been a constant struggle to force safari to store and allow
+access to a rails session while the application is embedded in Canvas.
+
+As of PandaPal 5, a persistent session is no longer required by panda_pal.
+
+This means that safari will likely refuse to send info about your rails session
+back to the LTI, and the application will start up a new session each time the
+browser navigates.  This likely means a new session each time the LTI launches.
+
+You will want to watch out for a few scenarios:
+
+1) Make sure you are using "redirect_with_session_to" if you need to redirect
+   and have your PandaPal session_key persisted server side.
+2) Use the "Authorization" header with "token={session_key}" to send your
+   PandaPal session info into api calls.
+3) If you use link_to and navigate in your LTI (apps that are not single page)
+   make sure you include an encrypted_session_key parameter in your links.
+
+# Upgrading from PandaPal 4 to 5:
+
+If your tool is setup according to a pretty standard pattern (see pace_plans,
+canvas_group_enrollment, etc), you shouldn't have to do anything to upgrade.
+
+You will want to make sure that IF your launch controller is redirecting, it is
+using "redirect_with_session_to".
+
+Here is an example launch / account controller setup, assuming an account launch.
+
+```
+class LaunchController < ApplicationController
+  # We don't verify CSRF on launch because the LTI launch is done via a POST
+  # request, and Canvas wouldn't know anything about the CSRF
+  skip_before_action :verify_authenticity_token
+  skip_before_action :forbid_access_if_lacking_session # We don't have a session yet
+  around_action :switch_tenant
+  before_action :validate_launch!
+  before_action :handle_launch
+
+  def handle_launch
+    current_session_data[:canvas_user_id] = params[:custom_canvas_user_id]
+    current_session_data[:canvas_course_id] = params[:custom_canvas_course_id]
+  end
+
+  def account
+    redirect_with_session_to :accounts_url
+  end
+end
+
+class AccountController < ApplicationController
+  prepend_before_action :forbid_access_if_lacking_session
+
+  def index
+  end
+end
+```
+

data/app/models/panda_pal/organization.rb

@@ -1,23 +1,15 @@
-Dir[File.dirname(__FILE__) + "/organization/*.rb"].each { |file| require file }
-
 module PandaPal
-  module OrganizationConcerns; end
 
   class Organization < ActiveRecord::Base
-    include OrganizationConcerns::SettingsValidation
-    include OrganizationConcerns::TaskScheduling if defined?(Sidekiq.schedule)
-
     attribute :settings
-    serialize :settings, Hash
     attr_encrypted :settings, marshal: true, key: :encryption_key
     before_save {|a| a.settings = a.settings} # this is a hacky work-around to a bug where attr_encrypted is not saving settings in place
-
     validates :key, uniqueness: { case_sensitive: false }, presence: true
     validates :secret, presence: true
     validates :name, uniqueness: { case_sensitive: false }, presence: true, format: { with: /\A[a-z0-9_]+\z/i }
     validates :canvas_account_id, presence: true
     validates :salesforce_id, presence: true, uniqueness: true
-
+    validate :validate_settings
     after_create :create_schema
     after_commit :destroy_schema, on: :destroy
 
@@ -25,6 +17,8 @@ module PandaPal
       errors.add(:name, 'should not be changed after creation') if name_changed?
     end
 
+    serialize :settings, Hash
+
     def encryption_key
       # production environment might not have loaded secret_key_base yet.
       # In that case, just read it from env.
@@ -35,14 +29,6 @@ module PandaPal
       end
     end
 
-    def switch_tenant(&block)
-      if block_given?
-        Apartment::Tenant.switch(name, &block)
-      else
-        Apartment::Tenant.switch!(name)
-      end
-    end
-
     private
 
     def create_schema
@@ -52,5 +38,48 @@ module PandaPal
     def destroy_schema
       Apartment::Tenant.drop name
     end
+
+    def validate_settings
+      record = self
+      if PandaPal.lti_options && PandaPal.lti_options[:settings_structure]
+        validate_level(record, PandaPal.lti_options[:settings_structure], record.settings, [])
+      end
+    end
+    def validate_level(record, expectation, reality, previous_keys)
+      # Verify that the data elements at this level conform to requirements.
+      if expectation
+        expectation.each do |key, value|
+          is_required = expectation[key].try(:delete, :is_required)
+          data_type = expectation[key].try(:delete, :data_type)
+          value = reality.is_a?(Hash) ? reality.dig(key) : reality
+
+          if is_required && !value
+            record.errors[:settings] << "PandaPal::Organization.settings requires key [:#{previous_keys.push(key).join("][:")}].  It was not found."
+          end
+          if data_type && value
+            if value.class.to_s != data_type
+              record.errors[:settings] << "PandaPal::Organization.settings expected key [:#{previous_keys.push(key).join("][:")}] to be #{data_type} but it was instead #{value.class}."
+            end
+          end
+        end
+      end
+      # Verify that anything that is in the real settings has an expectation.
+      if reality
+        if reality.is_a? Hash
+          reality.each do |key, value|
+            was_expected = expectation.has_key?(key)
+            if !was_expected
+              record.errors[:settings] << "PandaPal::Organization.settings had unexpected key: #{key}.  If settings have expanded please update your lti_options accordingly."
+            end
+          end
+        end
+      end
+      # Recursively check out any children settings as well.
+      if expectation
+        expectation.each do |key, value|
+          validate_level(record, expectation[key], (reality.is_a?(Hash) ? reality.dig(key) : nil), previous_keys.deep_dup.push(key))
+        end
+      end
+    end
   end
 end

data/lib/panda_pal/helpers/controller_helper.rb

@@ -42,17 +42,6 @@ module PandaPal::Helpers::ControllerHelper
       render plain: 'Invalid Credentials, please contact your Administrator.', :status => :unauthorized unless authorized
       return authorized
     end
-    if cookies_need_iframe_fix?
-      fix_iframe_cookies
-      return false
-    end
-    # For safari we may have been launched temporarily full-screen by canvas.  This allows us to set the session cookie.
-    # In this case, we should make sure the session cookie is fixed and redirect back to canvas to properly launch the embedded LTI.
-    if params[:platform_redirect_url]
-      session[:safari_cookie_fixed] = true
-      redirect_to params[:platform_redirect_url]
-      return false
-    end
     return authorized
   end
 
@@ -65,29 +54,8 @@ module PandaPal::Helpers::ControllerHelper
     end
   end
 
-  # Browsers that prevent 3rd party cookies by default (Safari and IE) run into problems
-  # with CSRF handling because the Rails session cookie isn't set. To fix this, we
-  # redirect the current page to the LTI using JavaScript, which will set the cookie,
-  # and then immediately redirect back to Canvas.
-  def fix_iframe_cookies
-    if params[:safari_cookie_fix].present?
-      session[:safari_cookie_fixed] = true
-      redirect_to params[:return_to]
-    else
-      render 'panda_pal/lti/iframe_cookie_fix', layout: false
-    end
-  end
-
-  def cookies_need_iframe_fix?
-    browser.safari? && !request.referrer&.include?('sessionless_launch') && !session[:safari_cookie_fixed] && !params[:platform_redirect_url]
-  end
-
   def forbid_access_if_lacking_session
-    if cookies_need_iframe_fix?
-      fix_iframe_cookies
-    else
-      render plain: 'You should do an LTI Tool Launch.', status: :unauthorized unless valid_session?
-    end
+    render plain: 'You should do an LTI Tool Launch.', status: :unauthorized unless valid_session?
     safari_override
   end
 
@@ -114,6 +82,10 @@ module PandaPal::Helpers::ControllerHelper
   end
 
   def session_key
+    if params[:encrypted_session_key]
+      crypt = ActiveSupport::MessageEncryptor.new(Rails.application.secret_key_base[0..31])
+      return crypt.decrypt_and_verify(params[:encrypted_session_key])
+    end
     params[:session_key] || session_key_header || flash[:session_key] || session[:session_key]
   end
 
@@ -122,4 +94,37 @@ module PandaPal::Helpers::ControllerHelper
       match[1]
     end
   end
+
+  # Redirect with the session key intact. In production,
+  # handle this by encrypting the session key.  That way if the
+  # url is logged anywhere, it will all be encrypted data.   In dev,
+  # just put it in the URL. Putting it in the URL
+  # is insecure, but is fine in development.
+  # Keeping it in the URL in development means that it plays
+  # nicely with webpack-dev-server live reloading (otherwise
+  # you get an access error everytime it tries to live reload).
+
+  def redirect_with_session_to(location, params = {})
+    if Rails.env.development?
+      redirect_development_mode(location, params)
+    else
+      redirect_production_mode(location, params)
+    end
+  end
+
+  def redirect_development_mode(location, params)
+    redirect_to send(location, {
+      session_key: current_session.session_key,
+      organization_id: current_organization.id
+    }.merge(params))
+  end
+
+  def redirect_production_mode(location, params)
+    crypt = ActiveSupport::MessageEncryptor.new(Rails.application.secret_key_base[0..31])
+    encrypted_data = crypt.encrypt_and_sign(current_session.session_key)
+    redirect_to send(location, {
+      encrypted_session_key: encrypted_data,
+      organization_id: current_organization.id
+    }.merge(params))
+  end
 end

data/lib/panda_pal/version.rb

@@ -1,3 +1,3 @@
 module PandaPal
-  VERSION = "4.1.0.beta2"
+  VERSION = "5.0.0.beta.4"
 end

data/panda_pal.gemspec

@@ -22,9 +22,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'browser', '2.5.0'
   s.add_dependency 'attr_encrypted', '~> 3.0.0'
   s.add_dependency 'secure_headers', '~> 6.1.2'
-
-  s.add_development_dependency 'sidekiq'
-  s.add_development_dependency 'sidekiq-scheduler'
   s.add_development_dependency 'rspec-rails'
   s.add_development_dependency 'factory_girl_rails'
 end

data/spec/dummy/config/application.rb

@@ -1,12 +1,6 @@
 require File.expand_path('../boot', __FILE__)
 
-require "active_model/railtie"
-require "active_job/railtie"
-require "active_record/railtie"
-# require "active_storage/engine"
-require "action_controller/railtie"
-require "action_mailer/railtie"
-require "action_view/railtie"
+require 'rails/all'
 
 Bundler.require(*Rails.groups)
 require "panda_pal"

data/spec/dummy/config/environments/development.rb

@@ -22,6 +22,20 @@ Rails.application.configure do
   # Raise an error on page load if there are pending migrations.
   config.active_record.migration_error = :page_load
 
+  # Debug mode disables concatenation and preprocessing of assets.
+  # This option may cause significant delays in view rendering with a large
+  # number of complex assets.
+  config.assets.debug = true
+
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
+  config.assets.digest = true
+
+  # Adds additional error checking when serving assets at runtime.
+  # Checks for improperly declared sprockets dependencies.
+  # Raises helpful error messages.
+  config.assets.raise_runtime_errors = true
+
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
 end

data/spec/dummy/config/environments/production.rb

@@ -24,6 +24,17 @@ Rails.application.configure do
   # Apache or NGINX already handles this.
   config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
+  # Compress JavaScripts and CSS.
+  config.assets.js_compressor = :uglifier
+  # config.assets.css_compressor = :sass
+
+  # Do not fallback to assets pipeline if a precompiled asset is missed.
+  config.assets.compile = false
+
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
+  config.assets.digest = true
+
   # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
 
   # Specifies the header that your server uses for sending files.

data/spec/dummy/config/initializers/assets.rb

@@ -0,0 +1,11 @@
+# Be sure to restart your server when you modify this file.
+
+# Version of your assets, change this if you want to expire all your assets.
+Rails.application.config.assets.version = '1.0'
+
+# Add additional assets to the asset load path
+# Rails.application.config.assets.paths << Emoji.images_path
+
+# Precompile additional assets.
+# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+# Rails.application.config.assets.precompile += %w( search.js )