Skip to content
Snippets Groups Projects
Commit 60cd0000 authored by Robert Goldmann's avatar Robert Goldmann
Browse files

Fixed #148 - include self-signed certificate for easy usage of server in LAN

parent b74fe00d
No related branches found
No related tags found
No related merge requests found
...@@ -88,8 +88,17 @@ public class SparkServer ...@@ -88,8 +88,17 @@ public class SparkServer
{ {
throw new Exception("empty string is no valid keystorePath"); throw new Exception("empty string is no valid keystorePath");
} }
File keystoreFile = new File(filePath); else if(settings.getKeystorePath().equals("default"))
secure(keystoreFile.getAbsolutePath(), settings.getKeystorePassword(), null, null); {
Logger.info("Connections are secured with default keystore");
Logger.warning("The Server is running with the default keystore. This is only recommended if the server is running in a local area network and is not exposed to the internet. Please check if this is intended.");
secure(SparkServer.class.getClassLoader().getResource("de/deadlocker8/budgetmasterserver/certificate/default_keystore.jks").toString(), settings.getKeystorePassword(), null, null);
}
else
{
Logger.info("Connections are secured with custom keystore");
secure(new File(filePath).getAbsolutePath(), settings.getKeystorePassword(), null, null);
}
} }
catch(Exception e) catch(Exception e)
{ {
......
-----BEGIN CERTIFICATE-----
MIIDHjCCAgYCCQDMkgYSh6618zANBgkqhkiG9w0BAQsFADBQMQswCQYDVQQGEwJE
RTEUMBIGA1UECgwLZGVhZGxvY2tlcjgxFTATBgNVBAsMDEJ1ZGdldE1hc3RlcjEU
MBIGA1UEAwwLZGVhZGxvY2tlcjgwIBcNMTcxMTI1MTAwMzM3WhgPMjA4NTEyMTIx
MDAzMzdaMFAxCzAJBgNVBAYTAkRFMRQwEgYDVQQKDAtkZWFkbG9ja2VyODEVMBMG
A1UECwwMQnVkZ2V0TWFzdGVyMRQwEgYDVQQDDAtkZWFkbG9ja2VyODCCASIwDQYJ
KoZIhvcNAQEBBQADggEPADCCAQoCggEBALzI08zIpuoK2zbgbOtAAEfwYxRZTeJr
d0+iFAYPoCgDruh2ldO6BXGpanw1QYh0dFkW/o+DhfuYnFknpwxQrBWmlG/hjFbz
QdT+5zefc1q6rX7tOJMFUY1Qj5s3l1ZFHAuD4kOUr8lgDQqoc4l4B+WTXiXPYnJh
+DcTH6oBHJVu40YXsTyGwBW+DDBn5VvkrhNkqqfedL/qQ0Nl41UTLOSG5Lg7hezP
DQiG3mEbpugGbqWV5t2CgyPr0eZMQKKo2srKPm+aIDp0kWyOIR3B7Bv9Onp70/QM
etMyLa9QWJyaGHaFkl7xwBwCl2L209iTYmJSC1GZQ252uT701VwIX70CAwEAATAN
BgkqhkiG9w0BAQsFAAOCAQEAZSH6BN4J7vLhBnZAVXrqVv/+ALEuKOpWG9pk8jfF
k1DWvH6NwIjrgrY13e6iEai/YbplGrb3U90bDF+kSH3fCu+9DueoSRlZ/pPmMDGT
1hFXU0QNNV8rjWYlttndpzaHqnxitJ4ERBcts4sFLUFq+aIQdGYR5/gpQQcXmk10
l3suT7O8NeSM7QGFO5rMm6k6XdLOBVvzaFwzuOwxOSvxV5dFwuRFuMxYddCnBGYH
kyPom4WfRKCvcbNT6RvJWQvBX5YOjIXpOV4gmwVtBbmhxrkSQvE56zrc2mewH6MN
dDTJmV5ZYlA4hXxSELOvmNqPE1SPtK3rNjtH55BtXuqvQQ==
-----END CERTIFICATE-----
...@@ -5,6 +5,6 @@ ...@@ -5,6 +5,6 @@
"databasePassword": "", "databasePassword": "",
"serverPort": 9000, "serverPort": 9000,
"serverSecret": "geheim", "serverSecret": "geheim",
"keystorePath": "", "keystorePath": "default",
"keystorePassword": "" "keystorePassword": "BudgetMaster"
} }
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment