HADOOP-18972: Copy SASL properties map when returning from SaslPropertiesResolver #6272

charlesconnell · 2023-11-13T23:21:14Z

Description of PR

When SaslDataTransferServer or SaslDataTranferClient want to get a SASL properties map to do a handshake, they call SaslPropertiesResolver#getServerProperties() or SaslPropertiesResolver#getClientProperties(), and they get back a Map<String, String>. Every call gets the same Map object back, and then the callers sometimes call put() on it. This means that future users of SaslPropertiesResolver get back the wrong information.

In this PR, SaslPropretiesResolver gives out copies of its internal map, so that users can safety modify them.

How was this patch tested?

My employer has effectively the same patch already committed to our fork of Hadoop 3.3.1. We are running this in production, and have found that this patch fixes the problem we were experiencing, described in the JIRA ticket.

For code changes:

Does the title or this PR starts with the corresponding JIRA issue id (e.g. 'HADOOP-17799. Your PR title ...')?
Object storage: have the integration tests been executed and the endpoint declared according to the connector-specific documentation?
If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under ASF 2.0?
If applicable, have you updated the LICENSE, LICENSE-binary, NOTICE-binary files?

hadoop-yetus · 2023-11-14T03:23:38Z

💔 -1 overall

Vote	Subsystem	Runtime	Logfile	Comment
+0 🆗	reexec	0m 51s		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 39s		trunk passed
+1 💚	compile	18m 25s		trunk passed with JDK Ubuntu-11.0.20.1+1-post-Ubuntu-0ubuntu120.04
+1 💚	compile	16m 40s		trunk passed with JDK Private Build-1.8.0_382-8u382-ga-1~20.04.1-b05
+1 💚	checkstyle	1m 14s		trunk passed
+1 💚	mvnsite	1m 36s		trunk passed
+1 💚	javadoc	1m 11s		trunk passed with JDK Ubuntu-11.0.20.1+1-post-Ubuntu-0ubuntu120.04
+1 💚	javadoc	0m 51s		trunk passed with JDK Private Build-1.8.0_382-8u382-ga-1~20.04.1-b05
+1 💚	spotbugs	2m 35s		trunk passed
+1 💚	shadedclient	40m 12s		branch has no errors when building and testing our client artifacts.
			_ Patch Compile Tests _
+1 💚	mvninstall	0m 57s		the patch passed
+1 💚	compile	17m 36s		the patch passed with JDK Ubuntu-11.0.20.1+1-post-Ubuntu-0ubuntu120.04
+1 💚	javac	17m 36s		the patch passed
+1 💚	compile	16m 51s		the patch passed with JDK Private Build-1.8.0_382-8u382-ga-1~20.04.1-b05
+1 💚	javac	16m 51s		the patch passed
+1 💚	blanks	0m 0s		The patch has no blanks issues.
-0 ⚠️	checkstyle	1m 10s	/results-checkstyle-hadoop-common-project_hadoop-common.txt	hadoop-common-project/hadoop-common: The patch generated 6 new + 5 unchanged - 1 fixed = 11 total (was 6)
+1 💚	mvnsite	1m 35s		the patch passed
+1 💚	javadoc	1m 6s		the patch passed with JDK Ubuntu-11.0.20.1+1-post-Ubuntu-0ubuntu120.04
+1 💚	javadoc	0m 47s		the patch passed with JDK Private Build-1.8.0_382-8u382-ga-1~20.04.1-b05
+1 💚	spotbugs	2m 46s		the patch passed
+1 💚	shadedclient	40m 21s		patch has no errors when building and testing our client artifacts.
			_ Other Tests _
+1 💚	unit	19m 14s		hadoop-common in the patch passed.
-1 ❌	asflicense	0m 59s	/results-asflicense.txt	The patch generated 1 ASF License warnings.
		240m 48s

Subsystem	Report/Notes
Docker	ClientAPI=1.43 ServerAPI=1.43 base: https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-6272/1/artifact/out/Dockerfile
GITHUB PR	#6272
Optional Tests	dupname asflicense compile javac javadoc mvninstall mvnsite unit shadedclient spotbugs checkstyle codespell detsecrets
uname	Linux 137bd61f8ca7 4.15.0-213-generic #224-Ubuntu SMP Mon Jun 19 13:30:12 UTC 2023 x86_64 x86_64 x86_64 GNU/Linux
Build tool	maven
Personality	dev-support/bin/hadoop.sh
git revision	trunk / `09426b3`
Default Java	Private Build-1.8.0_382-8u382-ga-1~20.04.1-b05
Multi-JDK versions	/usr/lib/jvm/java-11-openjdk-amd64:Ubuntu-11.0.20.1+1-post-Ubuntu-0ubuntu120.04 /usr/lib/jvm/java-8-openjdk-amd64:Private Build-1.8.0_382-8u382-ga-1~20.04.1-b05
Test Results	https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-6272/1/testReport/
Max. process+thread count	2279 (vs. ulimit of 5500)
modules	C: hadoop-common-project/hadoop-common U: hadoop-common-project/hadoop-common
Console output	https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-6272/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.

steveloughran

code looks straightforward, some minor tuning on production and tests, and you need those yetus checks to be happy too

...n-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslPropertiesResolver.java

...oject/hadoop-common/src/test/java/org/apache/hadoop/security/TestSaslPropertiesResolver.java

hadoop-yetus · 2023-11-14T22:08:54Z

🎊 +1 overall

Vote	Subsystem	Runtime	Logfile	Comment
+0 🆗	reexec	0m 24s		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	32m 42s		trunk passed
+1 💚	compile	9m 34s		trunk passed with JDK Ubuntu-11.0.20.1+1-post-Ubuntu-0ubuntu120.04
+1 💚	compile	9m 2s		trunk passed with JDK Private Build-1.8.0_382-8u382-ga-1~20.04.1-b05
+1 💚	checkstyle	0m 41s		trunk passed
+1 💚	mvnsite	0m 56s		trunk passed
+1 💚	javadoc	0m 41s		trunk passed with JDK Ubuntu-11.0.20.1+1-post-Ubuntu-0ubuntu120.04
+1 💚	javadoc	0m 29s		trunk passed with JDK Private Build-1.8.0_382-8u382-ga-1~20.04.1-b05
+1 💚	spotbugs	1m 30s		trunk passed
+1 💚	shadedclient	21m 3s		branch has no errors when building and testing our client artifacts.
			_ Patch Compile Tests _
+1 💚	mvninstall	0m 36s		the patch passed
+1 💚	compile	9m 3s		the patch passed with JDK Ubuntu-11.0.20.1+1-post-Ubuntu-0ubuntu120.04
+1 💚	javac	9m 3s		the patch passed
+1 💚	compile	8m 53s		the patch passed with JDK Private Build-1.8.0_382-8u382-ga-1~20.04.1-b05
+1 💚	javac	8m 53s		the patch passed
+1 💚	blanks	0m 0s		The patch has no blanks issues.
+1 💚	checkstyle	0m 37s		hadoop-common-project/hadoop-common: The patch generated 0 new + 5 unchanged - 1 fixed = 5 total (was 6)
+1 💚	mvnsite	0m 55s		the patch passed
+1 💚	javadoc	0m 32s		the patch passed with JDK Ubuntu-11.0.20.1+1-post-Ubuntu-0ubuntu120.04
+1 💚	javadoc	0m 29s		the patch passed with JDK Private Build-1.8.0_382-8u382-ga-1~20.04.1-b05
+1 💚	spotbugs	1m 35s		the patch passed
+1 💚	shadedclient	21m 17s		patch has no errors when building and testing our client artifacts.
			_ Other Tests _
+1 💚	unit	16m 1s		hadoop-common in the patch passed.
+1 💚	asflicense	0m 33s		The patch does not generate ASF License warnings.
		139m 0s

Subsystem	Report/Notes
Docker	ClientAPI=1.43 ServerAPI=1.43 base: https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-6272/2/artifact/out/Dockerfile
GITHUB PR	#6272
Optional Tests	dupname asflicense compile javac javadoc mvninstall mvnsite unit shadedclient spotbugs checkstyle codespell detsecrets
uname	Linux da92ec0221f2 5.15.0-88-generic #98-Ubuntu SMP Mon Oct 2 15:18:56 UTC 2023 x86_64 x86_64 x86_64 GNU/Linux
Build tool	maven
Personality	dev-support/bin/hadoop.sh
git revision	trunk / `8a432bd`
Default Java	Private Build-1.8.0_382-8u382-ga-1~20.04.1-b05
Multi-JDK versions	/usr/lib/jvm/java-11-openjdk-amd64:Ubuntu-11.0.20.1+1-post-Ubuntu-0ubuntu120.04 /usr/lib/jvm/java-8-openjdk-amd64:Private Build-1.8.0_382-8u382-ga-1~20.04.1-b05
Test Results	https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-6272/2/testReport/
Max. process+thread count	1842 (vs. ulimit of 5500)
modules	C: hadoop-common-project/hadoop-common U: hadoop-common-project/hadoop-common
Console output	https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-6272/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.

github-actions · 2025-10-08T00:21:48Z

We're closing this stale PR because it has been open for 100 days with no activity. This isn't a judgement on the merit of the PR in any way. It's just a way of keeping the PR queue manageable.
If you feel like this was a mistake, or you would like to continue working on it, please feel free to re-open it and ask for a committer to remove the stale tag and review again.
Thanks all for your contribution.

steveloughran

missed this. sorry. patch looks fine.

@charlesconnell can you re-open this, move to junit5/assertJ and we can merge in.

steveloughran · 2025-10-08T16:33:29Z

...oject/hadoop-common/src/test/java/org/apache/hadoop/security/TestSaslPropertiesResolver.java

+import java.util.Map;
+import javax.security.sasl.Sasl;
+
+import org.junit.Before;


we are now junit5 tests on trunk now. Either move or just pull all of setup() into testResolverDoesNotMutate()

steveloughran · 2025-10-08T16:34:38Z

...oject/hadoop-common/src/test/java/org/apache/hadoop/security/TestSaslPropertiesResolver.java

+  }
+
+  private static void assertPrivacyQop(Map<String, String> saslProperties) {
+    assertEquals(SaslRpcServer.QualityOfProtection.PRIVACY.getSaslQop(),


use AssertJ assertequals

hadoop-yetus · 2025-10-08T22:07:48Z

🎊 +1 overall

Vote	Subsystem	Runtime	Logfile	Comment
+0 🆗	reexec	0m 52s		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 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	54m 31s		trunk passed
+1 💚	compile	18m 14s		trunk passed with JDK Ubuntu-11.0.27+6-post-Ubuntu-0ubuntu120.04
+1 💚	compile	16m 5s		trunk passed with JDK Private Build-1.8.0_452-8u452-ga~~us1-0ubuntu1~~20.04-b09
+1 💚	checkstyle	1m 3s		trunk passed
+1 💚	mvnsite	1m 46s		trunk passed
+1 💚	javadoc	1m 21s		trunk passed with JDK Ubuntu-11.0.27+6-post-Ubuntu-0ubuntu120.04
+1 💚	javadoc	0m 55s		trunk passed with JDK Private Build-1.8.0_452-8u452-ga~~us1-0ubuntu1~~20.04-b09
+1 💚	spotbugs	2m 43s		trunk passed
+1 💚	shadedclient	43m 33s		branch has no errors when building and testing our client artifacts.
			_ Patch Compile Tests _
+1 💚	mvninstall	1m 2s		the patch passed
+1 💚	compile	19m 3s		the patch passed with JDK Ubuntu-11.0.27+6-post-Ubuntu-0ubuntu120.04
+1 💚	javac	19m 3s		the patch passed
+1 💚	compile	20m 6s		the patch passed with JDK Private Build-1.8.0_452-8u452-ga~~us1-0ubuntu1~~20.04-b09
+1 💚	javac	20m 6s		the patch passed
+1 💚	blanks	0m 0s		The patch has no blanks issues.
+1 💚	checkstyle	0m 57s		hadoop-common-project/hadoop-common: The patch generated 0 new + 5 unchanged - 1 fixed = 5 total (was 6)
+1 💚	mvnsite	1m 44s		the patch passed
+1 💚	javadoc	1m 14s		the patch passed with JDK Ubuntu-11.0.27+6-post-Ubuntu-0ubuntu120.04
+1 💚	javadoc	0m 53s		the patch passed with JDK Private Build-1.8.0_452-8u452-ga~~us1-0ubuntu1~~20.04-b09
+1 💚	spotbugs	2m 54s		the patch passed
+1 💚	shadedclient	42m 5s		patch has no errors when building and testing our client artifacts.
			_ Other Tests _
+1 💚	unit	23m 28s		hadoop-common in the patch passed.
+1 💚	asflicense	1m 8s		The patch does not generate ASF License warnings.
		256m 56s

Subsystem	Report/Notes
Docker	ClientAPI=1.51 ServerAPI=1.51 base: https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-6272/3/artifact/out/Dockerfile
GITHUB PR	#6272
Optional Tests	dupname asflicense compile javac javadoc mvninstall mvnsite unit shadedclient spotbugs checkstyle codespell detsecrets
uname	Linux df522600e5e1 5.15.0-151-generic #161-Ubuntu SMP Tue Jul 22 14:25:40 UTC 2025 x86_64 x86_64 x86_64 GNU/Linux
Build tool	maven
Personality	dev-support/bin/hadoop.sh
git revision	trunk / `59c3641`
Default Java	Private Build-1.8.0_452-8u452-ga~~us1-0ubuntu1~~20.04-b09
Multi-JDK versions	/usr/lib/jvm/java-11-openjdk-amd64:Ubuntu-11.0.27+6-post-Ubuntu-0ubuntu120.04 /usr/lib/jvm/java-8-openjdk-amd64:Private Build-1.8.0_452-8u452-ga~~us1-0ubuntu1~~20.04-b09
Test Results	https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-6272/3/testReport/
Max. process+thread count	1304 (vs. ulimit of 5500)
modules	C: hadoop-common-project/hadoop-common U: hadoop-common-project/hadoop-common
Console output	https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-6272/3/console
versions	git=2.25.1 maven=3.9.11 spotbugs=4.2.2
Powered by	Apache Yetus 0.14.0 https://yetus.apache.org

This message was automatically generated.

charlesconnell · 2025-10-08T22:10:12Z

@steveloughran Updated!

github-actions bot added trunk Common labels Nov 13, 2023

steveloughran requested changes Nov 14, 2023

View reviewed changes

charlesconnell requested a review from steveloughran December 12, 2023 00:35

github-actions bot added the Stale label Oct 8, 2025

steveloughran requested changes Oct 8, 2025

View reviewed changes

charlesconnell added 4 commits October 8, 2025 12:47

Copy SASL properties map when returning from SaslPropertiesResolver

341938e

Add a unit test

5d2c591

apache license, checkstyle, pr feedback

fe7517b

update to junit 5

59c3641

charlesconnell force-pushed the HADOOP-18972/sasl-properties-resolver-copy-map branch from 8a432bd to 59c3641 Compare October 8, 2025 17:49

github-actions bot closed this Oct 9, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

HADOOP-18972: Copy SASL properties map when returning from SaslPropertiesResolver #6272

HADOOP-18972: Copy SASL properties map when returning from SaslPropertiesResolver #6272

Uh oh!

charlesconnell commented Nov 13, 2023

Uh oh!

hadoop-yetus commented Nov 14, 2023

Uh oh!

steveloughran left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

hadoop-yetus commented Nov 14, 2023

Uh oh!

github-actions bot commented Oct 8, 2025

Uh oh!

steveloughran left a comment

Uh oh!

steveloughran Oct 8, 2025

Uh oh!

steveloughran Oct 8, 2025

Uh oh!

hadoop-yetus commented Oct 8, 2025

Uh oh!

charlesconnell commented Oct 8, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

HADOOP-18972: Copy SASL properties map when returning from SaslPropertiesResolver #6272

HADOOP-18972: Copy SASL properties map when returning from SaslPropertiesResolver #6272

Uh oh!

Conversation

charlesconnell commented Nov 13, 2023

Description of PR

How was this patch tested?

For code changes:

Uh oh!

hadoop-yetus commented Nov 14, 2023

Uh oh!

steveloughran left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

hadoop-yetus commented Nov 14, 2023

Uh oh!

github-actions bot commented Oct 8, 2025

Uh oh!

steveloughran left a comment

Choose a reason for hiding this comment

Uh oh!

steveloughran Oct 8, 2025

Choose a reason for hiding this comment

Uh oh!

steveloughran Oct 8, 2025

Choose a reason for hiding this comment

Uh oh!

hadoop-yetus commented Oct 8, 2025

Uh oh!

charlesconnell commented Oct 8, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants