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

* IRC Server tunnel: Reject bad protocols immediately

Browse Source
This commit is contained in:
zzz
2013-05-01 20:52:50 +00:00
parent 689b045a9b
commit 10efecaa9c
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCServer.java
View File

@ -72,6 +72,11 @@ public class I2PTunnelIRCServer extends I2PTunnelServer implements Runnable {
"\r\n") "\r\n")
.getBytes(); .getBytes();
private static final String[] BAD_PROTOCOLS = {
"GET ", "HEAD ", "POST ", "GNUTELLA CONNECT", "\023BitTorrent protocol"
};
/** /**
* @throws IllegalArgumentException if the I2PTunnel does not contain * @throws IllegalArgumentException if the I2PTunnel does not contain
* valid config to contact the router * valid config to contact the router
@ -193,6 +198,12 @@ public class I2PTunnelIRCServer extends I2PTunnelServer implements Runnable {
String s = DataHelper.readLine(in); String s = DataHelper.readLine(in);
if (s == null) if (s == null)
throw new IOException("EOF reached before the end of the headers [" + buf.toString() + "]"); throw new IOException("EOF reached before the end of the headers [" + buf.toString() + "]");
if (lineCount == 0) {
for (int i = 0; i < BAD_PROTOCOLS.length; i++) {
if (s.startsWith(BAD_PROTOCOLS[i]))
throw new IOException("Bad protocol " + BAD_PROTOCOLS[i]);
}
}
if (++lineCount > 10) if (++lineCount > 10)
throw new IOException("Too many lines before USER or SERVER, giving up"); throw new IOException("Too many lines before USER or SERVER, giving up");
if (System.currentTimeMillis() > expire) if (System.currentTimeMillis() > expire)