Repository: wicket Updated Branches: refs/heads/master 0d6278107 -> 48f458091
WICKET-6440 SecuredRemoteAddressRequestWrapperFactory doesn't make request secure Use the wrapped request in the logging of the new secure state (cherry picked from commit 18a1c2f9ea793a6707b30644f14a63a5edafcbc4) Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/48f45809 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/48f45809 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/48f45809 Branch: refs/heads/master Commit: 48f45809154558c1a6edba35f7211a0fd3f196ac Parents: 0d62781 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Sep 5 00:32:03 2017 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Sep 5 00:33:07 2017 +0300 ---------------------------------------------------------------------- .../servlet/SecuredRemoteAddressRequestWrapperFactory.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/48f45809/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/SecuredRemoteAddressRequestWrapperFactory.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/SecuredRemoteAddressRequestWrapperFactory.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/SecuredRemoteAddressRequestWrapperFactory.java index caeaf56..eb1dbae 100644 --- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/SecuredRemoteAddressRequestWrapperFactory.java +++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/SecuredRemoteAddressRequestWrapperFactory.java @@ -93,7 +93,6 @@ public class SecuredRemoteAddressRequestWrapperFactory extends AbstractRequestWr private final static String SECURED_REMOTE_ADDRESSES_PARAMETER = "securedRemoteAddresses"; - /** */ public static class Config { /** @see #setSecuredRemoteAdresses(String) */ @@ -147,9 +146,6 @@ public class SecuredRemoteAddressRequestWrapperFactory extends AbstractRequestWr this.config = config; } - /** - * {@inheritDoc} - */ @Override public HttpServletRequest getWrapper(final HttpServletRequest request) { @@ -159,15 +155,12 @@ public class SecuredRemoteAddressRequestWrapperFactory extends AbstractRequestWr { log.debug("Incoming request uri=" + request.getRequestURI() + " with originalSecure='" + request.isSecure() + "', remoteAddr='" + request.getRemoteAddr() + - "' will be seen with newSecure='" + request.isSecure() + "'"); + "' will be seen with newSecure='" + xRequest.isSecure() + "'"); } return xRequest; } - /** - * {@inheritDoc} - */ @Override public boolean needsWrapper(final HttpServletRequest request) {
