From 8251877375759c636c183d64c5d14f52c8ca776f Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Tue, 3 Dec 2019 13:53:59 +0100 Subject: [PATCH 1/5] BAEL-19790: Upgrade to Hoxton.RELEAS and Spring Boot 2.2.1 --- spring-cloud/spring-cloud-config/pom.xml | 7 ++++--- .../src/main/resources/application.properties | 14 +++++++------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/spring-cloud/spring-cloud-config/pom.xml b/spring-cloud/spring-cloud-config/pom.xml index 1a4efc7a60..82fac80a6b 100644 --- a/spring-cloud/spring-cloud-config/pom.xml +++ b/spring-cloud/spring-cloud-config/pom.xml @@ -9,10 +9,10 @@ pom - parent-boot-1 + parent-boot-2 com.baeldung 0.0.1-SNAPSHOT - ../../parent-boot-1 + ../../parent-boot-2 @@ -33,7 +33,8 @@ - Brixton.SR7 + Hoxton.RELEASE + 2.2.1.RELEASE 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 3d4f3bcd47..1260f16798 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,9 +1,9 @@ server.port=8888 -spring.cloud.config.server.git.uri= +spring.cloud.config.server.git.uri=file:///${user.home}/config-repo spring.cloud.config.server.git.clone-on-start=true -security.user.name=root -security.user.password=s3cr3t -encrypt.key-store.location=classpath:/config-server.jks -encrypt.key-store.password=my-s70r3-s3cr3t -encrypt.key-store.alias=config-server-key -encrypt.key-store.secret=my-k34-s3cr3t +spring.security.user.name=root +spring.security.user.password=s3cr3t +#encrypt.key-store.location=classpath:/config-server.jks +#encrypt.key-store.password=my-s70r3-s3cr3t +#encrypt.key-store.alias=config-server-key +#encrypt.key-store.secret=my-k34-s3cr3t From fdb093270690d840f384165a36e09a940943291b Mon Sep 17 00:00:00 2001 From: Krzysiek Date: Tue, 3 Dec 2019 22:23:28 +0100 Subject: [PATCH 2/5] BAEL-19790: Fix encryption issues after Spring Boot 2 migration --- .../cloud/config/server/SecurityConfigurer.java | 15 +++++++++++++++ .../src/main/resources/application.properties | 4 ---- .../src/main/resources/bootstrap.properties | 4 ++++ 3 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 spring-cloud/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/SecurityConfigurer.java create mode 100644 spring-cloud/spring-cloud-config/server/src/main/resources/bootstrap.properties 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/SecurityConfigurer.java new file mode 100644 index 0000000000..d4230d0d52 --- /dev/null +++ b/spring-cloud/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/SecurityConfigurer.java @@ -0,0 +1,15 @@ +package com.baeldung.spring.cloud.config.server; + +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; + +@Configuration +public class SecurityConfigurer extends WebSecurityConfigurerAdapter { + @Override + public void configure(HttpSecurity http) throws Exception { + http.csrf() + .disable() + .httpBasic(); + } +} 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 1260f16798..09639b2ad6 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 @@ -3,7 +3,3 @@ spring.cloud.config.server.git.uri=file:///${user.home}/config-repo spring.cloud.config.server.git.clone-on-start=true spring.security.user.name=root spring.security.user.password=s3cr3t -#encrypt.key-store.location=classpath:/config-server.jks -#encrypt.key-store.password=my-s70r3-s3cr3t -#encrypt.key-store.alias=config-server-key -#encrypt.key-store.secret=my-k34-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 new file mode 100644 index 0000000000..21648b6491 --- /dev/null +++ b/spring-cloud/spring-cloud-config/server/src/main/resources/bootstrap.properties @@ -0,0 +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 From 47277fb85f2e6c2d1e8289c29ab7903d32337825 Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Wed, 4 Dec 2019 09:01:18 +0100 Subject: [PATCH 3/5] 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 4/5] 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 From eb0512d7662ba11e4e4beafacef1258e7d930238 Mon Sep 17 00:00:00 2001 From: Krzysiek Date: Sat, 7 Dec 2019 08:57:56 +0100 Subject: [PATCH 5/5] BAEL-19790: Update to Spring Boot 2.2.2 --- spring-cloud/spring-cloud-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud/spring-cloud-config/pom.xml b/spring-cloud/spring-cloud-config/pom.xml index 82fac80a6b..6b4e9118fc 100644 --- a/spring-cloud/spring-cloud-config/pom.xml +++ b/spring-cloud/spring-cloud-config/pom.xml @@ -34,7 +34,7 @@ Hoxton.RELEASE - 2.2.1.RELEASE + 2.2.2.RELEASE