Merge pull request #1959 from mohanachandran-s/develop

MOSIP-38979 - Updated the masking and removed redundant api calls

Author: mohanachandran-s

apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/AdminTestUtil.java

@@ -174,7 +174,9 @@ public class AdminTestUtil extends BaseTestCase {
 	public static String currentLanguage;
 	protected static String idField = null;
 	protected static String identityHbs = null;
+	protected static String identityHbsV2 = null;
 	protected static String updateIdentityHbs = null;
+	protected static String updateIdentityHbsV2Cached = null;
 	protected static String draftHbs = null;
 	protected static String preregHbsForCreate = null;
 	protected static String preregHbsForUpdate = null;
@@ -5656,13 +5658,15 @@ public static String modifySchemaGenerateHbs(boolean regenerateHbs) {
 	}
 
 	public static String modifySchemaGenerateHbsV2(boolean regenerateHbs) {
-
+		if (identityHbsV2 != null && !regenerateHbs) {
+			return identityHbsV2;
+		}
+		if (regenerateHbs) identityHbsV2 = null;
 		String hbs = modifySchemaGenerateHbs(regenerateHbs);
-
 		JSONObject requestJson = new JSONObject(hbs);
 		requestJson.getJSONObject("request").put("verifiedAttributes", "$VERIFIED_ATTRIBUTES$");
-
-		return requestJson.toString().replace("\"$VERIFIED_ATTRIBUTES$\"", buildVerifiedAttributesHbs());
+		identityHbsV2 = requestJson.toString().replace("\"$VERIFIED_ATTRIBUTES$\"", buildVerifiedAttributesHbs());
+		return identityHbsV2;
 	}
 
 	private static String buildVerifiedAttributesHbs() {
@@ -5866,16 +5870,21 @@ else if (eachRequiredProp.contains(GlobalConstants.GENDER))
 	}
 
 	public static String updateIdentityHbsV2(boolean regenerateHbs) {
-
+		if (updateIdentityHbsV2Cached != null && !regenerateHbs) {
+			return updateIdentityHbsV2Cached;
+		}
+		if (regenerateHbs) updateIdentityHbsV2Cached = null;
 		String hbs = updateIdentityHbs(regenerateHbs);
-
 		JSONObject requestJson = new JSONObject(hbs);
 		requestJson.getJSONObject("request").put("verifiedAttributes", "$VERIFIED_ATTRIBUTES$");
-
-		return requestJson.toString().replace("\"$VERIFIED_ATTRIBUTES$\"", buildVerifiedAttributesHbs());
+		updateIdentityHbsV2Cached = requestJson.toString().replace("\"$VERIFIED_ATTRIBUTES$\"", buildVerifiedAttributesHbs());
+		return updateIdentityHbsV2Cached;
 	}
 
 	public static String generateLatestSchemaVersion() {
+		if (idSchemaVersion != null) {
+			return idSchemaVersion.toString();
+		}
 		kernelAuthLib = new KernelAuthentication();
 		String token = kernelAuthLib.getTokenByRole(GlobalConstants.ADMIN);
 		String url = getSchemaURL();

apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/GlobalMethods.java

@@ -267,28 +267,34 @@ public static boolean getCaptchaStatus() {
 	}
 
 	public static String maskOutSensitiveInfo(String strInput) {
-	    if (ConfigManager.IsDebugEnabled())
-	        return strInput;
-
 	    if (strInput == null || strInput.isBlank())
 	        return strInput;
 
 	    String maskedInput = strInput;
 
-	    String[] sensitiveKeys = {
-	        "password", "secret", "token", "key", "private", "client_secret", "authclientsecret"
-	    };
-
-	    for (String key : sensitiveKeys) {
-	        String regex = "(?i)(\"[^\"]*" + key + "[^\"]*\"\\s*:\\s*\")(.*?)(\")";
-	        maskedInput = maskedInput.replaceAll(regex, "$1***** MASKED *****$3");
+	    // In debug mode skip key/token masking so full payloads remain visible,
+	    // but always mask large binary payloads to keep the report size manageable.
+	    if (!ConfigManager.IsDebugEnabled()) {
+	        String[] sensitiveKeys = {
+	            "password", "secret", "token", "key", "private", "client_secret", "authclientsecret"
+	        };
+	        for (String key : sensitiveKeys) {
+	            String regex = "(?i)(\"[^\"]*" + key + "[^\"]*\"\\s*:\\s*\")(.*?)(\")";
+	            maskedInput = maskedInput.replaceAll(regex, "$1***** MASKED *****$3");
+	        }
+	        Pattern INDIVIDUAL_BIOMETRICS_PATTERN = Pattern.compile(
+	                "\"category\"\\s*:\\s*\"individualBiometrics\"\\s*,\\s*\"value\"\\s*:\\s*\"(.*?)\"");
+	        Matcher biometricsMatcher = INDIVIDUAL_BIOMETRICS_PATTERN.matcher(maskedInput);
+	        maskedInput = biometricsMatcher.replaceAll(
+	                "\"category\": \"individualBiometrics\", \"value\": \"***** MASKED *****\"");
 	    }
 
-	    Pattern INDIVIDUAL_BIOMETRICS_PATTERN = Pattern.compile(
-	            "\"category\"\\s*:\\s*\"individualBiometrics\"\\s*,\\s*\"value\"\\s*:\\s*\"(.*?)\"");
-	    Matcher biometricsMatcher = INDIVIDUAL_BIOMETRICS_PATTERN.matcher(maskedInput);
-	    maskedInput = biometricsMatcher.replaceAll(
-	            "\"category\": \"individualBiometrics\", \"value\": \"***** MASKED *****\"");
+	    // Always mask large base64/binary payloads regardless of debug mode --
+	    // cbeff biometrics, document files, encrypted identity data.
+	    maskedInput = maskedInput.replaceAll("\"value\"\\s*:\\s*\"([^\"]{200,})\"",
+	            "\"value\": \"***** MASKED *****\"");
+	    maskedInput = maskedInput.replaceAll("\"data\"\\s*:\\s*\"([^\"]{200,})\"",
+	            "\"data\": \"***** MASKED *****\"");
 
 	    return maskedInput;
 	}
@@ -335,7 +341,7 @@ public static void reportResponse(String responseHeader, String url, Response re
 					+ GlobalConstants.REPORT_RESPONSE_SUFFIX);
 		} else {
 			Reporter.log(GlobalConstants.REPORT_RESPONSE_PREFIX + GlobalConstants.REPORT_RESPONSE_BODY + formattedHeader
-					+ ReportUtil.getTextAreaJsonMsgHtml(response.asString()) + GlobalConstants.REPORT_RESPONSE_SUFFIX);
+					+ ReportUtil.getTextAreaJsonMsgHtml(maskOutSensitiveInfo(response.asString())) + GlobalConstants.REPORT_RESPONSE_SUFFIX);
 		}
 	}
 	public static void reportResponseHeader(String responseHeader, String url) {
@@ -352,12 +358,13 @@ public static void reportResponse(String responseHeader, String url, String resp
 	public static void reportResponse(String responseHeader, String url, String response, boolean formatResponse) {
 		String formattedHeader = ReportUtil.getTextAreaForHeaders(responseHeader);
 
+		String maskedResponse = maskOutSensitiveInfo(response);
 		if (formatResponse)
 			Reporter.log(GlobalConstants.REPORT_RESPONSE_PREFIX + GlobalConstants.REPORT_RESPONSE_BODY + formattedHeader
-					+ ReportUtil.getTextAreaJsonMsgHtml(response) + GlobalConstants.REPORT_RESPONSE_SUFFIX);
+					+ ReportUtil.getTextAreaJsonMsgHtml(maskedResponse) + GlobalConstants.REPORT_RESPONSE_SUFFIX);
 		else
 			Reporter.log(GlobalConstants.REPORT_RESPONSE_PREFIX + GlobalConstants.REPORT_RESPONSE_BODY + responseHeader
-					+ response + GlobalConstants.REPORT_RESPONSE_SUFFIX);
+					+ maskedResponse + GlobalConstants.REPORT_RESPONSE_SUFFIX);
 	}
 
 	// Hashes a string using SHA-256