Skip to content

Tolerate missing keystore password, for example for tests #417

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
Vlatombe wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Tolerate missing keystore password, for example for tests #417

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25c1450
Tolerate missing keystore password, for example for tests
Vlatombe Oct 10, 2024
56c2fbc
Spotless
Vlatombe Oct 10, 2024
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: 3 additions & 2 deletions src/main/java/winstone/AbstractSecuredConnectorFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ protected void configureSsl(Map<String, String> args, Server server) throws IOEx

keystore = KeyStore.getInstance(KeyStore.getDefaultType());
try (InputStream inputStream = new FileInputStream(keyStore)) {
keystore.load(inputStream, this.keystorePassword.toCharArray());
keystore.load(
inputStream, this.keystorePassword == null ? null : this.keystorePassword.toCharArray());
}
} else {
throw new WinstoneException(MessageFormat.format("Please set --{0}", Option.HTTPS_KEY_STORE));
Expand Down Expand Up @@ -84,7 +85,7 @@ protected SslContextFactory.Server getSSLContext(Map<String, String> args) {

// In case the KeyStore password and the KeyPassword are not the same,
// the KeyManagerFactory needs the KeyPassword because it will access the individual key(s)
kmf.init(keystore, keystorePassword.toCharArray());
kmf.init(keystore, keystorePassword == null ? null : keystorePassword.toCharArray());
Logger.log(Level.FINEST, SSL_RESOURCES, "HttpsListener.KeyCount", keystore.size() + "");
for (Enumeration<String> e = keystore.aliases(); e.hasMoreElements(); ) {
String alias = e.nextElement();
Expand Down