big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HADOOP-18301. Upgrade commons-io to 2.11.0 (#4455)

Browse Source 
Co-authored-by: Ashutosh Gupta <ashugpt@amazon.com>
Signed-off-by: Akira Ajisaka <aajisaka@apache.org>
This commit is contained in:
Ashutosh Gupta 2022-08-03 02:44:39 +01:00 committed by GitHub
parent 1f0a71a92b
commit 69f6fdb757
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/HostRestrictingAuthorizationFilter.java
View File

@ -117,17 +117,12 @@ private boolean matchRule(String user, String remoteIp, String path) {
String rulePath = rule.getPath(); String rulePath = rule.getPath();
LOG.trace("Evaluating rule, subnet: {}, path: {}", LOG.trace("Evaluating rule, subnet: {}, path: {}",
subnet != null ? subnet.getCidrSignature() : "*", rulePath); subnet != null ? subnet.getCidrSignature() : "*", rulePath);
try { if ((subnet == null || subnet.isInRange(remoteIp))
if ((subnet == null || subnet.isInRange(remoteIp)) && FilenameUtils.directoryContains(rulePath, path)) {
&& FilenameUtils.directoryContains(rulePath, path)) { LOG.debug("Found matching rule, subnet: {}, path: {}; returned true",
LOG.debug("Found matching rule, subnet: {}, path: {}; returned true", rule.getSubnet() != null ? subnet.getCidrSignature() : null,
rule.getSubnet() != null ? subnet.getCidrSignature() : null, rulePath);
rulePath); return true;
return true;
}
} catch (IOException e) {
LOG.warn("Got IOException {}; returned false", e);
return false;
} }
} }

2
hadoop-project/pom.xml
View File

@ -118,7 +118,7 @@
<commons-collections.version>3.2.2</commons-collections.version> <commons-collections.version>3.2.2</commons-collections.version>
<commons-compress.version>1.21</commons-compress.version> <commons-compress.version>1.21</commons-compress.version>
<commons-csv.version>1.0</commons-csv.version> <commons-csv.version>1.0</commons-csv.version>
<commons-io.version>2.8.0</commons-io.version> <commons-io.version>2.11.0</commons-io.version>
<commons-lang3.version>3.12.0</commons-lang3.version> <commons-lang3.version>3.12.0</commons-lang3.version>
<commons-logging.version>1.1.3</commons-logging.version> <commons-logging.version>1.1.3</commons-logging.version>
<commons-logging-api.version>1.1</commons-logging-api.version> <commons-logging-api.version>1.1</commons-logging-api.version>