From e437c4cd67998fa0c4c2e81c9ad99e1079ac3931 Mon Sep 17 00:00:00 2001 From: Madhura Bhave Date: Fri, 16 Jun 2017 10:51:20 -0700 Subject: [PATCH] OAuth2ClientIdCondition should not match if clientId absent Fixes gh-9435 --- .../OAuth2RestOperationsConfiguration.java | 2 +- ...Auth2RestOperationsConfigurationTests.java | 61 +++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfigurationTests.java diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java index c01dd1b12e..6e6e24e3ad 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java @@ -168,7 +168,7 @@ public class OAuth2RestOperationsConfiguration { return ConditionOutcome.match(message .foundExactly("security.oauth2.client.client-id property")); } - return ConditionOutcome.match(message + return ConditionOutcome.noMatch(message .didNotFind("security.oauth2.client.client-id property").atAll()); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfigurationTests.java new file mode 100644 index 0000000000..0e3c987b46 --- /dev/null +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfigurationTests.java @@ -0,0 +1,61 @@ +/* + * Copyright 2012-2017 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.boot.autoconfigure.security.oauth2.client; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; + +import org.springframework.beans.factory.NoSuchBeanDefinitionException; +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.core.env.ConfigurableEnvironment; +import org.springframework.core.env.StandardEnvironment; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Tests for {@link OAuth2RestOperationsConfiguration}. + * + * @author Madhura Bhave + */ +public class OAuth2RestOperationsConfigurationTests { + + private ConfigurableApplicationContext context; + + private ConfigurableEnvironment environment = new StandardEnvironment(); + + @Rule + public ExpectedException thrown = ExpectedException.none(); + + @Test + public void clientIdConditionMatches() throws Exception { + EnvironmentTestUtils.addEnvironment(this.environment, + "security.oauth2.client.client-id=acme"); + this.context = new SpringApplicationBuilder(OAuth2RestOperationsConfiguration.class).environment(this.environment).web(false).run(); + assertThat(this.context.getBean(OAuth2RestOperationsConfiguration.class)).isNotNull(); + } + + @Test + public void clientIdConditionDoesNotMatch() throws Exception { + this.context = new SpringApplicationBuilder(OAuth2RestOperationsConfiguration.class).environment(this.environment).web(false).run(); + this.thrown.expect(NoSuchBeanDefinitionException.class); + this.context.getBean(OAuth2RestOperationsConfiguration.class); + } + +}