From bb43cb20b65a9048560ece7081cbc9601ea455fd Mon Sep 17 00:00:00 2001
From: UdeshAthukorala <udeshathukorala@gmail.com>
Date: Tue, 23 Jul 2024 21:47:16 +0530
Subject: [PATCH] Sanitizing error message in send email adaptive auth function

---
 .../auth/functions/notification/SendEmailFunctionImpl.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/components/org.wso2.carbon.identity.conditional.auth.functions.notification/src/main/java/org/wso2/carbon/identity/conditional/auth/functions/notification/SendEmailFunctionImpl.java b/components/org.wso2.carbon.identity.conditional.auth.functions.notification/src/main/java/org/wso2/carbon/identity/conditional/auth/functions/notification/SendEmailFunctionImpl.java
index a4914657..5b7cd5b1 100644
--- a/components/org.wso2.carbon.identity.conditional.auth.functions.notification/src/main/java/org/wso2/carbon/identity/conditional/auth/functions/notification/SendEmailFunctionImpl.java
+++ b/components/org.wso2.carbon.identity.conditional.auth.functions.notification/src/main/java/org/wso2/carbon/identity/conditional/auth/functions/notification/SendEmailFunctionImpl.java
@@ -22,6 +22,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.graalvm.polyglot.HostAccess;
 import org.wso2.carbon.identity.application.authentication.framework.config.model.graph.js.JsAuthenticatedUser;
+import org.wso2.carbon.identity.central.log.mgt.utils.LoggerUtils;
 import org.wso2.carbon.identity.conditional.auth.functions.notification.internal.NotificationFunctionServiceHolder;
 import org.wso2.carbon.identity.event.IdentityEventConstants;
 import org.wso2.carbon.identity.event.IdentityEventException;
@@ -62,8 +63,10 @@ public boolean sendMail(JsAuthenticatedUser user, String templateId, Map<String,
         try {
             NotificationFunctionServiceHolder.getInstance().getIdentityEventService().handleEvent(identityMgtEvent);
         } catch (IdentityEventException | NotificationRuntimeException e) {
-            LOG.error(String.format("Error when sending notification of template %s to user %s", templateId, user
-                    .getWrapped().toFullQualifiedUsername()), e);
+            String loggableUsername = LoggerUtils.isLogMaskingEnable ? LoggerUtils.getMaskedContent(
+                    user.getWrapped().toFullQualifiedUsername()) : user.getWrapped().toFullQualifiedUsername();
+            LOG.error(String.format("Error when sending notification of template %s to user %s", templateId,
+                    loggableUsername), e);
             return false;
         }
         return true;