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

Router: Implement expiration for BlindData entries

Browse Source
This commit is contained in:
zzz
2019-09-17 11:17:14 +00:00
parent 0c2a8e9244
commit 94c96b09e9
8 changed files with 99 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
router/java/src/net/i2p/router/client/ClientMessageEventListener.java
View File

@ -839,8 +839,16 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi
if (_log.shouldWarn())
_log.warn("Updated: " + bd);
} else {
if (_log.shouldWarn())
_log.warn("No change: " + obd);
long oexp = obd.getExpiration();
long nexp = bd.getExpiration();
if (nexp > oexp) {
obd.setExpiration(nexp);
if (_log.shouldWarn())
_log.warn("Updated expiration: " + obd);
} else {
if (_log.shouldWarn())
_log.warn("No change: " + obd);
}
}
}
}

5
router/java/src/net/i2p/router/client/LookupDestJob.java
View File

@ -105,6 +105,11 @@ class LookupDestJob extends JobImpl {
bd = bd2;
}
} else {
long now = getContext().clock().now();
bd.setDate(now);
long exp = now + ((bd.getAuthRequired() || bd.getSecretRequired()) ? 365*24*60*60*1000L
: 90*24*68*60*1000L);
bd.setExpiration(exp);
getContext().netDb().setBlindData(bd);
}
h = bd.getBlindedHash();

35
router/java/src/net/i2p/router/networkdb/kademlia/BlindCache.java
View File

@ -275,13 +275,17 @@ class BlindCache {
/**
* Load from file.
* Format:
* sigtype,bsigtype,b64 pubkey,[b64 secret],[b64 dest]
* sigtype,bsigtype,authtype,timestamp,b64 pubkey,[b64 secret],[b64 auth privkey],[b64 dest]
*
* If timestamp is positive, it's a creation date;
* if negative, it's a negative expiration date.
*/
private synchronized void load() {
File file = new File(_context.getConfigDir(), PERSIST_FILE);
if (!file.exists())
return;
Log log = _context.logManager().getLog(BlindCache.class);
long now = _context.clock().now();
int count = 0;
BufferedReader br = null;
try {
@ -292,7 +296,14 @@ class BlindCache {
if (line.startsWith("#"))
continue;
try {
storeInCache(fromPersistentString(line));
BlindData bd = fromPersistentString(line);
long exp = bd.getExpiration();
if (exp > 0 && exp < now) {
if (log.shouldInfo())
log.info("Skipping expired entry " + bd);
continue;
}
storeInCache(bd);
count++;
} catch (IllegalArgumentException iae) {
if (log.shouldLog(Log.WARN))
@ -341,6 +352,9 @@ class BlindCache {
/**
* Format:
* sigtype,bsigtype,authtype,timestamp,b64 pubkey,[b64 secret],[b64 auth privkey],[b64 dest]
*
* If timestamp is positive, it's a creation date;
* if negative, it's a negative expiration date.
*/
private BlindData fromPersistentString(String line) throws DataFormatException {
String[] ss = DataHelper.split(line, ",", 8);
@ -389,13 +403,21 @@ class BlindCache {
} else {
rv = new BlindData(_context, spk, st2, secret, auth, privkey);
}
rv.setDate(time);
if (time >= 0) {
rv.setDate(time);
} else {
rv.setDate(_context.clock().now());
rv.setExpiration(0 - time);
}
return rv;
}
/**
* Format:
* sigtype,bsigtype,authtype,timestamp,b64 pubkey,[b64 secret],[b64 auth privkey],[b64 dest]
*
* If timestamp is positive, it's a creation date;
* if negative, it's a negative expiration date.
*/
private static String toPersistentString(BlindData bd) {
StringBuilder buf = new StringBuilder(1024);
@ -403,7 +425,12 @@ class BlindCache {
buf.append(spk.getType().getCode()).append(',');
buf.append(bd.getBlindedSigType().getCode()).append(',');
buf.append(bd.getAuthType()).append(',');
buf.append(bd.getDate()).append(',');
long time = bd.getExpiration();
if (time > 0)
time = 0 - time;
else
time = bd.getDate();
buf.append(time).append(',');
buf.append(spk.toBase64()).append(',');
String secret = bd.getSecret();
if (secret != null && secret.length() > 0)