lockbox 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3a6c05fd83da2e2fc8474f2daf3b55f27ee61dd8a86ff3264df772816bcf92b
-  data.tar.gz: d269773e126958e5288a2fcb48ee228dbcd3918648e02834057c8be04f36ec45
+  metadata.gz: 3c892b20d24ec1db29f60f508b0103c315450bf85f71e3d5ff9b92d3f21d1cca
+  data.tar.gz: 000fdbc4bc30ba97738d3823b719bbb37d23c4d926792d2f65197043502e843e
 SHA512:
-  metadata.gz: f05224cd3e90993ba6a5b7cadfd2bdac839e6590ae3a5702935dc1146b1349ce76d41d3de989f9e10b3510cf420a86936d283968cc343a7eaccfa119a4dff1b6
-  data.tar.gz: d185de56bd634a6ba6753d3a1acf91a7f3940edb02ccbcaa89b22839ef4e57e62a5c698074b6cff821bc5869e3b423dee94781fad4a7e0961794982fa2ed1faa
+  metadata.gz: 4fc7026684f02a5f8a34e827c16566425e2987efc5f5b02ff905431e1d1e9bdbf2ac542d87413418d8c0cb2b3d8feb2ce58c61aaed96b1dc32bf2a490cea8c4c
+  data.tar.gz: a04a81cab9ea3b9c8b8591846fe10866610fadd4829e04ffdc6bbd67138df307a78e05da0cf820bd1a44544a54980191202a4afd8b8b9e5f4ca1bf6f8109c529

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.3.0 (2026-11-10)
+
+- Fixed hybrid encryption key being able to decrypt - [more info](https://github.com/ankane/lockbox/security/advisories/GHSA-586r-mm5q-xhg2)
+
 ## 2.2.0 (2026-04-04)
 
 - Dropped support for Active Record < 7.2 and Ruby < 3.3

data/lib/lockbox/box.rb

@@ -6,8 +6,8 @@ module Lockbox
       raise ArgumentError, "Cannot pass both key and encryption/decryption key" if key && (encryption_key || decryption_key)
 
       key = Lockbox::Utils.decode_key(key) if key
-      encryption_key = Lockbox::Utils.decode_key(encryption_key, size: 64) if encryption_key
-      decryption_key = Lockbox::Utils.decode_key(decryption_key, size: 64) if decryption_key
+      encryption_key, legacy_encryption = decode_hybrid_key(encryption_key) if encryption_key
+      decryption_key, legacy_decryption = decode_hybrid_key(decryption_key) if decryption_key
 
       algorithm ||= "aes-gcm"
 
@@ -26,8 +26,22 @@ module Lockbox
       when "hybrid"
         raise ArgumentError, "Missing key" unless encryption_key || decryption_key
         require "rbnacl"
-        @encryption_box = RbNaCl::Boxes::Curve25519XSalsa20Poly1305.new(encryption_key.slice(0, 32), encryption_key.slice(32..-1)) if encryption_key
-        @decryption_box = RbNaCl::Boxes::Curve25519XSalsa20Poly1305.new(decryption_key.slice(32..-1), decryption_key.slice(0, 32)) if decryption_key
+        if encryption_key
+          @encryption_box =
+            if legacy_encryption
+              nil
+            else
+              RbNaCl::Boxes::Sealed.from_public_key(encryption_key)
+            end
+        end
+        if decryption_key
+          @decryption_box =
+            if legacy_decryption
+              RbNaCl::Boxes::Curve25519XSalsa20Poly1305.new(decryption_key.byteslice(32..-1), decryption_key.byteslice(0, 32))
+            else
+              RbNaCl::Boxes::Sealed.from_private_key(decryption_key)
+            end
+        end
       else
         raise ArgumentError, "Unknown algorithm: #{algorithm}"
       end
@@ -44,17 +58,16 @@ module Lockbox
       when "hybrid"
         raise ArgumentError, "No encryption key set" unless defined?(@encryption_box)
         raise ArgumentError, "Associated data not supported with this algorithm" if associated_data
-        nonce = generate_nonce(@encryption_box)
-        ciphertext = @encryption_box.encrypt(nonce, message)
+        Utils.raise_hybrid_error if @encryption_box.nil?
+        @encryption_box.encrypt(message)
       when "xsalsa20"
         raise ArgumentError, "Associated data not supported with this algorithm" if associated_data
         nonce = generate_nonce(@box)
-        ciphertext = @box.encrypt(nonce, message)
+        nonce + @box.encrypt(nonce, message)
       else
         nonce = generate_nonce(@box)
-        ciphertext = @box.encrypt(nonce, message, associated_data)
+        nonce + @box.encrypt(nonce, message, associated_data)
       end
-      nonce + ciphertext
     end
 
     def decrypt(ciphertext, associated_data: NOT_SET)
@@ -64,8 +77,12 @@ module Lockbox
         when "hybrid"
           raise ArgumentError, "No decryption key set" unless defined?(@decryption_box)
           raise ArgumentError, "Associated data not supported with this algorithm" if associated_data
-          nonce, ciphertext = extract_nonce(@decryption_box, ciphertext)
-          @decryption_box.decrypt(nonce, ciphertext)
+          if @decryption_box.is_a?(RbNaCl::Boxes::Sealed)
+            @decryption_box.decrypt(ciphertext)
+          else
+            nonce, ciphertext = extract_nonce(@decryption_box, ciphertext)
+            @decryption_box.decrypt(nonce, ciphertext)
+          end
         when "xsalsa20"
           raise ArgumentError, "Associated data not supported with this algorithm" if associated_data
           nonce, ciphertext = extract_nonce(@box, ciphertext)
@@ -94,5 +111,15 @@ module Lockbox
       nonce = bytes.slice(0, nonce_bytes)
       [nonce, bytes.slice(nonce_bytes..-1)]
     end
+
+    def decode_hybrid_key(key)
+      [Lockbox::Utils.decode_key(key), false]
+    rescue Error => e
+      begin
+        [Lockbox::Utils.decode_key(key, size: 64), true]
+      rescue Error
+        raise e
+      end
+    end
   end
 end

data/lib/lockbox/carrier_wave_extensions.rb

@@ -1,6 +1,8 @@
 module Lockbox
   module CarrierWaveExtensions
     def encrypt(**options)
+      Utils.check_options(options)
+
       class_eval do
         # uses same hook as process (before cache)
         # processing can be disabled, so better to keep separate

data/lib/lockbox/model.rb

@@ -23,6 +23,8 @@ module Lockbox
       #   options[:type] = :decimal
       # end
 
+      Utils.check_options(options)
+
       custom_type = options[:type].respond_to?(:serialize) && options[:type].respond_to?(:deserialize)
       valid_types = [nil, :string, :boolean, :date, :datetime, :time, :integer, :float, :decimal, :binary, :json, :hash, :array, :inet]
       raise ArgumentError, "Unknown type: #{options[:type]}" unless custom_type || valid_types.include?(options[:type])
@@ -516,7 +518,7 @@ module Lockbox
                 # set previous attribute so changes populate correctly
                 # it's fine if this is set on future decryptions (as is the case when message is nil)
                 # as only the first value is loaded into changes
-                @attributes[name.to_s].instance_variable_set("@value_before_type_cast", message)
+                @attributes[name.to_s].instance_variable_set(:@value_before_type_cast, message)
 
                 # cache
                 # decrypt method does type casting
@@ -677,6 +679,8 @@ module Lockbox
 
     module Attached
       def encrypts_attached(*attributes, **options)
+        Utils.check_options(options)
+
         attributes.each do |name|
           name = name.to_sym
 

data/lib/lockbox/utils.rb

@@ -121,5 +121,15 @@ module Lockbox
         content_type: attachment.content_type
       }
     end
+
+    def self.check_options(options)
+      if (options[:encryption_key].is_a?(String) && options[:encryption_key].bytesize == 128) || (options[:decryption_key].is_a?(String) && options[:decryption_key].bytesize == 128)
+        raise_hybrid_error
+      end
+    end
+
+    def self.raise_hybrid_error
+      raise Lockbox::Error, "Rotate your hybrid cryptography keys and data to address GHSA-586r-mm5q-xhg2"
+    end
   end
 end

data/lib/lockbox/version.rb

@@ -1,3 +1,3 @@
 module Lockbox
-  VERSION = "2.2.0"
+  VERSION = "2.3.0"
 end

data/lib/lockbox.rb

@@ -50,15 +50,10 @@ module Lockbox
 
   def self.generate_key_pair
     require "rbnacl"
-    # encryption and decryption servers exchange public keys
-    # this produces smaller ciphertext than sealed box
-    alice = RbNaCl::PrivateKey.generate
-    bob = RbNaCl::PrivateKey.generate
-    # alice is sending message to bob
-    # use bob first in both cases to prevent keys being swappable
+    key = RbNaCl::PrivateKey.generate
     {
-      encryption_key: to_hex(bob.public_key.to_bytes + alice.to_bytes),
-      decryption_key: to_hex(bob.to_bytes + alice.public_key.to_bytes)
+      encryption_key: to_hex(key.public_key.to_bytes),
+      decryption_key: to_hex(key.to_bytes)
     }
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lockbox
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Andrew Kane
@@ -55,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Modern encryption for Ruby and Rails
 test_files: []