Skip to content
This repository was archived by the owner on May 31, 2022. It is now read-only.

Commit b97728f

Browse files
spring-operatorjzheaux
spring-operator
authored and
jzheaux
committed
URL Cleanup
This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener). # Fixed URLs ## Fixed But Review Recommended These URLs were fixed, but the https status was not OK. However, the https status was the same as the http request or http redirected to an https URL, so they were migrated. Your review is recommended. * [ ] http://www.eclipse.org/downloads/ (302) with 1 occurrences migrated to: https://www.eclipse.org/downloads/ ([https](https://www.eclipse.org/downloads/) result ReadTimeoutException). * [ ] http://my.key-set.uri (UnknownHostException) with 1 occurrences migrated to: https://my.key-set.uri ([https](https://my.key-set.uri) result UnknownHostException). * [ ] http://example.com/oauth/authorize (404) with 4 occurrences migrated to: https://example.com/oauth/authorize ([https](https://example.com/oauth/authorize) result 404). * [ ] http://example.com/oauth/token (404) with 4 occurrences migrated to: https://example.com/oauth/token ([https](https://example.com/oauth/token) result 404). * [ ] http://example.com/token_key (404) with 1 occurrences migrated to: https://example.com/token_key ([https](https://example.com/token_key) result 404). ## Fixed Success These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended. * [ ] http://example.com with 14 occurrences migrated to: https://example.com ([https](https://example.com) result 200). * [ ] http://maven.apache.org/run-maven/index.html with 1 occurrences migrated to: https://maven.apache.org/run-maven/index.html ([https](https://maven.apache.org/run-maven/index.html) result 200). * [ ] http://spring.io with 1 occurrences migrated to: https://spring.io ([https](https://spring.io) result 200). * [ ] http://stackoverflow.com with 1 occurrences migrated to: https://stackoverflow.com ([https](https://stackoverflow.com) result 200). * [ ] http://stackoverflow.com/tags/spring-boot with 1 occurrences migrated to: https://stackoverflow.com/tags/spring-boot ([https](https://stackoverflow.com/tags/spring-boot) result 200). * [ ] http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html with 1 occurrences migrated to: https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html ([https](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) result 200). * [ ] http://contributor-covenant.org with 1 occurrences migrated to: https://contributor-covenant.org ([https](https://contributor-covenant.org) result 301). * [ ] http://contributor-covenant.org/version/1/3/0/ with 1 occurrences migrated to: https://contributor-covenant.org/version/1/3/0/ ([https](https://contributor-covenant.org/version/1/3/0/) result 301). * [ ] http://plugins.jetbrains.com/plugin/6546 with 1 occurrences migrated to: https://plugins.jetbrains.com/plugin/6546 ([https](https://plugins.jetbrains.com/plugin/6546) result 301). * [ ] http://eclipse.org with 1 occurrences migrated to: https://eclipse.org ([https](https://eclipse.org) result 302). * [ ] http://eclipse.org/m2e/ with 2 occurrences migrated to: https://eclipse.org/m2e/ ([https](https://eclipse.org/m2e/) result 302). * [ ] http://repo.spring.io/milestone with 1 occurrences migrated to: https://repo.spring.io/milestone ([https](https://repo.spring.io/milestone) result 302). * [ ] http://repo.spring.io/snapshot with 1 occurrences migrated to: https://repo.spring.io/snapshot ([https](https://repo.spring.io/snapshot) result 302). # Ignored These URLs were intentionally ignored. * http://localhost with 2 occurrences * http://localhost/login with 2 occurrences * http://localhost:12345/banana with 1 occurrences * http://localhost:8080 with 1 occurrences * http://localhost:8080/flights/1 with 1 occurrences * http://localhost:8080/flights/2 with 1 occurrences * http://localhost:8080/user with 2 occurrences * http://my-auth-server/check_token with 2 occurrences * http://my-auth-server/token_key with 1 occurrences * http://my-auth-server/token_keys with 7 occurrences * http://my-auth-server/userinfo with 5 occurrences
1 parent 454d368 commit b97728f

13 files changed

+38
-38
lines changed

‎CODE_OF_CONDUCT.adoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@ appropriate to the circumstances. Maintainers are obligated to maintain confiden
4040
with regard to the reporter of an incident.
4141

4242
This Code of Conduct is adapted from the
43-
http://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at
44-
http://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/]
43+
https://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at
44+
https://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/]

‎CONTRIBUTING.adoc

+9-9
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ unacceptable behavior to [email protected].
1414

1515
== Using GitHub issues
1616
We use GitHub issues to track bugs and enhancements. If you have a general usage question
17-
please ask on http://stackoverflow.com[Stack Overflow]. The Spring Boot team and the
18-
broader community monitor the http://stackoverflow.com/tags/spring-boot[`spring-boot`]
17+
please ask on https://stackoverflow.com[Stack Overflow]. The Spring Boot team and the
18+
broader community monitor the https://stackoverflow.com/tags/spring-boot[`spring-boot`]
1919
tag.
2020

2121
If you are reporting a bug, please help to speed up problem diagnosis by providing as much
@@ -43,7 +43,7 @@ added after the original pull request but before a merge.
4343
the '`Importing into eclipse`' instructions below you should get project specific
4444
formatting automatically. You can also import formatter settings using the
4545
`eclipse-code-formatter.xml` file from the `eclipse` folder. If using IntelliJ IDEA, you
46-
can use the http://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter Plugin]
46+
can use the https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter Plugin]
4747
to import the same file.
4848
* Make sure all new `.java` files to have a simple Javadoc class comment with at least an
4949
`@author` tag identifying you, and preferably at least a paragraph on what the class is
@@ -56,7 +56,7 @@ added after the original pull request but before a merge.
5656
* A few unit tests would help a lot as well -- someone has to do it.
5757
* If no-one else is using your branch, please rebase it against the current master (or
5858
other target branch in the main project).
59-
* When writing a commit message please follow http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions],
59+
* When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions],
6060
if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit
6161
message (where `XXXX` is the issue number).
6262

@@ -65,15 +65,15 @@ added after the original pull request but before a merge.
6565
== Working with the code
6666
If you don't have an IDE preference we would recommend that you use
6767
https://spring.io/tools/sts[Spring Tools Suite] or
68-
http://eclipse.org[Eclipse] when working with the code. We use the
69-
http://eclipse.org/m2e/[M2Eclipse] eclipse plugin for maven support. Other IDEs and tools
68+
https://eclipse.org[Eclipse] when working with the code. We use the
69+
https://eclipse.org/m2e/[M2Eclipse] eclipse plugin for maven support. Other IDEs and tools
7070
should also work without issue.
7171

7272

7373

7474
=== Building from source
7575
To build the source you will need to install
76-
http://maven.apache.org/run-maven/index.html[Apache Maven] v3.2.3 or above and JDK 1.8.
76+
https://maven.apache.org/run-maven/index.html[Apache Maven] v3.2.3 or above and JDK 1.8.
7777

7878

7979

@@ -153,7 +153,7 @@ Spring Boot includes a `.setup` files which can be used with the Eclipse Install
153153
provision a new environment. To use the installer:
154154

155155
* Download and run the latest Eclipse Installer from
156-
http://www.eclipse.org/downloads/[eclipse.org/downloads/].
156+
https://www.eclipse.org/downloads/[eclipse.org/downloads/].
157157
* Switch to "Advanced Mode" using the drop down menu on the right.
158158
* Select "`Eclipse IDE for Java Developers`" under "`Eclipse.org`" as the product to
159159
install and click "`next`".
@@ -175,7 +175,7 @@ easier to navigate.
175175

176176
==== Manual installation with m2eclipse
177177
If you prefer to install Eclipse yourself we recommend that you use the
178-
http://eclipse.org/m2e/[M2Eclipse] eclipse plugin. If you don't already have m2eclipse
178+
https://eclipse.org/m2e/[M2Eclipse] eclipse plugin. If you don't already have m2eclipse
179179
installed it is available from the "Eclipse marketplace".
180180

181181
Spring Boot includes project specific source formatting settings, in order to have these

‎docs/src/docs/asciidoc/index.adoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ If you are using a SNAPSHOT version, you will need to ensure you have the Spring
5656
<repository>
5757
<id>spring-snapshot</id>
5858
<name>Spring Snapshot Repository</name>
59-
<url>http://repo.spring.io/snapshot</url>
59+
<url>https://repo.spring.io/snapshot</url>
6060
</repository>
6161
</repositories>
6262
----
@@ -71,7 +71,7 @@ If you are using a milestone or release candidate version, you will need to ensu
7171
<repository>
7272
<id>spring-milestone</id>
7373
<name>Spring Milestone Repository</name>
74-
<url>http://repo.spring.io/milestone</url>
74+
<url>https://repo.spring.io/milestone</url>
7575
</repository>
7676
</repositories>
7777
----

‎samples/spring-boot-sample-web-secure-github/src/main/resources/static/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<div class="container">
99
<div class="navbar">
1010
<div class="navbar-inner">
11-
<a class="brand" href="http://spring.io"> Spring </a>
11+
<a class="brand" href="https://spring.io"> Spring </a>
1212
<ul class="nav">
1313
<li><a href="/"> Home </a></li>
1414
</ul>

‎spring-security-oauth2-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/MultipleResourceServerConfigurationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public void close() {
5555
public void orderIsUnchangedWhenThereAreMultipleResourceServerConfigurations() {
5656
this.context = new AnnotationConfigWebApplicationContext();
5757
this.context.register(DoubleResourceConfiguration.class);
58-
TestPropertyValues.of("security.oauth2.resource.tokenInfoUri:http://example.com",
58+
TestPropertyValues.of("security.oauth2.resource.tokenInfoUri:https://example.com",
5959
"security.oauth2.client.clientId=acme").applyTo(this.context);
6060
this.context.refresh();
6161
assertThat(this.context

‎spring-security-oauth2-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerPropertiesTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public class ResourceServerPropertiesTests {
5656
@Test
5757
@SuppressWarnings("unchecked")
5858
public void json() throws Exception {
59-
this.properties.getJwt().setKeyUri("http://example.com/token_key");
59+
this.properties.getJwt().setKeyUri("https://example.com/token_key");
6060
ObjectMapper mapper = new ObjectMapper();
6161
String json = mapper.writeValueAsString(this.properties);
6262
Map<String, Object> value = mapper.readValue(json, Map.class);

‎spring-security-oauth2-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfigurationTests.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public void close() {
9999

100100
@Test
101101
public void useRemoteTokenServices() {
102-
TestPropertyValues.of("security.oauth2.resource.tokenInfoUri:http://example.com")
102+
TestPropertyValues.of("security.oauth2.resource.tokenInfoUri:https://example.com")
103103
.applyTo(this.environment);
104104
this.context = new SpringApplicationBuilder(ResourceConfiguration.class)
105105
.environment(this.environment).web(WebApplicationType.NONE).run();
@@ -109,7 +109,7 @@ public void useRemoteTokenServices() {
109109

110110
@Test
111111
public void switchToUserInfo() {
112-
TestPropertyValues.of("security.oauth2.resource.userInfoUri:http://example.com")
112+
TestPropertyValues.of("security.oauth2.resource.userInfoUri:https://example.com")
113113
.applyTo(this.environment);
114114
this.context = new SpringApplicationBuilder(ResourceConfiguration.class)
115115
.environment(this.environment).web(WebApplicationType.NONE).run();
@@ -120,7 +120,7 @@ public void switchToUserInfo() {
120120

121121
@Test
122122
public void userInfoWithAuthorities() {
123-
TestPropertyValues.of("security.oauth2.resource.userInfoUri:http://example.com")
123+
TestPropertyValues.of("security.oauth2.resource.userInfoUri:https://example.com")
124124
.applyTo(this.environment);
125125
this.context = new SpringApplicationBuilder(AuthoritiesConfiguration.class)
126126
.environment(this.environment).web(WebApplicationType.NONE).run();
@@ -133,7 +133,7 @@ public void userInfoWithAuthorities() {
133133

134134
@Test
135135
public void userInfoWithPrincipal() {
136-
TestPropertyValues.of("security.oauth2.resource.userInfoUri:http://example.com")
136+
TestPropertyValues.of("security.oauth2.resource.userInfoUri:https://example.com")
137137
.applyTo(this.environment);
138138
this.context = new SpringApplicationBuilder(PrincipalConfiguration.class)
139139
.environment(this.environment).web(WebApplicationType.NONE).run();
@@ -147,7 +147,7 @@ public void userInfoWithPrincipal() {
147147
@Test
148148
public void userInfoWithClient() {
149149
TestPropertyValues.of("security.oauth2.client.client-id=acme",
150-
"security.oauth2.resource.userInfoUri:http://example.com",
150+
"security.oauth2.resource.userInfoUri:https://example.com",
151151
"server.port=-1", "debug=true").applyTo(this.environment);
152152
this.context = new SpringApplicationBuilder(ResourceNoClientConfiguration.class)
153153
.environment(this.environment).web(WebApplicationType.SERVLET).run();
@@ -159,8 +159,8 @@ public void userInfoWithClient() {
159159
@Test
160160
public void preferUserInfo() {
161161
TestPropertyValues
162-
.of("security.oauth2.resource.userInfoUri:http://example.com",
163-
"security.oauth2.resource.tokenInfoUri:http://example.com",
162+
.of("security.oauth2.resource.userInfoUri:https://example.com",
163+
"security.oauth2.resource.tokenInfoUri:https://example.com",
164164
"security.oauth2.resource.preferTokenInfo:false")
165165
.applyTo(this.environment);
166166
this.context = new SpringApplicationBuilder(ResourceConfiguration.class)
@@ -173,8 +173,8 @@ public void preferUserInfo() {
173173
@Test
174174
public void userInfoWithCustomizer() {
175175
TestPropertyValues
176-
.of("security.oauth2.resource.userInfoUri:http://example.com",
177-
"security.oauth2.resource.tokenInfoUri:http://example.com",
176+
.of("security.oauth2.resource.userInfoUri:https://example.com",
177+
"security.oauth2.resource.tokenInfoUri:https://example.com",
178178
"security.oauth2.resource.preferTokenInfo:false")
179179
.applyTo(this.environment);
180180
this.context = new SpringApplicationBuilder(ResourceConfiguration.class,
@@ -223,7 +223,7 @@ public void jwkConfiguration() throws Exception {
223223
@Test
224224
public void springSocialUserInfo() {
225225
TestPropertyValues
226-
.of("security.oauth2.resource.userInfoUri:http://example.com",
226+
.of("security.oauth2.resource.userInfoUri:https://example.com",
227227
"spring.social.facebook.app-id=foo",
228228
"spring.social.facebook.app-secret=bar")
229229
.applyTo(this.environment);
@@ -239,7 +239,7 @@ public void springSocialUserInfo() {
239239

240240
@Test
241241
public void customUserInfoRestTemplateFactory() {
242-
TestPropertyValues.of("security.oauth2.resource.userInfoUri:http://example.com")
242+
TestPropertyValues.of("security.oauth2.resource.userInfoUri:https://example.com")
243243
.applyTo(this.environment);
244244
this.context = new SpringApplicationBuilder(
245245
CustomUserInfoRestTemplateFactory.class, ResourceConfiguration.class)
@@ -471,7 +471,7 @@ static class JwkTokenStoreConfiguration {
471471

472472
@Bean
473473
public TokenStore tokenStore() {
474-
return new JwkTokenStore("http://my.key-set.uri");
474+
return new JwkTokenStore("https://my.key-set.uri");
475475
}
476476

477477
}

‎spring-security-oauth2-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoTokenServicesRefreshTokenTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
*/
6161
@RunWith(SpringRunner.class)
6262
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = {
63-
"security.oauth2.resource.userInfoUri:http://example.com",
63+
"security.oauth2.resource.userInfoUri:https://example.com",
6464
"security.oauth2.client.clientId=foo" })
6565
@DirtiesContext
6666
public class UserInfoTokenServicesRefreshTokenTests {

‎spring-security-oauth2-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoTokenServicesTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class UserInfoTokenServicesTests {
5151
public ExpectedException expected = ExpectedException.none();
5252

5353
private UserInfoTokenServices services = new UserInfoTokenServices(
54-
"http://example.com", "foo");
54+
"https://example.com", "foo");
5555

5656
private BaseOAuth2ProtectedResourceDetails resource = new BaseOAuth2ProtectedResourceDetails();
5757

‎spring-security-oauth2-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/sso/BasicOAuth2SsoConfigurationTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
@SpringBootTest
5151
@TestPropertySource(properties = { "security.oauth2.client.clientId=client",
5252
"security.oauth2.client.clientSecret=secret",
53-
"security.oauth2.client.userAuthorizationUri=http://example.com/oauth/authorize",
54-
"security.oauth2.client.accessTokenUri=http://example.com/oauth/token",
53+
"security.oauth2.client.userAuthorizationUri=https://example.com/oauth/authorize",
54+
"security.oauth2.client.accessTokenUri=https://example.com/oauth/token",
5555
"security.oauth2.resource.jwt.keyValue=SSSSHHH" })
5656
public class BasicOAuth2SsoConfigurationTests {
5757

‎spring-security-oauth2-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/sso/CustomOAuth2SsoConfigurationTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@
5555
@SpringBootTest
5656
@TestPropertySource(properties = { "security.oauth2.client.clientId=client",
5757
"security.oauth2.client.clientSecret=secret",
58-
"security.oauth2.client.authorizationUri=http://example.com/oauth/authorize",
59-
"security.oauth2.client.tokenUri=http://example.com/oauth/token",
58+
"security.oauth2.client.authorizationUri=https://example.com/oauth/authorize",
59+
"security.oauth2.client.tokenUri=https://example.com/oauth/token",
6060
"security.oauth2.resource.jwt.keyValue=SSSSHHH" })
6161
public class CustomOAuth2SsoConfigurationTests {
6262

‎spring-security-oauth2-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/sso/CustomOAuth2SsoWithAuthenticationEntryPointConfigurationTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
@SpringBootTest
5757
@TestPropertySource(properties = { "security.oauth2.client.clientId=client",
5858
"security.oauth2.client.clientSecret=secret",
59-
"security.oauth2.client.authorizationUri=http://example.com/oauth/authorize",
60-
"security.oauth2.client.tokenUri=http://example.com/oauth/token",
59+
"security.oauth2.client.authorizationUri=https://example.com/oauth/authorize",
60+
"security.oauth2.client.tokenUri=https://example.com/oauth/token",
6161
"security.oauth2.resource.jwt.keyValue=SSSSHHH" })
6262
public class CustomOAuth2SsoWithAuthenticationEntryPointConfigurationTests {
6363

‎spring-security-oauth2-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/sso/CustomRestTemplateBasicOAuth2SsoConfigurationTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
@SpringBootTest
4949
@TestPropertySource(properties = { "security.oauth2.client.clientId=client",
5050
"security.oauth2.client.clientSecret=secret",
51-
"security.oauth2.client.userAuthorizationUri=http://example.com/oauth/authorize",
52-
"security.oauth2.client.accessTokenUri=http://example.com/oauth/token",
51+
"security.oauth2.client.userAuthorizationUri=https://example.com/oauth/authorize",
52+
"security.oauth2.client.accessTokenUri=https://example.com/oauth/token",
5353
"security.oauth2.resource.jwt.keyValue=SSSSHHH" })
5454
public class CustomRestTemplateBasicOAuth2SsoConfigurationTests {
5555

0 commit comments

Comments
 (0)