Merge remote-tracking branch 'upstream/master'

# Conflicts: # pom.xml # spring-cloud/spring-cloud-bootstrap/config/src/main/java/com/baeldung/spring/cloud/bootstrap/config/SecurityConfig.java # spring-cloud/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/SecurityConfig.java # spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/SecurityConfig.java # spring-cloud/spring-cloud-bootstrap/resource/src/main/java/com/baeldung/spring/cloud/bootstrap/resource/SecurityConfig.java
2016-11-05 10:06:53 -06:00
parent 8564e482e4 c29601db41
commit 826c536d0d
685 changed files with 9025 additions and 3364 deletions
@@ -1,6 +1,8 @@
 package com.baeldung.spring.cloud.bootstrap.config;

+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
@@ -9,11 +11,19 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur
@EnableWebSecurity
 public class SecurityConfig extends WebSecurityConfigurerAdapter {

-        @Override
-        protected void configure(HttpSecurity http) throws Exception {
-                http
-                        .authorizeRequests().anyRequest().hasRole("SYSTEM").and()
-                        .httpBasic().and()
-                        .csrf().disable();
-        }
+    @Autowired
+    public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception{
+        auth.inMemoryAuthentication().withUser("configUser").password("configPassword").roles("SYSTEM");
+    }
+
+    @Override
+    protected void configure(HttpSecurity http) throws Exception {
+        http.authorizeRequests()
+            .anyRequest().hasRole("SYSTEM")
+            .and()
+          .httpBasic()
+            .and()
+          .csrf()
+            .disable();
+    }
 }