portunus 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ce3eac0af0a8a0fa451fb24de5cdddbc7741ce5bf043e669b580b2ae8f7045d
-  data.tar.gz: 901ec596dc6b5ca9f2a304fd90fe5cb260bffce513209b3b28cfdbf98d199fd5
+  metadata.gz: 55b4d7fa50d9b1784676c0cafbf30617b9eefa4fc441c2a6eb6db96b64b5a953
+  data.tar.gz: 647f2b1b543b9bd490d39e39d39d8178ab44a45f90a0b44aee1ffa7eacfa09ec
 SHA512:
-  metadata.gz: 721a12bf89394e876fac117f866e2938fb2a57805472fd53978cba626e6a9cbc82cf4c4462a6402ca31dbab2c8577a657cfe3445271df022b558d908db5d177d
-  data.tar.gz: 370cb0e5ae67bde8c1d0517586fd19802f14527337c087809578162411a06f7c97d9a109fc1f2c207557141ba474d42de75a66816e2f96e03f3ae90cb9aebbca
+  metadata.gz: b2bcd7c135f15758e05ebe0c94a3cd8b88b944db67440c0d2f535cb76af0aa8829ed89048e0b28fc9f354209b3235ffeb6679cf3ec4ede699a60861dd441934b
+  data.tar.gz: 1b16cfedbe5fa06809416e4f439612216ec9e08c221f44ca9c8b4af80d0a3b5729536d77e54486c8e53afd8fe7861d09381ccec361949c7a65fa46e39922cc5d

data/lib/portunus/rotators/dek.rb

@@ -12,20 +12,24 @@ module Portunus
       def rotate
         encryptable = data_encryption_key.encryptable
 
-        encryptable.class.encrypted_fields_list.map do |field_name|
-          field_value_map[field_name.to_sym] = encryptable.send(field_name.to_sym)
-        end
+        Rails.logger.debug(
+          "Rotating Encryptable: #{encryptable.class}, id: #{encryptable.id}"
+        )
+
+        ActiveRecord::Base.transaction do
+          encryptable.class.encrypted_fields_list.map do |field_name|
+            field_value_map[field_name.to_sym] = encryptable.send(field_name.to_sym)
+          end
 
-        data_encryption_key.encrypted_key = new_encrypted_key
+          data_encryption_key.update(encrypted_key: new_encrypted_key)
+          encryptable.data_encryption_key.reload
 
-        field_value_map.map do |field_name, value|
-          encryptable.send("#{field_name}=".to_sym, value)
-        end
+          field_value_map.map do |field_name, value|
+            encryptable.send("#{field_name}=".to_sym, value)
+          end
 
-        ActiveRecord::Base.transaction do
           encryptable.save
-          data_encryption_key.last_dek_rotation = DateTime.now
-          data_encryption_key.save
+          data_encryption_key.update(last_dek_rotation: DateTime.now)
         end
 
         true

data/lib/portunus/tasks/rotate_keys.rake

@@ -1,12 +1,16 @@
 namespace :portunus do
   desc "Rotate KEK keys, reencrypt the deks"
   task rotate_keks: :environment do
-    scope = ::Portunus::DataEncryptionKey.
-      where(
-        "last_kek_rotation < ? or (created_at < ? and last_kek_rotation is null)", 
-        DateTime.now - ::Portunus.configuration.max_key_duration,
-        DateTime.now - ::Portunus.configuration.max_key_duration
-      )
+    if ENV["FORCE"] == "true"
+      scope = ::Portunus::DataEncryptionKey.all
+    else
+      scope = ::Portunus::DataEncryptionKey.
+        where(
+          "last_kek_rotation < ? or (created_at < ? and last_kek_rotation is null)", 
+          DateTime.now - ::Portunus.configuration.max_key_duration,
+          DateTime.now - ::Portunus.configuration.max_key_duration
+        )
+    end
 
     scope.in_batches do |relation|
       relation.map do |encryption_key|

data/lib/portunus/version.rb

@@ -1,3 +1,3 @@
 module Portunus
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: portunus
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Colin Petruno