Skip to content

Commit

Permalink
Blocklist: Revert #93
Browse files Browse the repository at this point in the history
  • Loading branch information
eyedeekay committed Apr 29, 2024
1 parent d123aea commit 3a0188f
Showing 1 changed file with 6 additions and 91 deletions.
97 changes: 6 additions & 91 deletions router/java/src/net/i2p/router/Blocklist.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
Expand Down Expand Up @@ -90,14 +89,12 @@ public class Blocklist {
private final File _blocklistFeedFile;
private final boolean _haveIPv6;
private boolean _started;
private long _lastExpired = 0;
// temp
private final Map<Hash, String> _peerBlocklist = new HashMap<Hash, String>(4);

private static final String PROP_BLOCKLIST_ENABLED = "router.blocklist.enable";
private static final String PROP_BLOCKLIST_DETAIL = "router.blocklist.detail";
private static final String PROP_BLOCKLIST_FILE = "router.blocklist.file";
private static final String PROP_BLOCKLIST_EXPIRE_INTERVAL = "router.blocklist.expireInterval";
public static final String BLOCKLIST_FILE_DEFAULT = "blocklist.txt";
private static final String BLOCKLIST_FEED_FILE = "docs/feed/blocklist/blocklist.txt";
/** @since 0.9.48 */
Expand Down Expand Up @@ -150,37 +147,6 @@ private Blocklist() {
_singleIPv6Blocklist = _haveIPv6 ? new LHMCache<BigInteger, Object>(MAX_IPV6_SINGLES) : null;
}


private int expireInterval(){
String expireIntervalValue = _context.getProperty(PROP_BLOCKLIST_EXPIRE_INTERVAL, "0");
try{
Integer expireIntervalInt = 0;
if (expireIntervalValue.endsWith("s")) {
expireIntervalValue = expireIntervalValue.substring(0, expireIntervalValue.length() - 1);
expireIntervalInt = Integer.parseInt(expireIntervalValue) * 1000;
}else if(expireIntervalValue.endsWith("m")){
expireIntervalValue = expireIntervalValue.substring(0, expireIntervalValue.length() - 1);
expireIntervalInt = Integer.parseInt(expireIntervalValue) * 60000;
}else if(expireIntervalValue.endsWith("h")){
expireIntervalValue = expireIntervalValue.substring(0, expireIntervalValue.length() - 1);
expireIntervalInt = Integer.parseInt(expireIntervalValue) * 3600000;
}else if (expireIntervalValue.endsWith("d")) {
expireIntervalValue = expireIntervalValue.substring(0, expireIntervalValue.length() - 1);
expireIntervalInt = Integer.parseInt(expireIntervalValue) * 86400000;
}else{
expireIntervalInt = Integer.parseInt(expireIntervalValue);
}
if (expireIntervalInt < 0)
expireIntervalInt = 0;
return expireIntervalInt;
}catch(NumberFormatException nfe){
if (_log.shouldLog(_log.ERROR))
_log.error("format error in "+PROP_BLOCKLIST_EXPIRE_INTERVAL, nfe);
}
// if we don't have a valid value in this field, return 0 which is the same as disabling it.
return 0;
}

/**
* Loads the following files in-order:
* $I2P/blocklist.txt
Expand Down Expand Up @@ -227,11 +193,6 @@ public synchronized void startup() {
// but it's important to have this initialized before we read in the netdb.
//job.getTiming().setStartAfter(_context.clock().now() + 30*1000);
_context.jobQueue().addJob(job);
if (expireInterval() > 0) {
Job cleanupJob = new CleanupJob();
cleanupJob.getTiming().setStartAfter(_context.clock().now() + expireInterval());
_context.jobQueue().addJob(cleanupJob);
}
}

/**
Expand Down Expand Up @@ -271,34 +232,6 @@ public void timeReached() {
}
}
}

private class CleanupJob extends JobImpl {
public CleanupJob() {
super(_context);
}
public String getName(){
return "Expire blocklist at user-defined interval of " + expireInterval();
}
public void runJob() {
clear();
_lastExpired = System.currentTimeMillis();
if (_log.shouldLog(Log.DEBUG))
_log.debug("Expiring blocklist entrys at" + _lastExpired);
// schedule the next one
super.requeue(expireInterval());
}
}

private void clear(){
synchronized(_singleIPBlocklist) {
_singleIPBlocklist.clear();
}
if (_singleIPv6Blocklist != null) {
synchronized(_singleIPv6Blocklist) {
_singleIPv6Blocklist.clear();
}
}
}

private class ReadinJob extends JobImpl {
private final List<BLFile> _files;
Expand Down Expand Up @@ -352,20 +285,13 @@ private int process() {
reason = _x("Banned by router hash: {0}");
else
reason = _x("Banned by router hash");
banlistRouter(peer, reason, comment);
_context.banlist().banlistRouterForever(peer, reason, comment);
}
_peerBlocklist.clear();
return count;
}
}

private void banlistRouter(Hash peer, String reason, String comment) {
if (expireInterval() > 0)
_context.banlist().banlistRouter(peer, reason, comment, null, expireInterval());
else
_context.banlist().banlistRouterForever(peer, reason, comment);
}

/**
* The blocklist-country.txt file was created or updated.
* Read it in. Not required normally, as the country file
Expand Down Expand Up @@ -968,9 +894,6 @@ private List<byte[]> getAddresses(RouterInfo pinfo) {
/**
* Does the peer's IP address appear in the blocklist?
* If so, and it isn't banlisted, banlist it forever...
* or, if the user configured an override, ban it for the
* override period.
* @since 0.9.29
*/
public boolean isBlocklisted(Hash peer) {
List<byte[]> ips = getAddresses(peer);
Expand All @@ -990,8 +913,6 @@ public boolean isBlocklisted(Hash peer) {
/**
* Does the peer's IP address appear in the blocklist?
* If so, and it isn't banlisted, banlist it forever...
* or, if the user configured an override, ban it for the
* override period.
* @since 0.9.29
*/
public boolean isBlocklisted(RouterInfo pinfo) {
Expand Down Expand Up @@ -1228,7 +1149,7 @@ private void banlist(Hash peer, byte[] ip) {
_context.clock().now() + Banlist.BANLIST_DURATION_LOCALHOST);
return;
}
banlistRouter(peer, reason, sip);
_context.banlist().banlistRouterForever(peer, reason, sip);
if (! _context.getBooleanPropertyDefaultTrue(PROP_BLOCKLIST_DETAIL))
return;
boolean shouldRunJob;
Expand Down Expand Up @@ -1256,7 +1177,7 @@ public BanlistJob (Hash p, List<byte[]> ips) {
}
public String getName() { return "Ban Peer by IP"; }
public void runJob() {
banlistRouter(_peer, _ips, expireInterval());
banlistForever(_peer, _ips);
synchronized (_inProcess) {
_inProcess.remove(_peer);
}
Expand All @@ -1272,13 +1193,7 @@ public void runJob() {
* So we also stagger these jobs.
*
*/
private void banlistRouter( Hash peer, String reason, String reasonCode, long duration) {
if (duration > 0)
_context.banlist().banlistRouter(peer, reason, reasonCode, null, System.currentTimeMillis()+expireInterval());
else
_context.banlist().banlistRouterForever(peer, reason, reasonCode);
}
private synchronized void banlistRouter(Hash peer, List<byte[]> ips, long duration) {
private synchronized void banlistForever(Hash peer, List<byte[]> ips) {
// This only checks one file for now, pick the best one
// user specified
File blFile = null;
Expand All @@ -1298,7 +1213,7 @@ private synchronized void banlistRouter(Hash peer, List<byte[]> ips, long durati
// just ban it and be done
if (_log.shouldLog(Log.WARN))
_log.warn("Banlisting " + peer);
banlistRouter(peer, "Banned", "Banned", expireInterval());
_context.banlist().banlistRouterForever(peer, "Banned");
return;
}

Expand Down Expand Up @@ -1329,7 +1244,7 @@ private synchronized void banlistRouter(Hash peer, List<byte[]> ips, long durati
//reason = reason + " banned by " + BLOCKLIST_FILE_DEFAULT + " entry \"" + buf + "\"";
if (_log.shouldLog(Log.WARN))
_log.warn("Banlisting " + peer + " " + reason);
banlistRouter(peer, reason, buf.toString(), expireInterval());
_context.banlist().banlistRouterForever(peer, reason, buf.toString());
return;
}
}
Expand Down

0 comments on commit 3a0188f

Please sign in to comment.