Changeset b4f331e6

Timestamp:

May 31, 2019 1:17:30 PM (21 months ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

8a4c469

Parents:

6722485

Message:

Router: Fix persistence of blinded privkey and timestamp

Files:

• core/java/src/net/i2p/data/BlindData.java (modified) (5 diffs)
• router/java/src/net/i2p/router/networkdb/kademlia/BlindCache.java (modified) (2 diffs)

core/java/src/net/i2p/data/BlindData.java

@@ -1 +1 @@
 package net.i2p.data;
+
+import java.util.Date;
 
 import net.i2p.I2PAppContext;
@@ -26 +28 @@
     private boolean _secretRequired;
     private boolean _authRequired;
+    private long _date;
 
     /**
@@ -95 +98 @@
         if (authKey != null)
             _authRequired = true;
+        _date = _context.clock().now();
         // defer until needed
         //calculate();
@@ -245 +249 @@
     }
 
+    /**
+     *  @since 0.9.41
+     */
+    public void setDate(long date) {
+        _date = date;
+    }
+
+    /**
+     *  @return creation date or as overridden by setDate()
+     *  @since 0.9.41
+     */
+    public long getDate() {
+        return _date;
+    }
+
     @Override
     public synchronized String toString() {
@@ -272 +291 @@
             buf.append("\n\tDestination     : unknown");
         buf.append("\n\tB32             : ").append(toBase32());
+        buf.append("\n\tCreated         : ").append((new Date(_date)).toString());
         buf.append(']');
         return buf.toString();

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

@@ -381 +381 @@
         }
         BlindData rv;
-        // TODO pass privkey
         if (ss[7].length() > 0) {
             Destination dest = new Destination(ss[7]);
             if (!spk.equals(dest.getSigningPublicKey()))
                 throw new DataFormatException("spk mismatch");
-            rv = new BlindData(_context, dest, st2, secret);
+            rv = new BlindData(_context, dest, st2, secret, auth, privkey);
         } else {
-            rv = new BlindData(_context, spk, st2, secret);
-        }
+            rv = new BlindData(_context, spk, st2, secret, auth, privkey);
+        }
+        rv.setDate(time);
         return rv;
     }
@@ -403 +403 @@
         buf.append(bd.getBlindedSigType().getCode()).append(',');
         buf.append(bd.getAuthType()).append(',');
-        // timestamp todo
-        buf.append('0').append(',');
+        buf.append(bd.getDate()).append(',');
         buf.append(spk.toBase64()).append(',');
         String secret = bd.getSecret();