Minor - Merge pull request wet-boew#9659 from polmih/scrubbing

core - helpers: patch to cover encoded %2540 in email pattern Minor - Core - findPotentialPII - Include URL encoded email pattern
BrahimMahadi · Sep 11, 2023 · 9aede44 · 9aede44
2 parents 2e1c03a + 213f328
commit 9aede44
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/core/helpers.js b/src/core/helpers.js
@@ -1305,7 +1305,7 @@ wb.findPotentialPII = function( str, scope, opts ) {
 	var oRegEx = {
 			digits: /\d(?:[\s\-\\.\\/]?\d){8,}(?!\d)/ig, //9digits or more pattern
 			passport: /\b[A-Za-z]{2}[\s\\.-]*?\d{6}\b/ig, //canadian nr passport pattern
-			email: /\b(?:[a-zA-Z0-9_\-\\.]+)(?:@|%40)(?:[a-zA-Z0-9_\-\\.]+)\.(?:[a-zA-Z]{2,5})\b/ig, //email pattern
+			email: /\b(?:[a-zA-Z0-9_\-\\.]+)(?:@|%40|%2540)(?:[a-zA-Z0-9_\-\\.]+)\.(?:[a-zA-Z]{2,5})\b/ig, //email pattern
 			postalCode: /\b[A-Za-z]\d[A-Za-z][ -]?\d[A-Za-z]\d\b/ig, //postal code pattern
 			username: /(?:(username|user)[%20]?([:=]|(%EF%BC%9A))[^\s&]*)/ig,
 			password: /(?:(password|pass)[%20]?([:=]|(%EF%BC%9A))[^\s&]*)/ig

diff --git a/src/core/test.js b/src/core/test.js
@@ -45,6 +45,13 @@ describe( "findPotentialPII test suite", function() {
 			expect( wb.findPotentialPII( "email:1@example.com", true ) ).to.equal( "email:" );
 		} );
 
+		it( "should match email pattern", function() {
+			expect( wb.findPotentialPII( "email:1%40example.com", true ) ).to.equal( "email:" );
+		} );
+		it( "should match email pattern", function() {
+			expect( wb.findPotentialPII( "email:1%2540example.com", true ) ).to.equal( "email:" );
+		} );
+
 		it( "should match postal code pattern", function() {
 			expect( wb.findPotentialPII( "postal code:K2C3N2, postal code:K2C 3N2, postal code:K2C-3N2", true ) ).to.equal( "postal code:, postal code:, postal code:" );
 		} );