Merge pull request #1 from iwmedia/develop

ByteExceptionM · web-flow · commit b67812af190d · 2025-12-19T19:57:57.000+01:00
feat: Add commands to modify asn black- and whitelist and asn blacklist
diff --git a/bukkit/src/main/java/ls/ni/networkfilter/bukkit/NetworkFilterBukkitPlugin.java b/bukkit/src/main/java/ls/ni/networkfilter/bukkit/NetworkFilterBukkitPlugin.java
@@ -1,5 +1,6 @@
 package ls.ni.networkfilter.bukkit;
 
+import ls.ni.networkfilter.bukkit.commands.NetworkFilterCommand;
 import ls.ni.networkfilter.bukkit.listeners.PlayerJoinListener;
 import ls.ni.networkfilter.common.NetworkFilterCommon;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -12,6 +13,10 @@ public void onEnable() {
 
         // ---
 
+        this.getCommand("networkfilter").setExecutor(new NetworkFilterCommand());
+
+        // ---
+
         this.getServer().getPluginManager().registerEvents(new PlayerJoinListener(this), this);
     }
 }
diff --git a/bukkit/src/main/java/ls/ni/networkfilter/bukkit/commands/NetworkFilterCommand.java b/bukkit/src/main/java/ls/ni/networkfilter/bukkit/commands/NetworkFilterCommand.java
@@ -0,0 +1,98 @@
+package ls.ni.networkfilter.bukkit.commands;
+
+import com.google.common.primitives.Ints;
+import ls.ni.networkfilter.common.NetworkFilterCommon;
+import ls.ni.networkfilter.common.config.Config;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+
+public class NetworkFilterCommand implements TabExecutor {
+
+    private static final String PREFIX = "§e§lNetworkFilter §8» §r";
+
+    @Override
+    public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
+        if (args.length < 3 ||
+                (!args[0].equalsIgnoreCase("whitelist") && !args[0].equalsIgnoreCase("blacklist")) ||
+                (!args[1].equalsIgnoreCase("add") && !args[1].equalsIgnoreCase("remove"))) {
+            commandSender.sendMessage(PREFIX + "§cUsage: /networkfilter whitelist add|remove <asn>");
+            commandSender.sendMessage(PREFIX + "§cUsage: /networkfilter blacklist add|remove <asn>");
+        } else {
+            Integer asn = Ints.tryParse(args[2]);
+
+            if (asn == null) {
+                commandSender.sendMessage("§cInvalid ASN: " + args[2]);
+                return true;
+            }
+
+            Config config = NetworkFilterCommon.getConfig();
+
+            if (args[0].equalsIgnoreCase("whitelist")) {
+                List<Integer> asnWhitelist = config.getAsnWhitelist();
+
+                if (args[1].equalsIgnoreCase("add")) {
+                    if (asnWhitelist.contains(asn)) {
+                        commandSender.sendMessage(PREFIX + "§cASN " + asn + " is already in the whitelist");
+                    } else {
+                        asnWhitelist.add(asn);
+                        commandSender.sendMessage(PREFIX + "§aAdded ASN " + asn + " to whitelist");
+                    }
+                } else {
+                    if (asnWhitelist.contains(asn)) {
+                        asnWhitelist.remove(asn);
+                        commandSender.sendMessage(PREFIX + "§aRemoved ASN " + asn + " from whitelist");
+                    } else {
+                        commandSender.sendMessage(PREFIX + "§cASN " + asn + " is not in the whitelist");
+                    }
+                }
+            } else {
+                List<Integer> asnBlacklist = config.getAsnBlacklist();
+
+                if (args[1].equalsIgnoreCase("add")) {
+                    if (asnBlacklist.contains(asn)) {
+                        commandSender.sendMessage(PREFIX + "§cASN " + asn + " is already in the blacklist");
+                    } else {
+                        asnBlacklist.add(asn);
+                        commandSender.sendMessage(PREFIX + "§aAdded ASN " + asn + " to blacklist");
+                    }
+                } else {
+                    if (asnBlacklist.contains(asn)) {
+                        asnBlacklist.remove(asn);
+                        commandSender.sendMessage(PREFIX + "§aRemoved ASN " + asn + " from blacklist");
+                    } else {
+                        commandSender.sendMessage(PREFIX + "§cASN " + asn + " is not in the blacklist");
+                    }
+                }
+            }
+        }
+
+        return true;
+    }
+
+
+    @Override
+    public @Nullable List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
+        if (args.length == 1) {
+            return List.of("whitelist", "blacklist");
+        } else if (args.length == 2) {
+            return List.of("add", "remove");
+        } else if (args.length == 3) {
+            Config config = NetworkFilterCommon.getConfig();
+
+            if (args[0].equalsIgnoreCase("whitelist") && args[1].equalsIgnoreCase("remove")) {
+                return config.getAsnWhitelist().stream().map(String::valueOf).toList();
+            } else if (args[0].equalsIgnoreCase("blacklist") && args[1].equalsIgnoreCase("remove")) {
+                return config.getAsnBlacklist().stream().map(String::valueOf).toList();
+            } else {
+                return null;
+            }
+        } else {
+            return null;
+        }
+    }
+}
diff --git a/bukkit/src/main/resources/plugin.yml b/bukkit/src/main/resources/plugin.yml
@@ -8,3 +8,8 @@ author: nidotls
 website: https://github.com/nidotls/${project.parent.name}
 
 main: ${project.groupId}.bukkit.${project.name}Plugin
+
+commands:
+  networkfilter:
+    aliases: [nf]
+    permission: networkfilter.admin
diff --git a/bungee/pom.xml b/bungee/pom.xml
@@ -17,7 +17,7 @@
     <repositories>
         <repository>
             <id>bungeecord-repo</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/public/</url>
         </repository>
     </repositories>
 
diff --git a/bungee/src/main/java/ls/ni/networkfilter/bungee/NetworkFilterBungeePlugin.java b/bungee/src/main/java/ls/ni/networkfilter/bungee/NetworkFilterBungeePlugin.java
@@ -24,6 +24,7 @@
 
 package ls.ni.networkfilter.bungee;
 
+import ls.ni.networkfilter.bungee.commands.NetworkFilterCommand;
 import ls.ni.networkfilter.bungee.listeners.PostLoginListener;
 import ls.ni.networkfilter.common.NetworkFilterCommon;
 import net.md_5.bungee.api.plugin.Plugin;
@@ -36,6 +37,10 @@ public void onEnable() {
 
         // ---
 
+        this.getProxy().getPluginManager().registerCommand(this, new NetworkFilterCommand());
+
+        // ---
+
         this.getProxy().getPluginManager().registerListener(this, new PostLoginListener(this));
     }
 }
diff --git a/bungee/src/main/java/ls/ni/networkfilter/bungee/commands/NetworkFilterCommand.java b/bungee/src/main/java/ls/ni/networkfilter/bungee/commands/NetworkFilterCommand.java
@@ -0,0 +1,77 @@
+package ls.ni.networkfilter.bungee.commands;
+
+import com.google.common.primitives.Ints;
+import ls.ni.networkfilter.common.NetworkFilterCommon;
+import ls.ni.networkfilter.common.config.Config;
+import net.md_5.bungee.api.CommandSender;
+import net.md_5.bungee.api.chat.TextComponent;
+import net.md_5.bungee.api.plugin.Command;
+
+import java.util.List;
+
+public class NetworkFilterCommand extends Command {
+
+    private static final String PREFIX = "§e§lNetworkFilter §8» §r";
+
+    public NetworkFilterCommand() {
+        super("networkfilter", "networkfilter.admin", "nf");
+    }
+
+    @Override
+    public void execute(CommandSender commandSender, String[] args) {
+        if (args.length < 3 ||
+                (!args[0].equalsIgnoreCase("whitelist") && !args[0].equalsIgnoreCase("blacklist")) ||
+                (!args[1].equalsIgnoreCase("add") && !args[1].equalsIgnoreCase("remove"))) {
+            commandSender.sendMessage(TextComponent.fromLegacy(PREFIX + "§cUsage: /networkfilter whitelist add|remove <asn>"));
+            commandSender.sendMessage(TextComponent.fromLegacy(PREFIX + "§cUsage: /networkfilter blacklist add|remove <asn>"));
+        } else {
+            Integer asn = Ints.tryParse(args[2]);
+
+            if (asn == null) {
+                commandSender.sendMessage(TextComponent.fromLegacy("§cInvalid ASN: " + args[2]));
+                return;
+            }
+
+            Config config = NetworkFilterCommon.getConfig();
+
+            if (args[0].equalsIgnoreCase("whitelist")) {
+                List<Integer> asnWhitelist = config.getAsnWhitelist();
+
+                if (args[1].equalsIgnoreCase("add")) {
+                    if (asnWhitelist.contains(asn)) {
+                        commandSender.sendMessage(TextComponent.fromLegacy(PREFIX + "§cASN " + asn + " is already in the whitelist"));
+                    } else {
+                        asnWhitelist.add(asn);
+                        commandSender.sendMessage(TextComponent.fromLegacy(PREFIX + "§aAdded ASN " + asn + " to whitelist"));
+                    }
+                } else {
+                    if (asnWhitelist.contains(asn)) {
+                        asnWhitelist.remove(asn);
+                        commandSender.sendMessage(TextComponent.fromLegacy(PREFIX + "§aRemoved ASN " + asn + " from whitelist"));
+                    } else {
+                        commandSender.sendMessage(TextComponent.fromLegacy(PREFIX + "§cASN " + asn + " is not in the whitelist"));
+                    }
+                }
+            } else {
+                List<Integer> asnBlacklist = config.getAsnBlacklist();
+
+                if (args[1].equalsIgnoreCase("add")) {
+                    if (asnBlacklist.contains(asn)) {
+                        commandSender.sendMessage(TextComponent.fromLegacy(PREFIX + "§cASN " + asn + " is already in the blacklist"));
+                    } else {
+                        asnBlacklist.add(asn);
+                        commandSender.sendMessage(TextComponent.fromLegacy(PREFIX + "§aAdded ASN " + asn + " to blacklist"));
+                    }
+                } else {
+                    if (asnBlacklist.contains(asn)) {
+                        asnBlacklist.remove(asn);
+                        commandSender.sendMessage(TextComponent.fromLegacy(PREFIX + "§aRemoved ASN " + asn + " from blacklist"));
+                    } else {
+                        commandSender.sendMessage(TextComponent.fromLegacy(PREFIX + "§cASN " + asn + " is not in the blacklist"));
+                    }
+                }
+            }
+        }
+    }
+
+}
diff --git a/common/src/main/java/ls/ni/networkfilter/common/config/Config.java b/common/src/main/java/ls/ni/networkfilter/common/config/Config.java
@@ -13,6 +13,7 @@
 import ls.ni.networkfilter.common.config.service.ServiceSettings;
 import ls.ni.networkfilter.common.config.service.ServiceType;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Valid
@@ -49,6 +50,10 @@ public class Config {
     @NotNull
     private List<Integer> asnWhitelist;
 
+    @Valid
+    @NotNull
+    private List<Integer> asnBlacklist = new ArrayList<>();
+
     @Valid
     @NotNull
     private ConsequenceSettings consequences;
diff --git a/common/src/main/java/ls/ni/networkfilter/common/filter/types/IPApiIsFilterService.java b/common/src/main/java/ls/ni/networkfilter/common/filter/types/IPApiIsFilterService.java
@@ -44,9 +44,20 @@ public IPApiIsFilterService(@Nullable String apiKey, @NotNull Set<String> checkT
 
         JSONObject asnObject = response.getBody().getObject().getJSONObject("asn");
 
+        int asn = Optional.ofNullable(asnObject).map(jsonObject -> jsonObject.getInt("asn")).orElse(-1);
+
+        //blacklist
+        List<Integer> asnBlacklist = NetworkFilterCommon.getConfig().getAsnBlacklist();
+        if (asn != -1 && asnBlacklist.contains(asn)) {
+            return new FilterResult(
+                    true,
+                    asn,
+                    Optional.of(asnObject).map(jsonObject -> jsonObject.getString("org")).orElse("Unknown")
+            );
+        }
+
         // whitelist
         List<Integer> asnWhitelist = NetworkFilterCommon.getConfig().getAsnWhitelist();
-        int asn = Optional.ofNullable(asnObject).map(jsonObject -> jsonObject.getInt("asn")).orElse(-1);
         if (asn != -1 && asnWhitelist.contains(asn)) {
             return new FilterResult(
                     false,
diff --git a/common/src/main/java/ls/ni/networkfilter/common/filter/types/NetworkFilterFilterService.java b/common/src/main/java/ls/ni/networkfilter/common/filter/types/NetworkFilterFilterService.java
@@ -12,7 +12,6 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
-import java.util.Optional;
 
 public class NetworkFilterFilterService implements FilterService {
 
@@ -48,9 +47,20 @@ public NetworkFilterFilterService(@NotNull @NotBlank String apiKey) {
 
         JSONObject data = body.getJSONObject("data");
 
+        int asn = data.getInt("asn");
+
+        //blacklist
+        List<Integer> asnBlacklist = NetworkFilterCommon.getConfig().getAsnBlacklist();
+        if (asnBlacklist.contains(asn)) {
+            return new FilterResult(
+                    true,
+                    asn,
+                    data.getString("org")
+            );
+        }
+
         //whitelist
         List<Integer> asnWhitelist = NetworkFilterCommon.getConfig().getAsnWhitelist();
-        int asn = data.getInt("asn");
         if (asnWhitelist.contains(asn)) {
             return new FilterResult(
                     false,
diff --git a/common/src/main/resources/config.yml b/common/src/main/resources/config.yml
@@ -61,6 +61,8 @@ ignore:
 
 asnWhitelist: []
 
+asnBlacklist: []
+
 consequences:
   kick:
     enabled: true

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package ls.ni.networkfilter.bukkit;`
`2`	`2`
	`3`	`+import ls.ni.networkfilter.bukkit.commands.NetworkFilterCommand;`
`3`	`4`	`import ls.ni.networkfilter.bukkit.listeners.PlayerJoinListener;`
`4`	`5`	`import ls.ni.networkfilter.common.NetworkFilterCommon;`
`5`	`6`	`import org.bukkit.plugin.java.JavaPlugin;`
`@@ -12,6 +13,10 @@ public void onEnable() {`
`12`	`13`
`13`	`14`	`// ---`
`14`	`15`
	`16`	`+ this.getCommand("networkfilter").setExecutor(new NetworkFilterCommand());`
	`17`	`+`
	`18`	`+ // ---`
	`19`	`+`
`15`	`20`	`this.getServer().getPluginManager().registerEvents(new PlayerJoinListener(this), this);`
`16`	`21`	`}`
`17`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`
`25`	`25`	`package ls.ni.networkfilter.bungee;`
`26`	`26`
	`27`	`+import ls.ni.networkfilter.bungee.commands.NetworkFilterCommand;`
`27`	`28`	`import ls.ni.networkfilter.bungee.listeners.PostLoginListener;`
`28`	`29`	`import ls.ni.networkfilter.common.NetworkFilterCommon;`
`29`	`30`	`import net.md_5.bungee.api.plugin.Plugin;`
`@@ -36,6 +37,10 @@ public void onEnable() {`
`36`	`37`
`37`	`38`	`// ---`
`38`	`39`
	`40`	`+ this.getProxy().getPluginManager().registerCommand(this, new NetworkFilterCommand());`
	`41`	`+`
	`42`	`+ // ---`
	`43`	`+`
`39`	`44`	`this.getProxy().getPluginManager().registerListener(this, new PostLoginListener(this));`
`40`	`45`	`}`
`41`	`46`	`}`