From af49a903037be1fc5ba88bdcd599500af539c3e4 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sun, 23 Dec 2018 13:21:27 +0000
Subject: [PATCH] Sybil: Add background run form
---
.../src/net/i2p/router/sybil/Analysis.java | 2 +
.../i2p/router/web/helpers/NetDbHelper.java | 16 +++++++
.../i2p/router/web/helpers/SybilRenderer.java | 44 ++++++++++++++++---
3 files changed, 57 insertions(+), 5 deletions(-)
diff --git a/apps/routerconsole/java/src/net/i2p/router/sybil/Analysis.java b/apps/routerconsole/java/src/net/i2p/router/sybil/Analysis.java
index cae8d34f40..31ad8bf90b 100644
--- a/apps/routerconsole/java/src/net/i2p/router/sybil/Analysis.java
+++ b/apps/routerconsole/java/src/net/i2p/router/sybil/Analysis.java
@@ -192,6 +192,8 @@ public class Analysis extends JobImpl implements RouterApp {
when = Math.max(when, now + MIN_UPTIME - up);
getTiming().setStartAfter(when);
_context.jobQueue().addJob(this);
+ } else {
+ _context.jobQueue().removeJob(this);
}
}
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbHelper.java
index 4b34200b4d..f8e05bde52 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbHelper.java
@@ -6,6 +6,7 @@ import java.util.Locale;
import net.i2p.crypto.SigType;
import net.i2p.data.DataHelper;
import net.i2p.util.SystemVersion;
+import net.i2p.router.sybil.Analysis;
import net.i2p.router.web.FormHandler;
/**
@@ -219,6 +220,21 @@ public class NetDbHelper extends FormHandler {
protected void processForm() {
_postOK = "Run new analysis".equals(_action) ||
"Review analysis".equals(_action);
+ if ("Save".equals(_action)) {
+ String newTime = getJettyString("runFrequency");
+ if (newTime != null) {
+ try {
+ long ntime = Long.parseLong(newTime) * 60*60*1000;
+ if (_context.router().saveConfig(Analysis.PROP_FREQUENCY, Long.toString(ntime)))
+ addFormNotice(_t("Configuration saved successfully."));
+ else
+ addFormError("Error saving the configuration (applied but not saved) - please see the error logs");
+ Analysis.getInstance(_context).schedule();
+ } catch (NumberFormatException nfe) {
+ addFormError("bad value");
+ }
+ }
+ }
}
/**
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/SybilRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/SybilRenderer.java
index 4ac69d084f..e977312975 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/SybilRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/SybilRenderer.java
@@ -67,6 +67,7 @@ public class SybilRenderer {
private static final int MAX = Analysis.MAX;
private static final double MIN_CLOSE = Analysis.MIN_CLOSE;
private static final double MIN_DISPLAY_POINTS = 12.01;
+ private static final int[] HOURS = { 1, 6, 24, 7*24, 30*24, 0 };
public SybilRenderer(RouterContext ctx) {
_context = ctx;
@@ -143,6 +144,7 @@ public class SybilRenderer {
"If you see anything you would like to discuss with the devs, contact us on IRC #i2p-dev.</b></p>" +
"<div id=\"sybilnav\"><ul><li><a href=\"netdb?f=3\">Review stored analysis</a>" +
"</li><li><a href=\"netdb?f=3&m=14\">Run new analysis</a>" +
+ "</li><li><a href=\"netdb?f=3&m=15\">Configure periodic analysis</a>" +
"</li><li><a href=\"netdb?f=3&m=1\">Floodfill Summary</a>" +
"</li><li><a href=\"netdb?f=3&m=2\">Same Family</a>" +
"</li><li><a href=\"netdb?f=3&m=3\">IP close to us</a>" +
@@ -215,8 +217,11 @@ public class SybilRenderer {
}
renderThreatsHTML(out, buf, now, points);
} else if (mode == 14) {
- // show form
+ // show run form
renderRunForm(out, buf, nonce);
+ } else if (mode == 15) {
+ // show background form
+ renderBackgroundForm(out, buf, nonce);
} else {
out.write("Unknown mode " + mode);
}
@@ -235,7 +240,7 @@ public class SybilRenderer {
buf.append("<form action=\"netdb\" method=\"POST\">\n" +
"<input type=\"hidden\" name=\"f\" value=\"3\">\n" +
"<input type=\"hidden\" name=\"m\" value=\"12\">\n" +
- "<input type=\"hidden\" name=\"nonce\" value=\"" + nonce + "\" >\n" +
+ "<input type=\"hidden\" name=\"nonce\" value=\"").append(nonce).append("\" >\n" +
"Select stored analysis: " +
"<select name=\"date\">\n");
boolean first = true;
@@ -256,20 +261,49 @@ public class SybilRenderer {
writeBuf(out, buf);
}
-
/**
* @since 0.9.38
*/
- private void renderRunForm(Writer out, StringBuilder buf, String nonce) throws IOException {
+ private static void renderRunForm(Writer out, StringBuilder buf, String nonce) throws IOException {
buf.append("<form action=\"netdb\" method=\"POST\">\n" +
"<input type=\"hidden\" name=\"f\" value=\"3\">\n" +
"<input type=\"hidden\" name=\"m\" value=\"13\">\n" +
- "<input type=\"hidden\" name=\"nonce\" value=\"" + nonce + "\" >\n" +
+ "<input type=\"hidden\" name=\"nonce\" value=\"").append(nonce).append("\" >\n" +
"<input type=\"submit\" name=\"action\" class=\"go\" value=\"Run new analysis\" />" +
"</form>\n");
writeBuf(out, buf);
}
+ /**
+ * @since 0.9.38
+ */
+ private void renderBackgroundForm(Writer out, StringBuilder buf, String nonce) throws IOException {
+ long freq = _context.getProperty(Analysis.PROP_FREQUENCY, 0L);
+ buf.append("<form action=\"netdb\" method=\"POST\">\n" +
+ "<input type=\"hidden\" name=\"f\" value=\"3\">\n" +
+ "<input type=\"hidden\" name=\"m\" value=\"15\">\n" +
+ "<input type=\"hidden\" name=\"nonce\" value=\"").append(nonce).append("\" >\n" +
+ "Background analysis run frequency: <select name=\"runFrequency\">");
+ for (int i = 0; i < HOURS.length; i++) {
+ buf.append("<option value=\"");
+ buf.append(Integer.toString(HOURS[i]));
+ buf.append('"');
+ long time = HOURS[i] * 60*60*1000L;
+ if (time == freq)
+ buf.append(" selected=\"selected\"");
+ buf.append('>');
+ if (HOURS[i] > 0)
+ buf.append(DataHelper.formatDuration2(time));
+ else
+ buf.append(_t("Never"));
+ buf.append("</option>\n");
+ }
+ buf.append("</select> " +
+ "<input type=\"submit\" name=\"action\" class=\"accept\" value=\"Save\" />" +
+ "</form>\n");
+ writeBuf(out, buf);
+ }
+
/**
* @since 0.9.38 split out from renderRouterInfoHTML()
*/
--
GitLab