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

i2ptunnel: Fix HTTP websockets by passing through

Browse Source 
Connection headers containing "upgrade" (ticket #2422)
Client-side change only. Server-side todo.
This commit is contained in:
zzz
2019-02-03 16:31:26 +00:00
parent 0e710f8785
commit e20a6a9685
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java
View File

@@ -174,7 +174,13 @@ class HTTPResponseOutputStream extends FilterOutputStream {
String lcKey = key.toLowerCase(Locale.US);
if ("connection".equals(lcKey)) {
out.write(DataHelper.getASCII("Connection: close\r\n"));
if (val.toLowerCase(Locale.US).contains("upgrade")) {
// pass through for websocket
out.write(DataHelper.getASCII("Connection: " + val + "\r\n"));
proxyConnectionSent = true;
} else {
out.write(DataHelper.getASCII("Connection: close\r\n"));
}
connectionSent = true;
} else if ("proxy-connection".equals(lcKey)) {
out.write(DataHelper.getASCII("Proxy-Connection: close\r\n"));

23
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
View File

@@ -414,6 +414,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
int remotePort = 0;
String referer = null;
URI origRequestURI = null;
boolean preserveConnectionHeader = false;
while((line = reader.readLine(method)) != null) {
line = line.trim();
if(_log.shouldLog(Log.DEBUG)) {
@@ -421,11 +422,6 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
}
String lowercaseLine = line.toLowerCase(Locale.US);
if(lowercaseLine.startsWith("connection: ") ||
lowercaseLine.startsWith("keep-alive: ") ||
lowercaseLine.startsWith("proxy-connection: ")) {
continue;
}
if(method == null) { // first line (GET /base64/realaddr)
if(_log.shouldLog(Log.DEBUG)) {
@@ -940,7 +936,17 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
// end first line processing
} else {
if(lowercaseLine.startsWith("host: ") && !usingWWWProxy && !usingInternalOutproxy) {
if (lowercaseLine.startsWith("connection: ")) {
if (lowercaseLine.contains("upgrade")) {
// pass through for websocket
preserveConnectionHeader = true;
} else {
continue;
}
} else if (lowercaseLine.startsWith("keep-alive: ") ||
lowercaseLine.startsWith("proxy-connection: ")) {
continue;
} else if (lowercaseLine.startsWith("host: ") && !usingWWWProxy && !usingInternalOutproxy) {
// Note that we only pass the original Host: line through to the outproxy
// But we don't create a Host: line if it wasn't sent to us
line = "Host: " + host;
@@ -1081,7 +1087,10 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
.append("\r\n");
}
}
newRequest.append("Connection: close\r\n\r\n");
if (preserveConnectionHeader)
newRequest.append("\r\n");
else
newRequest.append("Connection: close\r\n\r\n");
s.setSoTimeout(0);
break;
} else {