Repository: incubator-geode Updated Branches: refs/heads/develop ad43d4472 -> 7511ffac9
GEODE-1983: Swagger is broken with integrated security * This required a simple configuration change. * This closes #263 Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/7511ffac Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/7511ffac Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/7511ffac Branch: refs/heads/develop Commit: 7511ffac940ef63850c5a3f83857efbae3ac3b18 Parents: ad43d44 Author: Kevin Duling <[email protected]> Authored: Tue Oct 18 10:33:37 2016 -0700 Committer: Jinmei Liao <[email protected]> Committed: Wed Oct 19 12:36:34 2016 -0700 ---------------------------------------------------------------------- .../internal/web/security/RestSecurityConfiguration.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7511ffac/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/RestSecurityConfiguration.java ---------------------------------------------------------------------- diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/RestSecurityConfiguration.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/RestSecurityConfiguration.java index f3b5c4d..4550ff2 100644 --- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/RestSecurityConfiguration.java +++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/RestSecurityConfiguration.java @@ -17,8 +17,6 @@ */ package org.apache.geode.rest.internal.web.security; -import org.apache.geode.internal.security.IntegratedSecurityService; -import org.apache.geode.internal.security.SecurityService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; @@ -31,6 +29,9 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.config.http.SessionCreationPolicy; +import org.apache.geode.internal.security.IntegratedSecurityService; +import org.apache.geode.internal.security.SecurityService; + @Configuration @EnableWebSecurity @EnableGlobalMethodSecurity(prePostEnabled = true) @@ -56,8 +57,7 @@ public class RestSecurityConfiguration extends WebSecurityConfigurerAdapter { protected void configure(HttpSecurity http) throws Exception { http.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS) .and() - .authorizeRequests() - .antMatchers("/ping").permitAll() + .authorizeRequests().antMatchers("/ping", "/api-docs/**", "/docs/**").permitAll() .anyRequest().authenticated() .and() .formLogin()
