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

cleaned up the validation of leaseSet/routerInfo elements being accepted so we validate only in one place (in the facade instead of both the facade and the dataStore)

Browse Source 
don't accept entries created (too far) in the future
This commit is contained in:
jrandom
2004-08-10 16:55:54 +00:00
committed by zzz
parent 97e5952544
commit b89e26c460
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
View File

@@ -428,6 +428,9 @@ public class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacade {
} }
} }
/** I don't think it'll ever make sense to have a lease last for a full day */
private static final long MAX_LEASE_FUTURE = 24*60*60*1000;
public LeaseSet store(Hash key, LeaseSet leaseSet) { public LeaseSet store(Hash key, LeaseSet leaseSet) {
long start = _context.clock().now(); long start = _context.clock().now();
if (!_initialized) return null; if (!_initialized) return null;
@@ -444,6 +447,10 @@ public class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacade {
if (_log.shouldLog(Log.WARN)) if (_log.shouldLog(Log.WARN))
_log.warn("Old leaseSet! not storing it: " + leaseSet); _log.warn("Old leaseSet! not storing it: " + leaseSet);
return null; return null;
} else if (leaseSet.getEarliestLeaseDate() > _context.clock().now() + MAX_LEASE_FUTURE) {
if (_log.shouldLog(Log.WARN))
_log.warn("LeaseSet to expire too far in the future: " + leaseSet);
return null;
} }
LeaseSet rv = null; LeaseSet rv = null;
@@ -499,6 +506,11 @@ public class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacade {
+ " peers left (curPeer: " + key.toBase64() + " published on " + " peers left (curPeer: " + key.toBase64() + " published on "
+ new Date(routerInfo.getPublished())); + new Date(routerInfo.getPublished()));
} }
} else if (routerInfo.getPublished() > start + Router.CLOCK_FUDGE_FACTOR) {
if (_log.shouldLog(Log.ERROR))
_log.error("Peer " + key.toBase64() + " published their leaseSet in the future?! ["
+ new Date(routerInfo.getPublished()) + "]");
return null;
} }
RouterInfo rv = null; RouterInfo rv = null;

16
router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java
View File

@@ -215,13 +215,7 @@ class PersistentDataStore extends TransientDataStore {
fis = new FileInputStream(_leaseFile); fis = new FileInputStream(_leaseFile);
LeaseSet ls = new LeaseSet(); LeaseSet ls = new LeaseSet();
ls.readBytes(fis); ls.readBytes(fis);
if (ls.isCurrent(Router.CLOCK_FUDGE_FACTOR)) { _facade.store(ls.getDestination().calculateHash(), ls);
_log.info("Reading in new LeaseSet: " + ls.getDestination().calculateHash());
accept(ls);
} else {
_log.warn("Expired LeaseSet found for " + ls.getDestination().calculateHash() + ": Deleting");
corrupt = true;
}
} catch (DataFormatException dfe) { } catch (DataFormatException dfe) {
_log.warn("Error reading the leaseSet from " + _leaseFile.getAbsolutePath(), dfe); _log.warn("Error reading the leaseSet from " + _leaseFile.getAbsolutePath(), dfe);
corrupt = true; corrupt = true;
@@ -272,13 +266,7 @@ class PersistentDataStore extends TransientDataStore {
fis = new FileInputStream(_routerFile); fis = new FileInputStream(_routerFile);
RouterInfo ri = new RouterInfo(); RouterInfo ri = new RouterInfo();
ri.readBytes(fis); ri.readBytes(fis);
if (ri.isValid()) { _facade.store(ri.getIdentity().getHash(), ri);
_log.info("Reading in new RouterInfo: " + ri.getIdentity().getHash());
accept(ri);
} else {
_log.warn("Invalid routerInfo found for " + ri.getIdentity().getHash() + ": " + ri);
corrupt = true;
}
} catch (DataFormatException dfe) { } catch (DataFormatException dfe) {
_log.warn("Error reading the routerInfo from " + _routerFile.getAbsolutePath(), dfe); _log.warn("Error reading the routerInfo from " + _routerFile.getAbsolutePath(), dfe);
corrupt = true; corrupt = true;