Upgrade to Rails 7.0 and apply new framework defaults

* Remove `send_stream` method pulled in before upgrading Rails
* Remove spring, it is no longer included by default for new apps
* Remove deprecated options from environments
* Remove old asset paths and workarounds no longer needed
* Remove unnecessary `OAUTH_10_SUPPORT` const, LTI still uses OAuth 1.0
* Dump schema with new defaults (and specify precision for timestamps where needed)

config/application.rb

@@ -13,7 +13,7 @@ require 'telegraf/rails'
 module CodeOcean
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 6.1
+    config.load_defaults 7.0
 
     # Configuration for the application, engines, and railties goes here.
     #
@@ -29,12 +29,12 @@ module CodeOcean
     # config.i18n.default_locale = :de
     config.i18n.available_locales = %i[de en]
 
-    extra_paths = %W[
-      #{config.root}/lib
+    extra_paths = [
+      Rails.root.join('lib'),
     ]
 
     # Add generators, they don't have a module structure that matches their directory structure.
-    extra_paths << "#{config.root}/lib/generators"
+    extra_paths << Rails.root.join('lib/generators')
 
     config.add_autoload_paths_to_load_path = false
     config.autoload_paths += extra_paths

config/environment.rb

@@ -3,8 +3,5 @@
 # Load the Rails application.
 require_relative 'application'
 
-# LTI 1.x uses OAuth 1.0
-OAUTH_10_SUPPORT = true
-
 # Initialize the Rails application.
 Rails.application.initialize!

config/environments/development.rb

@@ -18,6 +18,9 @@ Rails.application.configure do
   # Show full error reports.
   config.consider_all_requests_local = true
 
+  # Enable server timing
+  config.server_timing = true
+
   # Enable/disable caching. By default caching is disabled.
   # Run rails dev:cache to toggle caching.
   if Rails.root.join('tmp/caching-dev.txt').exist?
@@ -38,11 +41,11 @@ Rails.application.configure do
   config.active_storage.service = :local
 
   # Don't care if the mailer can't send.
-  config.action_mailer.perform_deliveries = true
+  config.action_mailer.raise_delivery_errors = false
 
   # Perform deliveries via letter opener
+  config.action_mailer.perform_deliveries = true
   config.action_mailer.delivery_method = :letter_opener
-  config.action_mailer.raise_delivery_errors = false
 
   config.action_mailer.perform_caching = false
 
@@ -75,11 +78,6 @@ Rails.application.configure do
   # Annotate rendered view with file names.
   # config.action_view.annotate_rendered_view_with_filenames = 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
-
   BetterErrors::Middleware.allow_ip! ENV.fetch('TRUSTED_IP', nil) if ENV['TRUSTED_IP']
 
   # Use an evented file watcher to asynchronously detect changes in source code,

config/environments/production.rb

@@ -79,12 +79,6 @@ Rails.application.configure do
   # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
 
-  # Log disallowed deprecations.
-  config.active_support.disallowed_deprecation = :log
-
-  # Tell Active Support which deprecation messages to disallow.
-  config.active_support.disallowed_deprecation_warnings = []
-
   # Use default logging formatter so that PID and timestamp are not suppressed.
   config.log_formatter = ::Logger::Formatter.new
 
@@ -100,25 +94,4 @@ Rails.application.configure do
 
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
-
-  # Inserts middleware to perform automatic connection switching.
-  # The `database_selector` hash is used to pass options to the DatabaseSelector
-  # middleware. The `delay` is used to determine how long to wait after a write
-  # to send a subsequent read to the primary.
-  #
-  # The `database_resolver` class is used by the middleware to determine which
-  # database is appropriate to use based on the time delay.
-  #
-  # The `database_resolver_context` class is used by the middleware to set
-  # timestamps for the last write to the primary. The resolver uses the context
-  # class timestamps to determine how long to wait before reading from the
-  # replica.
-  #
-  # By default Rails will store a last write timestamp in the session. The
-  # DatabaseSelector middleware is designed as such you can define your own
-  # strategy for connection switching and pass that into the middleware through
-  # these configuration options.
-  # config.active_record.database_selector = { delay: 2.seconds }
-  # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver
-  # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session
 end

config/environments/test.rb

@@ -10,12 +10,12 @@ require 'active_support/core_ext/integer/time'
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
-  config.cache_classes = false
-  config.action_view.cache_template_loading = true
+  # Turn false under Spring and add config.action_view.cache_template_loading = true.
+  config.cache_classes = true
 
-  # Do not eager load code on boot. This avoids loading your whole application
-  # just for the purpose of running a single test. If you are using a tool that
-  # preloads Rails for running tests, you may have to set it to true.
+  # Eager loading loads your whole application. When running a single test locally,
+  # this probably isn't necessary. It's a good idea to do in a continuous integration
+  # system, or in some way before deploying your code.
   # Eager load code for prometheus exporter
   config.eager_load = true
 

config/initializers/assets.rb

@@ -7,19 +7,8 @@ Rails.application.config.assets.version = '1.0'
 
 # Add additional assets to the asset load path.
 # Rails.application.config.assets.paths << Emoji.images_path
-# Add Yarn node_modules folder to the asset load path.
-Rails.application.config.assets.paths << Rails.root.join('node_modules')
 
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in the app/assets
 # folder are already added.
 Rails.application.config.assets.precompile += %w[markdown-buttons.png]
-
-# Disable concurrent asset compilation to prevent segfault # https://github.com/sass/sassc-ruby/issues/197
-# Reproduce: `rake assets:clobber`, `rake assets:precompile`. If the command succeeds, it worked
-Rails.application.config.assets.configure do |env|
-  env.export_concurrent = false
-end
-
-# Add node_modules folder to the asset load path.
-Rails.application.config.assets.paths << Rails.root.join('node_modules')

config/initializers/content_security_policy.rb

@@ -2,66 +2,66 @@
 
 # Be sure to restart your server when you modify this file.
 
-# Define an application-wide content security policy
-# For further information see the following documentation
-# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
+# Define an application-wide content security policy.
+# See the Securing Rails Applications Guide for more information:
+# https://guides.rubyonrails.org/security.html#content-security-policy-header
 
 require_relative 'sentry_csp'
 require_relative 'sentry_javascript'
 
-def self.apply_yml_settings_for(policy)
-  csp_settings = CodeOcean::Config.new(:content_security_policy)
+module CSP
+  def self.apply_yml_settings_for(policy)
+    csp_settings = CodeOcean::Config.new(:content_security_policy)
 
-  csp_settings.read.each do |directive, additional_settings|
-    existing_settings = if directive == 'report_uri'
-                          ''
-                        else
-                          policy.public_send(directive) || []
-                        end
-    all_settings = existing_settings + additional_settings
-    policy.public_send(directive, *all_settings)
+    csp_settings.read.each do |directive, additional_settings|
+      existing_settings = if directive == 'report_uri'
+                            ''
+                          else
+                            policy.public_send(directive) || []
+                          end
+      all_settings = existing_settings + additional_settings
+      policy.public_send(directive, *all_settings)
+    end
+  end
+
+  def self.apply_sentry_settings_for(policy)
+    sentry_domain = URI.parse SentryJavascript.dsn
+    additional_setting = "#{sentry_domain.scheme}://#{sentry_domain.host}"
+    existing_settings = policy.connect_src || []
+    all_settings = existing_settings + [additional_setting]
+    policy.connect_src(*all_settings)
   end
 end
 
-def self.apply_sentry_settings_for(policy)
-  sentry_domain = URI.parse SentryJavascript.dsn
-  additional_setting = "#{sentry_domain.scheme}://#{sentry_domain.host}"
-  existing_settings = policy.connect_src || []
-  all_settings = existing_settings + [additional_setting]
-  policy.connect_src(*all_settings)
+Rails.application.configure do
+  config.content_security_policy do |policy|
+    policy.default_src          :none
+    policy.base_uri             :self
+    policy.font_src             :self
+    # Code executions might return a base64 encoded image as a :data URI
+    policy.img_src              :self, :data
+    policy.object_src           :none
+    policy.media_src            :self
+    policy.script_src           :self, :report_sample
+    # Our ACE editor unfortunately requires :unsafe_inline for the code highlighting
+    policy.style_src            :self, :unsafe_inline, :report_sample
+    policy.connect_src          :self
+    # Our ACE editor uses web workers to highlight code, preferably via URL or otherwise with a blob.
+    policy.child_src            :self, :blob
+    policy.form_action          :self
+    policy.frame_ancestors      :none
+
+    # Specify URI for violation reports
+    policy.report_uri           SentryCsp.report_url if SentryCsp.active?
+
+    CSP.apply_yml_settings_for      policy
+    CSP.apply_sentry_settings_for   policy if SentryJavascript.active?
+  end
+
+  # Generate session nonces for permitted importmap and inline scripts
+  # config.content_security_policy_nonce_generator = ->(request) { request.session.id.to_s }
+  # config.content_security_policy_nonce_directives = %w[script-src]
+
+  # Report violations without enforcing the policy
+  # config.content_security_policy_report_only = true
 end
-
-Rails.application.config.content_security_policy do |policy|
-  policy.default_src          :none
-  policy.base_uri             :self
-  policy.font_src             :self
-  # Code executions might return a base64 encoded image as a :data URI
-  policy.img_src              :self, :data
-  policy.object_src           :none
-  policy.media_src            :self
-  policy.script_src           :self, :report_sample
-  # Our ACE editor unfortunately requires :unsafe_inline for the code highlighting
-  policy.style_src            :self, :unsafe_inline, :report_sample
-  policy.connect_src          :self
-  # Our ACE editor uses web workers to highlight code, preferably via URL or otherwise with a blob.
-  policy.child_src            :self, :blob
-  policy.form_action          :self
-  policy.frame_ancestors      :none
-
-  # Specify URI for violation reports
-  policy.report_uri           SentryCsp.report_url if SentryCsp.active?
-
-  apply_yml_settings_for      policy
-  apply_sentry_settings_for   policy if SentryJavascript.active?
-end
-
-# If you are using UJS then enable automatic nonce generation
-# Rails.application.config.content_security_policy_nonce_generator = ->(request) { request.session.id.to_s }
-
-# Set the nonce only to specific directives
-# Rails.application.config.content_security_policy_nonce_directives = %w[script-src]
-
-# Report CSP violations to a specified URI
-# For further information see the following documentation:
-# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only
-# Rails.application.config.content_security_policy_report_only = true

config/initializers/filter_parameter_logging.rb

@@ -2,7 +2,9 @@
 
 # Be sure to restart your server when you modify this file.
 
-# Configure sensitive parameters which will be filtered from the log file.
+# Configure parameters to be filtered from the log file. Use this to limit dissemination of
+# sensitive information. See the ActiveSupport::ParameterFilter documentation for supported
+# notations and behaviors.
 Rails.application.config.filter_parameters += %i[
   passw secret token _key crypt salt certificate otp ssn
 ]

config/initializers/inflections.rb

@@ -6,9 +6,9 @@
 # are locale specific, and you may define rules for as many different
 # locales as you wish. All of these examples are active by default:
 # ActiveSupport::Inflector.inflections(:en) do |inflect|
-#   inflect.plural /^(ox)$/i, '\1en'
-#   inflect.singular /^(ox)en/i, '\1'
-#   inflect.irregular 'person', 'people'
+#   inflect.plural /^(ox)$/i, "\\1en"
+#   inflect.singular /^(ox)en/i, "\\1"
+#   inflect.irregular "person", "people"
 #   inflect.uncountable %w( fish sheep )
 # end
 

config/spring.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-Spring.watch(
-  '.ruby-version',
-  '.rbenv-vars',
-  'tmp/restart.txt',
-  'tmp/caching-dev.txt'
-)