echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Console: Move from deprecated Jetty SSL methods to SslContextFactory

Browse Source
This commit is contained in:
zzz
2013-04-15 15:53:29 +00:00
parent e29bb5b88b
commit 11dd7f6b8c
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
View File

@ -69,6 +69,7 @@ import org.eclipse.jetty.util.resource.Resource;
import org.eclipse.jetty.util.security.Constraint; import org.eclipse.jetty.util.security.Constraint;
import org.eclipse.jetty.util.security.Credential; import org.eclipse.jetty.util.security.Credential;
import org.eclipse.jetty.util.security.Credential.MD5; import org.eclipse.jetty.util.security.Credential.MD5;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.util.thread.ExecutorThreadPool; import org.eclipse.jetty.util.thread.ExecutorThreadPool;
import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.eclipse.jetty.util.thread.ThreadPool; import org.eclipse.jetty.util.thread.ThreadPool;
@ -453,6 +454,11 @@ public class RouterConsoleRunner implements RouterApp {
if (sslPort > 0) { if (sslPort > 0) {
File keyStore = new File(_context.getConfigDir(), "keystore/console.ks"); File keyStore = new File(_context.getConfigDir(), "keystore/console.ks");
if (verifyKeyStore(keyStore)) { if (verifyKeyStore(keyStore)) {
// the keystore path and password
SslContextFactory sslFactory = new SslContextFactory(keyStore.getAbsolutePath());
sslFactory.setKeyStorePassword(_context.getProperty(PROP_KEYSTORE_PASSWORD, DEFAULT_KEYSTORE_PASSWORD));
// the X.509 cert password (if not present, verifyKeyStore() returned false)
sslFactory.setKeyManagerPassword(_context.getProperty(PROP_KEY_PASSWORD, "thisWontWork"));
StringTokenizer tok = new StringTokenizer(_sslListenHost, " ,"); StringTokenizer tok = new StringTokenizer(_sslListenHost, " ,");
while (tok.hasMoreTokens()) { while (tok.hasMoreTokens()) {
String host = tok.nextToken().trim(); String host = tok.nextToken().trim();
@ -476,25 +482,14 @@ public class RouterConsoleRunner implements RouterApp {
if (testSock != null) try { testSock.close(); } catch (IOException ioe) {} if (testSock != null) try { testSock.close(); } catch (IOException ioe) {}
} }
// TODO if class not found use SslChannelConnector // TODO if class not found use SslChannelConnector
// Sadly there's no common base class with the ssl methods in it
AbstractConnector ssll; AbstractConnector ssll;
if (SystemVersion.isJava6() && !SystemVersion.isGNU()) { if (SystemVersion.isJava6() && !SystemVersion.isGNU()) {
SslSelectChannelConnector sssll = new SslSelectChannelConnector(); SslSelectChannelConnector sssll = new SslSelectChannelConnector(sslFactory);
// the keystore path and password
sssll.setKeystore(keyStore.getAbsolutePath());
sssll.setPassword(_context.getProperty(PROP_KEYSTORE_PASSWORD, DEFAULT_KEYSTORE_PASSWORD));
// the X.509 cert password (if not present, verifyKeyStore() returned false)
sssll.setKeyPassword(_context.getProperty(PROP_KEY_PASSWORD, "thisWontWork"));
sssll.setUseDirectBuffers(false); // default true seems to be leaky sssll.setUseDirectBuffers(false); // default true seems to be leaky
ssll = sssll; ssll = sssll;
} else { } else {
// Jetty 6 and NIO on Java 5 don't get along that well // Jetty 6 and NIO on Java 5 don't get along that well
SslSocketConnector sssll = new SslSocketConnector(); SslSocketConnector sssll = new SslSocketConnector(sslFactory);
// the keystore path and password
sssll.setKeystore(keyStore.getAbsolutePath());
sssll.setPassword(_context.getProperty(PROP_KEYSTORE_PASSWORD, DEFAULT_KEYSTORE_PASSWORD));
// the X.509 cert password (if not present, verifyKeyStore() returned false)
sssll.setKeyPassword(_context.getProperty(PROP_KEY_PASSWORD, "thisWontWork"));
ssll = sssll; ssll = sssll;
} }
ssll.setHost(host); ssll.setHost(host);