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

Console: Support deleting blinded entries on /configkeyring

Browse Source
This commit is contained in:
zzz
2019-05-30 14:26:11 +00:00
parent 6b3896c1f8
commit f049319500
6 changed files with 94 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,12 +21,12 @@ public class ConfigKeyringHandler extends FormHandler {
private String _peer;
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"));
return;
@ -36,7 +36,7 @@ public class ConfigKeyringHandler extends FormHandler {
// don't wait for several seconds for b33 lookup
h = ConvertToHash.getHash(_peer);
}
if (adding) {
byte[] b = null;
if (_mode == 1 || _mode == 4 || _mode == 5) {
if (_key == null) {
@ -166,18 +166,37 @@ public class ConfigKeyringHandler extends FormHandler {
addFormError(_t("Invalid destination") + ": " + iae.getMessage());
}
}
} 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));
}
}
} else {
@ -203,4 +222,7 @@ public class ConfigKeyringHandler extends FormHandler {
_mode = Integer.parseInt(m);
} catch (NumberFormatException nfe) {}
}
/** @since 0.9.41 */
public void setRevokeClient(String[] revokes) { _revokes = revokes; }
}

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

@ -45,7 +45,10 @@ public class ConfigKeyringHelper extends HelperBase {
* @param local true for local (Enc. LS1 only), false for remote (all types)
*/
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)
buf.append("<th align=\"left\">").append(_t("Type"));
@ -59,7 +62,10 @@ public class ConfigKeyringHelper extends HelperBase {
if (local != _context.clientManager().isLocal(h))
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);
if (dest != null && local) {
@ -86,7 +92,10 @@ public class ConfigKeyringHelper extends HelperBase {
// TODO sort by hostname
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();
if (h != null) {

9
apps/routerconsole/jsp/configkeyring.jsp
View File

@ -21,9 +21,13 @@
<p id="keyringhelp" class="infohelp">
<%=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">
<tr>
@ -48,7 +52,7 @@
<%=intl._t("Blinded")%></option>
<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">
<%=intl._t("Blinded with lookup password and shared key")%></option>
@ -66,6 +70,5 @@
</tr><tr>
<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>

9
router/java/src/net/i2p/router/NetworkDatabaseFacade.java
View File

@ -187,4 +187,13 @@ public abstract class NetworkDatabaseFacade implements Service {
public List<BlindData> getBlindData() {
return null;
}
/**
* For console ConfigKeyringHelper
* @return true if removed
* @since 0.9.41
*/
public boolean removeBlindData(SigningPublicKey spk) {
return false;
}
}

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

@ -249,6 +249,28 @@ class BlindCache {
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;
}
/**
* Load from file.
* Format:

10
router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
View File

@ -501,6 +501,16 @@ public abstract class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacad
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);
}
/**
* @return RouterInfo, LeaseSet, or null, validated