coalescing_panda 1.1.21 → 1.1.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 944d92a3431e6323e9ba3b51aa7def85416dd322fbd51c26c70a1f07f5eced1a
-  data.tar.gz: f58244ff27af50fef210b7a88b306adda5ab421e3abf72ef9adfad2fdd198ffa
+  metadata.gz: 32540f0bb85313eba7c4fd929b7bf55e7eaf9530877403972269f55abe92921a
+  data.tar.gz: 7780ee6b54a92fc11d95cc2c7c25c294a6bed3d7954c1754f6ec8180a4761e44
 SHA512:
-  metadata.gz: f461fef8d038d1a6bb0c1bb6863231e556fe9bad0589d48b6e844dbc6e3f3eaf335f28706271a15eb54dfa5cb97c12cc34f044d243f594f82c64b4fe8244e723
-  data.tar.gz: 4962e1e2c3335c1e5986dca5ddd7132cb7b973156e76b34a738a6a9278f083106dd451165e7b88fde95d961a491301ba9bc98a61f0d3f226a4b41392c10120fb
+  metadata.gz: f72e05c8581d3caf3541718516b4a20e72c6cb78af4c9b822982805e6da1dab9f7f7ce17ce5179eaa703898452d65d338685b3f8bf890f6c42ed67eca2f5725c
+  data.tar.gz: b8079a6c869505f33092f442fc33c3865d515e8d781252fbc35a7fa033d9351a2650a3a558db56debaf18b6c6d1fa930c9713054e6ae168887a754ae6f6cbc1b

data/lib/coalescing_panda/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'secure_headers'
 
 module CoalescingPanda
@@ -7,74 +9,78 @@ module CoalescingPanda
 
     initializer :append_migrations do |app|
       unless app.root.to_s.match root.to_s
-        config.paths["db/migrate"].expanded.each do |expanded_path|
-          app.config.paths["db/migrate"] << expanded_path
+        config.paths['db/migrate'].expanded.each do |expanded_path|
+          app.config.paths['db/migrate'] << expanded_path
         end
       end
     end
 
-    initializer 'coalescing_panda.app_controller' do |app|
+    initializer 'coalescing_panda.app_controller' do |_app|
       OAUTH_10_SUPPORT = true
       ActiveSupport.on_load(:action_controller) do
         include CoalescingPanda::ControllerHelpers
       end
     end
 
-    initializer 'cloaescing_panda.route_helper' do |route|
-      ActionDispatch::Routing::Mapper.send :include, CoalescingPanda::RouteHelpers
+    initializer 'cloaescing_panda.route_helper' do |_route|
+      ActionDispatch::Routing::Mapper.include CoalescingPanda::RouteHelpers
     end
 
-    initializer 'coalescing_panda.route_options', :after => :disable_dependency_loading do |app|
+    initializer 'coalescing_panda.route_options', after: :disable_dependency_loading do |_app|
       ActiveSupport.on_load(:action_controller) do
-        #force the routes to load
+        # force the routes to load
         Rails.application.reload_routes!
-        CoalescingPanda::propagate_lti_navigation
+        CoalescingPanda.propagate_lti_navigation
       end
     end
 
-    initializer :secure_headers do |app|
-      connect_src = %w('self')
-      script_src = %w('self')
+    initializer :secure_headers do |_app|
+      connect_src = %w[self]
+      script_src = %w[self]
       if Rails.env.development?
         # Allow webpack-dev-server to work
-        connect_src << "http://localhost:3035"
-        connect_src << "ws://localhost:3035"
+        connect_src << 'http://localhost:3035'
+        connect_src << 'ws://localhost:3035'
         # Allow stuff like rack-mini-profiler to work in development:
         # https://github.com/MiniProfiler/rack-mini-profiler/issues/327
         # DON'T ENABLE THIS FOR PRODUCTION!
         script_src << "'unsafe-eval'"
       end
-      SecureHeaders::Configuration.default do |config|
-        # The default cookie headers aren't compatable with PandaPal cookies currenntly
-        config.cookies = { samesite: { none: true } }
-        # Need to allow LTI iframes
-        config.x_frame_options = "ALLOWALL"
-        config.x_content_type_options = "nosniff"
-        config.x_xss_protection = "1; mode=block"
-        config.referrer_policy = %w(origin-when-cross-origin strict-origin-when-cross-origin)
-        config.csp = {
-          default_src: %w('self'),
-          script_src: script_src,
-          # Certain CSS-in-JS libraries inline the CSS, so we need to use unsafe-inline for them
-          style_src: %w('self' 'unsafe-inline' blob: https://fonts.googleapis.com),
-          font_src: %w('self' data: https://fonts.gstatic.com),
-          connect_src: connect_src,
-        }
+      begin
+        SecureHeaders::Configuration.default do |config|
+          # The default cookie headers aren't compatable with PandaPal cookies currenntly
+          config.cookies = { samesite: { none: true } }
+          # Need to allow LTI iframes
+          config.x_frame_options = 'ALLOWALL'
+          config.x_content_type_options = 'nosniff'
+          config.x_xss_protection = '1; mode=block'
+          config.referrer_policy = %w[origin-when-cross-origin strict-origin-when-cross-origin]
+          config.csp = {
+            default_src: %w[self],
+            script_src: script_src,
+            # Certain CSS-in-JS libraries inline the CSS, so we need to use unsafe-inline for them
+            style_src: %w[self unsafe-inline blob: https://fonts.googleapis.com],
+            font_src: %w[self data: https://fonts.gstatic.com],
+            connect_src: connect_src
+          }
+        end
+      rescue AlreadyConfiguredError
+        Rails.logger.warn 'Could not set default secure headers configuration when there is one already, continuing with previously defined configuration'
       end
       SecureHeaders::Configuration.override(:safari_override) do |config|
         config.cookies = SecureHeaders::OPT_OUT
         # Need to allow LTI iframes
-        config.x_frame_options = "ALLOWALL"
-        config.x_content_type_options = "nosniff"
-        config.x_xss_protection = "1; mode=block"
-        config.referrer_policy = %w(origin-when-cross-origin strict-origin-when-cross-origin)
+        config.x_frame_options = 'ALLOWALL'
+        config.x_content_type_options = 'nosniff'
+        config.x_xss_protection = '1; mode=block'
+        config.referrer_policy = %w[origin-when-cross-origin strict-origin-when-cross-origin]
         config.csp = {
-          default_src: %w('self'),
+          default_src: %w[self],
           script_src: script_src,
           # Certain CSS-in-JS libraries inline the CSS, so we need to use unsafe-inline for them
-          style_src: %w('self' 'unsafe-inline' blob: https://fonts.googleapis.com),
-          font_src: %w('self' data: https://fonts.gstatic.com),
-          connect_src: connect_src,
+          style_src: %w[self unsafe-inline blob: https://fonts.googleapis.com],
+          font_src: %w[self data: https://fonts.gstatic.com],
+          connect_src: connect_src
         }
       end
     end

data/lib/coalescing_panda/version.rb

@@ -1,3 +1,3 @@
 module CoalescingPanda
-  VERSION = '1.1.21'
+  VERSION = '1.1.21.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coalescing_panda
 version: !ruby/object:Gem::Version
-  version: 1.1.21
+  version: 1.1.21.1
 platform: ruby
 authors:
 - Nathan Mills
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-28 00:00:00.000000000 Z
+date: 2020-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails