Add flag to enable set server url when request has no host header

rundeck · May 24, 2024 · 55b3681 · 55b3681
1 parent 0c1528a
commit 55b3681
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/rundeckapp/grails-app/conf/spring/resources.groovy b/rundeckapp/grails-app/conf/spring/resources.groovy
@@ -880,6 +880,7 @@ 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)
 

diff --git a/rundeckapp/grails-app/init/rundeckapp/init/servlet/JettyServletContainerCustomizer.groovy b/rundeckapp/grails-app/init/rundeckapp/init/servlet/JettyServletContainerCustomizer.groovy
@@ -27,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
@@ -39,6 +40,7 @@ class JettyServletContainerCustomizer implements WebServerFactoryCustomizer<Jett
     Boolean useForwardHeaders
     String serverUrl
     String serverPort
+    FeatureService featureService
 
     @Override
     void customize(final JettyServletWebServerFactory factory) {
@@ -53,7 +55,9 @@ class JettyServletContainerCustomizer implements WebServerFactoryCustomizer<Jett
             }
         })
         factory.addServerCustomizers(new BanHttpMethodCustomizer())
-        factory.addServerCustomizers(new RundeckHostHeaderCustomizer(serverUrl, Integer.parseInt(serverPort ?: "4440")))
+        if(featureService.featurePresent("setServerUrlOnNohostHeader", false)) {
+            factory.addServerCustomizers(new RundeckHostHeaderCustomizer(serverUrl, Integer.parseInt(serverPort ?: "4440")))
+        }
         factory.addConfigurations(new JettyConfigPropsInitParameterConfiguration(initParams))
         factory.useForwardHeaders=useForwardHeaders
     }