Skip to content

Commit

Permalink
Merge pull request #468 from alphagov/prepare-for-upgrade-to-rails-7.1
Browse files Browse the repository at this point in the history
Prepare for upgrade to rails 7.1
  • Loading branch information
chrisroos authored Oct 12, 2023
2 parents 52079fb + 11489db commit 81d31ee
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 18 deletions.
2 changes: 1 addition & 1 deletion app/models/user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

class User < ApplicationRecord
include GDS::SSO::User
serialize :permissions, Array
serialize :permissions, type: Array
end
17 changes: 0 additions & 17 deletions config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,5 @@ class Application < Rails::Application
#
# config.time_zone = "Central Time (US & Canada)"
# config.eager_load_paths << Rails.root.join("extras")

# Rotate SHA1 cookies to SHA256 (the new Rails 7 default)
# TODO: Remove this after existing user sessions have been rotated
# https://guides.rubyonrails.org/v7.0/upgrading_ruby_on_rails.html#key-generator-digest-class-changing-to-use-sha256
Rails.application.config.action_dispatch.cookies_rotations.tap do |cookies|
salt = Rails.application.config.action_dispatch.authenticated_encrypted_cookie_salt
secret_key_base = Rails.application.secrets.secret_key_base
next if secret_key_base.blank?

key_generator = ActiveSupport::KeyGenerator.new(
secret_key_base, iterations: 1000, hash_digest_class: OpenSSL::Digest::SHA1
)
key_len = ActiveSupport::MessageEncryptor.key_len
secret = key_generator.generate_key(salt, key_len)

cookies.rotate :encrypted, secret
end
end
end

0 comments on commit 81d31ee

Please sign in to comment.