From 2a8da9102cdde3a5f1d06a1eb8019fb8c6a652ed Mon Sep 17 00:00:00 2001
From: Ryan Wold <64987852+ryanwoldatwork@users.noreply.github.com>
Date: Tue, 22 Oct 2024 08:52:45 -0700
Subject: [PATCH] Update Rails
* rails app:update
---
Gemfile | 2 +-
Gemfile.lock | 191 +++++++++---------
.../admin/form_sections_controller.rb | 2 +-
app/controllers/admin/services_controller.rb | 2 +-
app/controllers/admin_controller.rb | 2 +-
bin/brakeman | 7 +
bin/rubocop | 8 +
bin/setup | 6 +-
config/application.rb | 8 +-
config/boot.rb | 5 +-
config/environment.rb | 2 +-
config/environments/development.rb | 19 +-
config/environments/production.rb | 26 +--
config/environments/test.rb | 40 ++--
.../initializers/content_security_policy.rb | 50 ++---
.../initializers/filter_parameter_logging.rb | 8 +-
config/initializers/inflections.rb | 8 +-
.../new_framework_defaults_7_2.rb | 70 +++++++
config/initializers/permissions_policy.rb | 20 +-
config/puma.rb | 62 +++---
..._to_active_storage_blobs.active_storage.rb | 22 ++
..._storage_variant_records.active_storage.rb | 27 +++
...e_storage_blobs_checksum.active_storage.rb | 8 +
db/schema.rb | 2 +-
public/406-unsupported-browser.html | 66 ++++++
25 files changed, 431 insertions(+), 232 deletions(-)
create mode 100755 bin/brakeman
create mode 100755 bin/rubocop
create mode 100644 config/initializers/new_framework_defaults_7_2.rb
create mode 100644 db/migrate/20241021183920_add_service_name_to_active_storage_blobs.active_storage.rb
create mode 100644 db/migrate/20241021183921_create_active_storage_variant_records.active_storage.rb
create mode 100644 db/migrate/20241021183922_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb
create mode 100644 public/406-unsupported-browser.html
diff --git a/Gemfile b/Gemfile
index fa4b638e7..a38b0cab5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
ruby '3.2.4'
# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
-gem "rails", "~> 7.1.4"
+gem "rails", "~> 7.2"
# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
gem "sprockets-rails"
diff --git a/Gemfile.lock b/Gemfile.lock
index 2898ca379..6197e1720 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -18,51 +18,46 @@ GEM
aasm-diagram (0.1.3)
aasm (~> 5.0, >= 4.12)
ruby-graphviz (~> 1.2)
- actioncable (7.1.4.1)
- actionpack (= 7.1.4.1)
- activesupport (= 7.1.4.1)
+ actioncable (7.2.1.1)
+ actionpack (= 7.2.1.1)
+ activesupport (= 7.2.1.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6)
- actionmailbox (7.1.4.1)
- actionpack (= 7.1.4.1)
- activejob (= 7.1.4.1)
- activerecord (= 7.1.4.1)
- activestorage (= 7.1.4.1)
- activesupport (= 7.1.4.1)
- mail (>= 2.7.1)
- net-imap
- net-pop
- net-smtp
- actionmailer (7.1.4.1)
- actionpack (= 7.1.4.1)
- actionview (= 7.1.4.1)
- activejob (= 7.1.4.1)
- activesupport (= 7.1.4.1)
- mail (~> 2.5, >= 2.5.4)
- net-imap
- net-pop
- net-smtp
+ actionmailbox (7.2.1.1)
+ actionpack (= 7.2.1.1)
+ activejob (= 7.2.1.1)
+ activerecord (= 7.2.1.1)
+ activestorage (= 7.2.1.1)
+ activesupport (= 7.2.1.1)
+ mail (>= 2.8.0)
+ actionmailer (7.2.1.1)
+ actionpack (= 7.2.1.1)
+ actionview (= 7.2.1.1)
+ activejob (= 7.2.1.1)
+ activesupport (= 7.2.1.1)
+ mail (>= 2.8.0)
rails-dom-testing (~> 2.2)
- actionpack (7.1.4.1)
- actionview (= 7.1.4.1)
- activesupport (= 7.1.4.1)
+ actionpack (7.2.1.1)
+ actionview (= 7.2.1.1)
+ activesupport (= 7.2.1.1)
nokogiri (>= 1.8.5)
racc
- rack (>= 2.2.4)
+ rack (>= 2.2.4, < 3.2)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
- actiontext (7.1.4.1)
- actionpack (= 7.1.4.1)
- activerecord (= 7.1.4.1)
- activestorage (= 7.1.4.1)
- activesupport (= 7.1.4.1)
+ useragent (~> 0.16)
+ actiontext (7.2.1.1)
+ actionpack (= 7.2.1.1)
+ activerecord (= 7.2.1.1)
+ activestorage (= 7.2.1.1)
+ activesupport (= 7.2.1.1)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
- actionview (7.1.4.1)
- activesupport (= 7.1.4.1)
+ actionview (7.2.1.1)
+ activesupport (= 7.2.1.1)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
@@ -72,52 +67,54 @@ GEM
activemodel (>= 4.1)
case_transform (>= 0.2)
jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
- activejob (7.1.4.1)
- activesupport (= 7.1.4.1)
+ activejob (7.2.1.1)
+ activesupport (= 7.2.1.1)
globalid (>= 0.3.6)
- activemodel (7.1.4.1)
- activesupport (= 7.1.4.1)
- activerecord (7.1.4.1)
- activemodel (= 7.1.4.1)
- activesupport (= 7.1.4.1)
+ activemodel (7.2.1.1)
+ activesupport (= 7.2.1.1)
+ activerecord (7.2.1.1)
+ activemodel (= 7.2.1.1)
+ activesupport (= 7.2.1.1)
timeout (>= 0.4.0)
- activestorage (7.1.4.1)
- actionpack (= 7.1.4.1)
- activejob (= 7.1.4.1)
- activerecord (= 7.1.4.1)
- activesupport (= 7.1.4.1)
+ activestorage (7.2.1.1)
+ actionpack (= 7.2.1.1)
+ activejob (= 7.2.1.1)
+ activerecord (= 7.2.1.1)
+ activesupport (= 7.2.1.1)
marcel (~> 1.0)
- activesupport (7.1.4.1)
+ activesupport (7.2.1.1)
base64
bigdecimal
- concurrent-ruby (~> 1.0, >= 1.0.2)
+ concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
+ logger (>= 1.4.2)
minitest (>= 5.1)
- mutex_m
- tzinfo (~> 2.0)
+ securerandom (>= 0.3)
+ tzinfo (~> 2.0, >= 2.0.5)
acts-as-list (0.1.2)
- acts-as-taggable-on (10.0.0)
- activerecord (>= 6.1, < 7.2)
+ acts-as-taggable-on (11.0.0)
+ activerecord (>= 7.0, < 8.0)
+ zeitwerk (>= 2.4, < 3.0)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
aes_key_wrap (1.1.0)
ast (2.4.2)
aws-eventstream (1.3.0)
- aws-partitions (1.991.0)
+ aws-partitions (1.992.0)
aws-record (2.13.2)
aws-sdk-dynamodb (~> 1, >= 1.85.0)
- aws-sdk-core (3.209.1)
+ aws-sdk-core (3.210.0)
aws-eventstream (~> 1, >= 1.3.0)
- aws-partitions (~> 1, >= 1.651.0)
+ aws-partitions (~> 1, >= 1.992.0)
aws-sigv4 (~> 1.9)
jmespath (~> 1, >= 1.6.1)
- aws-sdk-dynamodb (1.125.0)
- aws-sdk-core (~> 3, >= 3.207.0)
+ aws-sdk-dynamodb (1.126.0)
+ aws-sdk-core (~> 3, >= 3.210.0)
aws-sigv4 (~> 1.5)
- aws-sdk-kms (1.94.0)
- aws-sdk-core (~> 3, >= 3.207.0)
+ aws-sdk-kms (1.95.0)
+ aws-sdk-core (~> 3, >= 3.210.0)
aws-sigv4 (~> 1.5)
aws-sdk-rails (4.1.0)
actionmailbox (>= 7.0.0)
@@ -130,21 +127,21 @@ GEM
aws-sessionstore-dynamodb (~> 2)
concurrent-ruby (~> 1.3, >= 1.3.1)
railties (>= 7.0.0)
- aws-sdk-s3 (1.167.0)
- aws-sdk-core (~> 3, >= 3.207.0)
+ aws-sdk-s3 (1.169.0)
+ aws-sdk-core (~> 3, >= 3.210.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.5)
- aws-sdk-ses (1.75.0)
- aws-sdk-core (~> 3, >= 3.207.0)
+ aws-sdk-ses (1.76.0)
+ aws-sdk-core (~> 3, >= 3.210.0)
aws-sigv4 (~> 1.5)
- aws-sdk-sesv2 (1.64.0)
- aws-sdk-core (~> 3, >= 3.207.0)
+ aws-sdk-sesv2 (1.65.0)
+ aws-sdk-core (~> 3, >= 3.210.0)
aws-sigv4 (~> 1.5)
- aws-sdk-sns (1.88.0)
- aws-sdk-core (~> 3, >= 3.207.0)
+ aws-sdk-sns (1.89.0)
+ aws-sdk-core (~> 3, >= 3.210.0)
aws-sigv4 (~> 1.5)
- aws-sdk-sqs (1.86.0)
- aws-sdk-core (~> 3, >= 3.207.0)
+ aws-sdk-sqs (1.87.0)
+ aws-sdk-core (~> 3, >= 3.210.0)
aws-sigv4 (~> 1.5)
aws-sessionstore-dynamodb (2.2.0)
aws-sdk-dynamodb (~> 1, >= 1.85.0)
@@ -152,12 +149,14 @@ GEM
rack-session (>= 1, < 3)
aws-sigv4 (1.10.0)
aws-eventstream (~> 1, >= 1.0.2)
- axe-core-api (4.10.0)
+ axe-core-api (4.10.1)
dumb_delegator
+ ostruct
virtus
- axe-core-rspec (4.10.0)
- axe-core-api (= 4.10.0)
+ axe-core-rspec (4.10.1)
+ axe-core-api (= 4.10.1)
dumb_delegator
+ ostruct
virtus
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
@@ -170,7 +169,7 @@ GEM
bindex (0.8.1)
bootsnap (1.18.4)
msgpack (~> 1.2)
- brakeman (6.2.1)
+ brakeman (6.2.2)
racc
builder (3.3.0)
bullet (7.2.0)
@@ -344,10 +343,9 @@ GEM
multi_json (1.15.0)
multi_xml (0.7.1)
bigdecimal (~> 3.1)
- mutex_m (0.2.0)
net-http (0.4.1)
uri
- net-imap (0.4.17)
+ net-imap (0.5.0)
date
net-protocol
net-pop (0.1.2)
@@ -391,6 +389,7 @@ GEM
actionpack (>= 4.2)
omniauth (~> 2.0)
orm_adapter (0.5.0)
+ ostruct (0.6.0)
paper_trail (15.2.0)
activerecord (>= 6.1)
request_store (~> 1.4)
@@ -421,20 +420,20 @@ GEM
rackup (2.1.0)
rack (>= 3)
webrick (~> 1.8)
- rails (7.1.4.1)
- actioncable (= 7.1.4.1)
- actionmailbox (= 7.1.4.1)
- actionmailer (= 7.1.4.1)
- actionpack (= 7.1.4.1)
- actiontext (= 7.1.4.1)
- actionview (= 7.1.4.1)
- activejob (= 7.1.4.1)
- activemodel (= 7.1.4.1)
- activerecord (= 7.1.4.1)
- activestorage (= 7.1.4.1)
- activesupport (= 7.1.4.1)
+ rails (7.2.1.1)
+ actioncable (= 7.2.1.1)
+ actionmailbox (= 7.2.1.1)
+ actionmailer (= 7.2.1.1)
+ actionpack (= 7.2.1.1)
+ actiontext (= 7.2.1.1)
+ actionview (= 7.2.1.1)
+ activejob (= 7.2.1.1)
+ activemodel (= 7.2.1.1)
+ activerecord (= 7.2.1.1)
+ activestorage (= 7.2.1.1)
+ activesupport (= 7.2.1.1)
bundler (>= 1.15.0)
- railties (= 7.1.4.1)
+ railties (= 7.2.1.1)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
@@ -451,10 +450,10 @@ GEM
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
- railties (7.1.4.1)
- actionpack (= 7.1.4.1)
- activesupport (= 7.1.4.1)
- irb
+ railties (7.2.1.1)
+ actionpack (= 7.2.1.1)
+ activesupport (= 7.2.1.1)
+ irb (~> 1.13)
rackup (>= 1.0.0)
rake (>= 12.2)
thor (~> 1.0, >= 1.2.2)
@@ -482,7 +481,7 @@ GEM
railties (>= 5.2)
rexml (3.3.8)
rolify (6.0.1)
- rspec-core (3.13.1)
+ rspec-core (3.13.2)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.3)
diff-lcs (>= 1.2.0, < 2.0)
@@ -518,7 +517,7 @@ GEM
rack (>= 1.1)
rubocop (>= 1.52.0, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
- rubocop-rspec (3.0.5)
+ rubocop-rspec (3.1.0)
rubocop (~> 1.61)
ruby-graphviz (1.2.5)
rexml
@@ -537,6 +536,7 @@ GEM
sprockets (> 3.0)
sprockets-rails
tilt
+ securerandom (0.3.1)
selenium-webdriver (4.25.0)
base64 (~> 0.2)
logger (~> 1.4)
@@ -581,6 +581,7 @@ GEM
unicode-display_width (2.6.0)
uniform_notifier (1.16.0)
uri (0.13.1)
+ useragent (0.16.10)
version_gem (1.1.4)
virtus (2.0.0)
axiom-types (~> 0.1)
@@ -600,7 +601,7 @@ GEM
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
- zeitwerk (2.7.0)
+ zeitwerk (2.7.1)
PLATFORMS
aarch64-linux
@@ -658,7 +659,7 @@ DEPENDENCIES
pry
puma
rack-cors
- rails (~> 7.1.4)
+ rails (~> 7.2)
rails-controller-testing
rails-erd
redis-client
diff --git a/app/controllers/admin/form_sections_controller.rb b/app/controllers/admin/form_sections_controller.rb
index 70f9fdf6d..972173dde 100644
--- a/app/controllers/admin/form_sections_controller.rb
+++ b/app/controllers/admin/form_sections_controller.rb
@@ -2,7 +2,7 @@
module Admin
class FormSectionsController < AdminController
- before_action :set_form, only: %i[new create show edit update destroy]
+ before_action :set_form, only: %i[new create edit update destroy]
before_action :set_form_section, only: %i[edit update destroy]
def new
diff --git a/app/controllers/admin/services_controller.rb b/app/controllers/admin/services_controller.rb
index 93f6bb6da..7b85fc0f2 100644
--- a/app/controllers/admin/services_controller.rb
+++ b/app/controllers/admin/services_controller.rb
@@ -26,7 +26,7 @@ class ServicesController < AdminController
update
add_service_manager
remove_service_manager
- export_verions
+ export_versions
]
before_action :set_service_providers, only: %i[
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index b0ea22469..24089ab28 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -3,5 +3,5 @@
class AdminController < ::ApplicationController
include ApplicationHelper
- before_action :ensure_user, except: [:deactivate]
+ before_action :ensure_user
end
diff --git a/bin/brakeman b/bin/brakeman
new file mode 100755
index 000000000..ace1c9ba0
--- /dev/null
+++ b/bin/brakeman
@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+require "rubygems"
+require "bundler/setup"
+
+ARGV.unshift("--ensure-latest")
+
+load Gem.bin_path("brakeman", "brakeman")
diff --git a/bin/rubocop b/bin/rubocop
new file mode 100755
index 000000000..40330c0ff
--- /dev/null
+++ b/bin/rubocop
@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+require "rubygems"
+require "bundler/setup"
+
+# explicit rubocop config increases performance slightly while avoiding config confusion.
+ARGV.unshift("--config", File.expand_path("../.rubocop.yml", __dir__))
+
+load Gem.bin_path("rubocop", "rubocop")
diff --git a/bin/setup b/bin/setup
index 3cd5a9d78..75f33fe66 100755
--- a/bin/setup
+++ b/bin/setup
@@ -1,8 +1,8 @@
#!/usr/bin/env ruby
require "fileutils"
-# path to your application root.
APP_ROOT = File.expand_path("..", __dir__)
+APP_NAME = "touchpoints"
def system!(*args)
system(*args, exception: true)
@@ -30,4 +30,8 @@ FileUtils.chdir APP_ROOT do
puts "\n== Restarting application server =="
system! "bin/rails restart"
+
+ # puts "\n== Configuring puma-dev =="
+ # system "ln -nfs #{APP_ROOT} ~/.puma-dev/#{APP_NAME}"
+ # system "curl -Is https://#{APP_NAME}.test/up | head -n 1"
end
diff --git a/config/application.rb b/config/application.rb
index 5bd614ef2..4fee0c483 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,8 +1,7 @@
# frozen_string_literal: true
+require_relative "boot"
-require_relative 'boot'
-
-require 'rails/all'
+require "rails/all"
# Require the gems listed in Gemfile, including any gems
# you've limited to :test, :development, or :production.
@@ -18,8 +17,6 @@ class Application < Rails::Application
# Please, add to the `ignore` list any other `lib` subdirectories that do
# not contain `.rb` files, or that should not be reloaded or eager loaded.
# Common ones are `templates`, `generators`, or `middleware`, for example.
- config.autoload_lib(ignore: %w(assets tasks))
-
# Initialize an array of Omniauth providers
config.x.omniauth.providers = []
@@ -50,6 +47,7 @@ class Application < Rails::Application
resource '*', headers: :any, methods: %i[get post options]
end
end
+ config.autoload_lib(ignore: %w[assets tasks])
# Configuration for the application, engines, and railties goes here.
#
diff --git a/config/boot.rb b/config/boot.rb
index 30e594e23..f1f3a4476 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,5 +1,4 @@
# frozen_string_literal: true
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
-
-require 'bundler/setup' # Set up gems listed in the Gemfile.
+require "bundler/setup" # Set up gems listed in the Gemfile.
diff --git a/config/environment.rb b/config/environment.rb
index d5abe5580..7df99e89c 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
# Load the Rails application.
-require_relative 'application'
+require_relative "application"
# Initialize the Rails application.
Rails.application.initialize!
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 911d0fc3c..e8ace7d69 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -24,7 +24,7 @@
# Show full error reports.
config.consider_all_requests_local = true
- # Enable server timing
+ # Enable server timing.
config.server_timing = true
# Enable/disable caching. By default caching is disabled.
@@ -56,6 +56,8 @@
# Don't care if the mailer can't send.
config.action_mailer.raise_delivery_errors = false
+ # Disable caching for Action Mailer templates even if Action Controller
+ # caching is enabled.
config.action_mailer.perform_caching = false
# Print deprecation notices to the Rails logger.
@@ -79,13 +81,6 @@
# Suppress logger output for asset requests.
config.assets.quiet = true
- # Turn on source maps
- config.assets.debug = true
-
- # Use an evented file watcher to asynchronously detect changes in source code,
- # routes, locales, etc. This feature depends on the listen gem.
- config.file_watcher = ActiveSupport::EventedFileUpdateChecker
-
# For Mailcatcher
config.action_mailer.delivery_method = :smtp
config.action_mailer.smtp_settings = { address: 'localhost', port: 1025 }
@@ -97,16 +92,18 @@
# config.i18n.raise_on_missing_translations = true
# Annotate rendered view with file names.
- # config.action_view.annotate_rendered_view_with_filenames = true
+ config.action_view.annotate_rendered_view_with_filenames = true
# Uncomment if you wish to allow Action Cable access from any origin.
# config.action_cable.disable_request_forgery_protection = true
- # Raise error when a before_action's only/except options reference missing actions
- config.action_controller.raise_on_missing_callback_actions = false
+ # Raise error when a before_action's only/except options reference missing actions.
+ config.action_controller.raise_on_missing_callback_actions = true
config.active_record.encryption.primary_key = ENV.fetch("RAILS_ACTIVE_RECORD_PRIMARY_KEY")
config.active_record.encryption.deterministic_key = ENV.fetch("RAILS_ACTIVE_RECORD_DETERMINISTIC_KEY")
config.active_record.encryption.key_derivation_salt = ENV.fetch("RAILS_ACTIVE_RECORD_KEY_DERIVATION_SALT")
config.active_record.encryption.support_unencrypted_data = true
+ # Apply autocorrection by RuboCop to files generated by `bin/rails generate`.
+ # config.generators.apply_rubocop_autocorrect_after_generate!
end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 57cb9ddf3..beb1ca7bb 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -13,20 +13,20 @@
config.eager_load = true
# Full error reports are disabled and caching is turned on.
- config.consider_all_requests_local = false
+ config.consider_all_requests_local = false
config.action_controller.perform_caching = true
# Ensures that a master key has been made available in ENV["RAILS_MASTER_KEY"], config/master.key, or an environment
# key such as config/credentials/production.key. This key is used to decrypt credentials (and other encrypted files).
# config.require_master_key = true
- # Enable static file serving from the `/public` folder (turn off if using NGINX/Apache for it).
- config.public_file_server.enabled = true
+ # Disable serving static files from `public/`, relying on NGINX/Apache to do so instead.
+ # config.public_file_server.enabled = false
# Compress CSS using a preprocessor.
# config.assets.css_compressor = :sass
- # Do not fallback to assets pipeline if a precompiled asset is missed.
+ # Do not fall back to assets pipeline if a precompiled asset is missed.
config.assets.compile = false
# Enable serving of images, stylesheets, and JavaScripts from an asset server.
@@ -51,6 +51,9 @@
# Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
config.force_ssl = true
+ # Skip http-to-https redirect for the default health check endpoint.
+ # config.ssl_options = { redirect: { exclude: ->(request) { request.path == "/up" } } }
+
# Log to STDOUT by default
config.logger = ActiveSupport::Logger.new(STDOUT)
.tap { |logger| logger.formatter = ::Logger::Formatter.new }
@@ -59,7 +62,7 @@
# Prepend all log lines with the following tags.
config.log_tags = [ :request_id ]
- # Info include generic and useful information about system operation, but avoids logging too much
+ # "info" includes generic and useful information about system operation, but avoids logging too much
# information to avoid inadvertent exposure of personally identifiable information (PII). If you
# want to log everything, set the level to "debug".
config.log_level = ENV.fetch("RAILS_LOG_LEVEL", "info")
@@ -71,7 +74,7 @@
end
# Use a real queuing backend for Active Job (and separate queues per environment).
- # config.active_job.queue_adapter = :resque
+ # config.active_job.queue_adapter = :resque
# config.active_job.queue_name_prefix = "touchpoints_production"
config.active_job.queue_adapter = :sidekiq
@@ -79,6 +82,8 @@
config.action_mailer.default_options = { reply_to: 'feedback-analytics@gsa.gov' }
config.action_mailer.perform_deliveries = true
config.action_mailer.raise_delivery_errors = true
+ # Disable caching for Action Mailer templates even if Action Controller
+ # caching is enabled.
config.action_mailer.perform_caching = false
# Send deprecation notices to registered listeners.
@@ -86,17 +91,14 @@
# Log disallowed deprecations.
config.active_support.disallowed_deprecation = :log
-
- # Tell Active Support which deprecation messages to disallow.
- config.active_support.disallowed_deprecation_warnings = []
-
config.active_support.escape_html_entities_in_json = false
-
# Ignore bad email addresses and do not raise email delivery errors.
# Set this to true and configure the email server for immediate delivery to raise delivery errors.
# config.action_mailer.raise_delivery_errors = false
+ # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+ # the I18n.default_locale when a translation cannot be found).
config.i18n.fallbacks = true
# Don't log any deprecations.
@@ -105,7 +107,6 @@
# Do not dump schema after migrations.
config.active_record.dump_schema_after_migration = false
-
# For Devise
config.action_mailer.default_url_options = { host: ENV.fetch('TOUCHPOINTS_WEB_DOMAIN'), port: 443 }
@@ -116,7 +117,6 @@
config.action_mailer.delivery_method = :ses
config.action_mailer.perform_deliveries = true
-
config.active_record.encryption.primary_key = ENV.fetch("RAILS_ACTIVE_RECORD_PRIMARY_KEY")
config.active_record.encryption.deterministic_key = ENV.fetch("RAILS_ACTIVE_RECORD_DETERMINISTIC_KEY")
config.active_record.encryption.key_derivation_salt = ENV.fetch("RAILS_ACTIVE_RECORD_KEY_DERIVATION_SALT")
diff --git a/config/environments/test.rb b/config/environments/test.rb
index d43e41157..7dba33d58 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,22 +1,22 @@
# frozen_string_literal: true
-
-require 'active_support/core_ext/integer/time'
+require "active_support/core_ext/integer/time"
# The test environment is used exclusively to run your application's
# test suite. You never need to work with it otherwise. Remember that
# your test database is "scratch space" for the test suite and is wiped
# and recreated between test runs. Don't rely on the data there!
-require 'active_record'
Rails.application.configure do
# Settings specified here will take precedence over those in config/application.rb.
- config.cache_classes = true
+ # While tests run files are not watched, reloading is not necessary.
+ config.enable_reloading = false
- # 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.
- config.eager_load = false
+ # Eager loading loads your entire application. When running a single test locally,
+ # this is usually not necessary, and can slow down your test suite. However, it's
+ # recommended that you enable it in continuous integration systems to ensure eager
+ # loading is working properly before deploying your code.
+ config.eager_load = ENV["CI"].present?
# Configure public file server for tests with Cache-Control for performance.
config.public_file_server.enabled = true
@@ -30,16 +30,21 @@
config.active_job.queue_adapter = :test
# Show full error reports and disable caching.
- config.consider_all_requests_local = true
+ config.consider_all_requests_local = true
config.action_controller.perform_caching = false
config.cache_store = :null_store
- # Raise exceptions instead of rendering exception templates.
- config.action_dispatch.show_exceptions = :none
+ # Render exception templates for rescuable exceptions and raise for other exceptions.
+ config.action_dispatch.show_exceptions = :rescuable
+
+ # Allow request forgery protection in test environment.
+ config.action_controller.allow_forgery_protection = true
- # Store uploaded files on the local file system in a temporary directory
+ # Store uploaded files on the local file system in a temporary directory.
config.active_storage.service = :test
+ # Disable caching for Action Mailer templates even if Action Controller
+ # caching is enabled.
config.action_mailer.perform_caching = false
# Tell Action Mailer not to deliver emails to the real world.
@@ -47,6 +52,10 @@
# ActionMailer::Base.deliveries array.
config.action_mailer.delivery_method = :test
+ # Unlike controllers, the mailer instance doesn't have any context about the
+ # incoming request so you'll need to provide the :host parameter yourself.
+ config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
+
# Print deprecation notices to the stderr.
config.active_support.deprecation = :stderr
@@ -61,12 +70,7 @@
# Raises error for missing translations.
# config.i18n.raise_on_missing_translations = true
- # Enable request forgery protection in test environment.
- config.action_controller.allow_forgery_protection = true
-
# For Devise
- config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
-
# Annotate rendered view with file names.
# config.action_view.annotate_rendered_view_with_filenames = true
@@ -74,4 +78,6 @@
config.active_record.encryption.deterministic_key = ENV.fetch("RAILS_ACTIVE_RECORD_DETERMINISTIC_KEY")
config.active_record.encryption.key_derivation_salt = ENV.fetch("RAILS_ACTIVE_RECORD_KEY_DERIVATION_SALT")
config.active_record.encryption.support_unencrypted_data = true
+ # Raise error when a before_action's only/except options reference missing actions.
+ config.action_controller.raise_on_missing_callback_actions = true
end
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
index 899d3c9e6..b3076b38f 100644
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@@ -1,33 +1,25 @@
-# frozen_string_literal: true
# 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
-# Rails.application.config.content_security_policy do |policy| # # If you are using webpack-dev-server then specify webpack-dev-server host
-# policy.connect_src :self, :https, "http://localhost:3035", "ws://localhost:3035" if Rails.env.development?
-
-# policy.default_src :self, :https
-# policy.font_src :self, :https, :data
-# policy.img_src :self, :https, :data
-# policy.object_src :none
-# policy.script_src :self, :https
-# policy.style_src :self, :https
-# # If you are using webpack-dev-server then specify webpack-dev-server host
-# policy.connect_src :self, :https, "http://localhost:3035", "ws://localhost:3035" if Rails.env.development?
-
-# # Specify URI for violation reports
-# # policy.report_uri "/csp-violation-report-endpoint"
+# Rails.application.configure do
+# config.content_security_policy do |policy|
+# policy.default_src :self, :https
+# policy.font_src :self, :https, :data
+# policy.img_src :self, :https, :data
+# policy.object_src :none
+# policy.script_src :self, :https
+# policy.style_src :self, :https
+# # Specify URI for violation reports
+# # policy.report_uri "/csp-violation-report-endpoint"
+# end
+#
+# # Generate session nonces for permitted importmap, inline scripts, and inline styles.
+# config.content_security_policy_nonce_generator = ->(request) { request.session.id.to_s }
+# config.content_security_policy_nonce_directives = %w(script-src style-src)
+#
+# # Report violations without enforcing the policy.
+# # config.content_security_policy_report_only = true
# end
-
-# If you are using UJS then enable automatic nonce generation
-# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }
-
-# 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
diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb
index 457e55bfe..b7c4f6d92 100644
--- a/config/initializers/filter_parameter_logging.rb
+++ b/config/initializers/filter_parameter_logging.rb
@@ -2,8 +2,10 @@
# 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 partially matched (e.g. passw matches password) and 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[
- password
- passw secret token _key crypt salt certificate otp ssn
+ password api_key
+ passw email secret token _key crypt salt certificate otp ssn
]
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
index aa7435fbc..6c78420e7 100644
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
@@ -5,13 +5,13 @@
# 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
# These inflection rules are supported but not enabled by default:
# ActiveSupport::Inflector.inflections(:en) do |inflect|
-# inflect.acronym 'RESTful'
+# inflect.acronym "RESTful"
# end
diff --git a/config/initializers/new_framework_defaults_7_2.rb b/config/initializers/new_framework_defaults_7_2.rb
new file mode 100644
index 000000000..b549c4a25
--- /dev/null
+++ b/config/initializers/new_framework_defaults_7_2.rb
@@ -0,0 +1,70 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file eases your Rails 7.2 framework defaults upgrade.
+#
+# Uncomment each configuration one by one to switch to the new default.
+# Once your application is ready to run with all new defaults, you can remove
+# this file and set the `config.load_defaults` to `7.2`.
+#
+# Read the Guide for Upgrading Ruby on Rails for more info on each option.
+# https://guides.rubyonrails.org/upgrading_ruby_on_rails.html
+
+###
+# Controls whether Active Job's `#perform_later` and similar methods automatically defer
+# the job queuing to after the current Active Record transaction is committed.
+#
+# Example:
+# Topic.transaction do
+# topic = Topic.create(...)
+# NewTopicNotificationJob.perform_later(topic)
+# end
+#
+# In this example, if the configuration is set to `:never`, the job will
+# be enqueued immediately, even though the `Topic` hasn't been committed yet.
+# Because of this, if the job is picked up almost immediately, or if the
+# transaction doesn't succeed for some reason, the job will fail to find this
+# topic in the database.
+#
+# If `enqueue_after_transaction_commit` is set to `:default`, the queue adapter
+# will define the behaviour.
+#
+# Note: Active Job backends can disable this feature. This is generally done by
+# backends that use the same database as Active Record as a queue, hence they
+# don't need this feature.
+#++
+# Rails.application.config.active_job.enqueue_after_transaction_commit = :default
+
+###
+# Adds image/webp to the list of content types Active Storage considers as an image
+# Prevents automatic conversion to a fallback PNG, and assumes clients support WebP, as they support gif, jpeg, and png.
+# This is possible due to broad browser support for WebP, but older browsers and email clients may still not support
+# WebP. Requires imagemagick/libvips built with WebP support.
+#++
+# Rails.application.config.active_storage.web_image_content_types = %w[image/png image/jpeg image/gif image/webp]
+
+###
+# Enable validation of migration timestamps. When set, an ActiveRecord::InvalidMigrationTimestampError
+# will be raised if the timestamp prefix for a migration is more than a day ahead of the timestamp
+# associated with the current time. This is done to prevent forward-dating of migration files, which can
+# impact migration generation and other migration commands.
+#
+# Applications with existing timestamped migrations that do not adhere to the
+# expected format can disable validation by setting this config to `false`.
+#++
+# Rails.application.config.active_record.validate_migration_timestamps = true
+
+###
+# Controls whether the PostgresqlAdapter should decode dates automatically with manual queries.
+#
+# Example:
+# ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.select_value("select '2024-01-01'::date") #=> Date
+#
+# This query used to return a `String`.
+#++
+# Rails.application.config.active_record.postgresql_adapter_decode_dates = true
+
+###
+# Enables YJIT as of Ruby 3.3, to bring sizeable performance improvements. If you are
+# deploying to a memory constrained environment you may want to set this to `false`.
+#++
+# Rails.application.config.yjit = true
diff --git a/config/initializers/permissions_policy.rb b/config/initializers/permissions_policy.rb
index 50bcf4ead..b635b527e 100644
--- a/config/initializers/permissions_policy.rb
+++ b/config/initializers/permissions_policy.rb
@@ -1,12 +1,14 @@
# frozen_string_literal: true
+# Be sure to restart your server when you modify this file.
+
# Define an application-wide HTTP permissions policy. For further
-# information see https://developers.google.com/web/updates/2018/06/feature-policy
-#
-# Rails.application.config.permissions_policy do |f|
-# f.camera :none
-# f.gyroscope :none
-# f.microphone :none
-# f.usb :none
-# f.fullscreen :self
-# f.payment :self, "https://secure.example.com"
+# information see: https://developers.google.com/web/updates/2018/06/feature-policy
+
+# Rails.application.config.permissions_policy do |policy|
+# policy.camera :none
+# policy.gyroscope :none
+# policy.microphone :none
+# policy.usb :none
+# policy.fullscreen :self
+# policy.payment :self, "https://secure.example.com"
# end
diff --git a/config/puma.rb b/config/puma.rb
index 8ae6a7853..5fc36ba17 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -1,45 +1,35 @@
# frozen_string_literal: true
+# This configuration file will be evaluated by Puma. The top-level methods that
+# are invoked here are part of Puma's configuration DSL. For more information
+# about methods provided by the DSL, see https://puma.io/puma/Puma/DSL.html.
-# Puma can serve each request in a thread from an internal thread pool.
-# The `threads` method setting takes two numbers: a minimum and maximum.
-# Any libraries that use thread pools should be configured to match
-# the maximum value specified for Puma. Default is set to 5 threads for minimum
-# and maximum; this matches the default thread size of Active Record.
+# Puma starts a configurable number of processes (workers) and each process
+# serves each request in a thread from an internal thread pool.
#
-max_threads_count = ENV.fetch('RAILS_MAX_THREADS', 5)
-min_threads_count = ENV.fetch('RAILS_MIN_THREADS') { max_threads_count }
-threads min_threads_count, max_threads_count
-
-# Specifies the `worker_timeout` threshold that Puma will use to wait before
-# terminating a worker in development environments.
+# The ideal number of threads per worker depends both on how much time the
+# application spends waiting for IO operations and on how much you wish to
+# to prioritize throughput over latency.
#
-worker_timeout 3600 if ENV.fetch('RAILS_ENV', 'development') == 'development'
-
-# Specifies the `port` that Puma will listen on to receive requests; default is 3000.
-#
-port ENV.fetch('PORT', 3000)
-
-# Specifies the `environment` that Puma will run in.
+# As a rule of thumb, increasing the number of threads will increase how much
+# traffic a given process can handle (throughput), but due to CRuby's
+# Global VM Lock (GVL) it has diminishing returns and will degrade the
+# response time (latency) of the application.
#
-environment ENV.fetch('RAILS_ENV', 'development')
-
-# Specifies the `pidfile` that Puma will use.
-pidfile ENV.fetch('PIDFILE', 'tmp/pids/server.pid')
-
-# Specifies the number of `workers` to boot in clustered mode.
-# Workers are forked web server processes. If using threads and workers together
-# the concurrency of the application would be max `threads` * `workers`.
-# Workers do not work on JRuby or Windows (both of which do not support
-# processes).
+# The default is set to 3 threads as it's deemed a decent compromise between
+# throughput and latency for the average Rails application.
#
-# workers ENV.fetch("WEB_CONCURRENCY") { 2 }
+# Any libraries that use a connection pool or another resource pool should
+# be configured to provide at least as many connections as the number of
+# threads. This includes Active Record's `pool` parameter in `database.yml`.
+threads_count = ENV.fetch("RAILS_MAX_THREADS", 3)
+threads threads_count, threads_count
-# Use the `preload_app!` method when specifying a `workers` number.
-# This directive tells Puma to first boot the application and load code
-# before forking the application. This takes advantage of Copy On Write
-# process behavior so workers use less memory.
-#
-# preload_app!
+# Specifies the `port` that Puma will listen on to receive requests; default is 3000.
+port ENV.fetch("PORT", 3000)
-# Allow puma to be restarted by `rails restart` command.
+# Allow puma to be restarted by `bin/rails restart` command.
plugin :tmp_restart
+
+# Specify the PID file. Defaults to tmp/pids/server.pid in development.
+# In other environments, only set the PID file if requested.
+pidfile ENV["PIDFILE"] if ENV["PIDFILE"]
diff --git a/db/migrate/20241021183920_add_service_name_to_active_storage_blobs.active_storage.rb b/db/migrate/20241021183920_add_service_name_to_active_storage_blobs.active_storage.rb
new file mode 100644
index 000000000..a15c6ce8e
--- /dev/null
+++ b/db/migrate/20241021183920_add_service_name_to_active_storage_blobs.active_storage.rb
@@ -0,0 +1,22 @@
+# This migration comes from active_storage (originally 20190112182829)
+class AddServiceNameToActiveStorageBlobs < ActiveRecord::Migration[6.0]
+ def up
+ return unless table_exists?(:active_storage_blobs)
+
+ unless column_exists?(:active_storage_blobs, :service_name)
+ add_column :active_storage_blobs, :service_name, :string
+
+ if configured_service = ActiveStorage::Blob.service.name
+ ActiveStorage::Blob.unscoped.update_all(service_name: configured_service)
+ end
+
+ change_column :active_storage_blobs, :service_name, :string, null: false
+ end
+ end
+
+ def down
+ return unless table_exists?(:active_storage_blobs)
+
+ remove_column :active_storage_blobs, :service_name
+ end
+end
diff --git a/db/migrate/20241021183921_create_active_storage_variant_records.active_storage.rb b/db/migrate/20241021183921_create_active_storage_variant_records.active_storage.rb
new file mode 100644
index 000000000..94ac83af0
--- /dev/null
+++ b/db/migrate/20241021183921_create_active_storage_variant_records.active_storage.rb
@@ -0,0 +1,27 @@
+# This migration comes from active_storage (originally 20191206030411)
+class CreateActiveStorageVariantRecords < ActiveRecord::Migration[6.0]
+ def change
+ return unless table_exists?(:active_storage_blobs)
+
+ # Use Active Record's configured type for primary key
+ create_table :active_storage_variant_records, id: primary_key_type, if_not_exists: true do |t|
+ t.belongs_to :blob, null: false, index: false, type: blobs_primary_key_type
+ t.string :variation_digest, null: false
+
+ t.index %i[ blob_id variation_digest ], name: "index_active_storage_variant_records_uniqueness", unique: true
+ t.foreign_key :active_storage_blobs, column: :blob_id
+ end
+ end
+
+ private
+ def primary_key_type
+ config = Rails.configuration.generators
+ config.options[config.orm][:primary_key_type] || :primary_key
+ end
+
+ def blobs_primary_key_type
+ pkey_name = connection.primary_key(:active_storage_blobs)
+ pkey_column = connection.columns(:active_storage_blobs).find { |c| c.name == pkey_name }
+ pkey_column.bigint? ? :bigint : pkey_column.type
+ end
+end
diff --git a/db/migrate/20241021183922_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb b/db/migrate/20241021183922_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb
new file mode 100644
index 000000000..93c8b85ad
--- /dev/null
+++ b/db/migrate/20241021183922_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb
@@ -0,0 +1,8 @@
+# This migration comes from active_storage (originally 20211119233751)
+class RemoveNotNullOnActiveStorageBlobsChecksum < ActiveRecord::Migration[6.0]
+ def change
+ return unless table_exists?(:active_storage_blobs)
+
+ change_column_null(:active_storage_blobs, :checksum, true)
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 9b330a3bb..d5bc87fb5 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[7.1].define(version: 2024_09_27_200908) do
+ActiveRecord::Schema[7.2].define(version: 2024_10_21_183922) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
diff --git a/public/406-unsupported-browser.html b/public/406-unsupported-browser.html
new file mode 100644
index 000000000..7cf1e168e
--- /dev/null
+++ b/public/406-unsupported-browser.html
@@ -0,0 +1,66 @@
+
+
+
+ Your browser is not supported (406)
+
+
+
+
+
+
+