Skip to content

Keystore.load calls do not close InputStream #25884

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

Closed
wants to merge 1 commit into from
Closed

Keystore.load calls do not close InputStream #25884

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
5 changes: 4 additions & 1 deletion ...ain/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package org.springframework.boot.autoconfigure.couchbase;

import java.io.InputStream;
import java.net.URL;
import java.security.KeyStore;

Expand Down Expand Up @@ -114,7 +115,9 @@ private TrustManagerFactory getTrustManagerFactory(CouchbaseProperties.Ssl ssl)
private KeyStore loadKeyStore(String resource, String keyStorePassword) throws Exception {
KeyStore store = KeyStore.getInstance(KeyStore.getDefaultType());
URL url = ResourceUtils.getURL(resource);
store.load(url.openStream(), (keyStorePassword != null) ? keyStorePassword.toCharArray() : null);
try (InputStream inputStream = url.openStream()) {
store.load(inputStream, (keyStorePassword != null) ? keyStorePassword.toCharArray() : null);
}
return store;
}

Expand Down
5 changes: 4 additions & 1 deletion ...g-boot/src/main/java/org/springframework/boot/web/embedded/netty/SslServerCustomizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package org.springframework.boot.web.embedded.netty;

import java.io.InputStream;
import java.net.Socket;
import java.net.URL;
import java.security.InvalidAlgorithmParameterException;
Expand Down Expand Up @@ -170,7 +171,9 @@ private KeyStore loadStore(String type, String provider, String resource, String
KeyStore store = (provider != null) ? KeyStore.getInstance(type, provider) : KeyStore.getInstance(type);
try {
URL url = ResourceUtils.getURL(resource);
store.load(url.openStream(), (password != null) ? password.toCharArray() : null);
try (InputStream inputStream = url.openStream()) {
store.load(inputStream, (password != null) ? password.toCharArray() : null);
}
return store;
}
catch (Exception ex) {
Expand Down
5 changes: 4 additions & 1 deletion ...ot/src/main/java/org/springframework/boot/web/embedded/undertow/SslBuilderCustomizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package org.springframework.boot.web.embedded.undertow;

import java.io.InputStream;
import java.net.InetAddress;
import java.net.Socket;
import java.net.URL;
Expand Down Expand Up @@ -181,7 +182,9 @@ private KeyStore loadStore(String type, String provider, String resource, String
KeyStore store = (provider != null) ? KeyStore.getInstance(type, provider) : KeyStore.getInstance(type);
try {
URL url = ResourceUtils.getURL(resource);
store.load(url.openStream(), (password != null) ? password.toCharArray() : null);
try (InputStream inputStream = url.openStream()) {
store.load(inputStream, (password != null) ? password.toCharArray() : null);
}
return store;
}
catch (Exception ex) {
Expand Down