Skip to content

Commit

Permalink
feature：修改所有类名称
Browse files Browse the repository at this point in the history
  • Loading branch information
lwj committed Aug 21, 2023
1 parent f2be024 commit dd7efde
Show file tree
Hide file tree
Showing 15 changed files with 75 additions and 90 deletions.
4 changes: 2 additions & 2 deletions spring-cloud-alibaba-starters/spring-cloud-alibaba-starter-security/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@
<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-datasource-xds</artifactId>
<version>2.0.0-alpha</version>
<version>2.0.0-alpha2-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-security-core</artifactId>
<version>2.0.0-alpha</version>
<version>2.0.0-alpha2-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
48 changes: 24 additions & 24 deletions ...-starter-security/src/main/java/com/alibaba/cloud/security/SecurityAutoConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
import java.util.Optional;
import java.util.concurrent.CountDownLatch;

import com.alibaba.cloud.security.tls.MtlsSslStoreProvider;
import com.alibaba.cloud.security.tls.TlsModeListener;
import com.alibaba.cloud.security.tls.auth.TrustSentinelInterceptor;
import com.alibaba.cloud.security.tls.auth.XdsWebMvcConfigurer;
import com.alibaba.cloud.security.tls.rest.ClientRequestFactoryProvider;
import com.alibaba.cloud.security.tls.rest.RestMtlsBeanPostProcessor;
import com.alibaba.cloud.security.tls.rest.RestTemplateCallback;
import com.alibaba.cloud.security.tls.tomcat.MtlsTomcatConnectCustomizer;
import com.alibaba.cloud.security.trust.TlsModeListener;
import com.alibaba.cloud.security.trust.TrustSslStoreProvider;
import com.alibaba.cloud.security.trust.auth.SentinelTrustInterceptor;
import com.alibaba.cloud.security.trust.auth.TrustWebMvcConfigurer;
import com.alibaba.cloud.security.trust.rest.ClientRequestFactoryProvider;
import com.alibaba.cloud.security.trust.rest.TrustRestBeanPostProcessor;
import com.alibaba.cloud.security.trust.rest.TrustRestTemplateCallback;
import com.alibaba.cloud.security.trust.tomcat.TrustTomcatConnectCustomizer;
import com.alibaba.csp.sentinel.datasource.xds.XdsDataSource;
import com.alibaba.csp.sentinel.datasource.xds.config.XdsConfigProperties;
import com.alibaba.csp.sentinel.datasource.xds.constant.type.AsymCryptoType;
Expand Down Expand Up @@ -120,50 +120,50 @@ public XdsDataSource xdsDataSource(XdsConfigProperties properties) throws Interr

@Bean
@ConditionalOnClass(XdsConfigProperties.class)
public MtlsSslStoreProvider mtlsSslStoreProvider(XdsDataSource xdsDataSource) {
return new MtlsSslStoreProvider();
public TrustSslStoreProvider mtlsSslStoreProvider(XdsDataSource xdsDataSource) {
return new TrustSslStoreProvider();
}


@Bean
@ConditionalOnClass(XdsConfigProperties.class)
public TrustSentinelInterceptor trustSentinelInterceptor() {
return new TrustSentinelInterceptor();
public SentinelTrustInterceptor trustSentinelInterceptor() {
return new SentinelTrustInterceptor();
}

@Bean
@ConditionalOnClass(XdsConfigProperties.class)
public XdsWebMvcConfigurer xdsWebMvcConfigurer(TrustSentinelInterceptor trustSentinelInterceptor) {
return new XdsWebMvcConfigurer(trustSentinelInterceptor);
public TrustWebMvcConfigurer xdsWebMvcConfigurer(SentinelTrustInterceptor sentinelTrustInterceptor) {
return new TrustWebMvcConfigurer(sentinelTrustInterceptor);
}

@Bean
@ConditionalOnClass(XdsConfigProperties.class)
public TomcatConnectorCustomizer mtlsCustomizer(MtlsSslStoreProvider sslStoreProvider, XdsDataSource xdsDataSource) {
return new MtlsTomcatConnectCustomizer(sslStoreProvider);
public TomcatConnectorCustomizer mtlsCustomizer(TrustSslStoreProvider sslStoreProvider, XdsDataSource xdsDataSource) {
return new TrustTomcatConnectCustomizer(sslStoreProvider);
}

@Bean
@ConditionalOnClass(XdsConfigProperties.class)
public RestMtlsBeanPostProcessor restMtlsBeanPostProcessor(
public TrustRestBeanPostProcessor restMtlsBeanPostProcessor(
ClientRequestFactoryProvider clientRequestFactoryProvider) {
return new RestMtlsBeanPostProcessor(clientRequestFactoryProvider);
return new TrustRestBeanPostProcessor(clientRequestFactoryProvider);
}


@Bean
@ConditionalOnClass(XdsConfigProperties.class)
public RestTemplateCallback restTemplateCallback(ClientRequestFactoryProvider clientRequestFactoryProvider) {
RestTemplateCallback restTemplateCallback = new RestTemplateCallback(clientRequestFactoryProvider);
TrustManager.getInstance().registerCertCallback(certPair -> restTemplateCallback.onUpdateCert());
return restTemplateCallback;
public TrustRestTemplateCallback restTemplateCallback(ClientRequestFactoryProvider clientRequestFactoryProvider) {
TrustRestTemplateCallback trustRestTemplateCallback = new TrustRestTemplateCallback(clientRequestFactoryProvider);
TrustManager.getInstance().registerCertCallback(certPair -> trustRestTemplateCallback.onUpdateCert());
return trustRestTemplateCallback;
}


@Bean
@ConditionalOnClass(XdsConfigProperties.class)
public ClientRequestFactoryProvider clientRequestFactoryProvider(
MtlsSslStoreProvider mtlsSslStoreProvider) {
return new ClientRequestFactoryProvider(mtlsSslStoreProvider);
TrustSslStoreProvider trustSslStoreProvider) {
return new ClientRequestFactoryProvider(trustSslStoreProvider);
}
}
6 changes: 2 additions & 4 deletions ...tls/ApplicationPreparedEventListener.java → ...ust/ApplicationPreparedEventListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.alibaba.cloud.security.tls;
package com.alibaba.cloud.security.trust;


import org.springframework.beans.BeansException;
Expand All @@ -26,9 +26,7 @@
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.support.GenericApplicationContext;

/**
* @author <a href="liweijian@foxmail.com">lwj</a>
*/

public class ApplicationPreparedEventListener implements ApplicationListener<ApplicationPreparedEvent> {

private static ConfigurableApplicationContext context;
Expand Down
5 changes: 1 addition & 4 deletions ...a/cloud/security/tls/TlsModeListener.java → ...cloud/security/trust/TlsModeListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.alibaba.cloud.security.tls;
package com.alibaba.cloud.security.trust;

import java.io.Closeable;
import java.io.IOException;
Expand All @@ -30,9 +30,6 @@
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.util.ClassUtils;

/**
* @author <a href="liweijian@foxmail.com">lwj</a>
*/
public class TlsModeListener {
private Logger log = LoggerFactory.getLogger(TlsModeListener.class);

Expand Down
20 changes: 9 additions & 11 deletions ...ud/security/tls/MtlsSslStoreProvider.java → ...security/trust/TrustSslStoreProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.alibaba.cloud.security.tls;
package com.alibaba.cloud.security.trust;

import java.security.KeyStore;

Expand All @@ -25,27 +25,25 @@

import org.springframework.boot.web.server.SslStoreProvider;

/**
* @author <a href="liweijian@foxmail.com">lwj</a>
*/
public class MtlsSslStoreProvider implements SslStoreProvider {

private static final Logger log = LoggerFactory.getLogger(MtlsSslStoreProvider.class);
public class TrustSslStoreProvider implements SslStoreProvider {

private static final Logger log = LoggerFactory.getLogger(TrustSslStoreProvider.class);

/**
* Mtls default key store alias key.
* key store alias key.
*/
public static final String MTLS_DEFAULT_KEY_STORE_ALIAS = "mtls-default-key-store";

/**
* Mtls default trust store alias key.
* trust store alias key.
*/
public static final String MTLS_DEFAULT_TRUST_STORE_ALIAS = "mtls-default-trust-store";


private TrustManager trustManager = TrustManager.getInstance();

public MtlsSslStoreProvider() {
public TrustSslStoreProvider() {
}


Expand All @@ -62,7 +60,7 @@ public KeyStore getKeyStore() {
return keyStore;
}
catch (Exception e) {
log.error("Unable to get key store", e);
log.error("Error in getting key store", e);
return null;
}
}
Expand All @@ -80,7 +78,7 @@ public KeyStore getTrustStore() {
return keyStore;
}
catch (Exception e) {
log.error("Unable to get trust store", e);
log.error("Error in getting trust store", e);
return null;
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...ty/tls/auth/TrustSentinelInterceptor.java → .../trust/auth/SentinelTrustInterceptor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.alibaba.cloud.security.tls.auth;
package com.alibaba.cloud.security.trust.auth;

import java.security.cert.X509Certificate;
import java.util.ArrayList;
Expand Down Expand Up @@ -46,7 +46,7 @@



public class TrustSentinelInterceptor implements HandlerInterceptor {
public class SentinelTrustInterceptor implements HandlerInterceptor {

private static final String UNKNOWN_IP = "unknown";
private TrustManager trustManager = TrustManager.getInstance();
Expand Down
12 changes: 6 additions & 6 deletions ...ecurity/tls/auth/XdsWebMvcConfigurer.java → ...ity/trust/auth/TrustWebMvcConfigurer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,24 @@
* limitations under the License.
*/

package com.alibaba.cloud.security.tls.auth;
package com.alibaba.cloud.security.trust.auth;


import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;


public class XdsWebMvcConfigurer implements WebMvcConfigurer {
public class TrustWebMvcConfigurer implements WebMvcConfigurer {

private TrustSentinelInterceptor trustSentinelInterceptor;
private SentinelTrustInterceptor sentinelTrustInterceptor;

public XdsWebMvcConfigurer(TrustSentinelInterceptor trustSentinelInterceptor) {
this.trustSentinelInterceptor = trustSentinelInterceptor;
public TrustWebMvcConfigurer(SentinelTrustInterceptor sentinelTrustInterceptor) {
this.sentinelTrustInterceptor = sentinelTrustInterceptor;
}

@Override
public void addInterceptors(InterceptorRegistry registry) {

registry.addInterceptor(trustSentinelInterceptor);
registry.addInterceptor(sentinelTrustInterceptor);
}
}
16 changes: 8 additions & 8 deletions ...ls/rest/ClientRequestFactoryProvider.java → ...st/rest/ClientRequestFactoryProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
* limitations under the License.
*/

package com.alibaba.cloud.security.tls.rest;
package com.alibaba.cloud.security.trust.rest;

import javax.net.ssl.SSLContext;

import com.alibaba.cloud.security.tls.MtlsSslStoreProvider;
import com.alibaba.cloud.security.trust.TrustSslStoreProvider;
import org.apache.http.ssl.SSLContextBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -35,18 +35,18 @@ public class ClientRequestFactoryProvider {
private static final Logger log = LoggerFactory
.getLogger(ClientRequestFactoryProvider.class);

private final MtlsSslStoreProvider mtlsSslStoreProvider;
private final TrustSslStoreProvider trustSslStoreProvider;

public ClientRequestFactoryProvider(MtlsSslStoreProvider mtlsSslStoreProvider) {
this.mtlsSslStoreProvider = mtlsSslStoreProvider;
public ClientRequestFactoryProvider(TrustSslStoreProvider trustSslStoreProvider) {
this.trustSslStoreProvider = trustSslStoreProvider;
}


public ClientHttpRequestFactory getFactoryByTemplate(RestTemplate restTemplate) {
try {
SSLContext sslContext = new SSLContextBuilder()
.loadKeyMaterial(mtlsSslStoreProvider.getKeyStore(), "".toCharArray())
.loadTrustMaterial(mtlsSslStoreProvider.getTrustStore(), null)
.loadKeyMaterial(trustSslStoreProvider.getKeyStore(), "".toCharArray())
.loadTrustMaterial(trustSslStoreProvider.getTrustStore(), null)
.build();
return getFactoryByTemplate(restTemplate, sslContext);
}
Expand All @@ -58,7 +58,7 @@ public ClientHttpRequestFactory getFactoryByTemplate(RestTemplate restTemplate)
}

private ClientHttpRequestFactory getFactoryByTemplate(RestTemplate restTemplate, SSLContext sslContext) {
return new MtlsSimpleClientHttpRequestFactory(sslContext);
return new TrustSimpleClientHttpRequestFactory(sslContext);
}

}
8 changes: 4 additions & 4 deletions ...y/tls/rest/RestMtlsBeanPostProcessor.java → ...rust/rest/TrustRestBeanPostProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@
* limitations under the License.
*/

package com.alibaba.cloud.security.tls.rest;
package com.alibaba.cloud.security.trust.rest;

import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.web.client.RestTemplate;

public class RestMtlsBeanPostProcessor implements BeanPostProcessor {
public class TrustRestBeanPostProcessor implements BeanPostProcessor {

private final ClientRequestFactoryProvider clientRequestFactoryProvider;

public RestMtlsBeanPostProcessor(
public TrustRestBeanPostProcessor(
ClientRequestFactoryProvider clientRequestFactoryProvider) {
this.clientRequestFactoryProvider = clientRequestFactoryProvider;
}
Expand All @@ -38,7 +38,7 @@ public Object postProcessBeforeInitialization(Object bean, String beanName) {
clientRequestFactoryProvider.getFactoryByTemplate(restTemplate));
}
catch (Exception e) {
throw new RuntimeException("Error on enhancing resttemplate", e);
throw new RuntimeException("Error in enhancing restTemplate", e);
}
}
return bean;
Expand Down
8 changes: 4 additions & 4 deletions ...curity/tls/rest/RestTemplateCallback.java → ...trust/rest/TrustRestTemplateCallback.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.alibaba.cloud.security.tls.rest;
package com.alibaba.cloud.security.trust.rest;

import java.util.Map;

Expand All @@ -30,15 +30,15 @@



public class RestTemplateCallback implements ApplicationContextAware {
public class TrustRestTemplateCallback implements ApplicationContextAware {

private static final Logger log = LoggerFactory.getLogger(RestTemplateCallback.class);
private static final Logger log = LoggerFactory.getLogger(TrustRestTemplateCallback.class);

private ApplicationContext applicationContext;

private final ClientRequestFactoryProvider clientRequestFactoryProvider;

public RestTemplateCallback(
public TrustRestTemplateCallback(
ClientRequestFactoryProvider clientRequestFactoryProvider) {
this.clientRequestFactoryProvider = clientRequestFactoryProvider;
}
Expand Down
9 changes: 3 additions & 6 deletions ...t/MtlsSimpleClientHttpRequestFactory.java → .../TrustSimpleClientHttpRequestFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.alibaba.cloud.security.tls.rest;
package com.alibaba.cloud.security.trust.rest;


import java.io.IOException;
Expand All @@ -32,15 +32,12 @@
import com.alibaba.csp.sentinel.trust.tls.TlsMode;
import org.apache.http.conn.ssl.NoopHostnameVerifier;

import org.springframework.http.client.SimpleClientHttpRequestFactory;



public class MtlsSimpleClientHttpRequestFactory extends SimpleClientHttpRequestFactory {
public class TrustSimpleClientHttpRequestFactory extends org.springframework.http.client.SimpleClientHttpRequestFactory {

private final SSLContext sslContext;

public MtlsSimpleClientHttpRequestFactory(SSLContext sslContext) {
public TrustSimpleClientHttpRequestFactory(SSLContext sslContext) {
this.sslContext = sslContext;
}

Expand Down
2 changes: 1 addition & 1 deletion ...StoreProviderUrlStreamHandlerFactory.java → ...StoreProviderUrlStreamHandlerFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.alibaba.cloud.security.tls.tomcat;
package com.alibaba.cloud.security.trust.tomcat;

import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Expand Down
Loading

0 comments on commit dd7efde

Please sign in to comment.