inteligr8/alfresco-transform-core
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-transform-core.git synced 2025-05-12 17:04:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Feature/acs 4460 mtls support (#752)

Browse Source 
* ACS-4460: Release T-Core (T-Engines) 3.0.1-A3 [release], Truststore  type fix.
This commit is contained in:
kcichonczyk 2023-03-17 09:14:36 +01:00 committed by GitHub
parent 80764c0b30
commit 47dbf77ad5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/base/src/main/java/org/alfresco/transform/base/config/MTLSConfig.java
View File

@ -116,7 +116,9 @@ public class MTLSConfig {
} }
if(isTruststoreConfigured()) if(isTruststoreConfigured())
{ {
sslContextBuilder.loadTrustMaterial(trustStoreResource.getURL(), trustStorePassword); sslContextBuilder
.setKeyStoreType(trustStoreType)
.loadTrustMaterial(trustStoreResource.getURL(), trustStorePassword);
} }
return sslContextBuilder; return sslContextBuilder;

4
engines/base/src/test/java/org/alfresco/transform/base/MtlsTestUtils.java
View File

@ -47,7 +47,9 @@ public class MtlsTestUtils {
} }
File trustStore = new File(trustStoreFile); File trustStore = new File(trustStoreFile);
sslContextBuilder.loadTrustMaterial(trustStore, trustStorePassword); sslContextBuilder
.setKeyStoreType(trustStoreType)
.loadTrustMaterial(trustStore, trustStorePassword);
SSLContext sslContext = sslContextBuilder.build(); SSLContext sslContext = sslContextBuilder.build();
SSLConnectionSocketFactory sslContextFactory = new SSLConnectionSocketFactory(sslContext); SSLConnectionSocketFactory sslContextFactory = new SSLConnectionSocketFactory(sslContext);