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

Console: Support remote lookup of full router hash from search form

Browse Source
This commit is contained in:
zzz
2020-09-04 16:57:40 +00:00
parent ada6753255
commit d402300dba
1 changed files with 47 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java
View File

@@ -28,6 +28,7 @@ import java.util.TreeSet;
import net.i2p.crypto.EncType; import net.i2p.crypto.EncType;
import net.i2p.crypto.SigType; import net.i2p.crypto.SigType;
import net.i2p.data.Base64;
import net.i2p.data.DatabaseEntry; import net.i2p.data.DatabaseEntry;
import net.i2p.data.DataHelper; import net.i2p.data.DataHelper;
import net.i2p.data.Destination; import net.i2p.data.Destination;
@@ -38,6 +39,7 @@ import net.i2p.data.LeaseSet2;
import net.i2p.data.PublicKey; import net.i2p.data.PublicKey;
import net.i2p.data.router.RouterAddress; import net.i2p.data.router.RouterAddress;
import net.i2p.data.router.RouterInfo; import net.i2p.data.router.RouterInfo;
import net.i2p.router.JobImpl;
import net.i2p.router.RouterContext; import net.i2p.router.RouterContext;
import net.i2p.router.TunnelPoolSettings; import net.i2p.router.TunnelPoolSettings;
import net.i2p.router.util.HashDistance; // debug import net.i2p.router.util.HashDistance; // debug
@@ -113,6 +115,38 @@ class NetDbRenderer {
.append(_t("Never reveal your router identity to anyone, as it is uniquely linked to your IP address in the network database.")) .append(_t("Never reveal your router identity to anyone, as it is uniquely linked to your IP address in the network database."))
.append("</td></tr></table>"); .append("</td></tr></table>");
renderRouterInfo(buf, _context.router().getRouterInfo(), true, true); renderRouterInfo(buf, _context.router().getRouterInfo(), true, true);
} else if (routerPrefix != null && routerPrefix.length() >= 44) {
// easy way, full hash
byte[] h = Base64.decode(routerPrefix);
if (h != null && h.length == Hash.HASH_LENGTH) {
Hash hash = new Hash(h);
RouterInfo ri = _context.netDb().lookupRouterInfoLocally(hash);
if (ri == null) {
// remote lookup
LookupWaiter lw = new LookupWaiter();
_context.netDb().lookupRouterInfo(hash, lw, lw, 8*1000);
// just wait right here in the middle of the rendering, sure
synchronized(lw) {
try { lw.wait(9*1000); } catch (InterruptedException ie) {}
}
ri = _context.netDb().lookupRouterInfoLocally(hash);
}
if (ri != null) {
renderRouterInfo(buf, ri, false, true);
} else {
buf.append("<div class=\"netdbnotfound\">");
buf.append(_t("Router")).append(' ');
if (routerPrefix != null)
buf.append(routerPrefix);
buf.append(' ').append(_t("not found in network database"));
buf.append("</div>");
}
} else {
buf.append("<div class=\"netdbnotfound\">");
buf.append("Bad Base64 router hash").append(' ');
buf.append(DataHelper.escapeHTML(routerPrefix));
buf.append("</div>");
}
} else { } else {
StringBuilder ubuf = new StringBuilder(); StringBuilder ubuf = new StringBuilder();
if (routerPrefix != null) if (routerPrefix != null)
@@ -369,6 +403,19 @@ class NetDbRenderer {
SybilRenderer.renderSybilHTML(out, _context, sybils, sybil); SybilRenderer.renderSybilHTML(out, _context, sybils, sybil);
} }
/**
* @since 0.9.48
*/
private class LookupWaiter extends JobImpl {
public LookupWaiter() { super(_context); }
public void runJob() {
synchronized(this) {
notifyAll();
}
}
public String getName() { return "Console netdb lookup"; }
}
/** /**
* Special handling for 'O' cap * Special handling for 'O' cap
* @param caps non-null * @param caps non-null