[minbox-projects#42] Adapt "minbox-security" component

hengboy · Jul 22, 2020 · 2bb9ea3 · 2bb9ea3
1 parent 0ad24c3
commit 2bb9ea3
Show file tree

Hide file tree

Showing 19 changed files with 38 additions and 818 deletions.
diff --git a/api-boot-project/api-boot-autoconfigure/pom.xml b/api-boot-project/api-boot-autoconfigure/pom.xml
@@ -151,6 +151,11 @@
             <artifactId>minbox-oauth</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.minbox.framework</groupId>
+            <artifactId>minbox-security</artifactId>
+            <optional>true</optional>
+        </dependency>
 
 
         <!--Others-->

diff --git a/...minbox/framework/api/boot/autoconfigure/oauth/ApiBootResourceServerAutoConfiguration.java b/...minbox/framework/api/boot/autoconfigure/oauth/ApiBootResourceServerAutoConfiguration.java
@@ -17,7 +17,7 @@
 package org.minbox.framework.api.boot.autoconfigure.oauth;
 
 import org.minbox.framework.api.boot.autoconfigure.security.ApiBootSecurityProperties;
-import org.minbox.framework.api.boot.secuirty.SecurityUser;
+import org.minbox.framework.security.SecurityUser;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Configuration;

diff --git a/.../java/org/minbox/framework/api/boot/autoconfigure/security/ApiBootSecurityProperties.java b/.../java/org/minbox/framework/api/boot/autoconfigure/security/ApiBootSecurityProperties.java
@@ -17,10 +17,9 @@
 package org.minbox.framework.api.boot.autoconfigure.security;
 
 import lombok.Data;
-import org.minbox.framework.api.boot.secuirty.SecurityUser;
+import org.minbox.framework.security.SecurityUser;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
-import org.minbox.framework.api.boot.secuirty.delegate.ApiBootStoreDelegate;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -86,7 +85,7 @@ public class ApiBootSecurityProperties {
      * the data in the "api_boot_user_info" table will be read by default for authentication
      * <p>
      * If the value is set to false,
-     * you need to implement the {@link ApiBootStoreDelegate} interface to complete the custom method of reading user data
+     * you need to implement the {@link org.minbox.framework.security.delegate.SecurityStoreDelegate} interface to complete the custom method of reading user data
      */
     private boolean enableDefaultStoreDelegate = true;
     /**

diff --git a/...minbox/framework/api/boot/autoconfigure/security/ApiBootWebSecurityAutoConfiguration.java b/...minbox/framework/api/boot/autoconfigure/security/ApiBootWebSecurityAutoConfiguration.java
@@ -16,9 +16,9 @@
 
 package org.minbox.framework.api.boot.autoconfigure.security;
 
-import org.minbox.framework.api.boot.secuirty.ApiBootWebSecurityConfiguration;
-import org.minbox.framework.api.boot.secuirty.handler.ApiBootDefaultAccessDeniedHandler;
-import org.minbox.framework.api.boot.secuirty.point.ApiBootDefaultAuthenticationEntryPoint;
+import org.minbox.framework.security.WebSecurityConfiguration;
+import org.minbox.framework.security.handler.DefaultSecurityAccessDeniedHandler;
+import org.minbox.framework.security.point.DefaultSecurityAuthenticationEntryPoint;
 import org.springframework.security.web.AuthenticationEntryPoint;
 import org.springframework.security.web.access.AccessDeniedHandler;
 import org.springframework.util.ObjectUtils;
@@ -33,7 +33,7 @@
  * @see ApiBootWebSecurityMemoryAutoConfiguration
  * @see ApiBootWebSecurityJdbcAutoConfiguration
  */
-public class ApiBootWebSecurityAutoConfiguration extends ApiBootWebSecurityConfiguration {
+public class ApiBootWebSecurityAutoConfiguration extends WebSecurityConfiguration {
 
     protected ApiBootSecurityProperties apiBootSecurityProperties;
     private AccessDeniedHandler accessDeniedHandler;
@@ -63,12 +63,12 @@ protected List<String> configureIgnoreUrls() {
 
     @Override
     protected AccessDeniedHandler getAccessDeniedHandler() {
-        return ObjectUtils.isEmpty(this.accessDeniedHandler) ? new ApiBootDefaultAccessDeniedHandler() : this.accessDeniedHandler;
+        return ObjectUtils.isEmpty(this.accessDeniedHandler) ? new DefaultSecurityAccessDeniedHandler() : this.accessDeniedHandler;
     }
 
     @Override
     protected AuthenticationEntryPoint getAuthenticationEntryPoint() {
-        return ObjectUtils.isEmpty(this.authenticationEntryPoint) ? new ApiBootDefaultAuthenticationEntryPoint() : this.authenticationEntryPoint;
+        return ObjectUtils.isEmpty(this.authenticationEntryPoint) ? new DefaultSecurityAuthenticationEntryPoint() : this.authenticationEntryPoint;
     }
 
     @Override

diff --git a/...ox/framework/api/boot/autoconfigure/security/ApiBootWebSecurityJdbcAutoConfiguration.java b/...ox/framework/api/boot/autoconfigure/security/ApiBootWebSecurityJdbcAutoConfiguration.java
@@ -16,10 +16,10 @@
 
 package org.minbox.framework.api.boot.autoconfigure.security;
 
-import org.minbox.framework.api.boot.secuirty.ApiBootWebSecurityConfiguration;
-import org.minbox.framework.api.boot.secuirty.delegate.ApiBootDefaultStoreDelegate;
-import org.minbox.framework.api.boot.secuirty.delegate.ApiBootStoreDelegate;
-import org.minbox.framework.api.boot.secuirty.userdetails.ApiBootUserDetailsService;
+import org.minbox.framework.security.WebSecurityConfiguration;
+import org.minbox.framework.security.delegate.DefaultSecurityStoreDelegate;
+import org.minbox.framework.security.delegate.SecurityStoreDelegate;
+import org.minbox.framework.security.userdetails.SecurityUserDetailsService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.ObjectProvider;
@@ -50,7 +50,7 @@
 @EnableWebSecurity
 @EnableGlobalMethodSecurity(prePostEnabled = true)
 @EnableConfigurationProperties(ApiBootSecurityProperties.class)
-@ConditionalOnClass(ApiBootWebSecurityConfiguration.class)
+@ConditionalOnClass(WebSecurityConfiguration.class)
 @ConditionalOnBean(DataSource.class)
 @ConditionalOnProperty(prefix = API_BOOT_SECURITY_PREFIX, name = "away", havingValue = "jdbc")
 @AutoConfigureAfter(DataSourceAutoConfiguration.class)
@@ -68,18 +68,18 @@ public ApiBootWebSecurityJdbcAutoConfiguration(ApiBootSecurityProperties apiBoot
     @Override
     @Bean
     protected UserDetailsService userDetailsService() {
-        return new ApiBootUserDetailsService();
+        return new SecurityUserDetailsService();
     }
 
     /**
      * Use the default user authentication storage delegate class
      *
      * @param dataSource DataSource
-     * @return The default {@link ApiBootStoreDelegate}
+     * @return The default {@link SecurityStoreDelegate}
      */
     @Bean
     @ConditionalOnProperty(prefix = API_BOOT_SECURITY_PREFIX, name = "enable-default-store-delegate", havingValue = "true", matchIfMissing = true)
-    public ApiBootStoreDelegate apiBootStoreDelegate(DataSource dataSource) {
-        return new ApiBootDefaultStoreDelegate(dataSource);
+    public SecurityStoreDelegate apiBootStoreDelegate(DataSource dataSource) {
+        return new DefaultSecurityStoreDelegate(dataSource);
     }
 }
diff --git a/.../framework/api/boot/autoconfigure/security/ApiBootWebSecurityMemoryAutoConfiguration.java b/.../framework/api/boot/autoconfigure/security/ApiBootWebSecurityMemoryAutoConfiguration.java
@@ -16,8 +16,8 @@
 
 package org.minbox.framework.api.boot.autoconfigure.security;
 
-import org.minbox.framework.api.boot.secuirty.ApiBootWebSecurityConfiguration;
-import org.minbox.framework.api.boot.secuirty.SecurityUser;
+import org.minbox.framework.security.SecurityUser;
+import org.minbox.framework.security.WebSecurityConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.ObjectProvider;
@@ -49,7 +49,7 @@
 @EnableWebSecurity
 @EnableGlobalMethodSecurity(prePostEnabled = true)
 @EnableConfigurationProperties(ApiBootSecurityProperties.class)
-@ConditionalOnClass(ApiBootWebSecurityConfiguration.class)
+@ConditionalOnClass(WebSecurityConfiguration.class)
 @ConditionalOnProperty(prefix = API_BOOT_SECURITY_PREFIX, name = "away", havingValue = "memory", matchIfMissing = true)
 public class ApiBootWebSecurityMemoryAutoConfiguration extends ApiBootWebSecurityAutoConfiguration {
     /**

diff --git a/...i-boot-common/src/main/java/org/minbox/framework/api/boot/common/event/LoadUserEvent.java b/...i-boot-common/src/main/java/org/minbox/framework/api/boot/common/event/LoadUserEvent.java
diff --git a/api-boot-project/api-boot-dependencies/pom.xml b/api-boot-project/api-boot-dependencies/pom.xml
@@ -30,6 +30,7 @@
         <minbox-datasource-switch.version>1.0.0.RELEASE</minbox-datasource-switch.version>
         <minbox-sequence.version>1.0.0.RELEASE</minbox-sequence.version>
         <minbox-oauth.version>1.0.0.RELEASE</minbox-oauth.version>
+        <minbox-security.version>1.0.0.RELEASE</minbox-security.version>
         <minbox-mongo-client-settings.version>1.0.0.RELEASE</minbox-mongo-client-settings.version>
         <code.builder.core.version>1.0.5.RELEASE</code.builder.core.version>
         <mybatis-enhance.version>1.1.3.RELEASE</mybatis-enhance.version>
@@ -194,6 +195,11 @@
                 <artifactId>minbox-oauth</artifactId>
                 <version>${minbox-oauth.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.minbox.framework</groupId>
+                <artifactId>minbox-security</artifactId>
+                <version>${minbox-security.version}</version>
+            </dependency>
 
 
             <!--ApiBoot Dependencies-->

diff --git a/api-boot-project/api-boot-starters/api-boot-starter-security-oauth-jwt/pom.xml b/api-boot-project/api-boot-starters/api-boot-starter-security-oauth-jwt/pom.xml
@@ -31,11 +31,6 @@
             <groupId>org.minbox.framework</groupId>
             <artifactId>api-boot-starter</artifactId>
         </dependency>
-        <!--spring boot security-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
         <!--security oauth2-->
         <dependency>
             <groupId>org.springframework.security.oauth</groupId>
@@ -58,6 +53,10 @@
             <groupId>org.minbox.framework</groupId>
             <artifactId>minbox-oauth</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.minbox.framework</groupId>
+            <artifactId>minbox-security</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/...src/main/java/org/minbox/framework/api/boot/secuirty/ApiBootWebSecurityConfiguration.java b/...src/main/java/org/minbox/framework/api/boot/secuirty/ApiBootWebSecurityConfiguration.java