Skip to content

Commit e9e7f7d

Browse files
rwinchrwinch
committed
Polish URL Cleanup
Fixes: gh-6628
1 parent 3b89754 commit e9e7f7d

File tree

8 files changed

+31
-31
lines changed

8 files changed

+31
-31
lines changed

‎oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/DefaultOAuth2AuthorizationRequestResolverTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public void resolveWhenAuthorizationRequestIncludesPort80ThenExpandedRedirectUri
174174
String requestUri = this.authorizationRequestBaseUri + "/" + clientRegistration.getRegistrationId();
175175
MockHttpServletRequest request = new MockHttpServletRequest("GET", requestUri);
176176
request.setScheme("http");
177-
request.setServerName("example.com");
177+
request.setServerName("localhost");
178178
request.setServerPort(80);
179179
request.setServletPath(requestUri);
180180

@@ -183,7 +183,7 @@ public void resolveWhenAuthorizationRequestIncludesPort80ThenExpandedRedirectUri
183183
.matches("https://example.com/login/oauth/authorize\\?" +
184184
"response_type=code&client_id=client-id&" +
185185
"scope=read:user&state=.{15,}&" +
186-
"redirect_uri=https://example.com/login/oauth2/code/registration-id");
186+
"redirect_uri=http://localhost/login/oauth2/code/registration-id");
187187
}
188188

189189
@Test

‎oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/OAuth2LoginAuthenticationFilterTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ public void doFilterWhenAuthorizationResponseHasDefaultPort80ThenRedirectUriMatc
308308
String state = "state";
309309
MockHttpServletRequest request = new MockHttpServletRequest("GET", requestUri);
310310
request.setScheme("http");
311-
request.setServerName("example.com");
311+
request.setServerName("localhost");
312312
request.setServerPort(80);
313313
request.setServletPath(requestUri);
314314
request.addParameter(OAuth2ParameterNames.CODE, "code");
@@ -329,7 +329,7 @@ public void doFilterWhenAuthorizationResponseHasDefaultPort80ThenRedirectUriMatc
329329
OAuth2AuthorizationRequest authorizationRequest = authentication.getAuthorizationExchange().getAuthorizationRequest();
330330
OAuth2AuthorizationResponse authorizationResponse = authentication.getAuthorizationExchange().getAuthorizationResponse();
331331

332-
String expectedRedirectUri = "https://example.com/login/oauth2/code/registration-id-2";
332+
String expectedRedirectUri = "http://localhost/login/oauth2/code/registration-id-2";
333333
assertThat(authorizationRequest.getRedirectUri()).isEqualTo(expectedRedirectUri);
334334
assertThat(authorizationResponse.getRedirectUri()).isEqualTo(expectedRedirectUri);
335335
}

‎web/src/test/java/org/springframework/security/web/FilterInvocationTests.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void testGettersAndStringMethods() {
4545
MockHttpServletRequest request = new MockHttpServletRequest(null, null);
4646
request.setServletPath("/HelloWorld");
4747
request.setPathInfo("/some/more/segments.html");
48-
request.setServerName("www.example.com");
48+
request.setServerName("localhost");
4949
request.setScheme("http");
5050
request.setServerPort(80);
5151
request.setContextPath("/mycontext");
@@ -61,7 +61,7 @@ public void testGettersAndStringMethods() {
6161
assertThat(fi.getChain()).isEqualTo(chain);
6262
assertThat(fi.getRequestUrl()).isEqualTo("/HelloWorld/some/more/segments.html");
6363
assertThat(fi.toString()).isEqualTo("FilterInvocation: URL: /HelloWorld/some/more/segments.html");
64-
assertThat(fi.getFullRequestUrl()).isEqualTo("https://www.example.com/mycontext/HelloWorld/some/more/segments.html");
64+
assertThat(fi.getFullRequestUrl()).isEqualTo("http://localhost/mycontext/HelloWorld/some/more/segments.html");
6565
}
6666

6767
@Test(expected = IllegalArgumentException.class)
@@ -91,7 +91,7 @@ public void testStringMethodsWithAQueryString() {
9191
MockHttpServletRequest request = new MockHttpServletRequest();
9292
request.setQueryString("foo=bar");
9393
request.setServletPath("/HelloWorld");
94-
request.setServerName("www.example.com");
94+
request.setServerName("localhost");
9595
request.setScheme("http");
9696
request.setServerPort(80);
9797
request.setContextPath("/mycontext");
@@ -102,14 +102,14 @@ public void testStringMethodsWithAQueryString() {
102102
mock(FilterChain.class));
103103
assertThat(fi.getRequestUrl()).isEqualTo("/HelloWorld?foo=bar");
104104
assertThat(fi.toString()).isEqualTo("FilterInvocation: URL: /HelloWorld?foo=bar");
105-
assertThat(fi.getFullRequestUrl()).isEqualTo("https://www.example.com/mycontext/HelloWorld?foo=bar");
105+
assertThat(fi.getFullRequestUrl()).isEqualTo("http://localhost/mycontext/HelloWorld?foo=bar");
106106
}
107107

108108
@Test
109109
public void testStringMethodsWithoutAnyQueryString() {
110110
MockHttpServletRequest request = new MockHttpServletRequest(null, null);
111111
request.setServletPath("/HelloWorld");
112-
request.setServerName("www.example.com");
112+
request.setServerName("localhost");
113113
request.setScheme("http");
114114
request.setServerPort(80);
115115
request.setContextPath("/mycontext");
@@ -120,7 +120,7 @@ public void testStringMethodsWithoutAnyQueryString() {
120120
mock(FilterChain.class));
121121
assertThat(fi.getRequestUrl()).isEqualTo("/HelloWorld");
122122
assertThat(fi.toString()).isEqualTo("FilterInvocation: URL: /HelloWorld");
123-
assertThat(fi.getFullRequestUrl()).isEqualTo("https://www.example.com/mycontext/HelloWorld");
123+
assertThat(fi.getFullRequestUrl()).isEqualTo("http://localhost/mycontext/HelloWorld");
124124
}
125125

126126
@Test(expected = UnsupportedOperationException.class)

‎web/src/test/java/org/springframework/security/web/access/ExceptionTranslationFilterTests.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public void testAccessDeniedWhenAnonymous() throws Exception {
8686
request.setServletPath("/secure/page.html");
8787
request.setServerPort(80);
8888
request.setScheme("http");
89-
request.setServerName("www.example.com");
89+
request.setServerName("localhost");
9090
request.setContextPath("/mycontext");
9191
request.setRequestURI("/mycontext/secure/page.html");
9292

@@ -109,7 +109,7 @@ public void testAccessDeniedWhenAnonymous() throws Exception {
109109
MockHttpServletResponse response = new MockHttpServletResponse();
110110
filter.doFilter(request, response, fc);
111111
assertThat(response.getRedirectedUrl()).isEqualTo("/mycontext/login.jsp");
112-
assertThat(getSavedRequestUrl(request)).isEqualTo("https://www.example.com/mycontext/secure/page.html");
112+
assertThat(getSavedRequestUrl(request)).isEqualTo("http://localhost/mycontext/secure/page.html");
113113
}
114114

115115
@Test
@@ -119,7 +119,7 @@ public void testAccessDeniedWithRememberMe() throws Exception {
119119
request.setServletPath("/secure/page.html");
120120
request.setServerPort(80);
121121
request.setScheme("http");
122-
request.setServerName("www.example.com");
122+
request.setServerName("localhost");
123123
request.setContextPath("/mycontext");
124124
request.setRequestURI("/mycontext/secure/page.html");
125125

@@ -139,7 +139,7 @@ public void testAccessDeniedWithRememberMe() throws Exception {
139139
MockHttpServletResponse response = new MockHttpServletResponse();
140140
filter.doFilter(request, response, fc);
141141
assertThat(response.getRedirectedUrl()).isEqualTo("/mycontext/login.jsp");
142-
assertThat(getSavedRequestUrl(request)).isEqualTo("https://www.example.com/mycontext/secure/page.html");
142+
assertThat(getSavedRequestUrl(request)).isEqualTo("http://localhost/mycontext/secure/page.html");
143143
}
144144

145145

@@ -210,7 +210,7 @@ public void redirectedToLoginFormAndSessionShowsOriginalTargetWhenAuthentication
210210
request.setServletPath("/secure/page.html");
211211
request.setServerPort(80);
212212
request.setScheme("http");
213-
request.setServerName("www.example.com");
213+
request.setServerName("localhost");
214214
request.setContextPath("/mycontext");
215215
request.setRequestURI("/mycontext/secure/page.html");
216216

@@ -225,7 +225,7 @@ public void redirectedToLoginFormAndSessionShowsOriginalTargetWhenAuthentication
225225
MockHttpServletResponse response = new MockHttpServletResponse();
226226
filter.doFilter(request, response, fc);
227227
assertThat(response.getRedirectedUrl()).isEqualTo("/mycontext/login.jsp");
228-
assertThat(getSavedRequestUrl(request)).isEqualTo("https://www.example.com/mycontext/secure/page.html");
228+
assertThat(getSavedRequestUrl(request)).isEqualTo("http://localhost/mycontext/secure/page.html");
229229
}
230230

231231
@Test
@@ -236,7 +236,7 @@ public void redirectedToLoginFormAndSessionShowsOriginalTargetWithExoticPortWhen
236236
request.setServletPath("/secure/page.html");
237237
request.setServerPort(8080);
238238
request.setScheme("http");
239-
request.setServerName("www.example.com");
239+
request.setServerName("localhost");
240240
request.setContextPath("/mycontext");
241241
request.setRequestURI("/mycontext/secure/page.html");
242242

@@ -254,7 +254,7 @@ public void redirectedToLoginFormAndSessionShowsOriginalTargetWithExoticPortWhen
254254
MockHttpServletResponse response = new MockHttpServletResponse();
255255
filter.doFilter(request, response, fc);
256256
assertThat(response.getRedirectedUrl()).isEqualTo("/mycontext/login.jsp");
257-
assertThat(getSavedRequestUrl(request)).isEqualTo("https://www.example.com:8080/mycontext/secure/page.html");
257+
assertThat(getSavedRequestUrl(request)).isEqualTo("http://localhost:8080/mycontext/secure/page.html");
258258
}
259259

260260
@Test(expected = IllegalArgumentException.class)

‎web/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpEntryPointTests.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,15 @@ public void testNormalOperation() throws Exception {
9696

9797
ep.commence(request, response);
9898
assertThat(response.getRedirectedUrl()).isEqualTo(
99-
"https://www.example.com/bigWebApp/hello/pathInfo.html?open=true");
99+
"http://www.example.com/bigWebApp/hello/pathInfo.html?open=true");
100100
}
101101

102102
@Test
103103
public void testNormalOperationWithNullQueryString() throws Exception {
104104
MockHttpServletRequest request = new MockHttpServletRequest("GET",
105105
"/bigWebApp/hello");
106106
request.setScheme("https");
107-
request.setServerName("www.example.com");
107+
request.setServerName("localhost");
108108
request.setServerPort(443);
109109

110110
MockHttpServletResponse response = new MockHttpServletResponse();
@@ -115,7 +115,7 @@ public void testNormalOperationWithNullQueryString() throws Exception {
115115

116116
ep.commence(request, response);
117117
assertThat(response.getRedirectedUrl())
118-
.isEqualTo("https://www.example.com/bigWebApp/hello");
118+
.isEqualTo("http://localhost/bigWebApp/hello");
119119
}
120120

121121
@Test
@@ -142,7 +142,7 @@ public void testOperationWithNonStandardPort() throws Exception {
142142
"/bigWebApp/hello/pathInfo.html");
143143
request.setQueryString("open=true");
144144
request.setScheme("https");
145-
request.setServerName("www.example.com");
145+
request.setServerName("localhost");
146146
request.setServerPort(9999);
147147

148148
MockHttpServletResponse response = new MockHttpServletResponse();
@@ -158,6 +158,6 @@ public void testOperationWithNonStandardPort() throws Exception {
158158

159159
ep.commence(request, response);
160160
assertThat(response.getRedirectedUrl()).isEqualTo(
161-
"https://www.example.com:8888/bigWebApp/hello/pathInfo.html?open=true");
161+
"http://localhost:8888/bigWebApp/hello/pathInfo.html?open=true");
162162
}
163163
}

‎web/src/test/java/org/springframework/security/web/authentication/LoginUrlAuthenticationEntryPointTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,14 +166,14 @@ public void testNormalOperation() throws Exception {
166166
request.setRequestURI("/some_path");
167167
request.setContextPath("/bigWebApp");
168168
request.setScheme("http");
169-
request.setServerName("www.example.com");
169+
request.setServerName("localhost");
170170
request.setContextPath("/bigWebApp");
171171
request.setServerPort(80);
172172

173173
MockHttpServletResponse response = new MockHttpServletResponse();
174174

175175
ep.commence(request, response, null);
176-
assertThat(response.getRedirectedUrl()).isEqualTo("https://www.example.com/bigWebApp/hello");
176+
assertThat(response.getRedirectedUrl()).isEqualTo("http://localhost/bigWebApp/hello");
177177
}
178178

179179
@Test
@@ -188,7 +188,7 @@ public void testOperationWhenHttpsRequestsButHttpsPortUnknown() throws Exception
188188
request.setRequestURI("/some_path");
189189
request.setContextPath("/bigWebApp");
190190
request.setScheme("http");
191-
request.setServerName("www.example.com");
191+
request.setServerName("localhost");
192192
request.setContextPath("/bigWebApp");
193193
request.setServerPort(8888); // NB: Port we can't resolve
194194

@@ -198,7 +198,7 @@ public void testOperationWhenHttpsRequestsButHttpsPortUnknown() throws Exception
198198

199199
// Response doesn't switch to HTTPS, as we didn't know HTTP port 8888 to HTTP port
200200
// mapping
201-
assertThat(response.getRedirectedUrl()).isEqualTo("https://www.example.com:8888/bigWebApp/hello");
201+
assertThat(response.getRedirectedUrl()).isEqualTo("http://localhost:8888/bigWebApp/hello");
202202
}
203203

204204
@Test

‎web/src/test/java/org/springframework/security/web/header/writers/frameoptions/RegExpAllowFromStrategyTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void nullRegularExpressionShouldLeadToException() {
4141
@Test
4242
public void subdomainMatchingRegularExpression() {
4343
RegExpAllowFromStrategy strategy = new RegExpAllowFromStrategy(
44-
"^http://([a-z0-9]*?\\.)test\\.com");
44+
"^https://([a-z0-9]*?\\.)test\\.com");
4545
strategy.setAllowFromParameterName("from");
4646
MockHttpServletRequest request = new MockHttpServletRequest();
4747

@@ -53,15 +53,15 @@ public void subdomainMatchingRegularExpression() {
5353
String result2 = strategy.getAllowFromValue(request);
5454
assertThat(result2).isEqualTo("https://www.test.com");
5555

56-
request.setParameter("from", "http://test.foobar.com");
56+
request.setParameter("from", "https://test.foobar.com");
5757
String result3 = strategy.getAllowFromValue(request);
5858
assertThat(result3).isEqualTo("DENY");
5959
}
6060

6161
@Test
6262
public void noParameterShouldDeny() {
6363
RegExpAllowFromStrategy strategy = new RegExpAllowFromStrategy(
64-
"^http://([a-z0-9]*?\\.)test\\.com");
64+
"^https://([a-z0-9]*?\\.)test\\.com");
6565
MockHttpServletRequest request = new MockHttpServletRequest();
6666
String result1 = strategy.getAllowFromValue(request);
6767
assertThat(result1).isEqualTo("DENY");

‎web/src/test/java/org/springframework/security/web/server/header/StrictTransportSecurityServerHttpHeadersWriterTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public void writeHttpHeadersWhenNullSchemeThenNoHeaders() {
8686

8787
@Test
8888
public void writeHttpHeadersWhenHttpThenNoHeaders() {
89-
exchange = exchange(MockServerHttpRequest.get("https://example.com/"));
89+
exchange = exchange(MockServerHttpRequest.get("http://localhost/"));
9090

9191
hsts.writeHttpHeaders(exchange);
9292

0 commit comments

Comments
 (0)