Changeset 5b1b4ac

Timestamp:

Mar 6, 2019 3:28:47 PM (15 months ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

95366c0

Parents:

10bae6a

Message:

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

Location:

router/java/src/net/i2p/router/networkdb/kademlia

Files:

• FloodfillNetworkDatabaseFacade.java (modified) (5 diffs)
• StoreJob.java (modified) (2 diffs)

router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java

@@ -7 +7 @@
 import java.util.Set;
 
+import net.i2p.crypto.SigType;
 import net.i2p.data.DatabaseEntry;
 import net.i2p.data.Destination;
@@ -213 +214 @@
         FloodfillPeerSelector sel = (FloodfillPeerSelector)getPeerSelector();
         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;
         // increase candidates because we will be skipping some
@@ -255 +260 @@
             Hash peer = peers.get(i);
             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;
+            }
             DatabaseStoreMessage msg = new DatabaseStoreMessage(_context);
             msg.setEntry(ds);
@@ -278 +286 @@
     }
 
-    /** @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)) )
            return false;
@@ -290 +302 @@
            return false;
        // 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))
            return false;
-       if (type == DatabaseEntry.KEY_TYPE_ENCRYPTED_LS2 &&
+       if ((type == DatabaseEntry.KEY_TYPE_ENCRYPTED_LS2 ||
+            lsSigType == SigType.RedDSA_SHA512_Ed25519) &&
            !StoreJob.shouldStoreEncLS2To(target))
            return false;

router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java

@@ -185 +185 @@
             int skipped = 0;
             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) {
                 DatabaseEntry ds = _facade.getDataStore().get(peer);
@@ -198 +202 @@
                     _state.addSkipped(peer);
                     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)) {
                     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);
                     skipped++;