From bf02917ed643e475d580fde35581197813172938 Mon Sep 17 00:00:00 2001 From: shaozhuguang Date: Fri, 20 Sep 2019 14:48:13 +0800 Subject: [PATCH] Exclude loading tools-init jar . --- .../java/com/jd/blockchain/ump/UmpBooter.java | 7 ++++++- .../blockchain/ump/UmpApplicationStarter.java | 1 - .../jd/blockchain/ump/UmpConfiguration.java | 14 ++++++++++++++ .../blockchain/ump/web/UmpConfiguration.java | 12 ------------ .../ump/web/UmpSecurityConfiguration.java | 18 ++++++++++++++++++ 5 files changed, 38 insertions(+), 14 deletions(-) create mode 100644 source/manager/manager-web/src/main/java/com/jd/blockchain/ump/UmpConfiguration.java delete mode 100644 source/manager/manager-web/src/main/java/com/jd/blockchain/ump/web/UmpConfiguration.java create mode 100644 source/manager/manager-web/src/main/java/com/jd/blockchain/ump/web/UmpSecurityConfiguration.java diff --git a/source/manager/manager-booter/src/main/java/com/jd/blockchain/ump/UmpBooter.java b/source/manager/manager-booter/src/main/java/com/jd/blockchain/ump/UmpBooter.java index 3b5bf33e..5cf6f829 100644 --- a/source/manager/manager-booter/src/main/java/com/jd/blockchain/ump/UmpBooter.java +++ b/source/manager/manager-booter/src/main/java/com/jd/blockchain/ump/UmpBooter.java @@ -198,7 +198,12 @@ public class UmpBooter { public static List libsPathURLs() { try { File libsDir = new File(HOME_DIR + File.separator + "libs"); - File[] jars = libsDir.listFiles(f -> f.getName().endsWith(".jar") && f.isFile() && !f.getName().contains("-booter-")); + File[] jars = libsDir.listFiles(f -> + f.getName().endsWith(".jar") && + f.isFile() && + !f.getName().contains("-booter-") && + !f.getName().contains("tools-initializer") + ); List libsPathURLs = new ArrayList<>(); if (jars != null && jars.length > 0) { for (int i = 0; i < jars.length; i++) { diff --git a/source/manager/manager-web/src/main/java/com/jd/blockchain/ump/UmpApplicationStarter.java b/source/manager/manager-web/src/main/java/com/jd/blockchain/ump/UmpApplicationStarter.java index 1c685bb4..fedb5ec7 100644 --- a/source/manager/manager-web/src/main/java/com/jd/blockchain/ump/UmpApplicationStarter.java +++ b/source/manager/manager-web/src/main/java/com/jd/blockchain/ump/UmpApplicationStarter.java @@ -1,7 +1,6 @@ package com.jd.blockchain.ump; import com.jd.blockchain.ump.web.RetrievalConfigListener; -import com.jd.blockchain.ump.web.UmpConfiguration; import org.springframework.boot.SpringApplication; import java.util.Properties; diff --git a/source/manager/manager-web/src/main/java/com/jd/blockchain/ump/UmpConfiguration.java b/source/manager/manager-web/src/main/java/com/jd/blockchain/ump/UmpConfiguration.java new file mode 100644 index 00000000..e25fde13 --- /dev/null +++ b/source/manager/manager-web/src/main/java/com/jd/blockchain/ump/UmpConfiguration.java @@ -0,0 +1,14 @@ +package com.jd.blockchain.ump; + + +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.ComponentScan; + +@SpringBootApplication +@EnableAutoConfiguration +@EnableConfigurationProperties +@ComponentScan +public class UmpConfiguration { +} \ No newline at end of file diff --git a/source/manager/manager-web/src/main/java/com/jd/blockchain/ump/web/UmpConfiguration.java b/source/manager/manager-web/src/main/java/com/jd/blockchain/ump/web/UmpConfiguration.java deleted file mode 100644 index 42bf8285..00000000 --- a/source/manager/manager-web/src/main/java/com/jd/blockchain/ump/web/UmpConfiguration.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.jd.blockchain.ump.web; - - -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.context.properties.EnableConfigurationProperties; - -@EnableConfigurationProperties -@SpringBootApplication(exclude = { - org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class} - ) -public class UmpConfiguration { -} diff --git a/source/manager/manager-web/src/main/java/com/jd/blockchain/ump/web/UmpSecurityConfiguration.java b/source/manager/manager-web/src/main/java/com/jd/blockchain/ump/web/UmpSecurityConfiguration.java new file mode 100644 index 00000000..5a50b7e4 --- /dev/null +++ b/source/manager/manager-web/src/main/java/com/jd/blockchain/ump/web/UmpSecurityConfiguration.java @@ -0,0 +1,18 @@ +package com.jd.blockchain.ump.web; + +import org.springframework.context.annotation.Configuration; +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; + +@Configuration +@EnableWebSecurity +public class UmpSecurityConfiguration extends WebSecurityConfigurerAdapter { + + + @Override + protected void configure(HttpSecurity http) throws Exception { + http.authorizeRequests().anyRequest().permitAll(); + http.csrf().disable(); + } +}