X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FLauncher.java;h=12add4362de2d4c0c45ae7eb50f02f9bf1f799fd;hb=69e01f194e6183eccb8c7ca6f75fbe1132e0f194;hp=56306a98ba28d0d86c6cc1c0b3343bffca57a1db;hpb=f92f284f3a80e1f8fd87d2cc63288e1f1bbfeb9d;p=gigi.git

diff --git a/src/org/cacert/gigi/Launcher.java b/src/org/cacert/gigi/Launcher.java
index 56306a98..12add436 100644
--- a/src/org/cacert/gigi/Launcher.java
+++ b/src/org/cacert/gigi/Launcher.java
@@ -21,6 +21,7 @@ import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.SecureRequestCustomizer;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.server.SessionManager;
 import org.eclipse.jetty.server.SslConnectionFactory;
 import org.eclipse.jetty.server.handler.ContextHandler;
 import org.eclipse.jetty.server.handler.HandlerList;
@@ -32,6 +33,13 @@ import org.eclipse.jetty.util.ssl.SslContextFactory;
 
 public class Launcher {
 	public static void main(String[] args) throws Exception {
+		int port = 443;
+		for (int i = 0; i < args.length; i++) {
+			if (args[i].equals("--port")) {
+				port = Integer.parseInt(args[i + 1]);
+			}
+			i++;
+		}
 		Server s = new Server();
 		// === SSL HTTP Configuration ===
 		HttpConfiguration https_config = new HttpConfiguration();
@@ -45,7 +53,7 @@ public class Launcher {
 				new SslConnectionFactory(generateSSLContextFactory(),
 						"http/1.1"), new HttpConnectionFactory(https_config));
 		connector.setHost("127.0.0.1");
-		connector.setPort(443);
+		connector.setPort(port);
 		s.setConnectors(new Connector[]{connector});
 
 		HandlerList hl = new HandlerList();
@@ -65,6 +73,8 @@ public class Launcher {
 	private static ServletContextHandler generateGigiContext() {
 		ServletContextHandler servlet = new ServletContextHandler(
 				ServletContextHandler.SESSIONS);
+		servlet.setInitParameter(SessionManager.__SessionCookieProperty,
+				"CACert-Session");
 		servlet.addServlet(new ServletHolder(new Gigi()), "/*");
 		return servlet;
 	}
@@ -107,6 +117,7 @@ public class Launcher {
 			}
 
 		};
+		scf.setRenegotiationAllowed(false);
 		scf.setWantClientAuth(true);
 		KeyStore ks1 = KeyStore.getInstance("pkcs12");
 		ks1.load(new FileInputStream("config/keystore.pkcs12"),