package org.cacert.gigi;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.IOException;
+import java.security.GeneralSecurityException;
import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateException;
+import java.util.Properties;
import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLParameters;
-import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
import org.cacert.gigi.natives.SetUID;
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;
public class Launcher {
public static void main(String[] args) throws Exception {
+ GigiConfig conf = GigiConfig.parse(System.in);
+
Server s = new Server();
// === SSL HTTP Configuration ===
HttpConfiguration https_config = new HttpConfiguration();
https_config.addCustomizer(new SecureRequestCustomizer());
ServerConnector connector = new ServerConnector(s,
- new SslConnectionFactory(generateSSLContextFactory(),
+ new SslConnectionFactory(generateSSLContextFactory(conf),
"http/1.1"), new HttpConnectionFactory(https_config));
- connector.setHost("127.0.0.1");
- connector.setPort(443);
+ connector.setHost(conf.getMainProps().getProperty("host"));
+ connector.setPort(Integer.parseInt(conf.getMainProps().getProperty(
+ "port")));
s.setConnectors(new Connector[]{connector});
HandlerList hl = new HandlerList();
hl.setHandlers(new Handler[]{generateStaticContext(),
- generateGigiContext()});
+ generateGigiContext(conf.getMainProps())});
s.setHandler(hl);
s.start();
if (connector.getPort() <= 1024
}
}
- private static ServletContextHandler generateGigiContext() {
+ private static ServletContextHandler generateGigiContext(Properties conf) {
ServletContextHandler servlet = new ServletContextHandler(
ServletContextHandler.SESSIONS);
- servlet.addServlet(new ServletHolder(new Gigi()), "/*");
+ servlet.setInitParameter(SessionManager.__SessionCookieProperty,
+ "CACert-Session");
+ servlet.addServlet(new ServletHolder(new Gigi(conf)), "/*");
return servlet;
}
return ch;
}
- private static SslContextFactory generateSSLContextFactory()
- throws NoSuchAlgorithmException, KeyStoreException, IOException,
- CertificateException, FileNotFoundException {
+ private static SslContextFactory generateSSLContextFactory(GigiConfig conf)
+ throws GeneralSecurityException, IOException {
TrustManagerFactory tmFactory = TrustManagerFactory.getInstance("PKIX");
tmFactory.init((KeyStore) null);
- final TrustManager[] tm = tmFactory.getTrustManagers();
-
SslContextFactory scf = new SslContextFactory() {
String[] ciphers = null;
}
};
+ scf.setRenegotiationAllowed(false);
scf.setWantClientAuth(true);
- KeyStore ks1 = KeyStore.getInstance("pkcs12");
- ks1.load(new FileInputStream("config/keystore.pkcs12"),
- "".toCharArray());
- scf.setTrustStorePath("config/cacerts.jks");
- scf.setTrustStorePassword("changeit");
+
scf.setProtocol("TLS");
- scf.setKeyStore(ks1);
+ scf.setTrustStore(conf.getTrustStore());
+ scf.setKeyStore(conf.getPrivateStore());
return scf;
}
}