I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

* I2NP: Various cleanup and bulletproofing

Browse Source
This commit is contained in:
zzz
2010-01-26 19:59:39 +00:00
parent ccc95087a1
commit 164b39d8df
9 changed files with 76 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
core/java/src/net/i2p/data/DataHelper.java
View File

@ -48,8 +48,8 @@ import net.i2p.util.ReusableGZIPOutputStream;
* @author jrandom * @author jrandom
*/ */
public class DataHelper { public class DataHelper {
private final static byte _equalBytes[] = "=".getBytes(); // in UTF-8 private final static byte EQUAL_BYTES[] = "=".getBytes(); // in UTF-8
private final static byte _semicolonBytes[] = ";".getBytes(); // in UTF-8 private final static byte SEMICOLON_BYTES[] = ";".getBytes(); // in UTF-8
/** Read a mapping from the stream, as defined by the I2P data structure spec, /** Read a mapping from the stream, as defined by the I2P data structure spec,
* and store it into a Properties object. * and store it into a Properties object.
@ -76,17 +76,17 @@ public class DataHelper {
int read = read(rawStream, data); int read = read(rawStream, data);
if (read != size) throw new DataFormatException("Not enough data to read the properties"); if (read != size) throw new DataFormatException("Not enough data to read the properties");
ByteArrayInputStream in = new ByteArrayInputStream(data); ByteArrayInputStream in = new ByteArrayInputStream(data);
byte eqBuf[] = new byte[_equalBytes.length]; byte eqBuf[] = new byte[EQUAL_BYTES.length];
byte semiBuf[] = new byte[_semicolonBytes.length]; byte semiBuf[] = new byte[SEMICOLON_BYTES.length];
while (in.available() > 0) { while (in.available() > 0) {
String key = readString(in); String key = readString(in);
read = read(in, eqBuf); read = read(in, eqBuf);
if ((read != eqBuf.length) || (!eq(eqBuf, _equalBytes))) { if ((read != eqBuf.length) || (!eq(eqBuf, EQUAL_BYTES))) {
break; break;
} }
String val = readString(in); String val = readString(in);
read = read(in, semiBuf); read = read(in, semiBuf);
if ((read != semiBuf.length) || (!eq(semiBuf, _semicolonBytes))) { if ((read != semiBuf.length) || (!eq(semiBuf, SEMICOLON_BYTES))) {
break; break;
} }
props.put(key, val); props.put(key, val);
@ -123,7 +123,7 @@ public class DataHelper {
if (props != null) { if (props != null) {
OrderedProperties p = new OrderedProperties(); OrderedProperties p = new OrderedProperties();
p.putAll(props); p.putAll(props);
ByteArrayOutputStream baos = new ByteArrayOutputStream(32); ByteArrayOutputStream baos = new ByteArrayOutputStream(p.size() * 64);
for (Iterator iter = p.keySet().iterator(); iter.hasNext();) { for (Iterator iter = p.keySet().iterator(); iter.hasNext();) {
String key = (String) iter.next(); String key = (String) iter.next();
String val = p.getProperty(key); String val = p.getProperty(key);
@ -131,15 +131,17 @@ public class DataHelper {
writeStringUTF8(baos, key); writeStringUTF8(baos, key);
else else
writeString(baos, key); writeString(baos, key);
baos.write(_equalBytes); baos.write(EQUAL_BYTES);
if (utf8) if (utf8)
writeStringUTF8(baos, val); writeStringUTF8(baos, val);
else else
writeString(baos, val); writeString(baos, val);
baos.write(_semicolonBytes); baos.write(SEMICOLON_BYTES);
} }
baos.close(); baos.close();
byte propBytes[] = baos.toByteArray(); byte propBytes[] = baos.toByteArray();
if (propBytes.length > 65535)
throw new DataFormatException("Properties too big (65535 max): " + propBytes.length);
writeLong(rawStream, 2, propBytes.length); writeLong(rawStream, 2, propBytes.length);
rawStream.write(propBytes); rawStream.write(propBytes);
} else { } else {
@ -164,9 +166,9 @@ public class DataHelper {
//key = new String(key.getBytes(), "UTF-8"); //key = new String(key.getBytes(), "UTF-8");
//val = new String(val.getBytes(), "UTF-8"); //val = new String(val.getBytes(), "UTF-8");
writeString(baos, key); writeString(baos, key);
baos.write(_equalBytes); baos.write(EQUAL_BYTES);
writeString(baos, val); writeString(baos, val);
baos.write(_semicolonBytes); baos.write(SEMICOLON_BYTES);
} }
baos.close(); baos.close();
byte propBytes[] = baos.toByteArray(); byte propBytes[] = baos.toByteArray();
@ -190,17 +192,17 @@ public class DataHelper {
int size = (int)fromLong(source, offset, 2); int size = (int)fromLong(source, offset, 2);
offset += 2; offset += 2;
ByteArrayInputStream in = new ByteArrayInputStream(source, offset, size); ByteArrayInputStream in = new ByteArrayInputStream(source, offset, size);
byte eqBuf[] = new byte[_equalBytes.length]; byte eqBuf[] = new byte[EQUAL_BYTES.length];
byte semiBuf[] = new byte[_semicolonBytes.length]; byte semiBuf[] = new byte[SEMICOLON_BYTES.length];
while (in.available() > 0) { while (in.available() > 0) {
String key = readString(in); String key = readString(in);
int read = read(in, eqBuf); int read = read(in, eqBuf);
if ((read != eqBuf.length) || (!eq(eqBuf, _equalBytes))) { if ((read != eqBuf.length) || (!eq(eqBuf, EQUAL_BYTES))) {
break; break;
} }
String val = readString(in); String val = readString(in);
read = read(in, semiBuf); read = read(in, semiBuf);
if ((read != semiBuf.length) || (!eq(semiBuf, _semicolonBytes))) { if ((read != semiBuf.length) || (!eq(semiBuf, SEMICOLON_BYTES))) {
break; break;
} }
target.put(key, val); target.put(key, val);

11
history.txt
View File

@ -1,3 +1,14 @@
2010-01-28 zzz
* Clock: Don't refuse to update because of peer skew the first time
* I2NP: Various cleanup and bulletproofing
* Log: Try to avoid complaints at shutdown
* Profiles: Fix lack of profiles at router startup, especially for new routers
* stats.jsp: Shrink the dropdown box
2010-01-26 zzz
* build.xml: Speed up distclean additions
* Debian: Fixup, update, enhance scripts
2010-01-24 zzz 2010-01-24 zzz
* ProfileOrganizerRenderer: Cleanups * ProfileOrganizerRenderer: Cleanups
* Reseed: Update welt's reseed hostname * Reseed: Update welt's reseed hostname

4
router/java/src/net/i2p/data/i2np/DataMessage.java
View File

@ -22,8 +22,6 @@ public class DataMessage extends I2NPMessageImpl {
public final static int MESSAGE_TYPE = 20; public final static int MESSAGE_TYPE = 20;
private byte _data[]; private byte _data[];
// private static final int MAX_SIZE = 64*1024; // LINT -- field hides another field, and not used
public DataMessage(I2PAppContext context) { public DataMessage(I2PAppContext context) {
super(context); super(context);
_data = null; _data = null;
@ -48,7 +46,7 @@ public class DataMessage extends I2NPMessageImpl {
int curIndex = offset; int curIndex = offset;
long size = DataHelper.fromLong(data, curIndex, 4); long size = DataHelper.fromLong(data, curIndex, 4);
curIndex += 4; curIndex += 4;
if (size > 64*1024) if (size > MAX_SIZE)
throw new I2NPMessageException("wtf, size=" + size); throw new I2NPMessageException("wtf, size=" + size);
_data = new byte[(int)size]; _data = new byte[(int)size];
System.arraycopy(data, curIndex, _data, 0, (int)size); System.arraycopy(data, curIndex, _data, 0, (int)size);

59
router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java
View File

@ -17,7 +17,7 @@ import net.i2p.I2PAppContext;
import net.i2p.data.DataHelper; import net.i2p.data.DataHelper;
import net.i2p.data.Hash; import net.i2p.data.Hash;
import net.i2p.data.TunnelId; import net.i2p.data.TunnelId;
import net.i2p.util.Log; //import net.i2p.util.Log;
/** /**
* Defines the message a router sends to another router to search for a * Defines the message a router sends to another router to search for a
@ -26,18 +26,22 @@ import net.i2p.util.Log;
* @author jrandom * @author jrandom
*/ */
public class DatabaseLookupMessage extends I2NPMessageImpl { public class DatabaseLookupMessage extends I2NPMessageImpl {
private final static Log _log = new Log(DatabaseLookupMessage.class); //private final static Log _log = new Log(DatabaseLookupMessage.class);
public final static int MESSAGE_TYPE = 2; public final static int MESSAGE_TYPE = 2;
private Hash _key; private Hash _key;
private Hash _fromHash; private Hash _fromHash;
private TunnelId _replyTunnel; private TunnelId _replyTunnel;
private Set _dontIncludePeers; private Set<Hash> _dontIncludePeers;
private static volatile long _currentLookupPeriod = 0; //private static volatile long _currentLookupPeriod = 0;
private static volatile int _currentLookupCount = 0; //private static volatile int _currentLookupCount = 0;
// if we try to send over 20 netDb lookups in 10 seconds, we're acting up // if we try to send over 20 netDb lookups in 10 seconds, we're acting up
private static final long LOOKUP_THROTTLE_PERIOD = 10*1000; //private static final long LOOKUP_THROTTLE_PERIOD = 10*1000;
private static final long LOOKUP_THROTTLE_MAX = 50; //private static final long LOOKUP_THROTTLE_MAX = 50;
/** Insanely big. Not much more than 1500 will fit in a message.
Have to prevent a huge alloc on rcv of a malicious msg though */
private static final int MAX_NUM_PEERS = 512;
public DatabaseLookupMessage(I2PAppContext context) { public DatabaseLookupMessage(I2PAppContext context) {
this(context, false); this(context, false);
@ -48,24 +52,27 @@ public class DatabaseLookupMessage extends I2NPMessageImpl {
//setFrom(null); //setFrom(null);
//setDontIncludePeers(null); //setDontIncludePeers(null);
context.statManager().createRateStat("router.throttleNetDbDoSSend", "How many netDb lookup messages we are sending during a period with a DoS detected", "Throttle", new long[] { 60*1000, 10*60*1000, 60*60*1000, 24*60*60*1000 }); // This is the wrong place for this, any throttling should be in netdb
// And it doesnt throttle anyway (that would have to be in netdb), it just increments a stat
//context.statManager().createRateStat("router.throttleNetDbDoSSend", "How many netDb lookup messages we are sending during a period with a DoS detected", "Throttle", new long[] { 60*1000, 10*60*1000, 60*60*1000, 24*60*60*1000 });
//
// only check DoS generation if we are creating the message... // only check DoS generation if we are creating the message...
if (locallyCreated) { //if (locallyCreated) {
// we do this in the writeMessage so we know that we have all the data // // we do this in the writeMessage so we know that we have all the data
int dosCount = detectDoS(context); // int dosCount = detectDoS(context);
if (dosCount > 0) { // if (dosCount > 0) {
if (_log.shouldLog(Log.WARN)) // if (_log.shouldLog(Log.WARN))
_log.warn("Are we flooding the network with NetDb messages? (" + dosCount // _log.warn("Are we flooding the network with NetDb messages? (" + dosCount
+ " messages so far)", new Exception("Flood cause")); // + " messages so far)", new Exception("Flood cause"));
} // }
} //}
} }
/** /**
* Return number of netDb messages in this period, if flood, else 0 * Return number of netDb messages in this period, if flood, else 0
* *
*/ */
/*****
private static int detectDoS(I2PAppContext context) { private static int detectDoS(I2PAppContext context) {
int count = _currentLookupCount++; int count = _currentLookupCount++;
// now lets check for DoS // now lets check for DoS
@ -87,6 +94,7 @@ public class DatabaseLookupMessage extends I2NPMessageImpl {
return 0; return 0;
} }
} }
*****/
/** /**
* Defines the key being searched for * Defines the key being searched for
@ -113,7 +121,7 @@ public class DatabaseLookupMessage extends I2NPMessageImpl {
* *
* @return Set of Hash objects, each of which is the H(routerIdentity) to skip * @return Set of Hash objects, each of which is the H(routerIdentity) to skip
*/ */
public Set getDontIncludePeers() { return _dontIncludePeers; } public Set<Hash> getDontIncludePeers() { return _dontIncludePeers; }
public void setDontIncludePeers(Set peers) { public void setDontIncludePeers(Set peers) {
if (peers != null) if (peers != null)
_dontIncludePeers = new HashSet(peers); _dontIncludePeers = new HashSet(peers);
@ -156,9 +164,9 @@ public class DatabaseLookupMessage extends I2NPMessageImpl {
int numPeers = (int)DataHelper.fromLong(data, curIndex, 2); int numPeers = (int)DataHelper.fromLong(data, curIndex, 2);
curIndex += 2; curIndex += 2;
if ( (numPeers < 0) || (numPeers >= (1<<16) ) ) if ( (numPeers < 0) || (numPeers > MAX_NUM_PEERS) )
throw new I2NPMessageException("Invalid number of peers - " + numPeers); throw new I2NPMessageException("Invalid number of peers - " + numPeers);
Set peers = new HashSet(numPeers); Set<Hash> peers = new HashSet(numPeers);
for (int i = 0; i < numPeers; i++) { for (int i = 0; i < numPeers; i++) {
byte peer[] = new byte[Hash.HASH_LENGTH]; byte peer[] = new byte[Hash.HASH_LENGTH];
System.arraycopy(data, curIndex, peer, 0, Hash.HASH_LENGTH); System.arraycopy(data, curIndex, peer, 0, Hash.HASH_LENGTH);
@ -201,11 +209,14 @@ public class DatabaseLookupMessage extends I2NPMessageImpl {
out[curIndex++] = 0x0; out[curIndex++] = 0x0;
out[curIndex++] = 0x0; out[curIndex++] = 0x0;
} else { } else {
byte len[] = DataHelper.toLong(2, _dontIncludePeers.size()); int size = _dontIncludePeers.size();
if (size > MAX_NUM_PEERS)
throw new I2NPMessageException("Too many peers: " + size);
byte len[] = DataHelper.toLong(2, size);
out[curIndex++] = len[0]; out[curIndex++] = len[0];
out[curIndex++] = len[1]; out[curIndex++] = len[1];
for (Iterator iter = _dontIncludePeers.iterator(); iter.hasNext(); ) { for (Iterator<Hash> iter = _dontIncludePeers.iterator(); iter.hasNext(); ) {
Hash peer = (Hash)iter.next(); Hash peer = iter.next();
System.arraycopy(peer.getData(), 0, out, curIndex, Hash.HASH_LENGTH); System.arraycopy(peer.getData(), 0, out, curIndex, Hash.HASH_LENGTH);
curIndex += Hash.HASH_LENGTH; curIndex += Hash.HASH_LENGTH;
} }

11
router/java/src/net/i2p/data/i2np/DatabaseSearchReplyMessage.java
View File

@ -26,13 +26,14 @@ import net.i2p.data.Hash;
public class DatabaseSearchReplyMessage extends I2NPMessageImpl { public class DatabaseSearchReplyMessage extends I2NPMessageImpl {
public final static int MESSAGE_TYPE = 3; public final static int MESSAGE_TYPE = 3;
private Hash _key; private Hash _key;
private List _peerHashes; private List<Hash> _peerHashes;
private Hash _from; private Hash _from;
public DatabaseSearchReplyMessage(I2PAppContext context) { public DatabaseSearchReplyMessage(I2PAppContext context) {
super(context); super(context);
_context.statManager().createRateStat("netDb.searchReplyMessageSend", "How many search reply messages we send", "NetworkDatabase", new long[] { 60*1000, 5*60*1000, 10*60*1000, 60*60*1000 }); // do this in netdb if we need it
_context.statManager().createRateStat("netDb.searchReplyMessageReceive", "How many search reply messages we receive", "NetworkDatabase", new long[] { 60*1000, 5*60*1000, 10*60*1000, 60*60*1000 }); //_context.statManager().createRateStat("netDb.searchReplyMessageSend", "How many search reply messages we send", "NetworkDatabase", new long[] { 60*1000, 5*60*1000, 10*60*1000, 60*60*1000 });
//_context.statManager().createRateStat("netDb.searchReplyMessageReceive", "How many search reply messages we receive", "NetworkDatabase", new long[] { 60*1000, 5*60*1000, 10*60*1000, 60*60*1000 });
setSearchKey(null); setSearchKey(null);
_peerHashes = new ArrayList(3); _peerHashes = new ArrayList(3);
setFromHash(null); setFromHash(null);
@ -45,7 +46,7 @@ public class DatabaseSearchReplyMessage extends I2NPMessageImpl {
public void setSearchKey(Hash key) { _key = key; } public void setSearchKey(Hash key) { _key = key; }
public int getNumReplies() { return _peerHashes.size(); } public int getNumReplies() { return _peerHashes.size(); }
public Hash getReply(int index) { return (Hash)_peerHashes.get(index); } public Hash getReply(int index) { return _peerHashes.get(index); }
public void addReply(Hash peer) { _peerHashes.add(peer); } public void addReply(Hash peer) { _peerHashes.add(peer); }
//public void addReplies(Collection replies) { _peerHashes.addAll(replies); } //public void addReplies(Collection replies) { _peerHashes.addAll(replies); }
@ -77,7 +78,7 @@ public class DatabaseSearchReplyMessage extends I2NPMessageImpl {
curIndex += Hash.HASH_LENGTH; curIndex += Hash.HASH_LENGTH;
_from = new Hash(from); _from = new Hash(from);
_context.statManager().addRateData("netDb.searchReplyMessageReceive", num*32 + 64, 1); //_context.statManager().addRateData("netDb.searchReplyMessageReceive", num*32 + 64, 1);
} }
/** calculate the message body's length (not including the header and footer */ /** calculate the message body's length (not including the header and footer */

2
router/java/src/net/i2p/data/i2np/GarlicMessage.java
View File

@ -44,7 +44,7 @@ public class GarlicMessage extends I2NPMessageImpl {
long len = DataHelper.fromLong(data, curIndex, 4); long len = DataHelper.fromLong(data, curIndex, 4);
curIndex += 4; curIndex += 4;
if ( (len <= 0) || (len > 64*1024) ) throw new I2NPMessageException("size="+len); if ( (len <= 0) || (len > MAX_SIZE) ) throw new I2NPMessageException("size="+len);
_data = new byte[(int)len]; _data = new byte[(int)len];
System.arraycopy(data, curIndex, _data, 0, (int)len); System.arraycopy(data, curIndex, _data, 0, (int)len);
} }

6
router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java
View File

@ -373,8 +373,9 @@ public abstract class I2NPMessageImpl extends DataStructureImpl implements I2NPM
return new DatabaseSearchReplyMessage(context); return new DatabaseSearchReplyMessage(context);
case DeliveryStatusMessage.MESSAGE_TYPE: case DeliveryStatusMessage.MESSAGE_TYPE:
return new DeliveryStatusMessage(context); return new DeliveryStatusMessage(context);
case DateMessage.MESSAGE_TYPE: // unused since forever (0.5?)
return new DateMessage(context); //case DateMessage.MESSAGE_TYPE:
// return new DateMessage(context);
case GarlicMessage.MESSAGE_TYPE: case GarlicMessage.MESSAGE_TYPE:
return new GarlicMessage(context); return new GarlicMessage(context);
case TunnelDataMessage.MESSAGE_TYPE: case TunnelDataMessage.MESSAGE_TYPE:
@ -383,6 +384,7 @@ public abstract class I2NPMessageImpl extends DataStructureImpl implements I2NPM
return new TunnelGatewayMessage(context); return new TunnelGatewayMessage(context);
case DataMessage.MESSAGE_TYPE: case DataMessage.MESSAGE_TYPE:
return new DataMessage(context); return new DataMessage(context);
// unused since 0.6.1.10
//case TunnelCreateMessage.MESSAGE_TYPE: //case TunnelCreateMessage.MESSAGE_TYPE:
// return new TunnelCreateMessage(context); // return new TunnelCreateMessage(context);
//case TunnelCreateStatusMessage.MESSAGE_TYPE: //case TunnelCreateStatusMessage.MESSAGE_TYPE:

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 2; public final static long BUILD = 3;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = ""; public final static String EXTRA = "";

0
router/java/src/net/i2p/data/i2np/DateMessage.java → router/java/test/net/i2p/data/i2np/DateMessage.java
View File