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

NetDB: Fix flood version check, add version check for RedDSA

Browse Source
This commit is contained in:
zzz
2019-03-06 15:28:47 +00:00
parent 10bae6a07b
commit 5b1b4acd2c
2 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java
View File

@ -6,6 +6,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import net.i2p.crypto.SigType;
import net.i2p.data.DatabaseEntry; import net.i2p.data.DatabaseEntry;
import net.i2p.data.Destination; import net.i2p.data.Destination;
import net.i2p.data.Hash; import net.i2p.data.Hash;
@ -212,7 +213,11 @@ public class FloodfillNetworkDatabaseFacade extends KademliaNetworkDatabaseFacad
Hash rkey = gen.getRoutingKey(key); Hash rkey = gen.getRoutingKey(key);
FloodfillPeerSelector sel = (FloodfillPeerSelector)getPeerSelector(); FloodfillPeerSelector sel = (FloodfillPeerSelector)getPeerSelector();
final int type = ds.getType(); final int type = ds.getType();
final boolean isls2 = ds.isLeaseSet() && type != DatabaseEntry.KEY_TYPE_LEASESET; final boolean isls = ds.isLeaseSet();
final boolean isls2 = isls && type != DatabaseEntry.KEY_TYPE_LEASESET;
final SigType lsSigType = (isls && type != DatabaseEntry.KEY_TYPE_ENCRYPTED_LS2) ?
ds.getKeysAndCert().getSigningPublicKey().getType() :
null;
int max = MAX_TO_FLOOD; int max = MAX_TO_FLOOD;
// increase candidates because we will be skipping some // increase candidates because we will be skipping some
if (type == DatabaseEntry.KEY_TYPE_ENCRYPTED_LS2) if (type == DatabaseEntry.KEY_TYPE_ENCRYPTED_LS2)
@ -254,8 +259,11 @@ public class FloodfillNetworkDatabaseFacade extends KademliaNetworkDatabaseFacad
for (int i = 0; i < peers.size(); i++) { for (int i = 0; i < peers.size(); i++) {
Hash peer = peers.get(i); Hash peer = peers.get(i);
RouterInfo target = lookupRouterInfoLocally(peer); RouterInfo target = lookupRouterInfoLocally(peer);
if (!shouldFloodTo(key, type, peer, target)) if (!shouldFloodTo(key, type, lsSigType, peer, target)) {
if (_log.shouldDebug())
_log.debug("Too old, not flooding " + key.toBase64() + " to " + peer.toBase64());
continue; continue;
}
DatabaseStoreMessage msg = new DatabaseStoreMessage(_context); DatabaseStoreMessage msg = new DatabaseStoreMessage(_context);
msg.setEntry(ds); msg.setEntry(ds);
OutNetMessage m = new OutNetMessage(_context, msg, _context.clock().now()+FLOOD_TIMEOUT, FLOOD_PRIORITY, target); OutNetMessage m = new OutNetMessage(_context, msg, _context.clock().now()+FLOOD_TIMEOUT, FLOOD_PRIORITY, target);
@ -277,8 +285,12 @@ public class FloodfillNetworkDatabaseFacade extends KademliaNetworkDatabaseFacad
_log.info("Flooded the data to " + flooded + " of " + peers.size() + " peers"); _log.info("Flooded the data to " + flooded + " of " + peers.size() + " peers");
} }
/** @since 0.9.39 */ /**
private boolean shouldFloodTo(Hash key, int type, Hash peer, RouterInfo target) { * @param type database store type
* @param lsSigType may be null
* @since 0.9.39
*/
private boolean shouldFloodTo(Hash key, int type, SigType lsSigType, Hash peer, RouterInfo target) {
if ( (target == null) || (_context.banlist().isBanlisted(peer)) ) if ( (target == null) || (_context.banlist().isBanlisted(peer)) )
return false; return false;
// Don't flood an RI back to itself // Don't flood an RI back to itself
@ -289,10 +301,11 @@ public class FloodfillNetworkDatabaseFacade extends KademliaNetworkDatabaseFacad
if (peer.equals(_context.routerHash())) if (peer.equals(_context.routerHash()))
return false; return false;
// min version checks // min version checks
if (type != DatabaseEntry.KEY_TYPE_ROUTERINFO && type != DatabaseEntry.KEY_TYPE_LS2 && if (type != DatabaseEntry.KEY_TYPE_ROUTERINFO && type != DatabaseEntry.KEY_TYPE_LEASESET &&
!StoreJob.shouldStoreLS2To(target)) !StoreJob.shouldStoreLS2To(target))
return false; return false;
if (type == DatabaseEntry.KEY_TYPE_ENCRYPTED_LS2 && if ((type == DatabaseEntry.KEY_TYPE_ENCRYPTED_LS2 ||
lsSigType == SigType.RedDSA_SHA512_Ed25519) &&
!StoreJob.shouldStoreEncLS2To(target)) !StoreJob.shouldStoreEncLS2To(target))
return false; return false;
if (!StoreJob.shouldStoreTo(target)) if (!StoreJob.shouldStoreTo(target))

11
router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java
View File

@ -184,7 +184,11 @@ abstract class StoreJob extends JobImpl {
int queued = 0; int queued = 0;
int skipped = 0; int skipped = 0;
int type = _state.getData().getType(); int type = _state.getData().getType();
boolean isls2 = DatabaseEntry.isLeaseSet(type) && type != DatabaseEntry.KEY_TYPE_LEASESET; final boolean isls = DatabaseEntry.isLeaseSet(type);
final boolean isls2 = isls && type != DatabaseEntry.KEY_TYPE_LEASESET;
final SigType lsSigType = (isls && type != DatabaseEntry.KEY_TYPE_ENCRYPTED_LS2) ?
_state.getData().getKeysAndCert().getSigningPublicKey().getType() :
null;
for (Hash peer : closestHashes) { for (Hash peer : closestHashes) {
DatabaseEntry ds = _facade.getDataStore().get(peer); DatabaseEntry ds = _facade.getDataStore().get(peer);
if ( (ds == null) || !(ds.getType() == DatabaseEntry.KEY_TYPE_ROUTERINFO) ) { if ( (ds == null) || !(ds.getType() == DatabaseEntry.KEY_TYPE_ROUTERINFO) ) {
@ -197,10 +201,11 @@ abstract class StoreJob extends JobImpl {
_log.info(getJobId() + ": Skipping old router " + peer); _log.info(getJobId() + ": Skipping old router " + peer);
_state.addSkipped(peer); _state.addSkipped(peer);
skipped++; skipped++;
} else if (type == DatabaseEntry.KEY_TYPE_ENCRYPTED_LS2 && } else if ((type == DatabaseEntry.KEY_TYPE_ENCRYPTED_LS2 ||
lsSigType == SigType.RedDSA_SHA512_Ed25519) &&
!shouldStoreEncLS2To((RouterInfo)ds)) { !shouldStoreEncLS2To((RouterInfo)ds)) {
if (_log.shouldInfo()) if (_log.shouldInfo())
_log.info(getJobId() + ": Skipping router that doesn't support Enc LS2 " + peer); _log.info(getJobId() + ": Skipping router that doesn't support EncLS2/RedDSA " + peer);
_state.addSkipped(peer); _state.addSkipped(peer);
skipped++; skipped++;
} else if (isls2 && } else if (isls2 &&