Skip to content

Commit af426d0

Browse files
author
Dave Syer
committed
Be more defensive about a null password in Undertow SSL
Fixes gh-6387
1 parent b1dd928 commit af426d0

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactory.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,14 +294,17 @@ private KeyManager[] getKeyManagers() {
294294
}
295295
KeyStore keyStore = KeyStore.getInstance(keyStoreType);
296296
URL url = ResourceUtils.getURL(ssl.getKeyStore());
297-
keyStore.load(url.openStream(), ssl.getKeyStorePassword().toCharArray());
297+
char[] keyStorePassword = ssl.getKeyStorePassword() != null
298+
? ssl.getKeyStorePassword().toCharArray()
299+
: null;
300+
keyStore.load(url.openStream(), keyStorePassword);
298301

299302
// Get key manager to provide client credentials.
300303
KeyManagerFactory keyManagerFactory = KeyManagerFactory
301304
.getInstance(KeyManagerFactory.getDefaultAlgorithm());
302305
char[] keyPassword = ssl.getKeyPassword() != null
303306
? ssl.getKeyPassword().toCharArray()
304-
: ssl.getKeyStorePassword().toCharArray();
307+
: keyStorePassword;
305308
keyManagerFactory.init(keyStore, keyPassword);
306309
return keyManagerFactory.getKeyManagers();
307310
}

0 commit comments

Comments
 (0)