Skip to content

LG-491 Don't truncate scrypt digest in pii encryption #2355

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
Jul 23, 2018
Merged

LG-491 Don't truncate scrypt digest in pii encryption #2355

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
67f2c76
LG-491 Don't truncate scrypt digest in pii encryption
jmhooper Jul 20, 2018
f7aba3b
got call count stubs backwards
jmhooper Jul 20, 2018
fca75fa
we actually dont need that first method stub for secure random
jmhooper Jul 20, 2018
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
4 changes: 2 additions & 2 deletions app/services/encryption/encryptors/pii_encryptor.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def initialize(password)
end

def encrypt(plaintext)
salt = Devise.friendly_token[0, 20]
salt = SecureRandom.hex(32)
cost = Figaro.env.scrypt_cost
aes_encryption_key = scrypt_password_digest(salt: salt, cost: cost)
aes_encrypted_ciphertext = aes_cipher.encrypt(plaintext, aes_encryption_key)
Expand All @@ -61,7 +61,7 @@ def scrypt_password_digest(salt:, cost:)
scrypt_salt = cost + OpenSSL::Digest::SHA256.hexdigest(salt)
scrypted = SCrypt::Engine.hash_secret password, scrypt_salt, 32
scrypt_password_digest = SCrypt::Password.new(scrypted).digest
scrypt_password_digest[0...32]
[scrypt_password_digest].pack('H*')
end
end
end
Expand Down
17 changes: 9 additions & 8 deletions spec/services/encryption/encryptors/pii_encryptor_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@
end

it 'uses the user access key encryptor to encrypt the plaintext' do
salt = '0' * 20
allow(Devise).to receive(:friendly_token).and_return(salt)
salt = '0' * 64
allow(SecureRandom).to receive(:hex).once.with(32).and_return(salt)

scrypt_digest = '1' * 64
scrypt_digest = '31' * 32 # hex_encode('1111..')
decoded_scrypt_digest = '1' * 32

scrypt_password = instance_double(SCrypt::Password)
expect(scrypt_password).to receive(:digest).and_return(scrypt_digest)
Expand All @@ -26,7 +27,7 @@
cipher = instance_double(Encryption::AesCipher)
expect(Encryption::AesCipher).to receive(:new).and_return(cipher)
expect(cipher).to receive(:encrypt).
with(plaintext, scrypt_digest[0...32]).
with(plaintext, decoded_scrypt_digest).
and_return('aes_ciphertext')

kms_client = instance_double(Encryption::KmsClient)
Expand Down Expand Up @@ -63,10 +64,10 @@
end

it 'uses layered AES and KMS to decrypt the contents' do
salt = '0' * 20
allow(Devise).to receive(:friendly_token).and_return(salt)
salt = '0' * 64

scrypt_digest = '1' * 64
scrypt_digest = '31' * 32 # hex_encode('1111..')
decoded_scrypt_digest = '1' * 32

scrypt_password = instance_double(SCrypt::Password)
expect(scrypt_password).to receive(:digest).and_return(scrypt_digest)
Expand All @@ -81,7 +82,7 @@
cipher = instance_double(Encryption::AesCipher)
expect(Encryption::AesCipher).to receive(:new).and_return(cipher)
expect(cipher).to receive(:decrypt).
with('aes_ciphertext', scrypt_digest[0...32]).
with('aes_ciphertext', decoded_scrypt_digest).
and_return(plaintext)

result = subject.decrypt({
Expand Down