[CommonServer.js] Update emailRegex (#31148)

change email regex
demisto · Dec 7, 2023 · 29512df · 29512df
1 parent 3988df8
commit 29512df
Show file tree

Hide file tree

Showing 8 changed files with 2,157 additions and 4 deletions.
diff --git a/Packs/Base/.pack-ignore b/Packs/Base/.pack-ignore
@@ -52,6 +52,9 @@ ignore=BA124
 [file:DBotTrainClustering.yml]
 ignore=BA124
 
+[file:CommonServer_6_10.yml]
+ignore=BA108,BA109
+
 [known_words]
 createindicatorrelationship
 commonserverpython

diff --git a/Packs/Base/ReleaseNotes/1_33_0.md b/Packs/Base/ReleaseNotes/1_33_0.md
@@ -0,0 +1,6 @@
+
+#### Scripts
+
+##### CommonServer
+
+- Update the `emailRegex` in CommonServer (JS) to catch emails with unicode as well (Available from Cortex XSOAR 6.11.0).
diff --git a/Packs/Base/Scripts/CommonServer/CommonServer.js b/Packs/Base/Scripts/CommonServer/CommonServer.js
@@ -1945,7 +1945,7 @@ function stringToDate(dateString, format) {
   /**************************** REGEX FORMATTING *******************************/
 
     var ipRegex = /\b(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])\b/;
-    var emailRegex = /\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}\b/;
+    var emailRegex = /\b(?:(?:\\|\^{3})u[a-f\d]{4})?(?<localpart>[\p{L}\d.!#$%&'*+\/=?^_\xe60{}~-][\p{L}\d.!#$%&'*+\/=?^_\xe60{|}~-]{0,63})\[?@\]?(?<domain>[\p{L}\d-]{1,255}(?:\[?\.\]?(?:[\p{L}\d-]{2,}))*(?:\[?\.\]?(?<tld>[\p{L}]{2,})))\b/gm;
     var hashRegex = /[a-fA-F0-9]/;
     var md5Regex = /\b[a-fA-F\d]{32}\b/gm;
     var sha1Regex = /\b[a-fA-F\d]{40}\b/gm;

diff --git a/Packs/Base/Scripts/CommonServer/CommonServer.yml b/Packs/Base/Scripts/CommonServer/CommonServer.yml
@@ -7,11 +7,11 @@ type: javascript
 tags:
 - infra
 - server
-comment: Common code that will be merged into each server script when it runs
+comment: Common code that will be merged into each server script when it runs.
 system: true
 scripttarget: 0
 dependson: {}
 timeout: 0s
 tests:
 - 'Test CommonServer'
-fromversion: 5.0.0
+fromversion: 6.11.0