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

Console: Don't allow unbanning of all-zero hash

Browse Source
This commit is contained in:
zzz
2015-06-02 15:41:42 +00:00
parent f8594c316f
commit 525ec01c1e
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/routerconsole/java/src/net/i2p/router/web/BanlistRenderer.java
View File

@ -61,7 +61,9 @@ public class BanlistRenderer {
buf.append("<li>").append(_context.commSystem().renderPeerHTML(key)); buf.append("<li>").append(_context.commSystem().renderPeerHTML(key));
buf.append(' '); buf.append(' ');
String expireString = DataHelper.formatDuration2(expires); String expireString = DataHelper.formatDuration2(expires);
if (expires < 5l*24*60*60*1000) if (key.equals(Hash.FAKE_HASH))
buf.append(_("Permanently banned"));
else if (expires < 5l*24*60*60*1000)
buf.append(_("Temporary ban expiring in {0}", expireString)); buf.append(_("Temporary ban expiring in {0}", expireString));
else else
buf.append(_("Banned until restart or in {0}", expireString)); buf.append(_("Banned until restart or in {0}", expireString));
@ -75,8 +77,10 @@ public class BanlistRenderer {
else else
buf.append(_(entry.cause)); buf.append(_(entry.cause));
} }
buf.append(" (<a href=\"configpeer?peer=").append(key.toBase64()) if (!key.equals(Hash.FAKE_HASH)) {
.append("#unsh\">").append(_("unban now")).append("</a>)"); buf.append(" (<a href=\"configpeer?peer=").append(key.toBase64())
.append("#unsh\">").append(_("unban now")).append("</a>)");
}
buf.append("</li>\n"); buf.append("</li>\n");
} }
buf.append("</ul>\n"); buf.append("</ul>\n");