commit d74f9cc50e26b0ac82f3c7707893462b0289538a
author Stefaan Dutry <stefaan.dutry@gmail.com> Tue Mar 28 21:23:19 2017 +0200
committer Stefaan Dutry <stefaan.dutry@gmail.com> Tue Mar 28 21:23:19 2017 +0200
tree 96dbbca7a886ce31127282d1f570d5178855a29d
parent 6ac80743f253c0f5581c15a41c28b4e11e44abb4

extracted method for X-Forwarded-Proto header check

struts2-custom-results-plugin/src/main/java/org/apache/struts2/result/SslOffloadAwareServletRedirectResult.java

diff --git a/struts2-custom-results-plugin/src/main/java/org/apache/struts2/result/SslOffloadAwareServletRedirectResult.java b/struts2-custom-results-plugin/src/main/java/org/apache/struts2/result/SslOffloadAwareServletRedirectResult.java
index c540ad0..0955f8a 100644
--- a/struts2-custom-results-plugin/src/main/java/org/apache/struts2/result/SslOffloadAwareServletRedirectResult.java
+++ b/struts2-custom-results-plugin/src/main/java/org/apache/struts2/result/SslOffloadAwareServletRedirectResult.java
@@ -157,7 +157,11 @@
     }
 
     protected boolean shouldFixScheme(HttpServletRequest request) {
-        return "https".equals(request.getHeader("X-Forwarded-Proto")) || hasForwardedHeaderWithProtoParamHttps(request);
+        return hasXForwardedProtoHttps(request) || hasForwardedHeaderWithProtoParamHttps(request);
+    }
+
+    protected boolean hasXForwardedProtoHttps(HttpServletRequest request) {
+        return "https".equals(request.getHeader("X-Forwarded-Proto"));
     }
 
     protected boolean hasForwardedHeaderWithProtoParamHttps(HttpServletRequest request) {