Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Memoize key_provider from key or deterministic key_provider if any #51324

Merged
merged 1 commit into from
Mar 14, 2024
Merged

Memoize key_provider from key or deterministic key_provider if any #51324

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 8 additions & 4 deletions activerecord/lib/active_record/encryption/scheme.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def fixed?
end

def key_provider
@key_provider_param || build_key_provider || default_key_provider
@key_provider_param || key_provider_from_key || deterministic_key_provider || default_key_provider
end

def merge(other_scheme)
Expand Down Expand Up @@ -80,10 +80,14 @@ def validate_config!
raise Errors::Configuration, "key_provider: and key: can't be used simultaneously" if @key_provider_param && @key
end

def build_key_provider
return DerivedSecretKeyProvider.new(@key) if @key.present?
def key_provider_from_key
@key_provider_from_key ||= if @key.present?
DerivedSecretKeyProvider.new(@key)
end
end

if @deterministic
def deterministic_key_provider
@deterministic_key_provider ||= if @deterministic
DeterministicKeyProvider.new(ActiveRecord::Encryption.config.deterministic_key)
end
end
Expand Down