RSE-1052: fix IP disclosure when request doesnt have Host header #9110
Conversation
This file contains 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
|
Testing the solution feasibility: By passing the host header in: |
mrdubr
reviewed
May 16, 2024
rundeckapp/grails-app/init/rundeckapp/init/servlet/JettyServletContainerCustomizer.groovy
Outdated
Show resolved
Hide resolved
mrdubr
requested changes
May 16, 2024
rundeckapp/grails-app/init/rundeckapp/init/servlet/BanHttpMethodCustomizer.groovy
Outdated
Show resolved
Hide resolved
rundeckapp/grails-app/init/rundeckapp/init/servlet/BanHttpMethodCustomizer.groovy
Outdated
Show resolved
Hide resolved
| @@ -50,6 +55,9 @@ class JettyServletContainerCustomizer implements WebServerFactoryCustomizer<Jett | |||
| } | |||
| }) | |||
| factory.addServerCustomizers(new BanHttpMethodCustomizer()) | |||
| if(featureService.featurePresent("setServerUrlOnNohostHeader", false)) { | |||
There was a problem hiding this comment.
Is it possible that the server.address is not configured?
If so, I'm pretty sure the redirects (302s) will break.
mrdubr
requested changes
May 24, 2024
| @@ -3,6 +3,7 @@ package rundeckapp.init.servlet | |||
| import org.eclipse.jetty.http.HttpMethod | |||
| import org.eclipse.jetty.http.HttpStatus | |||
| import org.eclipse.jetty.server.Connector | |||
| import org.eclipse.jetty.server.HostHeaderCustomizer | |||
| @@ -50,6 +54,9 @@ class JettyServletContainerCustomizer implements WebServerFactoryCustomizer<Jett | |||
| } | |||
| }) | |||
| factory.addServerCustomizers(new BanHttpMethodCustomizer()) | |||
| if(featureService.featurePresent("setServerUrlOnNoHostHeader", false) && serverUrl) { | |||
There was a problem hiding this comment.
nit: for future considerations...
For minor perf improvements, it's recommended to order && checks from least expensive to most expensive.
|
Can you also please mark this PR as a "bugbash candidate". Thanks! |
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.
Is this a bugfix, or an enhancement? Please describe.
When performing a request to Rundeck with no Host header, the internal IP is revealed on the response
Describe the solution you've implemented
This PR add a customizer that is enabled by the config
rundeck.feature.setServerUrlOnNoHostHeader.enabledthat will force the serverUrl and serverPort in the response if there is no Host header on requestDescribe alternatives you've considered
Additional context