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

NetDB: Don't call heardAbout() unless peer is reachable

Browse Source 
Consolidate hash() calls
This commit is contained in:
zzz
2023-02-12 10:15:28 -05:00
parent afe236c62c
commit 4a9ca43614
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java
View File

@@ -303,7 +303,7 @@ class HandleFloodfillDatabaseStoreMessageJob extends JobImpl {
}
}
}
if (shouldStore)
if (shouldStore && ri.getCapabilities().indexOf(Router.CAPABILITY_REACHABLE) >= 0)
getContext().profileManager().heardAbout(key);
} catch (UnsupportedCryptoException uce) {
invalidMessage = uce.getMessage();

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

@@ -557,18 +557,19 @@ public class PersistentDataStore extends TransientDataStore {
fis = new BufferedInputStream(fis);
RouterInfo ri = new RouterInfo();
ri.readBytes(fis, true); // true = verify sig on read
Hash h = ri.getIdentity().calculateHash();
if (ri.getNetworkId() != _networkID) {
corrupt = true;
if (_log.shouldLog(Log.ERROR))
_log.error("The router "
+ ri.getIdentity().calculateHash().toBase64()
+ h.toBase64()
+ " is from a different network");
} else if (!ri.getIdentity().calculateHash().equals(_key)) {
} else if (!h.equals(_key)) {
// prevent injection from reseeding
// this is checked in KNDF.validate() but catch it sooner and log as error.
corrupt = true;
if (_log.shouldLog(Log.WARN))
_log.warn(ri.getIdentity().calculateHash() + " does not match " + _key + " from " + _routerFile);
_log.warn(h + " does not match " + _key + " from " + _routerFile);
} else if (ri.getPublished() <= _knownDate) {
// Don't store but don't delete
if (_log.shouldLog(Log.WARN))
@@ -576,15 +577,16 @@ public class PersistentDataStore extends TransientDataStore {
} else if (getContext().blocklist().isBlocklisted(ri)) {
corrupt = true;
if (_log.shouldLog(Log.WARN))
_log.warn(ri.getHash() + " is blocklisted");
_log.warn(h + " is blocklisted");
} else {
try {
// persist = false so we don't write what we just read
_facade.store(ri.getIdentity().getHash(), ri, false);
_facade.store(h, ri, false);
// when heardAbout() was removed from TransientDataStore, it broke
// profile bootstrapping for new routers,
// so add it here.
getContext().profileManager().heardAbout(ri.getIdentity().getHash(), ri.getPublished());
if (ri.getCapabilities().indexOf(Router.CAPABILITY_REACHABLE) >= 0)
getContext().profileManager().heardAbout(h, ri.getPublished());
} catch (IllegalArgumentException iae) {
if (_log.shouldLog(Log.INFO))
_log.info("Refused locally loaded routerInfo - deleting", iae);