qalam_lti_provider_engine 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c44302d262a552ee530b6f28ee83e7477d2246ed17ef96ab947dd05f9ab8feab
-  data.tar.gz: 44f56ac3fd92498e8d879d144c9cb46b427cf4f34da6b3af45a9d638669cd00d
+  metadata.gz: 58133aa1d62a24703c017cde3034ec79c66fdcfd933b199fd50b5b48eab54911
+  data.tar.gz: 99b8895d05651991ed895948c7a722be8e3825320114f7ca0f7741a1a7826e6a
 SHA512:
-  metadata.gz: d11a370ea40641bedfe3b509266b60f8147179e0ef82105d80b44eab4d6f6af877e20e928052614f0b65bafae8a909bd51ed371f08238991eff89859982a32f3
-  data.tar.gz: 5d10c95c500fb6198b99415a82163311272e19ced22b9e63db612d0f9b80fa34bf65eb6363cff0326cecdd35573199683f3a5e04f05c4283a2579d9da7ab7250
+  metadata.gz: '070911c42da9f77387c0f70ecb192390dab703191a3becf5631410e8535b42c8e98c63d84b80a635d715ff1a5bca1bbb0e378337d351a41a4e33b17bbea77abf'
+  data.tar.gz: 32257903add2518d9ba4f9f1e2a245a0764f3c75e5fb6066c2b09861b5721b1ae43a650a4f87f4fe7bbbbfc6c5bebbb11f0a3fdd1321f0d1b28e87b957087936

data/app/controllers/lti_provider/lti_controller.rb

@@ -4,21 +4,28 @@ require 'colorize'
 module LtiProvider
   class LtiController < LtiProvider::LtiApplicationController
     skip_before_action :require_lti_launch
-    # skip_before_action :verify_authenticity_token, only: :launch
+    skip_before_action :verify_authenticity_token, only: :launch
 
     def launch
-      provider = IMS::LTI::ToolProvider.new(params['oauth_consumer_key'], LtiProvider::Config.secret, params)
+      tool_key = params['oauth_consumer_key']
+      tool_secret = ((ToolLtiKey.table_exists? && ToolLtiKey.find_by(key: tool_key, canvas_url: canvas_url_domain)&.secret) or (LtiProvider::Config.secret))
+
+      # puts tool_key.inspect.green
+      # puts LtiProvider::Config.secret.inspect.red
+      # puts (ToolLtiKey.table_exists? && ToolLtiKey.find_by(key: tool_key, canvas_url: canvas_url_domain)&.secret).inspect.red
+      # puts tool_secret.inspect.green
+      
+      provider = IMS::LTI::ToolProvider.new(tool_key, tool_secret, params)
       launch = Launch.initialize_from_request(provider, request)
 
-      puts launch.inspect.red
-      puts request.origin.inspect.green
-      puts request.base_url.inspect.yellow
+      # puts launch.inspect.red
+      # puts request.origin.inspect.green
+      # puts request.base_url.inspect.yellow
       if !launch.valid_provider?
         msg = "#{launch.lti_errormsg} Please be sure you are launching this tool from the link provided in Qalam."
         return show_error msg
       elsif launch.save
         session[:cookie_test] = true
-
         ### QALAM ###
         if params[:timetable_date] && params[:section_room]
           redirect_to cookie_test_path(nonce: launch.nonce, timetable_date: params[:timetable_date], section_room: params[:section_room])
@@ -27,11 +34,11 @@ module LtiProvider
         end
         ### END ###
       else
-        if params[:launch_tool] && params[:launch_tool] == 'digital_library'
-          redirect_to main_app.root_path and return 
-        else
+        # if params[:launch_tool] && params[:launch_tool] == 'digital_library'
+        #   redirect_to main_app.root_path and return 
+        # else
           return show_error "Unable to launch #{LtiProvider::XmlConfig.tool_title}. Please check your External Tools configuration and try again."
-        end
+        # end
       end
     end
 
@@ -42,11 +49,11 @@ module LtiProvider
         # success!!! we've got a session!
         consume_launch
       else
-        if @launch.launch_tool && @launch.launch_tool == 'digital_library'
-          redirect_to main_app.root_path and return 
-        else
+        # if @launch.launch_tool && @launch.launch_tool == 'digital_library'
+        #   redirect_to main_app.root_path and return 
+        # else
           render and return
-        end
+        # end
       end
     end
 
@@ -66,17 +73,17 @@ module LtiProvider
         
         @launch.destroy
 
-        if @launch.launch_tool && @launch.launch_tool == 'digital_library'
-          redirect_to main_app.root_path and return 
-        else
+        # if @launch.launch_tool && @launch.launch_tool == 'digital_library'
+        #   redirect_to main_app.root_path and return 
+        # else
           redirect_to main_app.root_path and return
-        end
+        # end
       else
-        if @launch.launch_tool && @launch.launch_tool == 'digital_library'
-          redirect_to main_app.root_path and return 
-        else
+        # if @launch.launch_tool && @launch.launch_tool == 'digital_library'
+        #   redirect_to main_app.root_path and return 
+        # else
           return show_error "The tool was not launched successfully. Please try again."
-        end
+        # end
       end
     end
 
@@ -92,5 +99,15 @@ module LtiProvider
       def show_error(message)
         render plain: message
       end
+
+    private
+      def canvas_url_domain
+        if params['launch_presentation_return_url']
+          uri = URI.parse(params['launch_presentation_return_url'])
+          domain = "#{uri.scheme}://#{uri.host}"
+          domain += ":#{uri.port}" unless uri.port.nil? || [80, 443].include?(uri.port.to_i)
+          return domain
+        end
+      end
   end
 end

data/app/models/tool_lti_key.rb

@@ -0,0 +1,4 @@
+class ToolLtiKey < ApplicationRecord
+    validates :canvas_url, :secret, presence: true
+    validates :key, presence: true, :uniqueness => {:scope=>:canvas_url}
+end

data/app/views/layouts/lti_provider/application.html.erb

@@ -1,12 +1,14 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <title>LtiProvider</title>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>
+  <head>
+    <title>QalamLtiProvider</title>
+    <%= csrf_meta_tags %>
+    <meta name="description" content="About QalamLtiProvider">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <%= csrf_meta_tags %>
+    <%= csp_meta_tag %>
+  </head>
+  <body>
+    <%= yield %>
+  </body>
+</html>

data/db/migrate/20210809101126_create_tool_lti_keys.rb

@@ -0,0 +1,11 @@
+class CreateToolLtiKeys < ActiveRecord::Migration[6.0]
+  def change
+    create_table :tool_lti_keys do |t|
+      t.string :key
+      t.string :secret
+      t.string :canvas_url
+
+      t.timestamps
+    end
+  end
+end

data/lib/lti_provider/lti_application.rb

@@ -59,19 +59,19 @@ module LtiProvider
     end
 
     def student_launch?
-      user_roles.split(',').include? 'urn:lti:role:ims/lis/Learner'
+      user_roles&.split(',')&.include? 'urn:lti:role:ims/lis/Learner'
     end
 
     def teacher_launch?
-      user_roles.split(',').include? 'urn:lti:role:ims/lis/Instructor'
+      user_roles&.split(',')&.include? 'urn:lti:role:ims/lis/Instructor'
     end
 
     def account_admin_launch?
-      user_roles.split(',').include? 'urn:lti:instrole:ims/lis/Administrator'
+      user_roles&.split(',')&.include? 'urn:lti:instrole:ims/lis/Administrator'
     end
 
     def root_admin_launch?
-      user_roles.split(',').include? 'urn:lti:sysrole:ims/lis/SysAdmin'
+      user_roles&.split(',')&.include? 'urn:lti:sysrole:ims/lis/SysAdmin'
     end
     ### END ###
 
@@ -79,4 +79,4 @@ module LtiProvider
       render plain: "Unable to process request", status: 406
     end
   end
-end
+end

data/lib/lti_provider/version.rb

@@ -1,3 +1,3 @@
 module LtiProvider
-  VERSION = "2.0.7"
+  VERSION = "2.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qalam_lti_provider_engine
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors:
 - Dave Donahue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-08 00:00:00.000000000 Z
+date: 2021-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -245,12 +245,14 @@ files:
 - app/controllers/lti_provider/lti_application_controller.rb
 - app/controllers/lti_provider/lti_controller.rb
 - app/models/lti_provider/launch.rb
+- app/models/tool_lti_key.rb
 - app/views/layouts/lti_provider/application.html.erb
 - app/views/lti_provider/lti/cookie_test.html.erb
 - config/lti.yml.example
 - config/lti_xml.yml.example
 - config/routes.rb
 - db/migrate/20130319050003_create_lti_provider_launches.rb
+- db/migrate/20210809101126_create_tool_lti_keys.rb
 - lib/lti_provider.rb
 - lib/lti_provider/config.rb
 - lib/lti_provider/engine.rb