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

NetDB: Don't query floodfills if they are too old to

Browse Source 
support sig types or encrypted replies (ticket #1742)
This commit is contained in:
zzz
2016-01-06 19:38:26 +00:00
parent f85d03085b
commit 68d8c6e556
3 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
history.txt
View File

@ -3,10 +3,12 @@
* Console: Properly register listen hosts with PortMapper
* DataHelper: Optimize checks in storeProps()
* I2PTunnel: Fixup console links in error pages if console is
on a non-standard host or port, or on https
on a non-standard host or port, or on https
* Jetty: Change default source logging from b64 to b32.
To change back to b64, add the following to the RequestLogImpl
section of jetty.xml: <Set name="b64">true</Set>
* NetDB: Don't query floodfills if they are too old to
support sig types or encrypted replies (ticket #1742)
* PortMapper: Add method to convert wildcard host to actual host
2015-12-21 zzz

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

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

20
router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java
View File

@ -10,6 +10,7 @@ import java.util.SortedSet;
import java.util.TreeSet;
import java.util.concurrent.ConcurrentHashMap;
import net.i2p.crypto.SigType;
import net.i2p.data.Base64;
import net.i2p.data.DataHelper;
import net.i2p.data.Hash;
@ -30,6 +31,7 @@ import net.i2p.router.util.RandomIterator;
import net.i2p.util.Log;
import net.i2p.util.NativeBigInteger;
import net.i2p.util.SystemVersion;
import net.i2p.util.VersionComparator;
/**
* A traditional Kademlia search that continues to search
@ -288,6 +290,20 @@ class IterativeSearchJob extends FloodSearchJob {
private void sendQuery(Hash peer) {
TunnelManagerFacade tm = getContext().tunnelManager();
RouterInfo ri = getContext().netDb().lookupRouterInfoLocally(peer);
if (ri != null) {
// Now that most of the netdb is Ed RIs and EC LSs, don't even bother
// querying old floodfills that don't know about those sig types.
// This is also more recent than the version that supports encrypted replies,
// so we won't request unencrypted replies anymore either.
String v = ri.getVersion();
String since = SigType.EdDSA_SHA512_Ed25519.getSupportedSince();
if (VersionComparator.comp(v, since) < 0) {
failed(peer, false);
if (_log.shouldLog(Log.WARN))
_log.warn(getJobId() + ": not sending query to old version " + v + ": " + peer);
return;
}
}
TunnelInfo outTunnel;
TunnelInfo replyTunnel;
boolean isClientReplyTunnel;
@ -381,7 +397,9 @@ class IterativeSearchJob extends FloodSearchJob {
// if we have the ff RI, garlic encrypt it
if (ri != null) {
// request encrypted reply
if (DatabaseLookupMessage.supportsEncryptedReplies(ri)) {
// now covered by version check above, which is more recent
//if (DatabaseLookupMessage.supportsEncryptedReplies(ri)) {
if (true) {
MessageWrapper.OneTimeSession sess;
if (isClientReplyTunnel)
sess = MessageWrapper.generateSession(getContext(), _fromLocalDest);