From 0ba6d8da4af88fde2469ac64f21a604b090a6639 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 15 Aug 2018 14:21:22 +0100 Subject: [PATCH] Switch to Yahoo for OIDC as Google's cert is not yet trusted by Java 11 Until the fix for JDK-8209506 [1] is available in Java 11 builds, SSL connections to services using Google's SSL certificate do not work due to a lack of trust. This affects both our OAuth2 client samples which were using https://accounts.google.com as an OpenID Connect provider. This commit switches the two samples to use Yahoo in place of Google. See gh-14028 [1] https://bugs.openjdk.java.net/browse/JDK-8209506 --- .../src/main/resources/application.yml | 10 +++++----- .../client/SampleOAuth2ClientApplicationTests.java | 6 +++--- .../src/main/resources/application.yml | 10 +++++----- .../SampleReactiveOAuth2ClientApplicationTests.java | 6 +++--- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/spring-boot-samples/spring-boot-sample-oauth2-client/src/main/resources/application.yml b/spring-boot-samples/spring-boot-sample-oauth2-client/src/main/resources/application.yml index e0a70da4e0..1a7bd711b3 100644 --- a/spring-boot-samples/spring-boot-sample-oauth2-client/src/main/resources/application.yml +++ b/spring-boot-samples/spring-boot-sample-oauth2-client/src/main/resources/application.yml @@ -17,9 +17,9 @@ spring: provider: github scope: user:email redirect-uri-template: http://localhost:8080/login/oauth2/code/github - google-oidc: - client-id: ${GOOGLE-CLIENT-ID} - client-secret: ${GOOGLE-CLIENT-SECRET} + yahoo-oidc: + client-id: ${YAHOO-CLIENT-ID} + client-secret: ${YAHOO-CLIENT-SECRET} provider: - google-oidc: - issuer-uri: https://accounts.google.com \ No newline at end of file + yahoo-oidc: + issuer-uri: https://api.login.yahoo.com/ \ No newline at end of file diff --git a/spring-boot-samples/spring-boot-sample-oauth2-client/src/test/java/sample/oauth2/client/SampleOAuth2ClientApplicationTests.java b/spring-boot-samples/spring-boot-sample-oauth2-client/src/test/java/sample/oauth2/client/SampleOAuth2ClientApplicationTests.java index f286cddbac..0c04fabb2f 100644 --- a/spring-boot-samples/spring-boot-sample-oauth2-client/src/test/java/sample/oauth2/client/SampleOAuth2ClientApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-oauth2-client/src/test/java/sample/oauth2/client/SampleOAuth2ClientApplicationTests.java @@ -34,8 +34,8 @@ import static org.assertj.core.api.Assertions.assertThat; @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = { "APP-CLIENT-ID=my-client-id", "APP-CLIENT-SECRET=my-client-secret", - "GOOGLE-CLIENT-ID=my-google-client-id", - "GOOGLE-CLIENT-SECRET=my-google-client-secret" }) + "YAHOO-CLIENT-ID=my-yahoo-client-id", + "YAHOO-CLIENT-SECRET=my-yahooo-client-secret" }) public class SampleOAuth2ClientApplicationTests { @LocalServerPort @@ -57,7 +57,7 @@ public class SampleOAuth2ClientApplicationTests { ResponseEntity entity = this.restTemplate.getForEntity("/login", String.class); assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK); - assertThat(entity.getBody()).contains("/oauth2/authorization/google"); + assertThat(entity.getBody()).contains("/oauth2/authorization/yahoo"); assertThat(entity.getBody()).contains("/oauth2/authorization/github-client-1"); assertThat(entity.getBody()).contains("/oauth2/authorization/github-client-2"); } diff --git a/spring-boot-samples/spring-boot-sample-reactive-oauth2-client/src/main/resources/application.yml b/spring-boot-samples/spring-boot-sample-reactive-oauth2-client/src/main/resources/application.yml index e0a70da4e0..1a7bd711b3 100644 --- a/spring-boot-samples/spring-boot-sample-reactive-oauth2-client/src/main/resources/application.yml +++ b/spring-boot-samples/spring-boot-sample-reactive-oauth2-client/src/main/resources/application.yml @@ -17,9 +17,9 @@ spring: provider: github scope: user:email redirect-uri-template: http://localhost:8080/login/oauth2/code/github - google-oidc: - client-id: ${GOOGLE-CLIENT-ID} - client-secret: ${GOOGLE-CLIENT-SECRET} + yahoo-oidc: + client-id: ${YAHOO-CLIENT-ID} + client-secret: ${YAHOO-CLIENT-SECRET} provider: - google-oidc: - issuer-uri: https://accounts.google.com \ No newline at end of file + yahoo-oidc: + issuer-uri: https://api.login.yahoo.com/ \ No newline at end of file diff --git a/spring-boot-samples/spring-boot-sample-reactive-oauth2-client/src/test/java/sample/oauth2/client/SampleReactiveOAuth2ClientApplicationTests.java b/spring-boot-samples/spring-boot-sample-reactive-oauth2-client/src/test/java/sample/oauth2/client/SampleReactiveOAuth2ClientApplicationTests.java index 66fce8a191..506f3d0937 100644 --- a/spring-boot-samples/spring-boot-sample-reactive-oauth2-client/src/test/java/sample/oauth2/client/SampleReactiveOAuth2ClientApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-reactive-oauth2-client/src/test/java/sample/oauth2/client/SampleReactiveOAuth2ClientApplicationTests.java @@ -29,8 +29,8 @@ import static org.assertj.core.api.Assertions.assertThat; @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = { "APP-CLIENT-ID=my-client-id", "APP-CLIENT-SECRET=my-client-secret", - "GOOGLE-CLIENT-ID=my-google-client-id", - "GOOGLE-CLIENT-SECRET=my-google-client-secret" }) + "YAHOO-CLIENT-ID=my-google-client-id", + "YAHOO-CLIENT-SECRET=my-google-client-secret" }) public class SampleReactiveOAuth2ClientApplicationTests { @Autowired @@ -47,7 +47,7 @@ public class SampleReactiveOAuth2ClientApplicationTests { byte[] body = this.webTestClient.get().uri("/login").exchange().expectStatus() .isOk().returnResult(String.class).getResponseBodyContent(); String bodyString = new String(body); - assertThat(bodyString).contains("/oauth2/authorization/google"); + assertThat(bodyString).contains("/oauth2/authorization/yahoo"); assertThat(bodyString).contains("/oauth2/authorization/github-client-1"); assertThat(bodyString).contains("/oauth2/authorization/github-client-2"); }