From 98aaff03284614d3073dda7cd85bed3d41c725b9 Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Tue, 23 Oct 2018 15:12:45 +0300 Subject: [PATCH] [New] Added Nginx HTTPS Override HTTPS routing override can be activated by setting keystore path to 'nginx' - In this mode Plan uses HTTP server and gives out HTTPS links. Affected issues: #669 --- .../com/djrapitops/plan/system/webserver/WebServer.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Plan/src/main/java/com/djrapitops/plan/system/webserver/WebServer.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/WebServer.java index 0e06392fe..a6b4f1ccf 100644 --- a/Plan/src/main/java/com/djrapitops/plan/system/webserver/WebServer.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/WebServer.java @@ -117,6 +117,9 @@ public class WebServer implements SubSystem { if (!usingHttps) { logger.log(L.INFO_COLOR, "§e" + locale.getString(PluginLang.WEB_SERVER_NOTIFY_HTTP_USER_AUTH)); server = HttpServer.create(new InetSocketAddress(config.getString(Settings.WEBSERVER_IP), port), 10); + } else if (server == null) { + logger.log(L.INFO_COLOR, "§eWebServer: Nginx HTTPS Override enabled. HTTP Server in use, make sure that your Nginx is routing with HTTPS and AlternativeIP.Link points to Nginx"); + server = HttpServer.create(new InetSocketAddress(config.getString(Settings.WEBSERVER_IP), port), 10); } server.createContext("/", requestHandler); @@ -138,6 +141,11 @@ public class WebServer implements SubSystem { private boolean startHttpsServer() { String keyStorePath = config.getString(Settings.WEBSERVER_CERTIFICATE_PATH); + + if (keyStorePath.equalsIgnoreCase("nginx")) { + return true; + } + if (!Paths.get(keyStorePath).isAbsolute()) { keyStorePath = files.getDataFolder() + File.separator + keyStorePath; }