Skip to content

Commit 57b76f9

Browse files
hengboyhengboy
authored
Merge pull request #43 from hengboy/2.3.x
[#42] Adapt "minbox-security" component
2 parents 0ad24c3 + 2bb9ea3 commit 57b76f9

File tree

19 files changed

+38
-818
lines changed

19 files changed

+38
-818
lines changed

‎api-boot-project/api-boot-autoconfigure/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,11 @@
151151
<artifactId>minbox-oauth</artifactId>
152152
<optional>true</optional>
153153
</dependency>
154+
<dependency>
155+
<groupId>org.minbox.framework</groupId>
156+
<artifactId>minbox-security</artifactId>
157+
<optional>true</optional>
158+
</dependency>
154159

155160

156161
<!--Others-->

‎api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/oauth/ApiBootResourceServerAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package org.minbox.framework.api.boot.autoconfigure.oauth;
1818

1919
import org.minbox.framework.api.boot.autoconfigure.security.ApiBootSecurityProperties;
20-
import org.minbox.framework.api.boot.secuirty.SecurityUser;
20+
import org.minbox.framework.security.SecurityUser;
2121
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2222
import org.springframework.boot.context.properties.EnableConfigurationProperties;
2323
import org.springframework.context.annotation.Configuration;

‎api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/security/ApiBootSecurityProperties.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@
1717
package org.minbox.framework.api.boot.autoconfigure.security;
1818

1919
import lombok.Data;
20-
import org.minbox.framework.api.boot.secuirty.SecurityUser;
20+
import org.minbox.framework.security.SecurityUser;
2121
import org.springframework.boot.context.properties.ConfigurationProperties;
2222
import org.springframework.context.annotation.Configuration;
23-
import org.minbox.framework.api.boot.secuirty.delegate.ApiBootStoreDelegate;
2423

2524
import java.util.ArrayList;
2625
import java.util.List;
@@ -86,7 +85,7 @@ public class ApiBootSecurityProperties {
8685
* the data in the "api_boot_user_info" table will be read by default for authentication
8786
* <p>
8887
* If the value is set to false,
89-
* you need to implement the {@link ApiBootStoreDelegate} interface to complete the custom method of reading user data
88+
* you need to implement the {@link org.minbox.framework.security.delegate.SecurityStoreDelegate} interface to complete the custom method of reading user data
9089
*/
9190
private boolean enableDefaultStoreDelegate = true;
9291
/**

‎api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/security/ApiBootWebSecurityAutoConfiguration.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
package org.minbox.framework.api.boot.autoconfigure.security;
1818

19-
import org.minbox.framework.api.boot.secuirty.ApiBootWebSecurityConfiguration;
20-
import org.minbox.framework.api.boot.secuirty.handler.ApiBootDefaultAccessDeniedHandler;
21-
import org.minbox.framework.api.boot.secuirty.point.ApiBootDefaultAuthenticationEntryPoint;
19+
import org.minbox.framework.security.WebSecurityConfiguration;
20+
import org.minbox.framework.security.handler.DefaultSecurityAccessDeniedHandler;
21+
import org.minbox.framework.security.point.DefaultSecurityAuthenticationEntryPoint;
2222
import org.springframework.security.web.AuthenticationEntryPoint;
2323
import org.springframework.security.web.access.AccessDeniedHandler;
2424
import org.springframework.util.ObjectUtils;
@@ -33,7 +33,7 @@
3333
* @see ApiBootWebSecurityMemoryAutoConfiguration
3434
* @see ApiBootWebSecurityJdbcAutoConfiguration
3535
*/
36-
public class ApiBootWebSecurityAutoConfiguration extends ApiBootWebSecurityConfiguration {
36+
public class ApiBootWebSecurityAutoConfiguration extends WebSecurityConfiguration {
3737

3838
protected ApiBootSecurityProperties apiBootSecurityProperties;
3939
private AccessDeniedHandler accessDeniedHandler;
@@ -63,12 +63,12 @@ protected List<String> configureIgnoreUrls() {
6363

6464
@Override
6565
protected AccessDeniedHandler getAccessDeniedHandler() {
66-
return ObjectUtils.isEmpty(this.accessDeniedHandler) ? new ApiBootDefaultAccessDeniedHandler() : this.accessDeniedHandler;
66+
return ObjectUtils.isEmpty(this.accessDeniedHandler) ? new DefaultSecurityAccessDeniedHandler() : this.accessDeniedHandler;
6767
}
6868

6969
@Override
7070
protected AuthenticationEntryPoint getAuthenticationEntryPoint() {
71-
return ObjectUtils.isEmpty(this.authenticationEntryPoint) ? new ApiBootDefaultAuthenticationEntryPoint() : this.authenticationEntryPoint;
71+
return ObjectUtils.isEmpty(this.authenticationEntryPoint) ? new DefaultSecurityAuthenticationEntryPoint() : this.authenticationEntryPoint;
7272
}
7373

7474
@Override

‎api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/security/ApiBootWebSecurityJdbcAutoConfiguration.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616

1717
package org.minbox.framework.api.boot.autoconfigure.security;
1818

19-
import org.minbox.framework.api.boot.secuirty.ApiBootWebSecurityConfiguration;
20-
import org.minbox.framework.api.boot.secuirty.delegate.ApiBootDefaultStoreDelegate;
21-
import org.minbox.framework.api.boot.secuirty.delegate.ApiBootStoreDelegate;
22-
import org.minbox.framework.api.boot.secuirty.userdetails.ApiBootUserDetailsService;
19+
import org.minbox.framework.security.WebSecurityConfiguration;
20+
import org.minbox.framework.security.delegate.DefaultSecurityStoreDelegate;
21+
import org.minbox.framework.security.delegate.SecurityStoreDelegate;
22+
import org.minbox.framework.security.userdetails.SecurityUserDetailsService;
2323
import org.slf4j.Logger;
2424
import org.slf4j.LoggerFactory;
2525
import org.springframework.beans.factory.ObjectProvider;
@@ -50,7 +50,7 @@
5050
@EnableWebSecurity
5151
@EnableGlobalMethodSecurity(prePostEnabled = true)
5252
@EnableConfigurationProperties(ApiBootSecurityProperties.class)
53-
@ConditionalOnClass(ApiBootWebSecurityConfiguration.class)
53+
@ConditionalOnClass(WebSecurityConfiguration.class)
5454
@ConditionalOnBean(DataSource.class)
5555
@ConditionalOnProperty(prefix = API_BOOT_SECURITY_PREFIX, name = "away", havingValue = "jdbc")
5656
@AutoConfigureAfter(DataSourceAutoConfiguration.class)
@@ -68,18 +68,18 @@ public ApiBootWebSecurityJdbcAutoConfiguration(ApiBootSecurityProperties apiBoot
6868
@Override
6969
@Bean
7070
protected UserDetailsService userDetailsService() {
71-
return new ApiBootUserDetailsService();
71+
return new SecurityUserDetailsService();
7272
}
7373

7474
/**
7575
* Use the default user authentication storage delegate class
7676
*
7777
* @param dataSource DataSource
78-
* @return The default {@link ApiBootStoreDelegate}
78+
* @return The default {@link SecurityStoreDelegate}
7979
*/
8080
@Bean
8181
@ConditionalOnProperty(prefix = API_BOOT_SECURITY_PREFIX, name = "enable-default-store-delegate", havingValue = "true", matchIfMissing = true)
82-
public ApiBootStoreDelegate apiBootStoreDelegate(DataSource dataSource) {
83-
return new ApiBootDefaultStoreDelegate(dataSource);
82+
public SecurityStoreDelegate apiBootStoreDelegate(DataSource dataSource) {
83+
return new DefaultSecurityStoreDelegate(dataSource);
8484
}
8585
}

‎api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/security/ApiBootWebSecurityMemoryAutoConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
package org.minbox.framework.api.boot.autoconfigure.security;
1818

19-
import org.minbox.framework.api.boot.secuirty.ApiBootWebSecurityConfiguration;
20-
import org.minbox.framework.api.boot.secuirty.SecurityUser;
19+
import org.minbox.framework.security.SecurityUser;
20+
import org.minbox.framework.security.WebSecurityConfiguration;
2121
import org.slf4j.Logger;
2222
import org.slf4j.LoggerFactory;
2323
import org.springframework.beans.factory.ObjectProvider;
@@ -49,7 +49,7 @@
4949
@EnableWebSecurity
5050
@EnableGlobalMethodSecurity(prePostEnabled = true)
5151
@EnableConfigurationProperties(ApiBootSecurityProperties.class)
52-
@ConditionalOnClass(ApiBootWebSecurityConfiguration.class)
52+
@ConditionalOnClass(WebSecurityConfiguration.class)
5353
@ConditionalOnProperty(prefix = API_BOOT_SECURITY_PREFIX, name = "away", havingValue = "memory", matchIfMissing = true)
5454
public class ApiBootWebSecurityMemoryAutoConfiguration extends ApiBootWebSecurityAutoConfiguration {
5555
/**

‎api-boot-project/api-boot-common/src/main/java/org/minbox/framework/api/boot/common/event/LoadUserEvent.java

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎api-boot-project/api-boot-dependencies/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<minbox-datasource-switch.version>1.0.0.RELEASE</minbox-datasource-switch.version>
3131
<minbox-sequence.version>1.0.0.RELEASE</minbox-sequence.version>
3232
<minbox-oauth.version>1.0.0.RELEASE</minbox-oauth.version>
33+
<minbox-security.version>1.0.0.RELEASE</minbox-security.version>
3334
<minbox-mongo-client-settings.version>1.0.0.RELEASE</minbox-mongo-client-settings.version>
3435
<code.builder.core.version>1.0.5.RELEASE</code.builder.core.version>
3536
<mybatis-enhance.version>1.1.3.RELEASE</mybatis-enhance.version>
@@ -194,6 +195,11 @@
194195
<artifactId>minbox-oauth</artifactId>
195196
<version>${minbox-oauth.version}</version>
196197
</dependency>
198+
<dependency>
199+
<groupId>org.minbox.framework</groupId>
200+
<artifactId>minbox-security</artifactId>
201+
<version>${minbox-security.version}</version>
202+
</dependency>
197203

198204

199205
<!--ApiBoot Dependencies-->

‎api-boot-project/api-boot-starters/api-boot-starter-security-oauth-jwt/pom.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@
3131
<groupId>org.minbox.framework</groupId>
3232
<artifactId>api-boot-starter</artifactId>
3333
</dependency>
34-
<!--spring boot security-->
35-
<dependency>
36-
<groupId>org.springframework.boot</groupId>
37-
<artifactId>spring-boot-starter-security</artifactId>
38-
</dependency>
3934
<!--security oauth2-->
4035
<dependency>
4136
<groupId>org.springframework.security.oauth</groupId>
@@ -58,6 +53,10 @@
5853
<groupId>org.minbox.framework</groupId>
5954
<artifactId>minbox-oauth</artifactId>
6055
</dependency>
56+
<dependency>
57+
<groupId>org.minbox.framework</groupId>
58+
<artifactId>minbox-security</artifactId>
59+
</dependency>
6160
</dependencies>
6261

6362
</project>

‎api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/secuirty/ApiBootWebSecurityConfiguration.java

Lines changed: 0 additions & 142 deletions
This file was deleted.

0 commit comments

Comments
 (0)