From ab2b9ce2d518777a5a9c4597ae44afba8a3c64c0 Mon Sep 17 00:00:00 2001
From: Steve Vaughan Jr
Date: Tue, 21 Jun 2022 13:12:31 -0400
Subject: [PATCH 01/13] Replace htrace-core with hbase-noop-htrace for
CVE-2018-7489
---
hadoop-project/pom.xml | 21 +++++++++++++++++++
.../pom.xml | 6 ++++++
.../pom.xml | 5 +++++
.../pom.xml | 5 +++++
.../pom.xml | 5 +++++
.../pom.xml | 5 +++++
6 files changed, 47 insertions(+)
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 0f42e7e231c53..c26ea2606436d 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -1674,6 +1674,11 @@
log4j
log4j
+
+
+ org.apache.htrace
+ htrace-core
+
@@ -1691,6 +1696,11 @@
org.slf4j
slf4j-log4j12
+
+
+ org.apache.htrace
+ htrace-core
+
@@ -1703,8 +1713,19 @@
jdk.tools
jdk.tools
+
+
+ org.apache.htrace
+ htrace-core
+
+
+
+ org.apache.hbase.thirdparty
+ hbase-noop-htrace
+ 4.1.0
+
org.apache.hbase
hbase-server
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml
index 5c21e37172398..ad1e9330c63be 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml
@@ -214,6 +214,12 @@
+
+
+ org.apache.hbase.thirdparty
+ hbase-noop-htrace
+ test
+
org.apache.hbase
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-client/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-client/pom.xml
index 0b7be7843903a..8342ceaa9ddd2 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-client/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-client/pom.xml
@@ -141,6 +141,11 @@
+
+
+ org.apache.hbase.thirdparty
+ hbase-noop-htrace
+
org.apache.hbase
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-common/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-common/pom.xml
index e7b1b52c0d565..987393a02d1d0 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-common/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-common/pom.xml
@@ -83,6 +83,11 @@
+
+
+ org.apache.hbase.thirdparty
+ hbase-noop-htrace
+
org.apache.hadoop.thirdparty
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-server/hadoop-yarn-server-timelineservice-hbase-server-1/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-server/hadoop-yarn-server-timelineservice-hbase-server-1/pom.xml
index bbfb92673f5f6..ca6c76a271bc1 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-server/hadoop-yarn-server-timelineservice-hbase-server-1/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-server/hadoop-yarn-server-timelineservice-hbase-server-1/pom.xml
@@ -102,6 +102,11 @@
+
+
+ org.apache.hbase.thirdparty
+ hbase-noop-htrace
+
org.apache.hbase
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-server/hadoop-yarn-server-timelineservice-hbase-server-2/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-server/hadoop-yarn-server-timelineservice-hbase-server-2/pom.xml
index c015e170aa6dc..c072c3612b1a4 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-server/hadoop-yarn-server-timelineservice-hbase-server-2/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-server/hadoop-yarn-server-timelineservice-hbase-server-2/pom.xml
@@ -102,6 +102,11 @@
+
+
+ org.apache.hbase.thirdparty
+ hbase-noop-htrace
+
From 88da84a9c3f2b1b7f8ee7e80acad0df28a0b5a7f Mon Sep 17 00:00:00 2001
From: Steve Vaughan Jr
Date: Tue, 21 Jun 2022 14:49:27 -0400
Subject: [PATCH 02/13] Upgrade aws-java-sdk to address CVE-2018-7489
---
hadoop-project/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index c26ea2606436d..b17fb7e22d720 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -187,7 +187,7 @@
1.3.1
1.0-beta-1
900
- 1.11.1026
+ 1.12.243
2.3.4
1.11.2
2.1
From 533b3625684033ef8cf68492368ae23262e61c12 Mon Sep 17 00:00:00 2001
From: Steve Vaughan Jr
Date: Tue, 21 Jun 2022 18:44:45 -0400
Subject: [PATCH 03/13] Upgrade to ZooKeeper 3.5.10 to address CVE-2020-10663
This is the latest 3.5 release for ZooKeeper
---
hadoop-project/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index b17fb7e22d720..4216ddf74901a 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -100,7 +100,7 @@
${hadoop-thirdparty-shaded-prefix}.protobuf
${hadoop-thirdparty-shaded-prefix}.com.google.common
- 3.5.6
+ 3.5.10
4.2.0
3.0.5
2.1.7
From 7100300b0a5932521221c9abc1c917eabf4df37e Mon Sep 17 00:00:00 2001
From: Steve Vaughan Jr
Date: Tue, 21 Jun 2022 18:46:35 -0400
Subject: [PATCH 04/13] Upgrade Jetty to 9.4.46.* to address CVE
PRISMA-2021-0182
---
hadoop-project/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 4216ddf74901a..b91a409b37f07 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -37,7 +37,7 @@
true
true
- 9.4.43.v20210629
+ 9.4.46.v20220331
_
_
From 3bcde000d601779e5714b8a141e7984083ae8658 Mon Sep 17 00:00:00 2001
From: Steve Vaughan Jr
Date: Wed, 22 Jun 2022 21:46:10 -0400
Subject: [PATCH 05/13] Replace deprecated use of AllowSymLinkAliasChecker
---
.../src/main/java/org/apache/hadoop/http/HttpServer2.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
index b40d60cf50572..e698582b09671 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
@@ -95,7 +95,7 @@
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.SslConnectionFactory;
-import org.eclipse.jetty.server.handler.AllowSymLinkAliasChecker;
+import org.eclipse.jetty.server.SymlinkAllowedResourceAliasChecker;
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
import org.eclipse.jetty.server.handler.HandlerCollection;
import org.eclipse.jetty.server.handler.RequestLogHandler;
@@ -859,7 +859,7 @@ protected void addDefaultApps(ContextHandlerCollection parent,
handler.setHttpOnly(true);
handler.getSessionCookieConfig().setSecure(true);
logContext.setSessionHandler(handler);
- logContext.addAliasCheck(new AllowSymLinkAliasChecker());
+ logContext.addAliasCheck(new SymlinkAllowedResourceAliasChecker(logContext));
setContextAttributes(logContext, conf);
addNoCacheFilter(logContext);
defaultContexts.put(logContext, true);
@@ -878,7 +878,7 @@ protected void addDefaultApps(ContextHandlerCollection parent,
handler.setHttpOnly(true);
handler.getSessionCookieConfig().setSecure(true);
staticContext.setSessionHandler(handler);
- staticContext.addAliasCheck(new AllowSymLinkAliasChecker());
+ staticContext.addAliasCheck(new SymlinkAllowedResourceAliasChecker(staticContext));
setContextAttributes(staticContext, conf);
defaultContexts.put(staticContext, true);
}
From 5d327b8fe223a5c95826c92538b116a5722ad4a7 Mon Sep 17 00:00:00 2001
From: Steve Loughran
Date: Thu, 23 Jun 2022 20:22:33 +0100
Subject: [PATCH 06/13] HADOOP-18044. Hadoop - Upgrade to jQuery 3.6.0 (#3791)
Co-authored-by: luoyuan
---
LICENSE-binary | 2 +-
LICENSE.txt | 2 +-
.../hadoop-hdfs-rbf/src/main/webapps/router/explorer.html | 2 +-
.../src/main/webapps/router/federationhealth.html | 2 +-
hadoop-hdfs-project/hadoop-hdfs/pom.xml | 2 +-
.../hadoop-hdfs/src/main/webapps/datanode/datanode.html | 2 +-
.../hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html | 2 +-
.../hadoop-hdfs/src/main/webapps/hdfs/explorer.html | 2 +-
.../hadoop-hdfs/src/main/webapps/journal/journalnode.html | 2 +-
.../hadoop-hdfs/src/main/webapps/secondary/status.html | 2 +-
.../hadoop-hdfs/src/main/webapps/static/jquery-3.5.1.min.js | 2 --
.../hadoop-hdfs/src/main/webapps/static/jquery-3.6.0.min.js | 2 ++
.../main/resources/webapps/static/jquery/jquery-3.5.1.min.js | 2 --
.../main/resources/webapps/static/jquery/jquery-3.6.0.min.js | 2 ++
14 files changed, 14 insertions(+), 14 deletions(-)
delete mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.5.1.min.js
create mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.6.0.min.js
delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery/jquery-3.5.1.min.js
create mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery/jquery-3.6.0.min.js
diff --git a/LICENSE-binary b/LICENSE-binary
index 9734aa895850d..03c42f4deca26 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -406,7 +406,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dataTables.bootstrap.css
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dataTables.bootstrap.js
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dust-full-2.0.0.min.js
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dust-helpers-1.1.1.min.js
-hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.5.1.min.js
+hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.6.0.min.js
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery.dataTables.min.js
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/moment.min.js
hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/bootstrap.min.js
diff --git a/LICENSE.txt b/LICENSE.txt
index efb8745578bc6..9db61788de794 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -243,7 +243,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dataTables.bootstrap.css
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dataTables.bootstrap.js
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dust-full-2.0.0.min.js
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dust-helpers-1.1.1.min.js
-hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.5.1.min.js
+hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.6.0.min.js
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery.dataTables.min.js
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/moment.min.js
hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/bootstrap.min.js
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/explorer.html b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/explorer.html
index 49c3e6606accc..15f7d7feb3848 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/explorer.html
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/explorer.html
@@ -311,7 +311,7 @@ Delete
-
+
diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
index 6f172e82adf01..2e4c2991f99e4 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
@@ -412,7 +412,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
src/main/webapps/static/moment.min.js
src/main/webapps/static/dust-full-2.0.0.min.js
src/main/webapps/static/dust-helpers-1.1.1.min.js
- src/main/webapps/static/jquery-3.5.1.min.js
+ src/main/webapps/static/jquery-3.6.0.min.js
src/main/webapps/static/jquery.dataTables.min.js
src/main/webapps/static/json-bignum.js
src/main/webapps/static/dataTables.bootstrap.css
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/datanode.html b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/datanode.html
index b680f0a37e1ec..caab81ef686b9 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/datanode.html
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/datanode.html
@@ -126,7 +126,7 @@
{/dn.VolumeInfo}
-
+
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
index 69e3495fb62a5..ad5c30fe597ef 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
@@ -492,7 +492,7 @@
-
-
-
+
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/status.html b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/status.html
index 41a468d4cfd80..a3484fbcb6a88 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/status.html
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/status.html
@@ -86,7 +86,7 @@
{/snn}
-