From 47277fb85f2e6c2d1e8289c29ab7903d32337825 Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Wed, 4 Dec 2019 09:01:18 +0100 Subject: [PATCH 1/2] BAEL-19790: Use GetMapping and rename SecurityConfigurer --- .../spring/cloud/config/client/ConfigClient.java | 5 ++--- ...ecurityConfigurer.java => SecurityConfiguration.java} | 9 ++++++--- 2 files changed, 8 insertions(+), 6 deletions(-) rename spring-cloud/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/{SecurityConfigurer.java => SecurityConfiguration.java} (66%) diff --git a/spring-cloud/spring-cloud-config/client/src/main/java/com/baeldung/spring/cloud/config/client/ConfigClient.java b/spring-cloud/spring-cloud-config/client/src/main/java/com/baeldung/spring/cloud/config/client/ConfigClient.java index 1dd3bbdab0..57d6606469 100644 --- a/spring-cloud/spring-cloud-config/client/src/main/java/com/baeldung/spring/cloud/config/client/ConfigClient.java +++ b/spring-cloud/spring-cloud-config/client/src/main/java/com/baeldung/spring/cloud/config/client/ConfigClient.java @@ -4,9 +4,8 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; @SpringBootApplication @@ -22,7 +21,7 @@ public class ConfigClient { SpringApplication.run(ConfigClient.class, args); } - @RequestMapping(value = "/whoami/{username}", method = RequestMethod.GET, produces = MediaType.TEXT_PLAIN_VALUE) + @GetMapping(value = "/whoami/{username}", produces = MediaType.TEXT_PLAIN_VALUE) public String whoami(@PathVariable("username") String username) { return String.format("Hello %s! You are a(n) %s and your password is '%s'.\n", username, role, password); } diff --git a/spring-cloud/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/SecurityConfigurer.java b/spring-cloud/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/SecurityConfiguration.java similarity index 66% rename from spring-cloud/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/SecurityConfigurer.java rename to spring-cloud/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/SecurityConfiguration.java index d4230d0d52..b50184f296 100644 --- a/spring-cloud/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/SecurityConfigurer.java +++ b/spring-cloud/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/SecurityConfiguration.java @@ -5,11 +5,14 @@ import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; @Configuration -public class SecurityConfigurer extends WebSecurityConfigurerAdapter { +public class SecurityConfiguration extends WebSecurityConfigurerAdapter { + @Override public void configure(HttpSecurity http) throws Exception { http.csrf() - .disable() - .httpBasic(); + .ignoringAntMatchers("/encrypt/**") + .ignoringAntMatchers("/decrypt/**"); + + super.configure(http); } } From b43a3d1b4cc5b4f5a8c2c761eabecaf0f6da2f69 Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Wed, 4 Dec 2019 09:05:33 +0100 Subject: [PATCH 2/2] BAEL-19790: Remove the spring.cloud.config.server.git.uri value --- .../server/src/main/resources/application.properties | 2 +- .../server/src/main/resources/bootstrap.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud/spring-cloud-config/server/src/main/resources/application.properties b/spring-cloud/spring-cloud-config/server/src/main/resources/application.properties index 09639b2ad6..18d4b3596a 100644 --- a/spring-cloud/spring-cloud-config/server/src/main/resources/application.properties +++ b/spring-cloud/spring-cloud-config/server/src/main/resources/application.properties @@ -1,5 +1,5 @@ server.port=8888 -spring.cloud.config.server.git.uri=file:///${user.home}/config-repo +spring.cloud.config.server.git.uri= spring.cloud.config.server.git.clone-on-start=true spring.security.user.name=root spring.security.user.password=s3cr3t diff --git a/spring-cloud/spring-cloud-config/server/src/main/resources/bootstrap.properties b/spring-cloud/spring-cloud-config/server/src/main/resources/bootstrap.properties index 21648b6491..f2d75f5846 100644 --- a/spring-cloud/spring-cloud-config/server/src/main/resources/bootstrap.properties +++ b/spring-cloud/spring-cloud-config/server/src/main/resources/bootstrap.properties @@ -1,4 +1,4 @@ encrypt.keyStore.location=classpath:/config-server.jks encrypt.keyStore.password=my-s70r3-s3cr3t encrypt.keyStore.alias=config-server-key -encrypt.keyStore.secret=my-k34-s3cr3t \ No newline at end of file +encrypt.keyStore.secret=my-k34-s3cr3t