Changeset f049319

Timestamp:

May 30, 2019 2:26:11 PM (11 months ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

aae81a7b

Parents:

6b3896c

Message:

Console: Support deleting blinded entries on /configkeyring

Files:

• apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHandler.java (modified) (4 diffs)
• apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHelper.java (modified) (3 diffs)
• apps/routerconsole/jsp/configkeyring.jsp (modified) (3 diffs)
• router/java/src/net/i2p/router/NetworkDatabaseFacade.java (modified) (1 diff)
• router/java/src/net/i2p/router/networkdb/kademlia/BlindCache.java (modified) (1 diff)
• router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java (modified) (1 diff)

apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHandler.java

@@ -22 +22 @@
     private String _key;
     private String _secret;
+    private String[] _revokes;
     private int _mode;
     
     @Override
     protected void processForm() {
-        boolean adding = _action.equals(_t("Add key"));
-        if (adding || _action.equals(_t("Delete key"))) {
+        if (_action.equals(_t("Add key"))) {
             if (_peer == null) {
                 addFormError(_t("You must enter a destination"));
@@ -37 +37 @@
                 h = ConvertToHash.getHash(_peer);
             }
-            if (adding) {
+
                 byte[] b = null;
                 if (_mode == 1 || _mode == 4 || _mode == 5) {
@@ -167 +167 @@
                     }
                 }
-            } else {  // Delete
-                if (h != null && h.getData() != null) {
-                    if (_context.clientManager().isLocal(h)) {
-                        // don't bother translating
-                        addFormError("Cannot remove key for local destination. Disable encryption in the Hidden Services Manager.");
-                    } else if (_context.keyRing().remove(h) != null) {
-                        addFormNotice(_t("Key for {0} removed from keyring", h.toBase32()));
-                    } else {
-                        addFormNotice(_t("Key for {0} not found in keyring", h.toBase32()));
-                    }
+
+        } else if (_action.equals(_t("Delete key")) && _revokes != null) {
+            // these should all be b32s or b33s
+            for (String p : _revokes) {
+                boolean removed = false;
+                if (p.length() == 60) {
+                    // don't wait for several seconds for b33 lookup
+                    Hash h = ConvertToHash.getHash(p);
+                    if (h != null) {
+                        if (_context.clientManager().isLocal(h)) {
+                            // don't bother translating
+                            addFormError("Cannot remove key for local destination. Disable encryption in the Hidden Services Manager.");
+                        } else if (_context.keyRing().remove(h) != null) {
+                            removed = true;
+                        }
+                    }
+                } else if (p.length() > 60) {
+                    try {
+                        BlindData bd = Blinding.decode(_context, p);
+                        if (bd != null) {
+                            SigningPublicKey spk = bd.getUnblindedPubKey();
+                            removed = _context.netDb().removeBlindData(spk);
+                        }
+                    } catch (IllegalArgumentException iae) {}
                 } else {
-                    addFormError(_t("Invalid destination"));
+                    addFormError(_t("Invalid destination") + ": " + p);
+                }
+                if (removed) {
+                    addFormNotice(_t("Key for {0} removed from keyring", p));
+                } else {
+                    addFormError(_t("Key for {0} not found in keyring", p));
                 }
             }
@@ -204 +223 @@
         } catch (NumberFormatException nfe) {}
     }
+
+    /** @since 0.9.41 */
+    public void setRevokeClient(String[] revokes) { _revokes = revokes; }
 }

apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHelper.java

@@ -46 +46 @@
      */
     private void render(StringBuilder buf, boolean local) {
-        buf.append("\n<table class=\"configtable\"><tr><th align=\"left\">").append(_t("Destination"))
+        buf.append("\n<table class=\"configtable\"><tr>");
+        if (!local)
+            buf.append("<th align=\"left\">").append(_t("Delete"));
+        buf.append("<th align=\"left\">").append(_t("Destination"))
            .append("<th align=\"left\">").append(_t("Name"));
         if (!local)
@@ -60 +63 @@
                 continue;
             buf.append("\n<tr><td>");
-            buf.append(h.toBase32());
+            String b32 = h.toBase32();
+            if (!local)
+                buf.append("<input value=\"").append(b32).append("\" type=\"checkbox\" name=\"revokeClient\" class=\"tickbox\"/></td><td>");
+            buf.append(b32);
             buf.append("</td><td>");
             Destination dest = _context.netDb().lookupDestinationLocally(h);
@@ -87 +93 @@
             for (BlindData bd : bdata) {
                 buf.append("\n<tr><td>");
-                buf.append(bd.toBase32());
+                String b32 = bd.toBase32();
+                if (!local)
+                    buf.append("<input value=\"").append(b32).append("\" type=\"checkbox\" name=\"revokeClient\" class=\"tickbox\"/></td><td>");
+                buf.append(b32);
                 buf.append("</td><td>");
                 Hash h = bd.getDestHash();

apps/routerconsole/jsp/configkeyring.jsp

@@ -22 +22 @@
  <%=intl._t("The router keyring is used to decrypt encrypted leaseSets.")%>
  <%=intl._t("The keyring may contain keys for local or remote encrypted destinations.")%></p>
- <jsp:getProperty name="keyringhelper" property="summary" />
  <form action="" method="POST">
  <input type="hidden" name="nonce" value="<%=pageNonce%>" >
+ <jsp:getProperty name="keyringhelper" property="summary" />
+ <table id="addkeyring"><tr><td align="right">
+ <input type="reset" class="cancel" value="<%=intl._t("Cancel")%>" >
+ <input type="submit" name="action" class="delete" value="<%=intl._t("Delete key")%>" >
+ </td></tr></table>
  <h3 class="tabletitle"><%=intl._t("Manual Keyring Addition")%></h3>
  <table id="addkeyring">
@@ -49 +53 @@
           <option title="<%=intl._t("Only clients with the password will be able to connect")%>" value="3">
               <%=intl._t("Blinded with lookup password")%></option>
-          <option title="<%=intl._t("Only clients with the encryption key will be able to connect")%>" value="4">
+          <option title="<%=intl._t("Only clients with the encryption key will be able to connect")%>" value="4" selected="selected">
               <%=intl._t("Blinded with shared key")%></option>
           <option title="<%=intl._t("Only clients with the password and key will be able to connect")%>" value="5">
@@ -67 +71 @@
           <td align="right" colspan="2">
 <input type="reset" class="cancel" value="<%=intl._t("Cancel")%>" >
-<input type="submit" name="action" class="delete" value="<%=intl._t("Delete key")%>" >
 <input type="submit" name="action" class="add" value="<%=intl._t("Add key")%>" >
 </td></tr></table></form></div></body></html>

router/java/src/net/i2p/router/NetworkDatabaseFacade.java

@@ -188 +188 @@
         return null;
     }
+
+    /**
+     *  For console ConfigKeyringHelper
+     *  @return true if removed
+     *  @since 0.9.41
+     */
+    public boolean removeBlindData(SigningPublicKey spk) {
+        return false;
+    }
 }

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

@@ -247 +247 @@
         List<BlindData> rv = new ArrayList<BlindData>(_cache.size());
         rv.addAll(_cache.values());
+        return rv;
+    }
+
+    /**
+     *  For console ConfigKeyringHelper.
+     *  Persists immediately if removed.
+     *
+     *  @param spk the unblinded public key
+     *  @return true if removed
+     *  @since 0.9.41
+     */
+    public boolean removeBlindData(SigningPublicKey spk) {
+        boolean rv = false;
+        BlindData bd = _cache.remove(spk);
+        if (bd != null) {
+            rv = true;
+            _reverseCache.remove(bd.getBlindedPubKey());
+            Hash h = bd.getDestHash();
+            if (h != null)
+                _hashCache.remove(h);
+            store();
+        }
         return rv;
     }

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

@@ -501 +501 @@
     public List<BlindData> getBlindData() {
         return _blindCache.getData();
+    }
+
+    /**
+     *  For console ConfigKeyringHelper
+     *  @param spk the unblinded public key
+     *  @return true if removed
+     *  @since 0.9.41
+     */
+    public boolean removeBlindData(SigningPublicKey spk) {
+        return _blindCache.removeBlindData(spk);
     }