Changeset f2f5df0

Timestamp:

May 19, 2019 11:42:26 AM (11 months ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

1ffc006

Parents:

10354df

Message:

Sybil: Run IP and family tests on all routers
Hide some n/a fields, rework some text
Rename some config properties

Files:

• apps/routerconsole/java/src/net/i2p/router/sybil/Analysis.java (modified) (3 diffs)
• apps/routerconsole/java/src/net/i2p/router/web/helpers/SybilRenderer.java (modified) (15 diffs)
• history.txt (modified) (1 diff)
• router/java/src/net/i2p/router/RouterVersion.java (modified) (1 diff)

apps/routerconsole/java/src/net/i2p/router/sybil/Analysis.java

@@ -65 +65 @@
     public static final String PROP_FREQUENCY = "router.sybilFrequency";
     public static final String PROP_THRESHOLD = "router.sybilThreshold";
-    public static final String PROP_BLOCK = "router.sybilBlock.enable";
-    public static final String PROP_NONFF = "router.sybilIncludeAll";
-    public static final String PROP_BLOCKTIME = "router.sybilBlock.period";
+    public static final String PROP_BLOCK = "router.sybilEnableBlocking";
+    public static final String PROP_NONFF = "router.sybilAnalyzeAll";
+    public static final String PROP_BLOCKTIME = "router.sybilBlockPeriod";
     private static final long MIN_FREQUENCY = 60*60*1000L;
     private static final long MIN_UPTIME = 75*60*1000L;
@@ -268 +268 @@
     }
 
+    /**
+     *  All the routers, not including us
+     *  @since 0.9.41
+     */
+    public List<RouterInfo> getAllRouters(Hash us) {
+        Set<RouterInfo> set = _context.netDb().getRouters();
+        List<RouterInfo> ris = new ArrayList<RouterInfo>(set.size());
+        for (RouterInfo ri : set) {
+            if (!ri.getIdentity().getHash().equals(us))
+            ris.add(ri);
+        }
+        return ris;
+    }
+
     public double getAvgMinDist(List<RouterInfo> ris) {
         double tot = 0;
@@ -296 +310 @@
         List<RouterInfo> ris;
         if (includeAll) {
-            Set<RouterInfo> set = _context.netDb().getRouters();
-            ris = new ArrayList<RouterInfo>(set.size());
-            for (RouterInfo ri : set) {
-                if (!ri.getIdentity().getHash().equals(us))
-                ris.add(ri);
-            }
+            ris = getAllRouters(us);
         } else {
             ris = getFloodfills(us);

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

@@ -136 +136 @@
         List<RouterInfo> ris = null;
         if (mode != 0 && mode != 12 && mode != 13 && mode != 14 && mode != 16) {
-            ris = analysis.getFloodfills(us);
+            if (mode >= 2 && mode <= 6) {
+                // review all routers for family and IP analysis
+                ris = analysis.getAllRouters(us);
+            } else {
+                ris = analysis.getFloodfills(us);
+            }
             if (ris.isEmpty()) {
-                out.write("<h3 class=\"sybils\">No known floodfills</h3>");
+                out.write("<h3 class=\"sybils\">No known routers</h3>");
                 return;
             }
@@ -566 +571 @@
     private void renderIPGroupsUs(Writer out, StringBuilder buf, List<RouterInfo> ri32,
                                   List<RouterInfo> ri24, List<RouterInfo> ri16) throws IOException {
-        buf.append("<h3 id=\"ourIP\" class=\"sybils\">Floodfills close to Our IP</h3>");
+        buf.append("<h3 id=\"ourIP\" class=\"sybils\">Routers close to Our IP</h3>");
         boolean found = false;
         for (RouterInfo info : ri32) {
@@ -598 +603 @@
      */
     private void renderIPGroups32(Writer out, StringBuilder buf, Map<Integer, List<RouterInfo>> map) throws IOException {
-        buf.append("<h3 id=\"sameIP\" class=\"sybils\">Floodfills with the Same IP</h3>");
+        buf.append("<h3 id=\"sameIP\" class=\"sybils\">Routers with the Same IP</h3>");
         List<Integer> foo = new ArrayList<Integer>(map.keySet());
         Collections.sort(foo, new FooComparator(map));
@@ -611 +616 @@
             int i3 = i & 0xff;
             String sip = i0 + "." + i1 + '.' + i2 + '.' + i3;
-            buf.append("<p class=\"sybil_info\"><b>").append(count).append(" floodfills with IP <a href=\"/netdb?ip=")
+            buf.append("<p class=\"sybil_info\"><b>").append(count).append(" routers with IP <a href=\"/netdb?ip=")
                .append(sip).append("&amp;sybil\">").append(sip)
                .append("</a>:</b></p>");
@@ -628 +633 @@
      */
     private void renderIPGroups24(Writer out, StringBuilder buf, Map<Integer, List<RouterInfo>> map) throws IOException {
-        buf.append("<h3 id=\"same24\" class=\"sybils\">Floodfills in the Same /24 (2 minimum)</h3>");
+        buf.append("<h3 id=\"same24\" class=\"sybils\">Routers in the Same /24 (2 minimum)</h3>");
         List<Integer> foo = new ArrayList<Integer>(map.keySet());
         Collections.sort(foo, new FooComparator(map));
@@ -640 +645 @@
             int i2 = i & 0xff;
             String sip = i0 + "." + i1 + '.' + i2 + ".0/24";
-            buf.append("<p class=\"sybil_info\"><b>").append(count).append(" floodfills with IP <a href=\"/netdb?ip=")
+            buf.append("<p class=\"sybil_info\"><b>").append(count).append(" routers with IP <a href=\"/netdb?ip=")
                .append(sip).append("&amp;sybil\">").append(sip)
                .append("</a>:</b></p>");
@@ -657 +662 @@
      */
     private void renderIPGroups16(Writer out, StringBuilder buf, Map<Integer, List<RouterInfo>> map) throws IOException {
-        buf.append("<h3 id=\"same16\" class=\"sybils\">Floodfills in the Same /16 (4 minimum)</h3>");
+        buf.append("<h3 id=\"same16\" class=\"sybils\">Routers in the Same /16 (4 minimum)</h3>");
         List<Integer> foo = new ArrayList<Integer>(map.keySet());
         Collections.sort(foo, new FooComparator(map));
@@ -669 +674 @@
             String sip = i0 + "." + i1 + ".0.0/16";
             if (buf != null) {
-                buf.append("<p class=\"sybil_info\"><b>").append(count).append(" floodfills with IP <a href=\"/netdb?ip=")
+                buf.append("<p class=\"sybil_info\"><b>").append(count).append(" routers with IP <a href=\"/netdb?ip=")
                    .append(sip).append("&amp;sybil\">").append(sip)
                    .append("</a></b></p>");
@@ -687 +692 @@
      */
     private void renderIPGroupsFamily(Writer out, StringBuilder buf, Map<String, List<RouterInfo>> map) throws IOException {
-        buf.append("<h3 id=\"samefamily\" class=\"sybils\">Floodfills in the same Family</h3><div class=\"sybil_container\">");
+        buf.append("<h3 id=\"samefamily\" class=\"sybils\">Routers in the same Family</h3><div class=\"sybil_container\">");
         List<String> foo = new ArrayList<String>(map.keySet());
         Collections.sort(foo, new FoofComparator(map));
@@ -698 +703 @@
             String ss = DataHelper.escapeHTML(s);
             if (count > 1) {
-                buf.append("<p class=\"family\"><b>").append(count).append(" floodfills in family: &nbsp;<a href=\"/netdb?fam=")
+                buf.append("<p class=\"family\"><b>").append(count).append(" routers in family: &nbsp;<a href=\"/netdb?fam=")
                    .append(ss).append("&amp;sybil\">").append(ss).append("</a></b></p>");
                 found = true;
@@ -829 +834 @@
         if (kr != null) {
             buf.append("<p><b>Routers:</b> ").append(DataHelper.stripHTML(kr)).append("</p>");
-        } else {
-            buf.append("<p class=\"sybil_filler\"><b>Routers:</b> ").append(_t("n/a")).append("</p>");
+        //} else {
+        //    buf.append("<p class=\"sybil_filler\"><b>Routers:</b> ").append(_t("n/a")).append("</p>");
         }
         String kls = info.getOption("netdb.knownLeaseSets");
         if (kls != null) {
             buf.append("<p class=\"sybilinfo_leasesets\"><b>").append(_t("LeaseSets")).append(":</b> ").append(DataHelper.stripHTML(kls)).append("</p>\n");
-        } else {
-            buf.append("<p class=\"sybilinfo_leasesets filler\"><b>").append(_t("LeaseSets")).append(":</b> ").append(_t("n/a")).append("</p>");
+        //} else {
+        //    buf.append("<p class=\"sybilinfo_leasesets filler\"><b>").append(_t("LeaseSets")).append(":</b> ").append(_t("n/a")).append("</p>");
         }
         String fam = info.getOption("family");
@@ -873 +878 @@
                         long age = Math.max(now - heard, 1);
                         buf.append("<p><b>").append(_t("Last Good Lookup")).append(":</b> ").append(_t("{0} ago", DataHelper.formatDuration2(age))).append("</p>");
-                    } else {
-                        buf.append("<p class=\"sybil_filler\"><b>").append(_t("Last Good Lookup")).append(":</b> ").append(_t("n/a")).append("</p>");
+                    //} else {
+                    //    buf.append("<p class=\"sybil_filler\"><b>").append(_t("Last Good Lookup")).append(":</b> ").append(_t("n/a")).append("</p>");
                     }
                     heard = dbh.getLastLookupFailed();
@@ -880 +885 @@
                         long age = Math.max(now - heard, 1);
                         buf.append("<p><b>").append(_t("Last Bad Lookup")).append(":</b> ").append(_t("{0} ago", DataHelper.formatDuration2(age))).append("</p>");
-                    } else {
-                        buf.append("<p class=\"sybil_filler\"><b>").append(_t("Last Bad Lookup")).append(":</b> ").append(_t("n/a")).append("</p>");
+                    //} else {
+                    //    buf.append("<p class=\"sybil_filler\"><b>").append(_t("Last Bad Lookup")).append(":</b> ").append(_t("n/a")).append("</p>");
                     }
                     heard = dbh.getLastStoreSuccessful();
@@ -887 +892 @@
                         long age = Math.max(now - heard, 1);
                         buf.append("<p><b>").append(_t("Last Good Store")).append(":</b> ").append(_t("{0} ago", DataHelper.formatDuration2(age))).append("</p>");
-                    } else {
-                        buf.append("<p class=\"sybil_filler\"><b>").append(_t("Last Good Store")).append(":</b> ").append(_t("n/a")).append("</p>");
+                    //} else {
+                    //    buf.append("<p class=\"sybil_filler\"><b>").append(_t("Last Good Store")).append(":</b> ").append(_t("n/a")).append("</p>");
                     }
                     heard = dbh.getLastStoreFailed();
@@ -894 +899 @@
                         long age = Math.max(now - heard, 1);
                         buf.append("<p><b>").append(_t("Last Bad Store")).append(":</b> ").append(_t("{0} ago", DataHelper.formatDuration2(age))).append("</p>");
-                    } else {
-                        buf.append("<p class=\"sybil_filler\"><b>").append(_t("Last Bad Store")).append(":</b> ").append(_t("n/a")).append("</p>");
+                    //} else {
+                    //    buf.append("<p class=\"sybil_filler\"><b>").append(_t("Last Bad Store")).append(":</b> ").append(_t("n/a")).append("</p>");
                     }
                 }

history.txt

@@ +1 @@
+2019-05-19 zzz
+ * Sybil: Run IP and family tests on all routers
+
+2019-05-18 zzz
+ * Javadoc: fixes from FreeBSD ports
+ * Sybil:
+   - Option to run on non-floodfills too
+   - Show routers in analysis even if no RI available
+   - Date format and reason text fixes
+   - Add link to banlist
+
+2019-05-15 zzz
+ * EepGet: Don't continue when requested a partial but didn't
+   get it, and the output is to a stream
+ * Streaming: Fix NPE in debug logging (ticket #2504)
+
+2019-05-14 zzz
+ * Util: Don't set restrictive permissions on exported certs
+
 2019-05-13 zzz
- * Console: Hide transport table unless advanced
+ * Console:
+   - Hide transport table unless advanced
+   - Prevent editing a client while it's starting
  * Sybil: Add support for auto-blocking
  * Tunnels: Fix connection checker for NTCP2

router/java/src/net/i2p/router/RouterVersion.java

@@ -19 +19 @@
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 3;
+    public final static long BUILD = 4;
 
     /** for example "-test" */