Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Honor scheme in MockHttpServletRequest.isSecure()

Browse Source 
Prior to this commit the implementation of isSecure() in
MockHttpServletRequest simply returned the value of the 'secure'
boolean flag. Thus setting the scheme to 'https' had no effect on the
value returned by isSecure() even though most non-mock implementations
(e.g., Tomcat, Jetty, etc.) base the return value on the actual scheme
in the request.

This commit makes the behavior of MockHttpServletRequest.isSecure()
more intuitive by honoring both the 'secure' boolean flag and the
current value of the scheme.

Issue: SPR-12098
This commit is contained in:
Sam Brannen
2014-08-28 15:05:36 +02:00
parent fbfb7a3c48
commit 0b0ddc6ed1
2 changed files with 55 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
View File

@@ -75,10 +75,14 @@ import org.springframework.util.StringUtils;
*/
public class MockHttpServletRequest implements HttpServletRequest {
private static final String HTTP = "http";
private static final String HTTPS = "https";
/**
* The default protocol: 'http'.
*/
public static final String DEFAULT_PROTOCOL = "http";
public static final String DEFAULT_PROTOCOL = HTTP;
/**
* The default server address: '127.0.0.1'.
@@ -701,13 +705,29 @@ public class MockHttpServletRequest implements HttpServletRequest {
return Collections.enumeration(this.locales);
}
/**
* Set the boolean {@code secure} flag indicating whether the mock request
* was made using a secure channel, such as HTTPS.
* @param secure a boolean indicating if the mock request was made using a
* secure channel
* @see #isSecure()
* @see #getScheme()
* @see #setScheme(String)
*/
public void setSecure(boolean secure) {
this.secure = secure;
}
/**
* Returns {@code true} if the {@link #setSecure secure} flag has been set
* to {@code true} or if the {@link #getScheme scheme} is {@code https}.
* <p>
* {@inheritDoc}
* @see javax.servlet.ServletRequest#isSecure()
*/
@Override
public boolean isSecure() {
return this.secure;
return this.secure || HTTPS.equalsIgnoreCase(this.getScheme());
}
@Override
@@ -1021,7 +1041,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
StringBuffer url = new StringBuffer(this.scheme).append("://").append(this.serverName);
if (this.serverPort > 0
&& (("http".equalsIgnoreCase(scheme) && this.serverPort != 80) || ("https".equalsIgnoreCase(scheme) && this.serverPort != 443))) {
&& ((HTTP.equalsIgnoreCase(scheme) && this.serverPort != 80) || (HTTPS.equalsIgnoreCase(scheme) && this.serverPort != 443))) {
url.append(':').append(this.serverPort);
}