From c4d513ca26fe80946a5d90264de5d8e13e4ea974 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Thu, 23 Oct 2014 17:21:24 +0000
Subject: [PATCH] #2021 feature - Added pack actions in server and in frontend
---
securis/src/main/java/net/curisit/securis/SeCurisServer.java | 59 +++++++++++++++++++++++++++++------------------------------
1 files changed, 29 insertions(+), 30 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/SeCurisServer.java b/securis/src/main/java/net/curisit/securis/SeCurisServer.java
index 8b28615..23db35f 100644
--- a/securis/src/main/java/net/curisit/securis/SeCurisServer.java
+++ b/securis/src/main/java/net/curisit/securis/SeCurisServer.java
@@ -52,7 +52,7 @@
private static final Logger CONSOLE = LogManager.getLogger("console");
private static final String PID_FILE = System.getProperty("user.home") + "/.SeCuris/securis-server.pid";
-
+
private static Server server;
private static Injector injector = null;
@@ -64,19 +64,15 @@
CONSOLE.info("Execute SeCuris server using:");
CONSOLE.info(" $ ./securis-server.sh {start|stop}");
}
-
- private void testMail() {
-
- }
-
+
public static void main(String[] args) throws Exception {
- String command;
+ String command;
if (args.length > 0) {
command = args[0].toLowerCase();
} else {
command = "start";
}
-
+
switch (command) {
case "start":
startServer();
@@ -90,7 +86,7 @@
System.exit(-1);
}
}
-
+
private static void stopServer() {
if (!new File(PID_FILE).exists()) {
CONSOLE.error("SeCuris server is NOT running or PID file is missing");
@@ -105,7 +101,7 @@
LOG.error("Error getting SeCuris server process PID from file: {}", PID_FILE);
}
}
-
+
private static void startServer() {
if (new File(PID_FILE).exists()) {
@@ -116,20 +112,22 @@
}
System.exit(-2);
}
-
+
SecurisModule securisModule = new SecurisModule();
JpaPersistModule jpaPersistModule = new JpaPersistModule("localdb");
Properties props = new Properties();
props.put("javax.persistence.jdbc.password", securisModule.getPassword());
props.put("javax.persistence.jdbc.url", securisModule.getUrl(securisModule.getAppDir()));
- //LOG.info("BD Url: {} {}", securisModule.getUrl(securisModule.getAppDir()), securisModule.getPassword());
+ // LOG.info("BD Url: {} {}",
+ // securisModule.getUrl(securisModule.getAppDir()),
+ // securisModule.getPassword());
jpaPersistModule.properties(props);
injector = Guice.createInjector(securisModule, new RequestsModule(), jpaPersistModule);
try {
startServer(injector.getInstance(Key.get(URI.class, Names.named("base-uri"))));
-
+
} catch (SeCurisException e) {
CONSOLE.error("Error launching the SeCuris server, {}", e);
}
@@ -153,14 +151,14 @@
QueuedThreadPool threadPool = new QueuedThreadPool();
threadPool.setMaxThreads(50);
-
+
server = new Server();
-
+
ServerConnector httpConnector = new ServerConnector(server);
httpConnector.setPort(Config.getInt(Config.KEYS.SERVER_PORT, 9080));
httpConnector.setHost(Config.get(Config.KEYS.SERVER_HOSTNAME, "0.0.0.0"));
server.addConnector(httpConnector);
-
+
ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
context.setContextPath("/");
context.addEventListener(injector.getInstance(GuiceResteasyBootstrapServletContextListener.class));
@@ -191,33 +189,33 @@
contexts.setHandlers(new Handler[] {
staticResources, context
});
-
+
HttpConfiguration http_config = new HttpConfiguration();
http_config.setSecureScheme("https");
http_config.setSecurePort(Config.getInt(Config.KEYS.SERVER_SSL_PORT, 9443));
http_config.setOutputBufferSize(32768);
http_config.setSendServerVersion(true);
http_config.setSendDateHeader(false);
-
-
+
HttpConfiguration https_config = new HttpConfiguration(http_config);
https_config.addCustomizer(new SecureRequestCustomizer());
-
+
SslContextFactory sslContextFactory = new SslContextFactory();
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");
-// sslContextFactory.setTrustStorePassword("curist3c");
+ // sslContextFactory.setCertAlias("1");
+ // sslContextFactory.setKeyManagerPassword("curist3c");
+ // sslContextFactory.setTrustStorePath("/Users/rob/.ssh/keys/keystore");
+ // sslContextFactory.setTrustStorePassword("curist3c");
sslContextFactory.checkKeyStore();
sslContextFactory.setNeedClientAuth(false);
-
- ServerConnector sslConnector = new ServerConnector(server, new SslConnectionFactory(sslContextFactory,HttpVersion.HTTP_1_1.asString()), new HttpConnectionFactory(https_config));
+
+ ServerConnector sslConnector = new ServerConnector(server, new SslConnectionFactory(sslContextFactory, HttpVersion.HTTP_1_1.asString()),
+ new HttpConnectionFactory(https_config));
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.addConnector(sslConnector);
server.setHandler(context);
server.setStopAtShutdown(true);
@@ -233,9 +231,10 @@
}
}
-
- static class ServerStoppedListener extends AbstractLifeCycleListener {
- @Override public void lifeCycleStopped(LifeCycle event) {
+
+ static class ServerStoppedListener extends AbstractLifeCycleListener {
+ @Override
+ public void lifeCycleStopped(LifeCycle event) {
if (new File(PID_FILE).exists())
new File(PID_FILE).delete();
}
--
Gitblit v1.3.2