loggable_activity 0.1.47 → 0.1.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 769f6634b248e3b70df41eb296770debee95b28e4e80f16f5c1b548f594dfde2
-  data.tar.gz: 9edc8cbb35e16e0738e747ddb3cd8b953929a3cb4524ea623d118fed8bf38022
+  metadata.gz: ee3e20a374ac054a343ce5ff1c35c5fcce765fb631788fb6d9b738e52161a16a
+  data.tar.gz: 042cc1db90cf6b99eeb2c8d5ab3f16a5473178c00085f42400c4eec344a99731
 SHA512:
-  metadata.gz: cd00a44dff499dd739c210a6d15ebf30b8a281f6f20006922f39cb0411f939be982abd1b4c82bc39257237ea804422b358f5ba2b63a9d7531a0a3164fdf37240
-  data.tar.gz: 0f2e77814f90963fb65c322cc28e3be34faf62d079e7c7bfce98d80700d5a6c31fea40761e1ee62e85e2e0ae7b16852e1ff822374d684cdc029460a62ee2c82f
+  metadata.gz: 1f4063eb4cd98a16061d151759735e0b5cc98e7747151dc2c56856f2010f23936c2c338991c5cc85dfd3c72af4f60133a4e39271f29ec76e5ee04383ad6dd073
+  data.tar.gz: 8be57a52cfd948825e273648ffaec5809975dc14863f49206ee8f364f07b58a193758d80d867155f21760522a24bc2cf49d183ba757c503af1fdf51317b78202

data/CHANGELOG.md

@@ -1,7 +1,7 @@
 ## [Unreleased]
 - nothing so far
 
-## [0.1.47] - 2024-02-16
+## [0.1.48] - 2024-02-16
 ### Breaking change
 - Updated encryption_key to be 32 bytes
 - Updated README.md

data/lib/loggable_activity/encryption.rb

@@ -19,17 +19,21 @@ module LoggableActivity
     # Returns:
     #   "SOME_ENCRYPTED_STRING"
     #
-    def self.encrypt(data, encryption_key)
-      return nil if data.nil?
-      return nil if encryption_key.nil?
-      raise EncryptionError, 'Encryption failed: Invalid encryption key length' unless encryption_key.bytesize == 32
+    def self.encrypt(data, encoded_key)
+      return nil if data.nil? || encoded_key.nil?
+
+      encryption_key = Base64.decode64(encoded_key)
+      raise EncryptionError, "Encryption failed: Invalid encryption key length #{encryption_key.bytesize}" unless encryption_key.bytesize == 32
+
+      cipher = OpenSSL::Cipher.new('AES-256-CBC').encrypt
+      cipher.key = encryption_key
+      cipher.iv = iv = cipher.random_iv
 
-      cipher = OpenSSL::Cipher.new('AES-128-CBC').encrypt
-      cipher.key = Digest::SHA1.hexdigest(encryption_key)[0..15]
       encrypted = cipher.update(data.to_s) + cipher.final
-      Base64.encode64(encrypted)
+      # Combine IV with encrypted data, encode with Base64 for storage/transmission
+      Base64.encode64(iv + encrypted)
     rescue OpenSSL::Cipher::CipherError => e
-      raise EncryptionError, "Encryption failed: #{e.message} ***"
+      raise EncryptionError, "Encryption failed: #{e.message}"
     end
 
     # Decrypts the given data using the given encryption key
@@ -40,19 +44,22 @@ module LoggableActivity
     # Returns:
     #   "my secret data"
     #
-    def self.decrypt(data, encryption_key)
-      return '' if data.nil?
-      return I18n.t('loggable.activity.deleted') if encryption_key.nil?
+    def self.decrypt(data, encoded_key)
+      return '' if data.nil? || encoded_key.nil?
+
+      encryption_key = Base64.decode64(encoded_key)
+      raise EncryptionError, 'Decryption failed: Invalid encryption key length' unless encryption_key.bytesize == 32
+
+      cipher = OpenSSL::Cipher.new('AES-256-CBC').decrypt
+      cipher.key = encryption_key
 
-      cipher = OpenSSL::Cipher.new('AES-128-CBC').decrypt
-      cipher.key = Digest::SHA1.hexdigest(encryption_key)[0..15]
-      decrypted_data = Base64.decode64(data)
-      decrypted_output = cipher.update(decrypted_data) + cipher.final
-      raise 'Decryption failed: Invalid UTF-8 output' unless decrypted_output.valid_encoding?
+      raw_data = Base64.decode64(data)
+      cipher.iv = raw_data[0...cipher.iv_len] # Extract IV from the beginning of raw_data
+      decrypted_data = cipher.update(raw_data[cipher.iv_len..]) + cipher.final
 
-      decrypted_output.force_encoding('UTF-8')
+      decrypted_data.force_encoding('UTF-8')
     rescue OpenSSL::Cipher::CipherError => e
-      raise EncryptionError, e.message
+      raise EncryptionError, "Decryption failed: #{e.message}"
     end
 
     def self.blank?(value)

data/lib/loggable_activity/encryption_key.rb

@@ -107,7 +107,10 @@ module LoggableActivity
     #  "a8f4774e7f42eb253045a4db7de7b79e"
     #
     def self.random_key
-      SecureRandom.hex(32)
+      # Generate 32 random bytes (256 bits) directly
+      encryption_key = SecureRandom.random_bytes(32)
+      # Encode the key in Base64 to ensure it's in a transferable format
+      Base64.encode64(encryption_key).strip
     end
   end
 end

data/lib/loggable_activity/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LoggableActivity
-  VERSION = '0.1.47'
+  VERSION = '0.1.48'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: loggable_activity
 version: !ruby/object:Gem::Version
-  version: 0.1.47
+  version: 0.1.48
 platform: ruby
 authors:
 - "Max \nGroenlund"