diff --git a/src/de/deadlocker8/budgetmasterserver/main/Settings.java b/src/de/deadlocker8/budgetmasterserver/main/Settings.java index f981d9dedd1f5e94664f39b8f536a1ffcbc79125..1dbc26be8a1cacc8e1ecedba6a2216ec604b3d8b 100644 --- a/src/de/deadlocker8/budgetmasterserver/main/Settings.java +++ b/src/de/deadlocker8/budgetmasterserver/main/Settings.java @@ -8,6 +8,8 @@ public class Settings private String databasePassword; private int serverPort; private String serverSecret; + private String keystorePath; + private String keystorePassword; public Settings() { @@ -44,9 +46,20 @@ public class Settings return serverSecret; } + public String getKeystorePath() + { + return keystorePath; + } + + public String getKeystorePassword() + { + return keystorePassword; + } + @Override public String toString() { - return "Settings [databaseUrl=" + databaseUrl + ", databaseName=" + databaseName + ", databaseUsername=" + databaseUsername + ", databasePassword=" + databasePassword + ", serverPort=" + serverPort + ", serverSecret=" + serverSecret + "]"; - } + return "Settings [databaseUrl=" + databaseUrl + ", databaseName=" + databaseName + ", databaseUsername=" + databaseUsername + ", databasePassword=" + databasePassword + ", serverPort=" + serverPort + ", serverSecret=" + serverSecret + ", keystorePath=" + keystorePath + ", keystorePassword=" + + keystorePassword + "]"; + } } \ No newline at end of file diff --git a/src/de/deadlocker8/budgetmasterserver/server/SparkServer.java b/src/de/deadlocker8/budgetmasterserver/server/SparkServer.java index 4c9951379aa1ace35f022a0f161ea8cd7df5c196..1d645f716c574109e752e3c2b2abeeeee8981d1a 100644 --- a/src/de/deadlocker8/budgetmasterserver/server/SparkServer.java +++ b/src/de/deadlocker8/budgetmasterserver/server/SparkServer.java @@ -10,6 +10,8 @@ import static spark.Spark.post; import static spark.Spark.put; import static spark.Spark.secure; +import java.io.File; + import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -48,8 +50,18 @@ public class SparkServer port(settings.getServerPort()); - // DEBUG - secure("certs/keystore.jks", "geheim", null, null); + try + { + File keystoreFile = new File(settings.getKeystorePath()); + secure(keystoreFile.getAbsolutePath(), settings.getKeystorePassword(), null, null); + } + catch(Exception e) + { + Logger.error(e); + Logger.info("CANCELED server initialization"); + return; + } + RouteOverview.enableRouteOverview(); handler = new DatabaseHandler(settings);