extracted method for X-Forwarded-Proto header check
Project: http://git-wip-us.apache.org/repos/asf/struts-extras/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-extras/commit/d74f9cc5 Tree: http://git-wip-us.apache.org/repos/asf/struts-extras/tree/d74f9cc5 Diff: http://git-wip-us.apache.org/repos/asf/struts-extras/diff/d74f9cc5 Branch: refs/heads/master Commit: d74f9cc50e26b0ac82f3c7707893462b0289538a Parents: 6ac8074 Author: Stefaan Dutry <stefaan.du...@gmail.com> Authored: Tue Mar 28 21:23:19 2017 +0200 Committer: Stefaan Dutry <stefaan.du...@gmail.com> Committed: Tue Mar 28 21:23:19 2017 +0200 ---------------------------------------------------------------------- .../struts2/result/SslOffloadAwareServletRedirectResult.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts-extras/blob/d74f9cc5/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 @@ public class SslOffloadAwareServletRedirectResult extends ServletRedirectResult } 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) {
