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

Sybil: Auto-blocking

Browse Source
This commit is contained in:
zzz
2019-05-13 13:28:04 +00:00
parent 48a92ca1e7
commit 8840532ed0
5 changed files with 47 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
apps/routerconsole/java/src/net/i2p/router/sybil/Analysis.java
View File

@ -87,6 +87,9 @@ public class Analysis extends JobImpl implements RouterApp {
private static final double POINTS_UNREACHABLE = 4.0;
private static final double POINTS_NEW = 4.0;
private static final double POINTS_BANLIST = 25.0;
private static final double DEFAULT_BLOCK_THRESHOLD = 50.0;
private static final long DEFAULT_BLOCK_TIME = 7*24*60*60*1000L;
public static final float MIN_BLOCK_POINTS = 12.01f;
/** Get via getInstance() */
private Analysis(RouterContext ctx, ClientAppManager mgr, String[] args) {
@ -339,9 +342,41 @@ public class Analysis extends JobImpl implements RouterApp {
// Profile analysis
addProfilePoints(ris, points);
addVersionPoints(ris, points);
if (_context.getBooleanProperty(PROP_BLOCK))
doBlocking(points);
return points;
}
/**
* Blocklist and Banlist if configured
* @since 0.9.41
*/
private void doBlocking(Map<Hash, Points> points) {
double threshold = DEFAULT_BLOCK_THRESHOLD;
long blockUntil = _context.getProperty(Analysis.PROP_BLOCKTIME, DEFAULT_BLOCK_TIME) + _context.clock().now();
try {
threshold = Double.parseDouble(_context.getProperty(PROP_THRESHOLD, Double.toString(DEFAULT_BLOCK_THRESHOLD)));
if (threshold < MIN_BLOCK_POINTS)
threshold = MIN_BLOCK_POINTS;
} catch (NumberFormatException nfe) {}
for (Map.Entry<Hash, Points> e : points.entrySet()) {
double p = e.getValue().getPoints();
if (p >= threshold) {
Hash h = e.getKey();
RouterInfo ri = _context.netDb().lookupRouterInfoLocally(h);
if (ri != null) {
for (RouterAddress ra : ri.getAddresses()) {
byte[] ip = ra.getIP();
if (ip != null)
_context.blocklist().add(ip);
}
}
String reason = "Sybil analysis with " + fmt.format(p) + " threat points";
_context.banlist().banlistRouter(h, reason, null, null, blockUntil);
}
}
}
/**
* @param pairs out parameter, sorted
* @return average distance

2
apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbHelper.java
View File

@ -232,7 +232,7 @@ public class NetDbHelper extends FormHandler {
}
String thresh = getJettyString("threshold");
if (thresh != null && thresh.length() > 0) {
float val = Float.parseFloat(thresh);
float val = Math.max(Float.parseFloat(thresh), Analysis.MIN_BLOCK_POINTS);
toSave.put(Analysis.PROP_THRESHOLD, Float.toString(val));
}
String days = getJettyString("days");

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

@ -301,13 +301,7 @@ public class SybilRenderer {
}
boolean auto = _context.getBooleanProperty(Analysis.PROP_BLOCK);
String thresh = _context.getProperty(Analysis.PROP_THRESHOLD, "50");
long days = 7;
String time = _context.getProperty(Analysis.PROP_BLOCKTIME);
if (time != null) {
try {
days = Long.parseLong(time) / (24*60*60*1000L);
} catch (NumberFormatException nfe) {}
}
long days = _context.getProperty(Analysis.PROP_BLOCKTIME, 7*24*60*60*1000L) / (24*60*60*1000L);
buf.append("</select></td></tr>\n<tr><td>" +
"Auto-block routers?</td><td><input type=\"checkbox\" class=\"optbox\" value=\"1\" name=\"block\" ");
if (auto)