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

Jetty: Fix detection of SSL connector for registration with PortMapper

Browse Source
This commit is contained in:
zzz
2021-02-24 10:13:37 -05:00
parent 6e2292354a
commit 7f3f46c8ba
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apps/jetty/java/src/net/i2p/jetty/JettyStart.java
View File

@@ -38,6 +38,7 @@ import net.i2p.util.VersionComparator;
import org.eclipse.jetty.server.AbstractNetworkConnector;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.ConnectionFactory;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.util.component.LifeCycle;
import org.eclipse.jetty.xml.XmlConfiguration;
@@ -196,8 +197,16 @@ public class JettyStart implements ClientApp {
host = "127.0.0.1";
else if (host.equals("::"))
host = "::1";
// see ConnectionFactory javadoc, but from testing, it ends with /1.1
boolean isSSL = nconn.getConnectionFactory("SSL-http/1.1") != null;
// at some point this changed from "SSL-http/1.1" to "SSL" and "HTTP/1.1" ?
boolean isSSL = false;
//System.out.println("Found connector: " + nconn);
for (ConnectionFactory fact : nconn.getConnectionFactories()) {
//System.out.println(" Factory: " + fact + " protocol: " + fact.getProtocol());
if (fact.getProtocol().startsWith("SSL")) {
isSSL = true;
break;
}
}
String svc;
if (isSSL) {
_sslPort = port;