Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RSE-1052: fix IP disclosure when request doesnt have Host header #9110

Merged
merged 4 commits into from
May 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions rundeckapp/grails-app/conf/spring/resources.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -880,13 +880,15 @@ beans={
}

jettyServletCustomizer(JettyServletContainerCustomizer) {
featureService = ref('featureService')
def configParams = grailsApplication.config.getProperty("rundeck.web.jetty.servlet.initParams", String.class)
def useForwardHeadersConfig = grailsApplication.config.getProperty("server.useForwardHeaders",Boolean.class)

initParams = configParams?.toProperties()?.collectEntries {
[it.key.toString(), it.value.toString()]
}
useForwardHeaders = useForwardHeadersConfig ?: Boolean.getBoolean('rundeck.jetty.connector.forwarded')
serverUrl = grailsApplication.config.getProperty('grails.serverURL', String.class)
mrdubr marked this conversation as resolved.
Show resolved Hide resolved
}

def stsMaxAgeSeconds = grailsApplication.config.getProperty("rundeck.web.jetty.servlet.stsMaxAgeSeconds",Integer.class,-1)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ package rundeckapp.init.servlet

import com.dtolabs.rundeck.core.init.CustomWebAppInitializer
import org.eclipse.jetty.server.Handler
import org.eclipse.jetty.server.HostHeaderCustomizer
import org.eclipse.jetty.server.Server
import org.eclipse.jetty.server.handler.ContextHandler
import org.eclipse.jetty.webapp.AbstractConfiguration
Expand All @@ -26,6 +27,7 @@ import org.slf4j.LoggerFactory
import org.springframework.boot.web.embedded.jetty.JettyServerCustomizer
import org.springframework.boot.web.embedded.jetty.JettyServletWebServerFactory
import org.springframework.boot.web.server.WebServerFactoryCustomizer
import rundeck.services.feature.FeatureService

/**
* Customize embedded jetty
Expand All @@ -36,6 +38,8 @@ class JettyServletContainerCustomizer implements WebServerFactoryCustomizer<Jett
*/
Map<String, String> initParams = [:]
Boolean useForwardHeaders
String serverUrl
FeatureService featureService

@Override
void customize(final JettyServletWebServerFactory factory) {
Expand All @@ -50,6 +54,9 @@ class JettyServletContainerCustomizer implements WebServerFactoryCustomizer<Jett
}
})
factory.addServerCustomizers(new BanHttpMethodCustomizer())
if(serverUrl && featureService.featurePresent("setServerUrlOnNoHostHeader", false)) {
factory.addServerCustomizers(new RundeckHostHeaderCustomizer(serverUrl: serverUrl))
}
factory.addConfigurations(new JettyConfigPropsInitParameterConfiguration(initParams))
factory.useForwardHeaders=useForwardHeaders
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package rundeckapp.init.servlet

import org.eclipse.jetty.server.HostHeaderCustomizer
import org.eclipse.jetty.server.HttpConfiguration
import org.eclipse.jetty.server.HttpConnectionFactory
import org.eclipse.jetty.server.Server
import org.springframework.boot.web.embedded.jetty.JettyServerCustomizer

class RundeckHostHeaderCustomizer implements JettyServerCustomizer {
String serverUrl

@Override
void customize(Server server) {
server.connectors.each {connector ->
HttpConfiguration config = connector.getConnectionFactory(HttpConnectionFactory.class).httpConfiguration
config.addCustomizer(new HostHeaderCustomizer(serverUrl))
}
}
}