GH-9794: Allow usage of '@' in SMB domain, username and password #9795
+33
−11
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…d password Fixes: spring-projects#9794 The `SmbConfig.rawUrl()` method doesn't apply any URL encoding, resulting in parts of the `domainUserPass` that may contain a `@` character to break the URL logic in regard to determining the hostname. * Modify `SmbConfig.getDomainUserPass(_includePassword)` to conditionally encode the variables. Makes sure to encode the individual parts to not undesirably encode the `;` and `:` characters, breaking other logic. * Modify `SmbConfig.rawUrl(_includePassword)` and `SmbConfig.createUri(_includePassword)` to call the modified method with the correct `_urlEncode` variable Signed-off-by: Jelle Smits <[email protected]>
artembilan
requested changes
Jan 28, 2025
spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbConfig.java
Show resolved
Hide resolved
|
Merged as 36e4012. Thank you for contribution; looking forward for more! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: #9794
The
SmbConfig.rawUrl()method doesn't apply any URL encoding, resulting in parts of thedomainUserPassthat may contain a@character to break the URL logic in regard to determining the hostname.SmbConfig.getDomainUserPass(_includePassword)to conditionally encode the variables. Makes sure to encode the individual parts to not undesirably encode the;and:characters, breaking other logic.SmbConfig.rawUrl(_includePassword)andSmbConfig.createUri(_includePassword)to call the modified method with the correct_urlEncodevariable