Spring/spring-amqp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-1237: RCFB Close key/trust store input streams

Browse Source 
Resolves https://github.com/spring-projects/spring-amqp/issues/1237

**cherry-pick to 2.2.x, 2.1.x, 1.7.x**

(cherry picked from commit 165b838c3a)

# Conflicts:
#	spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/RabbitConnectionFactoryBean.java
This commit is contained in:
Gary Russell
2020-08-05 11:34:54 -04:00
committed by Artem Bilan
parent 028b28ae17
commit efcba3a83a
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/RabbitConnectionFactoryBean.java
View File

@@ -16,6 +16,7 @@
package org.springframework.amqp.rabbit.connection;
import java.io.InputStream;
import java.lang.reflect.Method;
import java.net.URI;
import java.net.URISyntaxException;
@@ -72,7 +73,7 @@ import com.rabbitmq.client.impl.nio.NioParams;
*
* @author Gary Russell
* @author Heath Abelson
* @author Arnaud Cogoluègnes
* @author Arnaud Cogoluegnes
* @author Hareendran
* @author Artem Bilan
* @author Zachary DeLuca
@@ -731,7 +732,13 @@ public class RabbitConnectionFactoryBean extends AbstractFactoryBean<ConnectionF
Resource keyStoreResource = this.keyStoreResource != null ? this.keyStoreResource
: resolver.getResource(keyStoreName);
KeyStore ks = KeyStore.getInstance(keyStoreType);
ks.load(keyStoreResource.getInputStream(), keyPassphrase);
InputStream inputStream = keyStoreResource.getInputStream();
try {
ks.load(inputStream, keyPassphrase);
}
finally {
inputStream.close();
}
KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
kmf.init(ks, keyPassphrase);
keyManagers = kmf.getKeyManagers();
@@ -740,7 +747,13 @@ public class RabbitConnectionFactoryBean extends AbstractFactoryBean<ConnectionF
Resource trustStoreResource = this.trustStoreResource != null ? this.trustStoreResource
: resolver.getResource(trustStoreName);
KeyStore tks = KeyStore.getInstance(trustStoreType);
tks.load(trustStoreResource.getInputStream(), trustPassphrase);
InputStream inputStream = trustStoreResource.getInputStream();
try {
tks.load(inputStream, trustPassphrase);
}
finally {
inputStream.close();
}
TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
tmf.init(tks);
trustManagers = tmf.getTrustManagers();