Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit e036bc4

Browse files
wilkinsonawilkinsona
committed
Merge pull request spring-projects#16318 from Spring Operator
* spring-projectsgh-16318: Polish "Use HTTPS for external links wherever possible" Use HTTPS for external links wherever possible
2 parents 94633cf + 365fed5 commit e036bc4

File tree

15 files changed

+29
-29
lines changed

15 files changed

+29
-29
lines changed

‎spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfigurationTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public void cloudFoundryPlatformActiveSetsCloudControllerUrl() throws Exception
115115
"cloudFoundrySecurityService");
116116
String cloudControllerUrl = (String) ReflectionTestUtils
117117
.getField(interceptorSecurityService, "cloudControllerUrl");
118-
assertThat(cloudControllerUrl).isEqualTo("http://my-cloud-controller.com");
118+
assertThat(cloudControllerUrl).isEqualTo("https://my-cloud-controller.com");
119119
}
120120

121121
@Test
@@ -189,7 +189,7 @@ public void cloudFoundryManagementEndpointsDisabled() throws Exception {
189189
private CloudFoundryEndpointHandlerMapping getHandlerMapping() {
190190
EnvironmentTestUtils.addEnvironment(this.context, "VCAP_APPLICATION:---",
191191
"vcap.application.application_id:my-app-id",
192-
"vcap.application.cf_api:http://my-cloud-controller.com");
192+
"vcap.application.cf_api:https://my-cloud-controller.com");
193193
this.context.refresh();
194194
return this.context.getBean("cloudFoundryEndpointHandlerMapping",
195195
CloudFoundryEndpointHandlerMapping.class);

‎spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundrySecurityInterceptorTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public void setup() throws Exception {
7474
@Test
7575
public void preHandleWhenRequestIsPreFlightShouldReturnTrue() throws Exception {
7676
this.request.setMethod("OPTIONS");
77-
this.request.addHeader(HttpHeaders.ORIGIN, "http://example.com");
77+
this.request.addHeader(HttpHeaders.ORIGIN, "https://example.com");
7878
this.request.addHeader(HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD, "GET");
7979
boolean preHandle = this.interceptor.preHandle(this.request, this.response,
8080
this.handlerMethod);

‎spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundrySecurityServiceTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ public class CloudFoundrySecurityServiceTests {
5050
@Rule
5151
public ExpectedException thrown = ExpectedException.none();
5252

53-
private static final String CLOUD_CONTROLLER = "http://my-cloud-controller.com";
53+
private static final String CLOUD_CONTROLLER = "https://my-cloud-controller.com";
5454

5555
private static final String CLOUD_CONTROLLER_PERMISSIONS = CLOUD_CONTROLLER
5656
+ "/v2/apps/my-app-id/permissions";
5757

58-
private static final String UAA_URL = "http://my-uaa.com";
58+
private static final String UAA_URL = "https://my-uaa.com";
5959

6060
private CloudFoundrySecurityService securityService;
6161

@@ -152,7 +152,7 @@ public void getAccessLevelWhenCloudControllerIsNotReachableThrowsException()
152152
public void fetchTokenKeysWhenSuccessfulShouldReturnListOfKeysFromUAA()
153153
throws Exception {
154154
this.server.expect(requestTo(CLOUD_CONTROLLER + "/info"))
155-
.andRespond(withSuccess("{\"token_endpoint\":\"http://my-uaa.com\"}",
155+
.andRespond(withSuccess("{\"token_endpoint\":\"https://my-uaa.com\"}",
156156
MediaType.APPLICATION_JSON));
157157
String tokenKeyValue = "-----BEGIN PUBLIC KEY-----\n"
158158
+ "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0m59l2u9iDnMbrXHfqkO\n"

‎spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/TokenValidatorTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public void validateTokenWhenExpiredShouldThrowException() throws Exception {
182182
@Test
183183
public void validateTokenWhenIssuerIsNotValidShouldThrowException() throws Exception {
184184
given(this.securityService.fetchTokenKeys()).willReturn(VALID_KEYS);
185-
given(this.securityService.getUaaUrl()).willReturn("http://other-uaa.com");
185+
given(this.securityService.getUaaUrl()).willReturn("https://other-uaa.com");
186186
String header = "{ \"alg\": \"RS256\", \"kid\": \"valid-key\", \"typ\": \"JWT\", \"scope\": [\"actuator.read\"]}";
187187
String claims = "{ \"exp\": 2147483647, \"iss\": \"http://localhost:8080/uaa/oauth/token\"}";
188188
this.thrown

‎spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/AbstractEndpointHandlerMappingTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public void securityInterceptorShouldBePresentAfterCorsInterceptorForCorsRequest
7575
mapping.setSecurityInterceptor(securityInterceptor);
7676
mapping.afterPropertiesSet();
7777
MockHttpServletRequest request = request("POST", "/a");
78-
request.addHeader("Origin", "http://example.com");
78+
request.addHeader("Origin", "https://example.com");
7979
assertThat(mapping.getHandler(request).getInterceptors().length).isEqualTo(3);
8080
assertThat(mapping.getHandler(request).getInterceptors()[2])
8181
.isEqualTo(securityInterceptor);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void orderIsUnchangedWhenThereAreMultipleResourceServerConfigurations() {
5656
this.context = new AnnotationConfigWebApplicationContext();
5757
this.context.register(DoubleResourceConfiguration.class);
5858
EnvironmentTestUtils.addEnvironment(this.context,
59-
"security.oauth2.resource.tokenInfoUri:http://example.com",
59+
"security.oauth2.resource.tokenInfoUri:https://example.com",
6060
"security.oauth2.client.clientId=acme");
6161
this.context.refresh();
6262
assertThat(this.context

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ public void springSocialUserInfo() {
239239
@Test
240240
public void customUserInfoRestTemplateFactory() {
241241
EnvironmentTestUtils.addEnvironment(this.environment,
242-
"security.oauth2.resource.userInfoUri:http://example.com");
242+
"security.oauth2.resource.userInfoUri:https://example.com");
243243
this.context = new SpringApplicationBuilder(
244244
CustomUserInfoRestTemplateFactory.class, ResourceConfiguration.class)
245245
.environment(this.environment).web(false).run();
@@ -420,7 +420,7 @@ static class JwkTokenStoreConfiguration {
420420

421421
@Bean
422422
public TokenStore tokenStore() {
423-
return new JwkTokenStore("http://my.key-set.uri");
423+
return new JwkTokenStore("https://my.key-set.uri");
424424
}
425425

426426
}

‎spring-boot-docs/src/main/asciidoc/deployment.adoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ option : AWS Elastic Beanstalk.
312312

313313

314314
==== AWS Elastic Beanstalk
315-
As described in the official http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/create_deploy_Java.html[Elastic
315+
As described in the official https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/create_deploy_Java.html[Elastic
316316
Beanstalk Java guide], there are two main options to deploy a Java application; You can
317317
either use the "`Tomcat Platform`" or the "`Java SE platform`".
318318

@@ -356,7 +356,7 @@ binaries instead, add the following to your `.elasticbeanstalk/config.yml` file:
356356
====== Reduce costs by setting the environment type
357357
By default an Elastic Beanstalk environment is load balanced. The load balancer has a cost
358358
perspective, to avoid it, set the environment type to "`Single instance`" as described
359-
http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/environments-create-wizard.html#environments-create-wizard-capacity[in the Amazon documentation].
359+
https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/environments-create-wizard.html#environments-create-wizard-capacity[in the Amazon documentation].
360360
Single instance environments can be created using the CLI as well using the following
361361
command:
362362

‎spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3590,7 +3590,7 @@ persistence for the embedded mode:
35903590
====
35913591
The Neo4j OGM embedded driver does not provide the Neo4j kernel. Users are expected to
35923592
provide this dependency manually, see
3593-
http://neo4j.com/docs/ogm-manual/current/reference/#reference:getting-started[the documentation]
3593+
https://neo4j.com/docs/ogm-manual/current/reference/#reference:getting-started[the documentation]
35943594
for more details.
35953595
====
35963596

@@ -4015,7 +4015,7 @@ If you need to customize connection settings you can use the `spring.ldap.base`
40154015
==== Spring Data LDAP repositories
40164016
Spring Data includes repository support for LDAP. For complete details of Spring
40174017
Data LDAP, refer to their
4018-
http://docs.spring.io/spring-data/ldap/docs/1.0.x/reference/html/[reference documentation].
4018+
https://docs.spring.io/spring-data/ldap/docs/1.0.x/reference/html/[reference documentation].
40194019

40204020
You can also inject an auto-configured `LdapTemplate` instance as you would with any
40214021
other Spring Bean.
@@ -4828,7 +4828,7 @@ reached.
48284828

48294829
[[boot-features-kafka]]
48304830
=== Apache Kafka Support
4831-
http://kafka.apache.org/[Apache Kafka] is supported by providing auto-configuration of the
4831+
https://kafka.apache.org/[Apache Kafka] is supported by providing auto-configuration of the
48324832
`spring-kafka` project.
48334833

48344834
Kafka configuration is controlled by external configuration properties in

‎spring-boot-samples/spring-boot-sample-data-neo4j/README.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ spring.data.neo4j.password=secret
1212
You can also locally add the embedded driver to embed Neo4j instead. Note
1313
that Spring Boot does not provide dependency management for that GPL-licensed
1414
library, see
15-
http://docs.spring.io/spring-data/neo4j/docs/4.2.x/reference/html/#reference.getting_started.driver[the official documentation]
15+
https://docs.spring.io/spring-data/neo4j/docs/4.2.x/reference/html/#reference.getting_started.driver[the official documentation]
1616
for more details.

0 commit comments

Comments
 (0)