Skip to content

Commit 7008e02

Browse files
RANGER-5391: Migrate from Apache Commons Lang 2.6 to Commons Lang 3.19.0 (#724)
This commit migrates Apache Ranger from the vulnerable Commons Lang 2.6 library to Commons Lang 3.19.0, addressing CVE-2025-48924. The migration involves updating all import statements from org.apache.commons.lang.* to org.apache.commons.lang3.* across the codebase and updating dependency declarations in POM files. Key changes: - Updated Commons Lang 3 version from 3.3.2 to 3.19.0 in the root POM - Replaced all imports across 100+ Java files from org.apache.commons.lang to org.apache.commons.lang3 - Removed commons-lang:2.6 dependency declarations and added commons-lang3:3.19.0 where needed --------- Co-authored-by: Madhan Neethiraj <[email protected]>
1 parent f5cf897 commit 7008e02

File tree

410 files changed

+512
-533
lines changed

Some content is hidden

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

410 files changed

+512
-533
lines changed

agents-audit/core/pom.xml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,7 @@
3737
<artifactId>hppc</artifactId>
3838
<version>${hppc.version}</version>
3939
</dependency>
40-
<dependency>
41-
<groupId>commons-lang</groupId>
42-
<artifactId>commons-lang</artifactId>
43-
<version>${commons.lang.version}</version>
44-
</dependency>
40+
4541
<dependency>
4642
<groupId>io.airlift</groupId>
4743
<artifactId>aircompressor</artifactId>
@@ -63,6 +59,11 @@
6359
<artifactId>commons-configuration2</artifactId>
6460
<version>${commons.configuration.version}</version>
6561
</dependency>
62+
<dependency>
63+
<groupId>org.apache.commons</groupId>
64+
<artifactId>commons-lang3</artifactId>
65+
<version>${commons.lang3.version}</version>
66+
</dependency>
6667
<dependency>
6768
<groupId>org.apache.commons</groupId>
6869
<artifactId>commons-text</artifactId>

agents-audit/core/src/main/java/org/apache/ranger/audit/model/AuthzAuditEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import com.fasterxml.jackson.annotation.JsonIgnore;
2323
import com.fasterxml.jackson.annotation.JsonProperty;
2424
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
25-
import org.apache.commons.lang.StringUtils;
25+
import org.apache.commons.lang3.StringUtils;
2626

2727
import java.util.Date;
2828
import java.util.HashSet;

agents-audit/core/src/main/java/org/apache/ranger/audit/provider/AuditWriterFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* under the License.
2020
*/
2121

22-
import org.apache.commons.lang.StringUtils;
22+
import org.apache.commons.lang3.StringUtils;
2323
import org.apache.ranger.audit.utils.RangerAuditWriter;
2424
import org.slf4j.Logger;
2525
import org.slf4j.LoggerFactory;

agents-audit/core/src/main/java/org/apache/ranger/audit/provider/MiscUtil.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
import com.fasterxml.jackson.core.JsonParser;
2020
import com.fasterxml.jackson.databind.ObjectMapper;
21-
import org.apache.commons.lang.ArrayUtils;
22-
import org.apache.commons.lang.StringUtils;
21+
import org.apache.commons.lang3.ArrayUtils;
22+
import org.apache.commons.lang3.StringUtils;
2323
import org.apache.hadoop.security.UserGroupInformation;
2424
import org.apache.hadoop.security.authentication.util.KerberosName;
2525
import org.apache.hadoop.security.authentication.util.KerberosUtil;

agents-audit/core/src/main/java/org/apache/ranger/audit/utils/AbstractRangerAuditWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* under the License.
2020
*/
2121

22-
import org.apache.commons.lang.StringUtils;
22+
import org.apache.commons.lang3.StringUtils;
2323
import org.apache.hadoop.conf.Configuration;
2424
import org.apache.hadoop.fs.CommonPathCapabilities;
2525
import org.apache.hadoop.fs.FSDataOutputStream;

agents-audit/core/src/main/java/org/apache/ranger/audit/utils/RollingTimeUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
package org.apache.ranger.audit.utils;
2020

21-
import org.apache.commons.lang.StringUtils;
21+
import org.apache.commons.lang3.StringUtils;
2222

2323
import java.util.Calendar;
2424
import java.util.Date;

agents-audit/dest-cloudwatch/src/main/java/org/apache/ranger/audit/destination/AmazonCloudWatchAuditDestination.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import com.amazonaws.services.logs.model.PutLogEventsRequest;
2828
import com.amazonaws.services.logs.model.PutLogEventsResult;
2929
import com.amazonaws.services.logs.model.ResourceNotFoundException;
30-
import org.apache.commons.lang.StringUtils;
30+
import org.apache.commons.lang3.StringUtils;
3131
import org.apache.ranger.audit.model.AuditEventBase;
3232
import org.apache.ranger.audit.provider.MiscUtil;
3333
import org.slf4j.Logger;

agents-audit/dest-es/src/main/java/org/apache/ranger/audit/destination/ElasticSearchAuditDestination.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
package org.apache.ranger.audit.destination;
2121

22-
import org.apache.commons.lang.StringUtils;
22+
import org.apache.commons.lang3.StringUtils;
2323
import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
2424
import org.apache.http.HttpHost;
2525
import org.apache.http.auth.AuthSchemeProvider;

agents-audit/dest-hdfs/src/main/java/org/apache/ranger/audit/provider/hdfs/HdfsLogDestination.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919
package org.apache.ranger.audit.provider.hdfs;
2020

21-
import org.apache.commons.lang.StringUtils;
21+
import org.apache.commons.lang3.StringUtils;
2222
import org.apache.hadoop.conf.Configuration;
2323
import org.apache.hadoop.fs.FSDataOutputStream;
2424
import org.apache.hadoop.fs.FileSystem;

agents-audit/dest-solr/src/main/java/org/apache/ranger/audit/destination/SolrAuditDestination.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
package org.apache.ranger.audit.destination;
2121

22-
import org.apache.commons.lang.StringUtils;
22+
import org.apache.commons.lang3.StringUtils;
2323
import org.apache.ranger.audit.model.AuditEventBase;
2424
import org.apache.ranger.audit.model.AuthzAuditEvent;
2525
import org.apache.ranger.audit.provider.MiscUtil;

0 commit comments

Comments
 (0)