Skip to content

Fix FileInputStream resource leaks in RabbitMQ and MQTT SSL configurations #1838

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sunny-Hasho wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix FileInputStream resource leaks in RabbitMQ and MQTT SSL configurations #1838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions ...t/src/main/java/org/wso2/carbon/inbound/endpoint/protocol/mqtt/MqttConnectionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,14 +356,18 @@ protected SSLSocketFactory getSocketFactory(String keyStoreLocation,

char[] keyPassphrase = keyStorePassword.toCharArray();
KeyStore keyStore = KeyStore.getInstance(keyStoreType);
keyStore.load(new FileInputStream(keyStoreLocation), keyPassphrase);
try (FileInputStream keyStoreStream = new FileInputStream(keyStoreLocation)) {
keyStore.load(keyStoreStream, keyPassphrase);
}

KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
keyManagerFactory.init(keyStore, keyPassphrase);

char[] trustPassphrase = trustStorePassword.toCharArray();
KeyStore trustStore = KeyStore.getInstance(trustStoreType);
trustStore.load(new FileInputStream(trustStoreLocation), trustPassphrase);
try (FileInputStream trustStoreStream = new FileInputStream(trustStoreLocation)) {
trustStore.load(trustStoreStream, trustPassphrase);
}

TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
trustManagerFactory.init(trustStore);
Expand Down
8 changes: 6 additions & 2 deletions ...in/java/org/wso2/carbon/inbound/endpoint/protocol/rabbitmq/RabbitMQConnectionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,14 +178,18 @@ private void setSSL(Map<String, String> parameters, boolean sslEnabled) {
} else {
char[] keyPassphrase = keyStorePassword.toCharArray();
KeyStore ks = KeyStore.getInstance(keyStoreType);
ks.load(new FileInputStream(keyStoreLocation), keyPassphrase);
try (FileInputStream keyStoreStream = new FileInputStream(keyStoreLocation)) {
ks.load(keyStoreStream, keyPassphrase);
}

KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
kmf.init(ks, keyPassphrase);

char[] trustPassphrase = trustStorePassword.toCharArray();
KeyStore tks = KeyStore.getInstance(trustStoreType);
tks.load(new FileInputStream(trustStoreLocation), trustPassphrase);
try (FileInputStream trustStoreStream = new FileInputStream(trustStoreLocation)) {
tks.load(trustStoreStream, trustPassphrase);
}

TrustManagerFactory tmf = TrustManagerFactory
.getInstance(KeyManagerFactory.getDefaultAlgorithm());
Expand Down