Merge remote-tracking branch 'origin/foundation-2022' into foundation…

…-2023
OpenNMS · Jun 26, 2023 · 208b414 · 208b414
2 parents 90c8176 + 5d864b5
commit 208b414
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/opennms-base-assembly/src/main/filtered/etc/opennms.properties b/opennms-base-assembly/src/main/filtered/etc/opennms.properties
@@ -346,6 +346,9 @@ org.opennms.netmgt.jetty.sendServerVersion=false
 # Provisioning web UI)
 org.eclipse.jetty.server.Request.maxFormKeys=2000
 
+# Allow relative redirects, see NMS-15732
+#org.opennms.netmgt.jetty.relativeRedirectAllowed=true
+
 ###### JETTY HTTPS SUPPORT ######
 # Details: http://www.opennms.org/index.php/Standalone_HTTPS_with_Jetty
 # If you want Jetty to provide an HTTPS listener, this is the port to listen on

diff --git a/opennms-jetty/src/main/resources/org/opennms/netmgt/jetty/jetty.xml b/opennms-jetty/src/main/resources/org/opennms/netmgt/jetty/jetty.xml
@@ -6,6 +6,7 @@
   <New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
     <Set name="requestHeaderSize"><SystemProperty name="org.opennms.netmgt.jetty.requestHeaderSize" default="4000" /></Set>
     <Set name="sendServerVersion"><SystemProperty name="org.opennms.netmgt.jetty.sendServerVersion" default="false" /></Set>
+    <Set name="relativeRedirectAllowed"><SystemProperty name="org.opennms.netmgt.jetty.relativeRedirectAllowed" default="true" /></Set>
   </New>
 
   <Call name="addConnector">