Merge with Future branch.

Conflicts:
	lib/net/authorize/util/ANetSensitiveFields.php

Author: Vyoam

lib/net/authorize/api/controller/base/ApiOperationBase.php

@@ -10,8 +10,6 @@
 use \net\authorize\util\HttpClient;
 use \net\authorize\util\Helpers;
 use \net\authorize\util\LogFactory as LogFactory;
-//use \net\authorize\util\LogHelper;
-use \net\authorize\util\Log;
 
 
 abstract class ApiOperationBase implements IApiOperation

lib/net/authorize/util/ANetSensitiveFields.php

@@ -16,15 +16,16 @@ private static function fetchFromConfigFiles(){
             exit("Class (".ANET_SENSITIVE_DATE_CONFIG_CLASS.") doesn't exist; can't deserialize json; can't log. Exiting.");
 
 		$serializer = SerializerBuilder::create()->build();
+
+		$userConfigFilePath = ANET_SENSITIVE_XMLTAGS_JSON_FILE;
+        $presentUserConfigFile = file_exists($userConfigFilePath);
 
-        $userConfigFile = ANET_SENSITIVE_XMLTAGS_JSON_FILE;
         $configFilePath = dirname(__FILE__) . "/" . ANET_SENSITIVE_XMLTAGS_JSON_FILE;
-        
-        $presentUserConfigFile = file_exists($userConfigFile);
         $useDefaultConfigFile = !$presentUserConfigFile;
+		
         if ($presentUserConfigFile) { //client config for tags
             //read list of tags (and associated regex-patterns and replacements) from .json file
-            $jsonFileData=file_get_contents($userConfigFile);
+            $jsonFileData=file_get_contents($userConfigFilePath);
             $sensitiveDataConfig = $serializer->deserialize($jsonFileData, ANET_SENSITIVE_DATE_CONFIG_CLASS, 'json');
 
             $sensitiveTags = $sensitiveDataConfig->sensitiveTags;
@@ -33,7 +34,7 @@ private static function fetchFromConfigFiles(){
             if (json_last_error() === JSON_ERROR_NONE) {// JSON is valid
             }
             else{
-                echo "ERROR: Invalid json in: " . $userConfigFile  . " json_last_error_msg : " . json_last_error_msg();
+                echo "ERROR: Invalid json in: " . $userConfigFilePath  . " json_last_error_msg : " . json_last_error_msg();
                 $useDefaultConfigFile = true;
             }
         }

lib/net/authorize/util/Log.php

@@ -132,7 +132,7 @@ private function getPropertiesInclBase($reflClass)
 	}
 
 	/**
-	* private function checkAndMask($prop, $obj).
+	* private function checkPropertyAndMask($prop, $obj).
 	* 
 	* Receives a ReflectionProperty and an object, and returns a masked object if the ReflectionProperty corresponds to a sensitive field, else returns false.
 	*
@@ -141,22 +141,22 @@ private function getPropertiesInclBase($reflClass)
 	*
 	* @return string|bool
 	*/
-	private function checkAndMask($prop, $obj){
-		foreach($this->sensitiveXmlTags as $i => $sensitiveTag)
+	private function checkPropertyAndMask($prop, $obj){
+		foreach($this->sensitiveXmlTags as $i => $sensitiveField)
 		{
 			$inputPattern = "(.+)";
 			$inputReplacement = "xxxx";
 
-            if(trim($sensitiveTag->pattern)) {
-                $inputPattern = $sensitiveTag->pattern;
+            if(trim($sensitiveField->pattern)) {
+                $inputPattern = $sensitiveField->pattern;
             }
 			$inputPattern = $this->addDelimiterFwdSlash($inputPattern);
 
-            if(trim($sensitiveTag->replacement)) {
-                $inputReplacement = $sensitiveTag->replacement;
+            if(trim($sensitiveField->replacement)) {
+                $inputReplacement = $sensitiveField->replacement;
             }
 
-			if(strcmp($prop->getName(),$sensitiveTag->tagName)==0)
+			if(strcmp($prop->getName(),$sensitiveField->tagName)==0)
 			{
 				$prop->setValue($obj,preg_replace($inputPattern,$inputReplacement,$prop->getValue($obj)));
 				return $prop->getValue($obj);
@@ -196,7 +196,7 @@ private function maskSensitiveProperties ($obj)
             }
 			// else check if the property represents a sensitive field. If so, mask.
             else{
-				$res=$this->checkAndMask($prop, $obj);
+				$res=$this->checkPropertyAndMask($prop, $obj);
 				if($res)
 					$prop->setValue($obj, $res);
             }
@@ -222,15 +222,27 @@ private function getMasked($raw)
     { //always returns string
         $messageType = gettype($raw);
         $message="";
-        if ($messageType == "string") {
-            $maskedXml = $this->maskSensitiveXmlString($raw);
-            //mask credit card numbers
-            $message = $this->maskCreditCards($maskedXml);
-        }
-        else if($messageType == "object"){
+        if($messageType == "object"){
 			$obj = unserialize(serialize($raw)); // deep copying the object
 			$message = print_r($this->maskSensitiveProperties($obj), true); //object to string
         }
+        else if($messageType == "array"){
+            $copyArray = unserialize(serialize($raw));
+            foreach($copyArray as $i => $element){
+                $copyArray[$i] = $this->getMasked($element);
+            }
+            $message = print_r($copyArray, true); // returns string
+        }
+        else { //$messageType == "string")
+            $primtiveTypeAsString = strval($raw);
+
+            $maskedXml = $primtiveTypeAsString;
+            if($messageType == "string") {
+                $maskedXml = $this->maskSensitiveXmlString($primtiveTypeAsString);
+            }
+            //mask credit card numbers
+            $message = $this->maskCreditCards($maskedXml);
+        }
         return $message;
     }