Skip to content

Commit 8193aeb

Browse files
authored
CVE-2025-48924 Apache Commons Lang is vulnerable to Uncontrolled Recursion when processing long inputs (#887)
1 parent e3976b5 commit 8193aeb

File tree

84 files changed

+201
-111
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+201
-111
lines changed

legal/THIRDPARTYREADME.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,7 @@ Copyright: Copyright 2002-2014 The Apache Software Foundation
7171
Version: commons-io-2.3.jar
7272
Copyright: Copyright 2002-2012 The Apache Software Foundation
7373

74-
Version: commons-lang-2.6.jar
75-
Copyright: Copyright 2001-2008 The Apache Software Foundation
76-
77-
Version: commons-lang3-3.4.jar
74+
Version: commons-lang3-3.18.jar
7875
Copyright: Copyright 2001-2015 The Apache Software Foundation
7976

8077
Version: commons-logging-1.1.3.jar

openam-authentication/openam-auth-ldap/src/main/java/com/sun/identity/authentication/modules/ldap/LDAP.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
*
2727
* Portions Copyrighted 2010-2016 ForgeRock AS.
2828
* Portions Copyrighted 2019 Open Source Solution Technology Corporation
29-
* Portions Copyrighted 2024 3A Systems LLC
29+
* Portions Copyrighted 2024-2025 3A Systems LLC
3030
*/
3131

3232
package com.sun.identity.authentication.modules.ldap;
@@ -57,7 +57,7 @@
5757
import javax.security.auth.callback.NameCallback;
5858
import javax.security.auth.callback.PasswordCallback;
5959

60-
import org.apache.commons.lang.StringUtils;
60+
import org.apache.commons.lang3.StringUtils;
6161
import org.forgerock.openam.ldap.LDAPAuthUtils;
6262
import org.forgerock.openam.ldap.LDAPUtilException;
6363
import org.forgerock.openam.ldap.ModuleState;

openam-authentication/openam-auth-oauth2/src/main/java/org/forgerock/openam/authentication/modules/oauth2/OAuth.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
 * "Portions Copyrighted [year] [name of copyright owner]"
2424
*
2525
* Portions Copyrighted 2015 Nomura Research Institute, Ltd.
26+
* Portions Copyrighted 2018-2025 3A Systems, LLC.
2627
*/
2728
package org.forgerock.openam.authentication.modules.oauth2;
2829

@@ -51,8 +52,8 @@
5152
import javax.servlet.http.HttpServletRequest;
5253
import javax.servlet.http.HttpServletResponse;
5354

54-
import org.apache.commons.lang.RandomStringUtils;
55-
import org.apache.commons.lang.StringUtils;
55+
import org.apache.commons.lang3.RandomStringUtils;
56+
import org.apache.commons.lang3.StringUtils;
5657
import org.forgerock.guice.core.InjectorHolder;
5758
import org.forgerock.json.jose.jwt.JwtClaimsSet;
5859
import org.forgerock.openam.authentication.modules.common.mapping.AccountProvider;

openam-authentication/openam-auth-oauth2/src/main/java/org/forgerock/openam/authentication/modules/oauth2/profile/ESIAProfileProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import javax.security.auth.login.LoginException;
88

99
import org.apache.commons.codec.binary.Base64;
10-
import org.apache.commons.lang.StringUtils;
10+
import org.apache.commons.lang3.StringUtils;
1111
import org.forgerock.openam.authentication.modules.oauth2.HttpRequestContent;
1212
import org.forgerock.openam.authentication.modules.oauth2.OAuthConf;
1313
import org.forgerock.openam.authentication.modules.oauth2.OAuthUtil;

openam-authentication/openam-auth-oauth2/src/main/java/org/forgerock/openam/authentication/modules/oauth2/profile/ProfileProviderFactory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
* Header, with the fields enclosed by brackets [] replaced by your own identifying
1212
* information: "Portions copyright [year] [name of copyright owner]".
1313
*
14-
* Copyright 2018-2024 3A Systems LLC.
14+
* Copyright 2018-2025 3A Systems LLC.
1515
*/
1616

1717
package org.forgerock.openam.authentication.modules.oauth2.profile;
1818

19-
import org.apache.commons.lang.StringUtils;
19+
import org.apache.commons.lang3.StringUtils;
2020
import org.forgerock.openam.authentication.modules.oauth2.OAuthConf;
2121

2222
public class ProfileProviderFactory {

openam-authentication/openam-auth-persistentcookie/src/main/java/org/forgerock/openam/authentication/modules/persistentcookie/PersistentCookieAuthModule.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* information: "Portions copyright [year] [name of copyright owner]".
1313
*
1414
* Copyright 2013-2016 ForgeRock AS.
15+
* Portions Copyrighted 2018-2025 3A Systems, LLC.
1516
*/
1617

1718
package org.forgerock.openam.authentication.modules.persistentcookie;
@@ -30,7 +31,7 @@
3031
import javax.security.auth.login.LoginException;
3132
import javax.security.auth.message.MessageInfo;
3233

33-
import org.apache.commons.lang.StringUtils;
34+
import org.apache.commons.lang3.StringUtils;
3435
import org.forgerock.caf.authentication.framework.AuthenticationFramework;
3536
import org.forgerock.jaspi.modules.session.jwt.JwtSessionModule;
3637
import org.forgerock.json.jose.jwt.Jwt;

openam-authentication/openam-auth-persistentcookie/src/main/java/org/forgerock/openam/authentication/modules/persistentcookie/PersistentCookieAuthModulePostAuthenticationPlugin.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* information: "Portions copyright [year] [name of copyright owner]".
1313
*
1414
* Copyright 2016 ForgeRock AS.
15+
* Portions Copyrighted 2018-2025 3A Systems, LLC.
1516
*/
1617

1718
package org.forgerock.openam.authentication.modules.persistentcookie;
@@ -31,7 +32,7 @@
3132
import javax.servlet.http.HttpServletRequest;
3233
import javax.servlet.http.HttpServletResponse;
3334

34-
import org.apache.commons.lang.StringUtils;
35+
import org.apache.commons.lang3.StringUtils;
3536
import org.forgerock.jaspi.modules.session.jwt.JwtSessionModule;
3637
import org.forgerock.openam.authentication.modules.common.JaspiAuthLoginModulePostAuthenticationPlugin;
3738
import org.forgerock.openam.utils.ClientUtils;

openam-authentication/openam-auth-recaptcha/src/main/java/org/openidentityplatform/openam/authentication/modules/recaptcha/ReCaptcha.java

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/*
2+
* The contents of this file are subject to the terms of the Common Development and
3+
* Distribution License (the License). You may not use this file except in compliance with the
4+
* License.
5+
*
6+
* You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
7+
* specific language governing permission and limitations under the License.
8+
*
9+
* When distributing Covered Software, include this CDDL Header Notice in each file and include
10+
* the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
11+
* Header, with the fields enclosed by brackets [] replaced by your own identifying
12+
* information: "Portions copyright [year] [name of copyright owner]".
13+
*
14+
* Copyright 2018-2025 3A Systems LLC.
15+
*/
16+
117
package org.openidentityplatform.openam.authentication.modules.recaptcha;
218

319
import java.lang.reflect.Field;
@@ -13,7 +29,7 @@
1329
import javax.security.auth.callback.TextOutputCallback;
1430
import javax.security.auth.login.LoginException;
1531

16-
import org.apache.commons.lang.StringUtils;
32+
import org.apache.commons.lang3.StringUtils;
1733
import org.apache.commons.net.util.SubnetUtils;
1834
import org.apache.http.NameValuePair;
1935
import org.apache.http.client.config.RequestConfig;

openam-authentication/openam-auth-webauthn/src/main/java/org/openidentityplatform/openam/authentication/modules/webauthn/WebAuthnAuthentication.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* Header, with the fields enclosed by brackets [] replaced by your own identifying
1212
* information: "Portions Copyrighted [year] [name of copyright owner]".
1313
*
14-
* Copyright 2024 3A-Systems LLC. All rights reserved.
14+
* Copyright 2019-2025 3A-Systems LLC. All rights reserved.
1515
*/
1616

1717
package org.openidentityplatform.openam.authentication.modules.webauthn;
@@ -36,7 +36,7 @@
3636
import com.webauthn4j.authenticator.Authenticator;
3737
import com.webauthn4j.data.PublicKeyCredentialRequestOptions;
3838
import com.webauthn4j.data.attestation.authenticator.AuthenticatorData;
39-
import org.apache.commons.lang.SerializationUtils;
39+
import org.apache.commons.lang3.SerializationUtils;
4040

4141
import javax.security.auth.Subject;
4242
import javax.security.auth.callback.Callback;

openam-authentication/openam-auth-webauthn/src/main/java/org/openidentityplatform/openam/authentication/modules/webauthn/WebAuthnAuthenticationProcessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* Header, with the fields enclosed by brackets [] replaced by your own identifying
1212
* information: "Portions Copyrighted [year] [name of copyright owner]".
1313
*
14-
* Copyright 2024 3A-Systems LLC. All rights reserved.
14+
* Copyright 2019-2025 3A-Systems LLC. All rights reserved.
1515
*/
1616

1717
package org.openidentityplatform.openam.authentication.modules.webauthn;
@@ -32,7 +32,7 @@
3232
import com.webauthn4j.data.client.challenge.DefaultChallenge;
3333
import com.webauthn4j.server.ServerProperty;
3434
import com.webauthn4j.validator.exception.ValidationException;
35-
import org.apache.commons.lang.ArrayUtils;
35+
import org.apache.commons.lang3.ArrayUtils;
3636

3737
import javax.servlet.http.HttpServletRequest;
3838
import java.util.ArrayList;

0 commit comments

Comments
 (0)