From 13bdfdf65620e99bba9d64c1ddc00911a5fe03cd Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sun, 19 Mar 2017 15:55:44 +0100
Subject: [PATCH] externalized settings for keystore file
---
.../budgetmasterserver/main/Settings.java | 17 +++++++++++++++--
.../budgetmasterserver/server/SparkServer.java | 16 ++++++++++++++--
2 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/src/de/deadlocker8/budgetmasterserver/main/Settings.java b/src/de/deadlocker8/budgetmasterserver/main/Settings.java
index f981d9ded..1dbc26be8 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 4c9951379..1d645f716 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);
--
GitLab