HDFS-17591. RBF: Router should follow X-FRAME-OPTIONS protection setting #6963

tasanuma · 2024-07-26T01:27:25Z

Description of PR

Router UI doesn't have X-FRAME-OPTIONS in its header. Router should load the value of dfs.xframe.value.

This issue is reported by Daiki Mashima.

How was this patch tested?

unit test

For code changes:

Does the title or this PR starts with the corresponding JIRA issue id (e.g. 'HADOOP-17799. Your PR title ...')?

hadoop-yetus · 2024-07-26T04:19:40Z

🎊 +1 overall

Vote	Subsystem	Runtime	Logfile	Comment
+0 🆗	reexec	0m 45s		Docker mode activated.
			_ Prechecks _
+1 💚	dupname	0m 0s		No case conflicting files found.
+0 🆗	codespell	0m 1s		codespell was not available.
+0 🆗	detsecrets	0m 1s		detect-secrets was not available.
+1 💚	@author	0m 0s		The patch does not contain any @author tags.
+1 💚	test4tests	0m 0s		The patch appears to include 1 new or modified test files.
			_ trunk Compile Tests _
+1 💚	mvninstall	49m 10s		trunk passed
+1 💚	compile	0m 39s		trunk passed with JDK Ubuntu-11.0.23+9-post-Ubuntu-1ubuntu120.04.2
+1 💚	compile	0m 36s		trunk passed with JDK Private Build-1.8.0_412-8u412-ga-1~20.04.1-b08
+1 💚	checkstyle	0m 29s		trunk passed
+1 💚	mvnsite	0m 41s		trunk passed
+1 💚	javadoc	0m 42s		trunk passed with JDK Ubuntu-11.0.23+9-post-Ubuntu-1ubuntu120.04.2
+1 💚	javadoc	0m 31s		trunk passed with JDK Private Build-1.8.0_412-8u412-ga-1~20.04.1-b08
+1 💚	spotbugs	1m 19s		trunk passed
+1 💚	shadedclient	38m 46s		branch has no errors when building and testing our client artifacts.
			_ Patch Compile Tests _
+1 💚	mvninstall	0m 31s		the patch passed
+1 💚	compile	0m 33s		the patch passed with JDK Ubuntu-11.0.23+9-post-Ubuntu-1ubuntu120.04.2
+1 💚	javac	0m 33s		the patch passed
+1 💚	compile	0m 29s		the patch passed with JDK Private Build-1.8.0_412-8u412-ga-1~20.04.1-b08
+1 💚	javac	0m 29s		the patch passed
+1 💚	blanks	0m 0s		The patch has no blanks issues.
+1 💚	checkstyle	0m 18s		the patch passed
+1 💚	mvnsite	0m 32s		the patch passed
+1 💚	javadoc	0m 29s		the patch passed with JDK Ubuntu-11.0.23+9-post-Ubuntu-1ubuntu120.04.2
+1 💚	javadoc	0m 24s		the patch passed with JDK Private Build-1.8.0_412-8u412-ga-1~20.04.1-b08
+1 💚	spotbugs	1m 21s		the patch passed
+1 💚	shadedclient	38m 56s		patch has no errors when building and testing our client artifacts.
			_ Other Tests _
+1 💚	unit	31m 32s		hadoop-hdfs-rbf in the patch passed.
+1 💚	asflicense	0m 36s		The patch does not generate ASF License warnings.
		170m 55s

Subsystem	Report/Notes
Docker	ClientAPI=1.44 ServerAPI=1.44 base: https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-6963/1/artifact/out/Dockerfile
GITHUB PR	#6963
Optional Tests	dupname asflicense compile javac javadoc mvninstall mvnsite unit shadedclient spotbugs checkstyle codespell detsecrets
uname	Linux 4224d3ab6ea1 5.15.0-94-generic #104-Ubuntu SMP Tue Jan 9 15:25:40 UTC 2024 x86_64 x86_64 x86_64 GNU/Linux
Build tool	maven
Personality	dev-support/bin/hadoop.sh
git revision	trunk / `9341691`
Default Java	Private Build-1.8.0_412-8u412-ga-1~20.04.1-b08
Multi-JDK versions	/usr/lib/jvm/java-11-openjdk-amd64:Ubuntu-11.0.23+9-post-Ubuntu-1ubuntu120.04.2 /usr/lib/jvm/java-8-openjdk-amd64:Private Build-1.8.0_412-8u412-ga-1~20.04.1-b08
Test Results	https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-6963/1/testReport/
Max. process+thread count	3109 (vs. ulimit of 5500)
modules	C: hadoop-hdfs-project/hadoop-hdfs-rbf U: hadoop-hdfs-project/hadoop-hdfs-rbf
Console output	https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-6963/1/console
versions	git=2.25.1 maven=3.6.3 spotbugs=4.2.2
Powered by	Apache Yetus 0.14.0 https://yetus.apache.org

This message was automatically generated.

ayushtkn

thanx @tasanuma for the fix, minor comments, rest lgtm

ayushtkn · 2024-07-26T07:07:34Z

...rc/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterHttpServerXFrame.java

+  public void testRouterXFrame() throws IOException {
+    Configuration conf = new HdfsConfiguration();
+    conf.setBoolean(DFSConfigKeys.DFS_XFRAME_OPTION_ENABLED, true);
+    conf.set(DFSConfigKeys.DFS_XFRAME_OPTION_VALUE, "SAMEORIGIN");


Can we use HttpServer2.XFrameOption.SAMEORIGIN.toString() rather than hardcoding the value?

ayushtkn · 2024-07-26T07:08:45Z

...rc/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterHttpServerXFrame.java

+    router.stop();
+    router.close();


can we have this in finally block or part of After block?, else if the test fails after router start, it won't stop/close the router

tasanuma · 2024-07-26T12:18:42Z

@ayushtkn Thanks for your review. I have updated the PR to address your comments.

hadoop-yetus · 2024-07-26T16:30:43Z

💔 -1 overall

Vote	Subsystem	Runtime	Logfile	Comment
+0 🆗	reexec	0m 49s		Docker mode activated.
			_ Prechecks _
+1 💚	dupname	0m 0s		No case conflicting files found.
+0 🆗	codespell	0m 0s		codespell was not available.
+0 🆗	detsecrets	0m 0s		detect-secrets was not available.
+1 💚	@author	0m 1s		The patch does not contain any @author tags.
+1 💚	test4tests	0m 0s		The patch appears to include 1 new or modified test files.
			_ trunk Compile Tests _
+1 💚	mvninstall	53m 17s		trunk passed
+1 💚	compile	1m 15s		trunk passed with JDK Ubuntu-11.0.23+9-post-Ubuntu-1ubuntu120.04.2
+1 💚	compile	0m 53s		trunk passed with JDK Private Build-1.8.0_412-8u412-ga-1~20.04.1-b08
+1 💚	checkstyle	0m 44s		trunk passed
+1 💚	mvnsite	1m 5s		trunk passed
+1 💚	javadoc	1m 3s		trunk passed with JDK Ubuntu-11.0.23+9-post-Ubuntu-1ubuntu120.04.2
+1 💚	javadoc	0m 45s		trunk passed with JDK Private Build-1.8.0_412-8u412-ga-1~20.04.1-b08
+1 💚	spotbugs	1m 59s		trunk passed
+1 💚	shadedclient	51m 46s		branch has no errors when building and testing our client artifacts.
			_ Patch Compile Tests _
+1 💚	mvninstall	0m 35s		the patch passed
+1 💚	compile	0m 42s		the patch passed with JDK Ubuntu-11.0.23+9-post-Ubuntu-1ubuntu120.04.2
+1 💚	javac	0m 42s		the patch passed
+1 💚	compile	0m 33s		the patch passed with JDK Private Build-1.8.0_412-8u412-ga-1~20.04.1-b08
+1 💚	javac	0m 33s		the patch passed
+1 💚	blanks	0m 0s		The patch has no blanks issues.
+1 💚	checkstyle	0m 20s		the patch passed
+1 💚	mvnsite	0m 37s		the patch passed
+1 💚	javadoc	0m 29s		the patch passed with JDK Ubuntu-11.0.23+9-post-Ubuntu-1ubuntu120.04.2
+1 💚	javadoc	0m 24s		the patch passed with JDK Private Build-1.8.0_412-8u412-ga-1~20.04.1-b08
+1 💚	spotbugs	1m 30s		the patch passed
-1 ❌	shadedclient	6m 36s		patch has errors when building and testing our client artifacts.
			_ Other Tests _
-1 ❌	unit	124m 41s	/patch-unit-hadoop-hdfs-project_hadoop-hdfs-rbf.txt	hadoop-hdfs-rbf in the patch passed.
+1 💚	asflicense	0m 36s		The patch does not generate ASF License warnings.
		252m 40s

Reason	Tests
Failed junit tests	hadoop.hdfs.server.federation.fairness.TestRouterRefreshFairnessPolicyController
	hadoop.hdfs.server.federation.router.TestRouterRPCMultipleDestinationMountTableResolver
	hadoop.fs.contract.router.TestRouterHDFSContractAppendSecure
	hadoop.hdfs.server.federation.fairness.TestRouterHandlersFairness
	hadoop.fs.contract.router.web.TestRouterWebHDFSContractSeek
	hadoop.hdfs.server.federation.router.TestRouterRpc
	hadoop.hdfs.server.federation.router.TestRouterNamenodeHeartbeat
	hadoop.hdfs.server.federation.store.driver.TestStateStoreFileSystem
	hadoop.hdfs.server.federation.router.TestRouterQuota
	hadoop.hdfs.server.federation.router.TestRouterWithSecureStartup
	hadoop.hdfs.server.federation.metrics.TestRouterClientMetrics
	hadoop.hdfs.server.federation.router.TestRouterFederationRenamePermission
	hadoop.fs.contract.router.TestRouterHDFSContractGetFileStatus
	hadoop.hdfs.server.federation.metrics.TestNameserviceRPCMetrics
	hadoop.fs.contract.router.web.TestRouterWebHDFSContractAppend
	hadoop.hdfs.server.federation.router.TestRouterMountTable
	hadoop.fs.contract.router.TestRouterHDFSContractDelete
	hadoop.fs.contract.router.web.TestRouterWebHDFSContractConcat
	hadoop.hdfs.server.federation.security.token.TestZKDelegationTokenSecretManagerImpl
	hadoop.fs.contract.router.web.TestRouterWebHDFSContractOpen
	hadoop.hdfs.server.federation.router.TestRouterClientRejectOverload

Subsystem	Report/Notes
Docker	ClientAPI=1.44 ServerAPI=1.44 base: https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-6963/2/artifact/out/Dockerfile
GITHUB PR	#6963
Optional Tests	dupname asflicense compile javac javadoc mvninstall mvnsite unit shadedclient spotbugs checkstyle codespell detsecrets
uname	Linux f87faa9bad5a 5.15.0-94-generic #104-Ubuntu SMP Tue Jan 9 15:25:40 UTC 2024 x86_64 x86_64 x86_64 GNU/Linux
Build tool	maven
Personality	dev-support/bin/hadoop.sh
git revision	trunk / `292679a`
Default Java	Private Build-1.8.0_412-8u412-ga-1~20.04.1-b08
Multi-JDK versions	/usr/lib/jvm/java-11-openjdk-amd64:Ubuntu-11.0.23+9-post-Ubuntu-1ubuntu120.04.2 /usr/lib/jvm/java-8-openjdk-amd64:Private Build-1.8.0_412-8u412-ga-1~20.04.1-b08
Test Results	https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-6963/2/testReport/
Max. process+thread count	1666 (vs. ulimit of 5500)
modules	C: hadoop-hdfs-project/hadoop-hdfs-rbf U: hadoop-hdfs-project/hadoop-hdfs-rbf
Console output	https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-6963/2/console
versions	git=2.25.1 maven=3.6.3 spotbugs=4.2.2
Powered by	Apache Yetus 0.14.0 https://yetus.apache.org

This message was automatically generated.

hadoop-yetus · 2024-07-29T11:15:52Z

🎊 +1 overall

Vote	Subsystem	Runtime	Logfile	Comment
+0 🆗	reexec	17m 27s		Docker mode activated.
			_ Prechecks _
+1 💚	dupname	0m 0s		No case conflicting files found.
+0 🆗	codespell	0m 1s		codespell was not available.
+0 🆗	detsecrets	0m 1s		detect-secrets was not available.
+1 💚	@author	0m 0s		The patch does not contain any @author tags.
+1 💚	test4tests	0m 0s		The patch appears to include 1 new or modified test files.
			_ trunk Compile Tests _
+1 💚	mvninstall	49m 8s		trunk passed
+1 💚	compile	0m 41s		trunk passed with JDK Ubuntu-11.0.23+9-post-Ubuntu-1ubuntu120.04.2
+1 💚	compile	0m 36s		trunk passed with JDK Private Build-1.8.0_412-8u412-ga-1~20.04.1-b08
+1 💚	checkstyle	0m 29s		trunk passed
+1 💚	mvnsite	0m 42s		trunk passed
+1 💚	javadoc	0m 41s		trunk passed with JDK Ubuntu-11.0.23+9-post-Ubuntu-1ubuntu120.04.2
+1 💚	javadoc	0m 30s		trunk passed with JDK Private Build-1.8.0_412-8u412-ga-1~20.04.1-b08
+1 💚	spotbugs	1m 20s		trunk passed
+1 💚	shadedclient	39m 46s		branch has no errors when building and testing our client artifacts.
			_ Patch Compile Tests _
+1 💚	mvninstall	0m 30s		the patch passed
+1 💚	compile	0m 33s		the patch passed with JDK Ubuntu-11.0.23+9-post-Ubuntu-1ubuntu120.04.2
+1 💚	javac	0m 33s		the patch passed
+1 💚	compile	0m 29s		the patch passed with JDK Private Build-1.8.0_412-8u412-ga-1~20.04.1-b08
+1 💚	javac	0m 29s		the patch passed
+1 💚	blanks	0m 0s		The patch has no blanks issues.
+1 💚	checkstyle	0m 18s		the patch passed
+1 💚	mvnsite	0m 30s		the patch passed
+1 💚	javadoc	0m 28s		the patch passed with JDK Ubuntu-11.0.23+9-post-Ubuntu-1ubuntu120.04.2
+1 💚	javadoc	0m 23s		the patch passed with JDK Private Build-1.8.0_412-8u412-ga-1~20.04.1-b08
+1 💚	spotbugs	1m 20s		the patch passed
+1 💚	shadedclient	40m 21s		patch has no errors when building and testing our client artifacts.
			_ Other Tests _
+1 💚	unit	31m 18s		hadoop-hdfs-rbf in the patch passed.
+1 💚	asflicense	0m 36s		The patch does not generate ASF License warnings.
		189m 42s

Subsystem	Report/Notes
Docker	ClientAPI=1.44 ServerAPI=1.44 base: https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-6963/3/artifact/out/Dockerfile
GITHUB PR	#6963
Optional Tests	dupname asflicense compile javac javadoc mvninstall mvnsite unit shadedclient spotbugs checkstyle codespell detsecrets
uname	Linux dbd1f7cc6408 5.15.0-94-generic #104-Ubuntu SMP Tue Jan 9 15:25:40 UTC 2024 x86_64 x86_64 x86_64 GNU/Linux
Build tool	maven
Personality	dev-support/bin/hadoop.sh
git revision	trunk / `292679a`
Default Java	Private Build-1.8.0_412-8u412-ga-1~20.04.1-b08
Multi-JDK versions	/usr/lib/jvm/java-11-openjdk-amd64:Ubuntu-11.0.23+9-post-Ubuntu-1ubuntu120.04.2 /usr/lib/jvm/java-8-openjdk-amd64:Private Build-1.8.0_412-8u412-ga-1~20.04.1-b08
Test Results	https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-6963/3/testReport/
Max. process+thread count	3092 (vs. ulimit of 5500)
modules	C: hadoop-hdfs-project/hadoop-hdfs-rbf U: hadoop-hdfs-project/hadoop-hdfs-rbf
Console output	https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-6963/3/console
versions	git=2.25.1 maven=3.6.3 spotbugs=4.2.2
Powered by	Apache Yetus 0.14.0 https://yetus.apache.org

This message was automatically generated.

ayushtkn

LGTM

tasanuma · 2024-07-30T01:14:54Z

Merged. Thanks for your review, @ayushtkn !

…ing (#6963) (cherry picked from commit 059e996)

…ing (apache#6963) (cherry picked from commit 059e996)

…ing (apache#6963)

HDFS-17591. RBF: Router should follow X-FRAME-OPTIONS protection setting

9341691

github-actions bot added HDFS trunk RBF labels Jul 26, 2024

ayushtkn reviewed Jul 26, 2024

View reviewed changes

remove hardcoding & use try block

292679a

ayushtkn approved these changes Jul 29, 2024

View reviewed changes

tasanuma merged commit 059e996 into apache:trunk Jul 30, 2024

tasanuma deleted the HDFS-17591 branch July 30, 2024 01:14

tasanuma added a commit that referenced this pull request Jul 30, 2024

HDFS-17591. RBF: Router should follow X-FRAME-OPTIONS protection sett…

029fb54

…ing (#6963) (cherry picked from commit 059e996)

tasanuma added a commit that referenced this pull request Jul 30, 2024

HDFS-17591. RBF: Router should follow X-FRAME-OPTIONS protection sett…

c34cfd3

…ing (#6963) (cherry picked from commit 059e996)

steveloughran pushed a commit to steveloughran/hadoop that referenced this pull request Aug 15, 2024

HDFS-17591. RBF: Router should follow X-FRAME-OPTIONS protection sett…

91f6840

…ing (apache#6963) (cherry picked from commit 059e996)

KeeProMise pushed a commit to KeeProMise/hadoop that referenced this pull request Sep 9, 2024

HDFS-17591. RBF: Router should follow X-FRAME-OPTIONS protection sett…

3cc0028

…ing (apache#6963)

Hexiaoqiao pushed a commit to Hexiaoqiao/hadoop that referenced this pull request Sep 12, 2024

HDFS-17591. RBF: Router should follow X-FRAME-OPTIONS protection sett…

f26bab2

…ing (apache#6963)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

HDFS-17591. RBF: Router should follow X-FRAME-OPTIONS protection setting #6963

HDFS-17591. RBF: Router should follow X-FRAME-OPTIONS protection setting #6963

Uh oh!

tasanuma commented Jul 26, 2024

Uh oh!

hadoop-yetus commented Jul 26, 2024

Uh oh!

ayushtkn left a comment

Uh oh!

ayushtkn Jul 26, 2024

Uh oh!

ayushtkn Jul 26, 2024

Uh oh!

tasanuma commented Jul 26, 2024

Uh oh!

hadoop-yetus commented Jul 26, 2024

Uh oh!

hadoop-yetus commented Jul 29, 2024

Uh oh!

ayushtkn left a comment

Uh oh!

tasanuma commented Jul 30, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

HDFS-17591. RBF: Router should follow X-FRAME-OPTIONS protection setting #6963

HDFS-17591. RBF: Router should follow X-FRAME-OPTIONS protection setting #6963

Uh oh!

Conversation

tasanuma commented Jul 26, 2024

Description of PR

How was this patch tested?

For code changes:

Uh oh!

hadoop-yetus commented Jul 26, 2024

Uh oh!

ayushtkn left a comment

Choose a reason for hiding this comment

Uh oh!

ayushtkn Jul 26, 2024

Choose a reason for hiding this comment

Uh oh!

ayushtkn Jul 26, 2024

Choose a reason for hiding this comment

Uh oh!

tasanuma commented Jul 26, 2024

Uh oh!

hadoop-yetus commented Jul 26, 2024

Uh oh!

hadoop-yetus commented Jul 29, 2024

Uh oh!

ayushtkn left a comment

Choose a reason for hiding this comment

Uh oh!

tasanuma commented Jul 30, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants