fix(redact): redact emails inside strings MONGOSH-1392 (#404)

* fix(redact): redact emails inside strings MONGOSH-1392 * refactor: combine rules
mongodb-js · Jul 11, 2024 · be8a9b7 · be8a9b7
1 parent 6f9e6b5
commit be8a9b7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/packages/mongodb-redact/src/index.spec.ts b/packages/mongodb-redact/src/index.spec.ts
@@ -77,6 +77,14 @@ describe('mongodb-redact', function () {
       expect(redact('[email protected]')).to.equal('<email>');
     });
 
+    it('should redact emails inside strings', function () {
+      expect(
+        redact(
+          '"db.test.insert({ email: "[email protected]" })"'
+        )
+      ).to.equal('"db.test.insert({ email: "<email>" })"');
+    });
+
     it('should redact ip addresses', function () {
       expect(redact('10.0.0.1')).to.equal('<ip address>');
     });

diff --git a/packages/mongodb-redact/src/regexes.ts b/packages/mongodb-redact/src/regexes.ts
@@ -23,8 +23,8 @@ export const regexes = [
 
   // Email addresses
   [
-    /(^|[ \t\r\n\v\f])([a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]{1,64}@[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?){1,500})/gim,
-    '$1<email>',
+    /(^|[ \t\r\n\v\f"'`])([a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]{1,64}@[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(["'`]?)){1,500})/gim,
+    '$1<email>$6',
   ],
 
   // IP addresses