Fix serialization error at authentication context cloning.

Thisara-Welmilla · Feb 9, 2025 · 0a6345c · 0a6345c
1 parent 5e1dcbe
commit 0a6345c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 42 deletions.
diff --git a/...arbon/identity/application/authentication/framework/config/model/AuthenticatorConfig.java b/...arbon/identity/application/authentication/framework/config/model/AuthenticatorConfig.java
@@ -20,7 +20,9 @@
 
 import org.wso2.carbon.identity.application.authentication.framework.ApplicationAuthenticator;
 import org.wso2.carbon.identity.application.authentication.framework.AuthenticatorStateInfo;
+import org.wso2.carbon.identity.application.common.model.FederatedAuthenticatorConfig;
 import org.wso2.carbon.identity.application.common.model.IdentityProvider;
+import org.wso2.carbon.identity.application.common.model.UserDefinedFederatedAuthenticatorConfig;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -127,6 +129,21 @@ public Map<String, IdentityProvider> getIdps() {
 
     public void setIdPs(Map<String, IdentityProvider> idPs) {
 
+
+        if (idPs != null) {
+            /* Remove non-serializable UserDefinedAuthenticatorEndpointConfig objects from the
+             UserDefinedFederatedAuthenticatorConfig in the context. The UserDefinedAuthenticatorEndpointConfig contains
+             the endpoint URI and the authentication type of the corresponding action. However, this information is not
+             used in the authentication flow. Instead, the action ID in the authenticator property is used to resolve
+             the corresponding action. */
+            for (IdentityProvider idp : idPs.values()) {
+                for (FederatedAuthenticatorConfig authConfig : idp.getFederatedAuthenticatorConfigs()) {
+                    if (authConfig instanceof UserDefinedFederatedAuthenticatorConfig) {
+                        ((UserDefinedFederatedAuthenticatorConfig) authConfig).setEndpointConfig(null);
+                    }
+                }
+            }
+        }
         this.idps = idPs;
     }
 

diff --git a/...2/carbon/identity/application/authentication/framework/context/AuthenticationContext.java b/...2/carbon/identity/application/authentication/framework/context/AuthenticationContext.java
@@ -22,17 +22,12 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.SerializationUtils;
 import org.wso2.carbon.identity.application.authentication.framework.AuthenticatorStateInfo;
-import org.wso2.carbon.identity.application.authentication.framework.config.model.AuthenticatorConfig;
 import org.wso2.carbon.identity.application.authentication.framework.config.model.ExternalIdPConfig;
 import org.wso2.carbon.identity.application.authentication.framework.config.model.SequenceConfig;
-import org.wso2.carbon.identity.application.authentication.framework.config.model.StepConfig;
 import org.wso2.carbon.identity.application.authentication.framework.model.AuthenticatedIdPData;
 import org.wso2.carbon.identity.application.authentication.framework.model.AuthenticatedUser;
 import org.wso2.carbon.identity.application.authentication.framework.model.AuthenticationRequest;
 import org.wso2.carbon.identity.application.authentication.framework.util.FrameworkConstants;
-import org.wso2.carbon.identity.application.common.model.FederatedAuthenticatorConfig;
-import org.wso2.carbon.identity.application.common.model.IdentityProvider;
-import org.wso2.carbon.identity.application.common.model.UserDefinedFederatedAuthenticatorConfig;
 import org.wso2.carbon.identity.base.IdentityRuntimeException;
 import org.wso2.carbon.identity.core.bean.context.MessageContext;
 import org.wso2.carbon.identity.core.util.IdentityTenantUtil;
@@ -860,43 +855,6 @@ public void setExpiryTime(long expiryTimeNano) {
      */
     public Object clone () {
 
-        removeNonSerializableObjects();
         return SerializationUtils.clone(this);
     }
-
-    private void removeNonSerializableObjects() {
-
-        /* Remove non-serializable UserDefinedAuthenticatorEndpointConfig objects from the
-         UserDefinedFederatedAuthenticatorConfig in the context. The UserDefinedAuthenticatorEndpointConfig contains
-         the endpoint URI and the authentication type of the corresponding action. However, this information is not
-         used in the authentication flow. Instead, the action ID in the authenticator property is used to resolve the
-         corresponding action. */
-        if (sequenceConfig == null || sequenceConfig.getStepMap() == null) {
-            return;
-        }
-
-        for (StepConfig stepConfig : sequenceConfig.getStepMap().values()) {
-            if (stepConfig == null || stepConfig.getAuthenticatorList() == null) {
-                continue;
-            }
-
-            for (AuthenticatorConfig authenticatorConfig : stepConfig.getAuthenticatorList()) {
-                if (stepConfig.getAuthenticatorList() == null) {
-                    continue;
-                }
-
-                for (IdentityProvider idp : authenticatorConfig.getIdps().values()) {
-                    if (idp == null || idp.getFederatedAuthenticatorConfigs() == null) {
-                        continue;
-                    }
-
-                    for (FederatedAuthenticatorConfig authConfig : idp.getFederatedAuthenticatorConfigs()) {
-                        if (authConfig instanceof UserDefinedFederatedAuthenticatorConfig) {
-                            ((UserDefinedFederatedAuthenticatorConfig) authConfig).setEndpointConfig(null);
-                        }
-                    }
-                }
-            }
-        }
-    }
 }