From fdb093270690d840f384165a36e09a940943291b Mon Sep 17 00:00:00 2001
From: Krzysiek <krzysztofwoyke@gmail.com>
Date: Tue, 3 Dec 2019 22:23:28 +0100
Subject: [PATCH] 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