This is an automated email from the ASF dual-hosted git repository.
dongjoon-hyun pushed a commit to branch branch-4.x
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-4.x by this push:
new d6597eb7accf [SPARK-58521][UI] Forward `X-Forwarded-Context` header
and skip Master CSP on reverse-proxied UI requests
d6597eb7accf is described below
commit d6597eb7accf00d5fc6c1dc303ff707c918d2b01
Author: Nflrijal <[email protected]>
AuthorDate: Mon Aug 3 10:27:29 2026 -0700
[SPARK-58521][UI] Forward `X-Forwarded-Context` header and skip Master CSP
on reverse-proxied UI requests
### What changes were proposed in this pull request?
1. Overrode `addProxyHeaders` in `JettyUtils.createProxyHandler` to
automatically attach/chain the `X-Forwarded-Context` header to all proxied HTTP
requests.
2. Updated `HttpSecurityFilter` to skip setting Master's CSP nonce header
on proxied requests (`/proxy/*`), preventing browser CSP blocking of inline
scripts like Event Timeline.
3. Added unit test in `UISuite.scala`.
### Why are the changes needed?
When `spark.ui.reverseProxy=true` is enabled in Standalone mode, navigating
UI tabs stripped the `/proxy/<id>` prefix. Additionally, Master's CSP header
conflicted with Driver's inline script nonces, blocking Event Timeline scripts.
### Does this PR introduce _any_ user-facing change?
Yes. Fixes navigation links and interactive UI elements (such as Event
Timeline) when viewing Application UI through Master's reverse proxy
(spark.ui.reverseProxy=true).
### How was this patch tested?
Added unit test in UISuite: SPARK-47232: createProxyHandler forwards
X-Forwarded-Context header.
Manually tested batch (SparkPi) and streaming (NetworkWordCount)
applications on a local Standalone cluster (Master, Worker, SparkSubmit in
cluster mode), verifying that all UI tabs and Event Timeline work cleanly.
### Was this patch authored or co-authored using generative AI tooling?
No
Closes #57549 from Nflrijal/fix/SPARK-47232-driver-proxybase-not-propagated.
Lead-authored-by: Nflrijal <[email protected]>
Co-authored-by: Dongjoon Hyun <[email protected]>
Signed-off-by: Dongjoon Hyun <[email protected]>
(cherry picked from commit 71cc5e54e109cc145fac3effc2ee9d59ac42ed54)
Signed-off-by: Dongjoon Hyun <[email protected]>
---
.../org/apache/spark/ui/HttpSecurityFilter.scala | 4 ++-
.../scala/org/apache/spark/ui/JettyUtils.scala | 21 +++++++++++++-
.../test/scala/org/apache/spark/ui/UISuite.scala | 32 +++++++++++++++++++++-
3 files changed, 54 insertions(+), 3 deletions(-)
diff --git a/core/src/main/scala/org/apache/spark/ui/HttpSecurityFilter.scala
b/core/src/main/scala/org/apache/spark/ui/HttpSecurityFilter.scala
index edfa3581d9ab..86c0df0e50b9 100644
--- a/core/src/main/scala/org/apache/spark/ui/HttpSecurityFilter.scala
+++ b/core/src/main/scala/org/apache/spark/ui/HttpSecurityFilter.scala
@@ -49,9 +49,11 @@ private class HttpSecurityFilter(
val hres = res.asInstanceOf[HttpServletResponse]
hres.setHeader("Cache-Control", "no-cache, no-store, must-revalidate")
+ val isProxyRequest = hreq.getContextPath == "/proxy"
+
val cspNonce = CspNonce.generate()
try {
- if (conf.get(UI_CONTENT_SECURITY_POLICY_ENABLED)) {
+ if (conf.get(UI_CONTENT_SECURITY_POLICY_ENABLED) && !isProxyRequest) {
// Use CSP frame-ancestors as the primary clickjacking protection
mechanism.
// X-Frame-Options ALLOW-FROM is deprecated and ignored by modern
browsers
// (Chrome, Firefox, Edge, Safari), so frame-ancestors is used instead.
diff --git a/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala
b/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala
index 3c21fd6d2a00..164a3bccf2f3 100644
--- a/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala
+++ b/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala
@@ -27,7 +27,7 @@ import scala.xml.Node
import jakarta.servlet.{DispatcherType, Filter, FilterChain, ServletRequest,
ServletResponse}
import jakarta.servlet.http._
-import org.eclipse.jetty.client.{Response => CResponse}
+import org.eclipse.jetty.client.{Request => CRequest, Response => CResponse}
import org.eclipse.jetty.client.HttpClient
import org.eclipse.jetty.client.transport.HttpClientTransportOverHTTP
import org.eclipse.jetty.compression.server.CompressionHandler
@@ -209,6 +209,25 @@ private[spark] object JettyUtils extends Logging {
.orNull
}
+ override def addProxyHeaders(
+ clientRequest: HttpServletRequest,
+ proxyRequest: CRequest): Unit = {
+ super.addProxyHeaders(clientRequest, proxyRequest)
+ val path = clientRequest.getPathInfo
+ if (path != null) {
+ val prefixTrailingSlashIndex = path.indexOf('/', 1)
+ val prefix = if (prefixTrailingSlashIndex == -1) {
+ path
+ } else {
+ path.substring(0, prefixTrailingSlashIndex)
+ }
+ val existingContext =
Option(clientRequest.getHeader("X-Forwarded-Context")).getOrElse("")
+ val contextPath = Option(clientRequest.getContextPath).getOrElse("")
+ val proxyContext = existingContext + contextPath + prefix
+ proxyRequest.headers(headers => headers.put("X-Forwarded-Context",
proxyContext))
+ }
+ }
+
override def newHttpClient(): HttpClient = {
// SPARK-21176: Use the Jetty logic to calculate the number of
selector threads (#CPUs/2),
// but limit it to 8 max.
diff --git a/core/src/test/scala/org/apache/spark/ui/UISuite.scala
b/core/src/test/scala/org/apache/spark/ui/UISuite.scala
index 9bd649994258..7a6f409c04ef 100644
--- a/core/src/test/scala/org/apache/spark/ui/UISuite.scala
+++ b/core/src/test/scala/org/apache/spark/ui/UISuite.scala
@@ -534,9 +534,39 @@ class UISuite extends SparkFunSuite {
lastRequest = req
res.sendError(HttpServletResponse.SC_OK)
}
-
}
+ test("SPARK-58521: createProxyHandler forwards X-Forwarded-Context header") {
+ val (conf, securityMgr, sslOptions) = sslDisabledConf()
+ val targetServer = JettyUtils.startJettyServer("0.0.0.0", 0, sslOptions,
conf)
+ val proxyServer = JettyUtils.startJettyServer("0.0.0.0", 0, sslOptions,
conf)
+
+ @volatile var forwardedContext: String = null
+ val targetHandler = new ServletContextHandler()
+ targetHandler.setContextPath("/")
+ targetHandler.addServlet(new ServletHolder(new HttpServlet {
+ override def doGet(req: HttpServletRequest, resp: HttpServletResponse):
Unit = {
+ forwardedContext = req.getHeader("X-Forwarded-Context")
+ resp.setStatus(HttpServletResponse.SC_OK)
+ }
+ }), "/*")
+ targetServer.addHandler(targetHandler, securityMgr)
+
+ val targetAddr = s"http://$localhost:${targetServer.boundPort}"
+ val proxyHandler = JettyUtils.createProxyHandler(_ => Some(targetAddr))
+ proxyServer.addHandler(proxyHandler, securityMgr)
+
+ try {
+ val proxyUrl =
s"http://$localhost:${proxyServer.boundPort}/proxy/app-123/stages/"
+ TestUtils.withHttpConnection(new URI(proxyUrl).toURL) { conn =>
+ assert(conn.getResponseCode === HttpServletResponse.SC_OK)
+ assert(forwardedContext === "/proxy/app-123")
+ }
+ } finally {
+ stopServer(proxyServer)
+ stopServer(targetServer)
+ }
+ }
}
// Filter for testing; returns a configurable code for every request.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]