Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-12-23 09:37:54 +01:00
Code Issues Projects Releases Wiki Activity

Fix NPE on null Keystore when using old .jks cert

Browse Source
This commit is contained in:
Aurora Lahtela 2022-08-16 22:20:43 +03:00
parent e41af49544
commit 9737aa1ddc
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/http/JettyWebserver.java
View File

@ -33,6 +33,7 @@ import org.eclipse.jetty.util.ssl.SslContextFactory;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
import java.io.File; import java.io.File;
import java.security.KeyStore;
import java.security.KeyStoreException; import java.security.KeyStoreException;
import java.security.cert.Certificate; import java.security.cert.Certificate;
import java.security.cert.X509Certificate; import java.security.cert.X509Certificate;
@ -130,14 +131,14 @@ public class JettyWebserver implements WebServer {
} }
webserverLogMessages.infoWebserverEnabled(getPort()); webserverLogMessages.infoWebserverEnabled(getPort());
sslContext.ifPresent(this::logCertificateExpiryInformation); sslContext.map(SslContextFactory::getKeyStore).ifPresent(this::logCertificateExpiryInformation);
responseResolver.registerPages(); responseResolver.registerPages();
} }
private void logCertificateExpiryInformation(SslContextFactory.Server sslContext) { private void logCertificateExpiryInformation(KeyStore keyStore) {
try { try {
Certificate certificate = sslContext.getKeyStore().getCertificate(webserverConfiguration.getAlias()); Certificate certificate = keyStore.getCertificate(webserverConfiguration.getAlias());
if (certificate instanceof X509Certificate) { if (certificate instanceof X509Certificate) {
long expires = ((X509Certificate) certificate).getNotAfter().getTime(); long expires = ((X509Certificate) certificate).getNotAfter().getTime();
long timeLeft = expires - System.currentTimeMillis(); long timeLeft = expires - System.currentTimeMillis();