Ensure we do not miss any updates if only sensitive fields have changed

lorenzo · Aug 29, 2024 · 1ceebd5 · 1ceebd5
1 parent 1bb48c0
commit 1ceebd5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/Model/Behavior/AuditLogBehavior.php b/src/Model/Behavior/AuditLogBehavior.php
@@ -143,10 +143,7 @@ public function afterSave(
             return;
         }
 
-        $this->redactArray($changed);
-
         $original = $entity->extractOriginal(array_keys($changed));
-        $this->redactArray($original);
 
         $properties = $this->getAssociationProperties(array_keys($options['associated']));
         foreach ($properties as $property) {
@@ -157,6 +154,9 @@ public function afterSave(
             return;
         }
 
+        $this->redactArray($changed);
+        $this->redactArray($original);
+
         $primary = $entity->extract((array)$this->_table->getPrimaryKey());
         $auditEvent = $entity->isNew() ? AuditCreateEvent::class : AuditUpdateEvent::class;
 

diff --git a/tests/TestCase/Model/Behavior/AuditLogBehaviorTest.php b/tests/TestCase/Model/Behavior/AuditLogBehaviorTest.php
@@ -207,7 +207,6 @@ public function testSensitiveFields(): void
             'author_id' => 1,
         ];
         $entity = new Entity($data, ['markNew' => false, 'markClean' => true]);
-        $entity->author_id = 50;
         $entity->body = 'The changed body';
 
         $event = new Event('Model.afterSave');