From 3293b85ad46d2622ae6ead2caf107e3c41c15561 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Mon, 29 Sep 2014 12:40:12 +0000
Subject: [PATCH] #2021 fix - Added Config class to read parameters
---
securis/src/main/java/net/curisit/securis/SeCurisServer.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/SeCurisServer.java b/securis/src/main/java/net/curisit/securis/SeCurisServer.java
index 3f98d84..961da24 100644
--- a/securis/src/main/java/net/curisit/securis/SeCurisServer.java
+++ b/securis/src/main/java/net/curisit/securis/SeCurisServer.java
@@ -12,6 +12,7 @@
import net.curisit.securis.ioc.RequestsModule;
import net.curisit.securis.ioc.SecurisModule;
+import net.curisit.securis.utils.Config;
import org.apache.commons.io.FileUtils;
import org.apache.logging.log4j.LogManager;
@@ -149,7 +150,7 @@
QueuedThreadPool threadPool = new QueuedThreadPool();
threadPool.setMaxThreads(50);
- server = new Server(9997);
+ server = new Server(Config.getInt(Config.KEYS.SERVER_PORT, 9080));
ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
context.setContextPath("/");
context.addEventListener(injector.getInstance(GuiceResteasyBootstrapServletContextListener.class));
@@ -184,7 +185,7 @@
HttpConfiguration http_config = new HttpConfiguration();
http_config.setSecureScheme("https");
- http_config.setSecurePort(8443);
+ http_config.setSecurePort(Config.getInt(Config.KEYS.SERVER_SSL_PORT, 9443));
http_config.setOutputBufferSize(32768);
http_config.setSendServerVersion(true);
http_config.setSendDateHeader(false);
@@ -194,9 +195,9 @@
https_config.addCustomizer(new SecureRequestCustomizer());
SslContextFactory sslContextFactory = new SslContextFactory();
- sslContextFactory.setKeyStorePath("/Users/rob/.ssh/keys/securis.pkcs12");
- sslContextFactory.setKeyStoreType("PKCS12");
- sslContextFactory.setKeyStorePassword("curist3c");
+ sslContextFactory.setKeyStorePath(Config.get(Config.KEYS.KEYSTORE_PATH));
+ sslContextFactory.setKeyStoreType(Config.get(Config.KEYS.KEYSTORE_TYPE, "JKS"));
+ sslContextFactory.setKeyStorePassword(Config.get(Config.KEYS.KEYSTORE_PASSWORD, ""));
//sslContextFactory.setCertAlias("1");
// sslContextFactory.setKeyManagerPassword("curist3c");
// sslContextFactory.setTrustStorePath("/Users/rob/.ssh/keys/keystore");
@@ -206,8 +207,8 @@
LOG.info("Protocol: {}", sslContextFactory.getProtocol());
ServerConnector sslConnector = new ServerConnector(server, new SslConnectionFactory(sslContextFactory,HttpVersion.HTTP_1_1.asString()), new HttpConnectionFactory(https_config));
- sslConnector.setPort(8443);
- sslConnector.setHost("securis.curistec.com");
+ sslConnector.setPort(Config.getInt(Config.KEYS.SERVER_SSL_PORT, 9443));
+ sslConnector.setHost(Config.get(Config.KEYS.SERVER_HOSTNAME, "0.0.0.0"));
server.addConnector( sslConnector );
server.setHandler(context);
--
Gitblit v1.3.2