mirror of
https://github.com/Alfresco/alfresco-transform-core.git
synced 2025-05-12 17:04:48 +00:00
[ACS-4839] Add mtls config in the deprecated module (#758)
This commit is contained in:
parent
c04fa6d3fa
commit
c7df2c5bb3
@ -75,6 +75,10 @@
|
|||||||
<artifactId>google-collections</artifactId>
|
<artifactId>google-collections</artifactId>
|
||||||
<version>1.0</version>
|
<version>1.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.httpcomponents</groupId>
|
||||||
|
<artifactId>httpclient</artifactId>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
@ -0,0 +1,134 @@
|
|||||||
|
/*
|
||||||
|
* #%L
|
||||||
|
* Alfresco Transform Core
|
||||||
|
* %%
|
||||||
|
* Copyright (C) 2005 - 2023 Alfresco Software Limited
|
||||||
|
* %%
|
||||||
|
* This file is part of the Alfresco software.
|
||||||
|
* -
|
||||||
|
* If the software was purchased under a paid Alfresco license, the terms of
|
||||||
|
* the paid license agreement will prevail. Otherwise, the software is
|
||||||
|
* provided under the following open source license terms:
|
||||||
|
* -
|
||||||
|
* Alfresco is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Lesser General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
* -
|
||||||
|
* Alfresco is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Lesser General Public License for more details.
|
||||||
|
* -
|
||||||
|
* You should have received a copy of the GNU Lesser General Public License
|
||||||
|
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
* #L%
|
||||||
|
*/
|
||||||
|
package org.alfresco.transformer.config;
|
||||||
|
|
||||||
|
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
|
||||||
|
import org.apache.http.impl.client.CloseableHttpClient;
|
||||||
|
import org.apache.http.impl.client.HttpClients;
|
||||||
|
import org.apache.http.ssl.SSLContextBuilder;
|
||||||
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
|
import org.springframework.context.annotation.Bean;
|
||||||
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
import org.springframework.core.io.Resource;
|
||||||
|
import org.springframework.http.client.ClientHttpRequestFactory;
|
||||||
|
import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
|
||||||
|
import org.springframework.web.client.RestTemplate;
|
||||||
|
|
||||||
|
import javax.net.ssl.SSLContext;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.security.KeyManagementException;
|
||||||
|
import java.security.KeyStore;
|
||||||
|
import java.security.KeyStoreException;
|
||||||
|
import java.security.NoSuchAlgorithmException;
|
||||||
|
import java.security.UnrecoverableKeyException;
|
||||||
|
import java.security.cert.CertificateException;
|
||||||
|
|
||||||
|
@Deprecated
|
||||||
|
@Configuration
|
||||||
|
public class MTLSConfig {
|
||||||
|
|
||||||
|
@Value("${client.ssl.key-store:#{null}}")
|
||||||
|
private Resource keyStoreResource;
|
||||||
|
|
||||||
|
@Value("${client.ssl.key-store-password:}")
|
||||||
|
private char[] keyStorePassword;
|
||||||
|
|
||||||
|
@Value("${client.ssl.key-store-type:}")
|
||||||
|
private String keyStoreType;
|
||||||
|
|
||||||
|
@Value("${client.ssl.trust-store:#{null}}")
|
||||||
|
private Resource trustStoreResource;
|
||||||
|
|
||||||
|
@Value("${client.ssl.trust-store-password:}")
|
||||||
|
private char[] trustStorePassword;
|
||||||
|
|
||||||
|
@Value("${client.ssl.trust-store-type:}")
|
||||||
|
private String trustStoreType;
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
public RestTemplate restTemplate(SSLContextBuilder apacheSSLContextBuilder) throws IOException, CertificateException, NoSuchAlgorithmException, KeyStoreException, KeyManagementException, UnrecoverableKeyException
|
||||||
|
{
|
||||||
|
if(isTlsOrMtlsConfigured())
|
||||||
|
{
|
||||||
|
return createRestTemplateWithSslContext(apacheSSLContextBuilder);
|
||||||
|
} else {
|
||||||
|
return new RestTemplate();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
public SSLContextBuilder apacheSSLContextBuilder() throws CertificateException, KeyStoreException, IOException, NoSuchAlgorithmException, UnrecoverableKeyException {
|
||||||
|
SSLContextBuilder sslContextBuilder = new SSLContextBuilder();
|
||||||
|
if(isKeystoreConfigured())
|
||||||
|
{
|
||||||
|
KeyStore keyStore = getKeyStore(keyStoreType, keyStoreResource, keyStorePassword);
|
||||||
|
sslContextBuilder.loadKeyMaterial(keyStore, keyStorePassword);
|
||||||
|
}
|
||||||
|
if(isTruststoreConfigured())
|
||||||
|
{
|
||||||
|
sslContextBuilder
|
||||||
|
.setKeyStoreType(trustStoreType)
|
||||||
|
.loadTrustMaterial(trustStoreResource.getURL(), trustStorePassword);
|
||||||
|
}
|
||||||
|
|
||||||
|
return sslContextBuilder;
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean isTlsOrMtlsConfigured()
|
||||||
|
{
|
||||||
|
return isTruststoreConfigured() || isKeystoreConfigured();
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean isTruststoreConfigured()
|
||||||
|
{
|
||||||
|
return trustStoreResource != null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean isKeystoreConfigured()
|
||||||
|
{
|
||||||
|
return keyStoreResource != null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private RestTemplate createRestTemplateWithSslContext(SSLContextBuilder sslContextBuilder) throws NoSuchAlgorithmException, KeyManagementException {
|
||||||
|
SSLContext sslContext = sslContextBuilder.build();
|
||||||
|
SSLConnectionSocketFactory sslContextFactory = new SSLConnectionSocketFactory(sslContext);
|
||||||
|
CloseableHttpClient httpClient = HttpClients.custom().setSSLSocketFactory(sslContextFactory).build();
|
||||||
|
ClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory(httpClient);
|
||||||
|
return new RestTemplate(requestFactory);
|
||||||
|
}
|
||||||
|
|
||||||
|
private KeyStore getKeyStore(String keyStoreType, Resource keyStoreResource, char[] keyStorePassword) throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException
|
||||||
|
{
|
||||||
|
KeyStore keyStore = KeyStore.getInstance(keyStoreType);
|
||||||
|
try (InputStream keyStoreInputStream = keyStoreResource.getInputStream())
|
||||||
|
{
|
||||||
|
keyStore.load(keyStoreInputStream, keyStorePassword);
|
||||||
|
}
|
||||||
|
return keyStore;
|
||||||
|
}
|
||||||
|
}
|
@ -41,7 +41,6 @@ import org.springframework.http.client.ClientHttpRequestFactory;
|
|||||||
import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
|
import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
|
||||||
import org.springframework.http.client.reactive.ReactorClientHttpConnector;
|
import org.springframework.http.client.reactive.ReactorClientHttpConnector;
|
||||||
import org.springframework.web.client.RestTemplate;
|
import org.springframework.web.client.RestTemplate;
|
||||||
import org.springframework.web.reactive.function.client.WebClient;
|
|
||||||
import reactor.netty.http.client.HttpClient;
|
import reactor.netty.http.client.HttpClient;
|
||||||
|
|
||||||
import javax.net.ssl.KeyManagerFactory;
|
import javax.net.ssl.KeyManagerFactory;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user