Skip to content

LG-10218 Retire the v2 session encryptor #8687

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

Merged
jmhooper merged 3 commits into from
Jun 30, 2023
Merged

LG-10218 Retire the v2 session encryptor #8687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6261d9a
Retire the v2 session encryptor
jmhooper Jun 28, 2023
003bbc6
whoops
jmhooper Jun 28, 2023
f245d60
Merge branch 'main' into jmhooper-retire-v2-session-encryptor
jmhooper Jun 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion config/application.yml.default
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,6 @@ service_provider_request_ttl_hours: 24
session_check_delay: 30
session_check_frequency: 30
session_encryptor_alert_enabled: false
session_encryptor_v3_enabled: true
session_timeout_in_minutes: 15
session_timeout_warning_seconds: 150
session_total_duration_timeout_in_minutes: 720
Expand Down
1 change: 0 additions & 1 deletion config/initializers/session_store.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
require 'session_encryptor'
require 'legacy_session_encryptor'

APPLICATION_SESSION_COOKIE_KEY = '_identity_idp_session'.freeze

Expand Down
1 change: 0 additions & 1 deletion lib/identity_config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,6 @@ def self.build_store(config_map)
config.add(:session_check_frequency, type: :integer)
config.add(:session_encryption_key, type: :string)
config.add(:session_encryptor_alert_enabled, type: :boolean)
config.add(:session_encryptor_v3_enabled, type: :boolean)
config.add(:session_timeout_in_minutes, type: :integer)
config.add(:session_timeout_warning_seconds, type: :integer)
config.add(:session_total_duration_timeout_in_minutes, type: :integer)
Expand Down
150 changes: 0 additions & 150 deletions lib/legacy_session_encryptor.rb
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions lib/session_encryptor.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ class SensitiveValueError < StandardError; end
SENSITIVE_REGEX = %r{#{SENSITIVE_DEFAULT_FIELDS.join('|')}}i

def load(value)
return LegacySessionEncryptor.new.load(value) if should_use_legacy_encryptor_for_read?(value)

payload = MessagePack.unpack(value)
ciphertext = payload[CIPHERTEXT_KEY]
compressed = payload[COMPRESSED_KEY]
Expand All @@ -62,7 +60,6 @@ def load(value)
end

def dump(value)
return LegacySessionEncryptor.new.dump(value) if should_use_legacy_encryptor_for_write?
value.deep_stringify_keys!

kms_encrypt_pii!(value)
Expand Down Expand Up @@ -206,18 +203,10 @@ def alert_or_raise_if_contains_sensitive_keys!(hash)
end
end

def should_use_legacy_encryptor_for_read?(value)
value.start_with?(LegacySessionEncryptor::CIPHERTEXT_HEADER)
end

def should_compress?(value)
value.bytesize >= MINIMUM_COMPRESS_LIMIT
end

def should_use_legacy_encryptor_for_write?
!IdentityConfig.store.session_encryptor_v3_enabled
end

def session_encryption_key
IdentityConfig.store.session_encryption_key
end
Expand Down
Loading