From 7576b4247b9df8e5e39e61e8157d0ac48f55bf30 Mon Sep 17 00:00:00 2001 From: Zhihai Xu Date: Fri, 18 Sep 2015 08:24:03 -0700 Subject: [PATCH] Disable caching for JarURLConnection to avoid sharing JarFile with other users when loading resource from URL in Configuration class. Contributed by Zhihai Xu (cherry picked from commit e690a32e57bc14b0cca0e2d39da513841d81b4fc) --- hadoop-common-project/hadoop-common/CHANGES.txt | 4 ++++ .../java/org/apache/hadoop/conf/Configuration.java | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index d810ddfa2fb..4a495daa231 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -270,6 +270,10 @@ Release 2.8.0 - UNRELEASED HADOOP-12413. AccessControlList should avoid calling getGroupNames in isUserInList with empty groups. (Zhihai Xu via cnauroth) + HADOOP-12404. Disable caching for JarURLConnection to avoid sharing + JarFile with other users when loading resource from URL in Configuration + class. (zxu) + OPTIMIZATIONS HADOOP-11785. Reduce the number of listStatus operation in distcp diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java index cee17a53b80..8cdae3d9fac 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java @@ -34,7 +34,9 @@ import java.io.Writer; import java.lang.ref.WeakReference; import java.net.InetSocketAddress; +import java.net.JarURLConnection; import java.net.URL; +import java.net.URLConnection; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -2467,7 +2469,14 @@ private Document parse(DocumentBuilder builder, URL url) if (url == null) { return null; } - return parse(builder, url.openStream(), url.toString()); + + URLConnection connection = url.openConnection(); + if (connection instanceof JarURLConnection) { + // Disable caching for JarURLConnection to avoid sharing JarFile + // with other users. + connection.setUseCaches(false); + } + return parse(builder, connection.getInputStream(), url.toString()); } private Document parse(DocumentBuilder builder, InputStream is,