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

Sybil: Skip comment lines in stored files

Browse Source 
Escape % in stored reasons
Improve error handling when loading files
This commit is contained in:
zzz
2019-05-20 18:27:29 +00:00
parent cafdca9a7b
commit 67e7e45779
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/routerconsole/java/src/net/i2p/router/sybil/PersistSybil.java
View File

@ -64,6 +64,8 @@ public class PersistSybil {
Writer out = null;
try {
out = new OutputStreamWriter(new GZIPOutputStream(new SecureFileOutputStream(file)));
out.write("# Format (one per line)\n");
out.write("# Base64 router hash:total points%points:reason%points:reason ...\n");
for (Map.Entry<Hash, Points> entry : entries.entrySet()) {
Hash h = entry.getKey();
Points p = entry.getValue();
@ -114,6 +116,8 @@ public class PersistSybil {
in = new BufferedReader(new InputStreamReader(new GZIPInputStream(new FileInputStream(file))));
String line;
while ((line = in.readLine()) != null) {
if (line.startsWith("#"))
continue;
int colon = line.indexOf(':');
if (colon != 44)
continue;
@ -192,6 +196,8 @@ public class PersistSybil {
if (d < cutoff) {
if (file.delete())
deleted++;
else if (_log.shouldWarn())
_log.warn("Failed to delete: " + file);
}
} catch (NumberFormatException nfe) {}
}

2
apps/routerconsole/java/src/net/i2p/router/sybil/Points.java
View File

@ -81,7 +81,7 @@ public class Points implements Comparable<Points> {
public void toString(StringBuilder buf) {
buf.append(points);
for (String r : reasons) {
buf.append('%').append(r);
buf.append('%').append(r.replace("%", "&#x25;"));
}
}

9
apps/routerconsole/java/src/net/i2p/router/web/helpers/SybilRenderer.java
View File

@ -62,6 +62,7 @@ import net.i2p.util.VersionComparator;
public class SybilRenderer {
private final RouterContext _context;
private final Log _log;
private final DecimalFormat fmt = new DecimalFormat("#0.00");
private final DateFormat dfmt;
@ -74,6 +75,7 @@ public class SybilRenderer {
public SybilRenderer(RouterContext ctx) {
_context = ctx;
_log = ctx.logManager().getLog(SybilRenderer.class);
dfmt = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.SHORT);
dfmt.setTimeZone(SystemVersion.getSystemTimeZone(_context));
}
@ -206,11 +208,14 @@ public class SybilRenderer {
try {
points = ps.load(date);
} catch (IOException ioe) {
out.write("<b>No analysis found for " + new Date(date) + "</b>");
_log.error("loading stored analysis for date: " + date, ioe);
out.write("<b>Failed to load analysis for " + dfmt.format(new Date(date)) + "</b>: " +
DataHelper.escapeHTML(ioe.toString()));
return;
}
if (points.isEmpty()) {
out.write("<b>No analysis found for " + new Date(date) + "</b>");
_log.error("empty stored analysis or bad file format for date: " + date);
out.write("<b>Corrupt analysis file for " + dfmt.format(new Date(date)) + "</b>");
} else {
renderThreatsHTML(out, buf, date, points);
}