import java.security.KeyStore;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
-import java.security.cert.CRL;
import java.security.cert.CertificateException;
-import java.util.Collection;
+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.cacert.gigi.util.CipherInfo;
import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.HttpConfiguration;
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.SslConnectionFactory;
+import org.eclipse.jetty.server.handler.ContextHandler;
+import org.eclipse.jetty.server.handler.HandlerList;
+import org.eclipse.jetty.server.handler.ResourceHandler;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.util.log.Log;
connector.setHost("127.0.0.1");
connector.setPort(443);
s.setConnectors(new Connector[]{connector});
- ServletContextHandler sh = new ServletContextHandler(
- ServletContextHandler.SESSIONS);
- s.setHandler(sh);
- sh.addServlet(new ServletHolder(new Gigi()), "/*");
+
+ HandlerList hl = new HandlerList();
+ hl.setHandlers(new Handler[]{generateStaticContext(),
+ generateGigiContext()});
+ s.setHandler(hl);
s.start();
if (connector.getPort() <= 1024
&& !System.getProperty("os.name").toLowerCase().contains("win")) {
}
}
+ private static ServletContextHandler generateGigiContext() {
+ ServletContextHandler servlet = new ServletContextHandler(
+ ServletContextHandler.SESSIONS);
+ servlet.addServlet(new ServletHolder(new Gigi()), "/*");
+ return servlet;
+ }
+
+ private static ContextHandler generateStaticContext() {
+ ResourceHandler rh = new ResourceHandler();
+ rh.setResourceBase("static");
+ ContextHandler ch = new ContextHandler();
+ ch.setHandler(rh);
+ ch.setContextPath("/static");
+ return ch;
+ }
+
private static SslContextFactory generateSSLContextFactory()
throws NoSuchAlgorithmException, KeyStoreException, IOException,
CertificateException, FileNotFoundException {
final TrustManager[] tm = tmFactory.getTrustManagers();
SslContextFactory scf = new SslContextFactory() {
+
+ String[] ciphers = null;
+
@Override
- protected TrustManager[] getTrustManagers(KeyStore trustStore,
- Collection<? extends CRL> crls) throws Exception {
- return tm;
+ public void customize(SSLEngine sslEngine) {
+ super.customize(sslEngine);
+
+ SSLParameters ssl = sslEngine.getSSLParameters();
+ ssl.setUseCipherSuitesOrder(true);
+ if (ciphers == null) {
+ ciphers = CipherInfo.filter(sslEngine
+ .getSupportedCipherSuites());
+ }
+
+ ssl.setCipherSuites(ciphers);
+ sslEngine.setSSLParameters(ssl);
+
}
+
};
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.setProtocol("TLSv1");
return scf;
}
}