Merge branch 'main' of github.com:davidmarkclements/fast-redact

davidmarkclements · Mar 7, 2024 · 2c2c4be · 2c2c4be
2 parents cc56593 + 59b84b2
commit 2c2c4be
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/lib/redactor.js b/lib/redactor.js
@@ -11,12 +11,21 @@ function redactor ({ secret, serialize, wcLen, strict, isCensorFct, censorFctTak
       ${strictImpl(strict, serialize)}
     }
     const { censor, secret } = this
+    const originalSecret = {}
+    const secretKeys = Object.keys(secret)
+    for (var i = 0; i < secretKeys.length; i++) {
+      originalSecret[secretKeys[i]] = secret[secretKeys[i]]
+    }
+
     ${redactTmpl(secret, isCensorFct, censorFctTakesPath)}
     this.compileRestore()
     ${dynamicRedactTmpl(wcLen > 0, isCensorFct, censorFctTakesPath)}
+    this.secret = originalSecret
     ${resultTmpl(serialize)}
   `).bind(state)
 
+  redact.secret = secret
+
   if (serialize === false) {
     redact.restore = (o) => state.restore(o)
   }

diff --git a/lib/restorer.js b/lib/restorer.js
@@ -70,9 +70,11 @@ function restoreTmpl (resetters, paths, hasWildcards) {
     for (var i = len - 1; i >= ${paths.length}; i--) {
       const k = keys[i]
       const o = secret[k]
-      if (o.flat === true) this.groupRestore(o)
-      else this.nestedRestore(o)
-      secret[k] = null
+      if (o) {
+        if (o.flat === true) this.groupRestore(o)
+        else this.nestedRestore(o)
+        secret[k] = null
+      }
     }
   ` : ''
 

diff --git a/test/index.js b/test/index.js
@@ -318,6 +318,17 @@ test('masks according to supplied censor function with nested wildcards', ({ end
   end()
 })
 
+test('does not increment secret size', ({ end, is }) => {
+  const redact = fastRedact({ paths: ['*.b'], censor: censorFct, serialize: false })
+  is(redact({ a: { b: '0123456' } }).a.b, 'xxx56')
+  is(redact.secret[''].length, 1)
+  is(redact({ c: { b: '0123456', d: 'pristine' } }).c.b, 'xxx56')
+  is(redact.secret[''].length, 1)
+  is(redact({ c: { b: '0123456', d: 'pristine' } }).c.d, 'pristine')
+  is(redact.secret[''].length, 1)
+  end()
+})
+
 test('masks according to supplied censor-with-path function', ({ end, is }) => {
   const redact = fastRedact({ paths: ['a'], censor: censorWithPath, serialize: false })
   is(redact({ a: '0123456' }).a, 'a xxx56')