Merge branch 'master' of https://github.com/ashtru/sdk-php

Author: ashtru

lib/net/authorize/util/AuthorizedNetSensitiveTagsConfig.json

@@ -8,7 +8,7 @@
         },
         {
             "tagName": "cardNumber",
-            "pattern": "(\\d+)(\\d{4})",
+            "pattern": "(\\p{N}+)(\\p{N}{4})",
             "replacement": "xxxx-$2",
             "disableMask": false
         },
@@ -20,7 +20,7 @@
         },
         {
             "tagName": "accountNumber",
-            "pattern": "(\\d+)(\\d{4})",
+            "pattern": "(\\p{N}+)(\\p{N}{4})",
             "replacement": "xxxx-$2",
             "disableMask": false
         },
@@ -38,12 +38,12 @@
         }
     ],
     "sensitiveStringRegexes": [
-        "4\\d{3}([\\ \\-]?)\\d{4}\\1\\d{4}\\1\\d{4}",
-        "4\\d{3}([\\ \\-]?)(?:\\d{4}\\1){2}\\d(?:\\d{3})?",
-        "5[1-5]\\d{2}([\\ \\-]?)\\d{4}\\1\\d{4}\\1\\d{4}",
-        "6(?:011|22(?:1(?=[\\ \\-]?(?:2[6-9]|[3-9]))|[2-8]|9(?=[\\ \\-]?(?:[01]|2[0-5])))|4[4-9]\\d|5\\d\\d)([\\ \\-]?)\\d{4}\\1\\d{4}\\1\\d{4}",
-        "35(?:2[89]|[3-8]\\d)([\\ \\-]?)\\d{4}\\1\\d{4}\\1\\d{4}",
-        "3[47]\\d\\d([\\ \\-]?)\\d{6}\\1\\d{5}"
+        "4\\p{N}{3}([\\ \\-]?)\\p{N}{4}\\1\\p{N}{4}\\1\\p{N}{4}",
+        "4\\p{N}{3}([\\ \\-]?)(?:\\p{N}{4}\\1){2}\\p{N}(?:\\p{N}{3})?",
+        "5[1-5]\\p{N}{2}([\\ \\-]?)\\p{N}{4}\\1\\p{N}{4}\\1\\p{N}{4}",
+        "6(?:011|22(?:1(?=[\\ \\-]?(?:2[6-9]|[3-9]))|[2-8]|9(?=[\\ \\-]?(?:[01]|2[0-5])))|4[4-9]\\p{N}|5\\p{N}\\p{N})([\\ \\-]?)\\p{N}{4}\\1\\p{N}{4}\\1\\p{N}{4}",
+        "35(?:2[89]|[3-8]\\p{N})([\\ \\-]?)\\p{N}{4}\\1\\p{N}{4}\\1\\p{N}{4}",
+        "3[47]\\p{N}\\p{N}([\\ \\-]?)\\p{N}{6}\\1\\p{N}{5}"
     ]
 }
 

lib/net/authorize/util/Log.php

@@ -31,6 +31,19 @@ class Log
 {
     private $sensitiveXmlTags = NULL;
 
+	/**
+	* Takes a regex pattern (string) as argument and adds the forward slash delimiter.
+	* Also adds the u flag to enable Unicode mode regex.
+	*
+	* @param string $regexPattern
+	*
+	* @return string
+	*/
+	private function addDelimiterFwdSlash($regexPattern)
+	{
+		return '/'.$regexPattern.'/u';
+	}
+	
 	/**
 	* Takes an xml as string and masks the sensitive fields.
 	*
@@ -50,7 +63,8 @@ private function maskSensitiveXmlString($rawString){
             if(trim($sensitiveTag->pattern)) {
                 $inputPattern = $sensitiveTag->pattern;
             }
-            $pattern = "/<" . $tag . ">(?:.*)". $inputPattern ."(?:.*)<\/" . $tag . ">/";
+            $pattern = "<" . $tag . ">(?:.*)". $inputPattern ."(?:.*)<\/" . $tag . ">";
+			$pattern = $this->addDelimiterFwdSlash($pattern);
 
             if(trim($sensitiveTag->replacement)) {
                 $inputReplacement = $sensitiveTag->replacement;
@@ -76,15 +90,18 @@ private function maskCreditCards($rawString){
         $replacements=array();
 
         foreach ($this->sensitiveStringRegexes as $i => $creditCardRegex){
-            $pattern = "/" . $creditCardRegex . "/";
+            $pattern = $creditCardRegex;
+			$pattern = $this->addDelimiterFwdSlash($pattern);
 
             $replacement = "xxxx";
             $patterns [$i] = $pattern;
             $replacements[$i]  = $replacement;
         }
         $maskedString = preg_replace($patterns, $replacements, $rawString);
         return $maskedString;
-    }/**
+    }
+	
+	/**
 	* Object data masking related functions START
 	*/
 
@@ -133,7 +150,7 @@ private function checkPropertyAndMask($prop, $obj){
             if(trim($sensitiveField->pattern)) {
                 $inputPattern = $sensitiveField->pattern;
             }
-			$inputPattern='/'.$inputPattern.'/';
+			$inputPattern = $this->addDelimiterFwdSlash($inputPattern);
 
             if(trim($sensitiveField->replacement)) {
                 $inputReplacement = $sensitiveField->replacement;