diff --git a/Plan/src/main/java/com/djrapitops/plan/Settings.java b/Plan/src/main/java/com/djrapitops/plan/Settings.java index 717ca160d..6f0ec63ff 100644 --- a/Plan/src/main/java/com/djrapitops/plan/Settings.java +++ b/Plan/src/main/java/com/djrapitops/plan/Settings.java @@ -48,7 +48,7 @@ public enum Settings { ANALYSIS_EXPORT_PATH("Settings.Analysis.Export.DestinationFolder"), WEBSERVER_CERTIFICATE_PATH("Settings.WebServer.Security.Certificate.KeyStorePath"), WEBSERVER_CERTIFICATE_KEYPASS("Settings.WebServer.Security.Certificate.KeyPass"), - WEBSERVER_CERTIFICATE_STOREPASS("Settings.WebServer.Security.Certificate.KeyPass"), + WEBSERVER_CERTIFICATE_STOREPASS("Settings.WebServer.Security.Certificate.StorePass"), WEBSERVER_CERTIFICATE_ALIAS("Settings.WebServer.Security.Certificate.Alias"), LINK_PROTOCOL("Settings.WebServer.ExternalWebServerLinkProtocol"), // diff --git a/Plan/src/main/java/com/djrapitops/plan/ui/webserver/WebServer.java b/Plan/src/main/java/com/djrapitops/plan/ui/webserver/WebServer.java index 0bd9c6dbe..b1ab4dc6e 100644 --- a/Plan/src/main/java/com/djrapitops/plan/ui/webserver/WebServer.java +++ b/Plan/src/main/java/com/djrapitops/plan/ui/webserver/WebServer.java @@ -72,6 +72,7 @@ public class WebServer { Log.debug(usingHttps ? "Https Start Successful." : "Https Start Failed."); if (!usingHttps) { + Log.infoColor(ChatColor.YELLOW + "User Authorization Disabled! (Not possible over http)"); server = HttpServer.create(new InetSocketAddress(port), 10); } @@ -171,7 +172,7 @@ public class WebServer { private boolean startHttpsServer() throws IOException { String keyStorePath = Settings.WEBSERVER_CERTIFICATE_PATH.toString(); if (!Paths.get(keyStorePath).isAbsolute()) { - keyStorePath = plugin.getDataFolder() + keyStorePath; + keyStorePath = plugin.getDataFolder() + File.separator + keyStorePath; } char[] storepass = Settings.WEBSERVER_CERTIFICATE_STOREPASS.toString().toCharArray(); char[] keypass = Settings.WEBSERVER_CERTIFICATE_KEYPASS.toString().toCharArray(); @@ -216,7 +217,9 @@ public class WebServer { } catch (FileNotFoundException e) { Log.infoColor(ChatColor.YELLOW + "WebServer: SSL Certificate KeyStore File not Found: " + keyStorePath); Log.info("No Certificate -> Using Http server for Visualization."); - Log.infoColor(ChatColor.YELLOW + "User Authorization Disabled! (Not possible over http)"); + } catch (IOException e) { + Log.error("WebServer: " + e); + Log.toLog(this.getClass().getName(), e); } catch (KeyStoreException | CertificateException | UnrecoverableKeyException e) { Log.error("WebServer: SSL Certificate loading Failed."); Log.toLog(this.getClass().getName(), e); diff --git a/Plan/src/main/resources/Cert.keystore b/Plan/src/main/resources/Cert.keystore index 4ddf94995..9f95d3807 100644 Binary files a/Plan/src/main/resources/Cert.keystore and b/Plan/src/main/resources/Cert.keystore differ