Re-added disableMask in ANetSensitiveFields.php

Author: ashtru

lib/net/authorize/util/ANetSensitiveFields.php

@@ -5,7 +5,7 @@
 
 class ANetSensitiveFields
 {
-    private static $sensitiveTags = NULL;
+    private static $applySensitiveTags = NULL;
     private static $sensitiveStringRegexes = NULL;
 
     private static function fetchFromConfigFiles(){
@@ -15,7 +15,7 @@ private static function fetchFromConfigFiles(){
         if ($presentUserConfigFile) { //client config for tags
             //read list of tags(and associate regex-patterns and replacements) from .json file
             $jsonFileObejct = json_decode(file_get_contents($userConfigFile));
-            self::$sensitiveTags = $jsonFileObejct->sensitiveTags;
+            $sensitiveTags = $jsonFileObejct->sensitiveTags;
             self::$sensitiveStringRegexes = $jsonFileObejct->sensitiveStringRegexes;
             if (json_last_error() === JSON_ERROR_NONE) {// JSON is valid
             }
@@ -29,14 +29,24 @@ private static function fetchFromConfigFiles(){
                 exit("ERROR: No config file: " . $configFilePath);
             }
             $jsonFileObejct = json_decode(file_get_contents($configFilePath));
-            self::$sensitiveTags = $jsonFileObejct->sensitiveTags;
+            $sensitiveTags = $jsonFileObejct->sensitiveTags;
             self::$sensitiveStringRegexes = $jsonFileObejct->sensitiveStringRegexes;
             if (json_last_error() === JSON_ERROR_NONE) {
             }
             else{
                 exit("ERROR: Invalid json in: " . $configFilePath  . " json_last_error_msg : " . json_last_error_msg());
             }
         }
+        //Check for disableMask flag in case of client json.
+        self::$applySensitiveTags = array();
+        foreach($sensitiveTags as $sensitiveTag){
+            if($sensitiveTag->disableMask){
+                //skip masking continue;
+            }
+            else{
+                array_push(self::$applySensitiveTags,$sensitiveTag);
+            }
+        }
     }
     public static function getSensitiveStringRegexes(){
         if(NULL == self::$sensitiveStringRegexes) {
@@ -45,9 +55,9 @@ public static function getSensitiveStringRegexes(){
         return self::$sensitiveStringRegexes;
     }
     public static function getSensitiveXmlTags(){
-        if(NULL == self::$sensitiveTags) {
+        if(NULL == self::$applySensitiveTags) {
             self::fetchFromConfigFiles();
         }
-        return self::$sensitiveTags;
+        return self::$applySensitiveTags;
     }
 }