mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-10-03 08:57:43 +02:00
Proxy check whitelist
This commit is contained in:
parent
6e96f0be14
commit
1b12df9d51
@ -1,4 +1,4 @@
|
|||||||
From 3c1c6b50d0d78a409332452b39390ce5ed3ce871 Mon Sep 17 00:00:00 2001
|
From 5ab898235d0a3f199036d39c3215a28eab3445ad Mon Sep 17 00:00:00 2001
|
||||||
From: LinsaFTW <25271111+linsaftw@users.noreply.github.com>
|
From: LinsaFTW <25271111+linsaftw@users.noreply.github.com>
|
||||||
Date: Fri, 4 Mar 2022 13:35:53 -0300
|
Date: Fri, 4 Mar 2022 13:35:53 -0300
|
||||||
Subject: [PATCH] Antibot System
|
Subject: [PATCH] Antibot System
|
||||||
@ -1090,10 +1090,10 @@ index 00000000..68555de3
|
|||||||
+}
|
+}
|
||||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/ProxyCheck.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/ProxyCheck.java
|
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/ProxyCheck.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/ProxyCheck.java
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 00000000..77e8004e
|
index 00000000..6b3ee3d0
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/ProxyCheck.java
|
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/ProxyCheck.java
|
||||||
@@ -0,0 +1,174 @@
|
@@ -0,0 +1,180 @@
|
||||||
+package dev._2lstudios.flamecord.antibot;
|
+package dev._2lstudios.flamecord.antibot;
|
||||||
+
|
+
|
||||||
+import java.io.BufferedReader;
|
+import java.io.BufferedReader;
|
||||||
@ -1204,6 +1204,12 @@ index 00000000..77e8004e
|
|||||||
+
|
+
|
||||||
+ AddressData addressData = addressDataManager.getAddressData(address);
|
+ AddressData addressData = addressDataManager.getAddressData(address);
|
||||||
+ String ip = addressData.getHostString();
|
+ String ip = addressData.getHostString();
|
||||||
|
+ Collection<String> whitelist = config.getAntibotProxyWhitelist();
|
||||||
|
+
|
||||||
|
+ // Check if the ip is whitelisted
|
||||||
|
+ if (whitelist.contains(ip)) {
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
+
|
+
|
||||||
+ // Check if it's a proxy
|
+ // Check if it's a proxy
|
||||||
+ if ((!proxies.equals("") && proxies.contains(ip)) || isVPN(ip)) {
|
+ if ((!proxies.equals("") && proxies.contains(ip)) || isVPN(ip)) {
|
||||||
@ -1467,10 +1473,10 @@ index 00000000..44d773ab
|
|||||||
+ }
|
+ }
|
||||||
+}
|
+}
|
||||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
||||||
index 14665b1f..c59227cb 100644
|
index 14665b1f..950a189d 100644
|
||||||
--- a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
--- a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
||||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
||||||
@@ -15,6 +15,220 @@ import net.md_5.bungee.config.Configuration;
|
@@ -15,6 +15,223 @@ import net.md_5.bungee.config.Configuration;
|
||||||
import net.md_5.bungee.config.ConfigurationProvider;
|
import net.md_5.bungee.config.ConfigurationProvider;
|
||||||
|
|
||||||
public class FlameCordConfiguration extends FlameConfig {
|
public class FlameCordConfiguration extends FlameConfig {
|
||||||
@ -1598,6 +1604,8 @@ index 14665b1f..c59227cb 100644
|
|||||||
+ @Getter
|
+ @Getter
|
||||||
+ private String antibotProxyEmail = "flamecord@gmail.com";
|
+ private String antibotProxyEmail = "flamecord@gmail.com";
|
||||||
+ @Getter
|
+ @Getter
|
||||||
|
+ private Collection<String> antibotProxyWhitelist = Arrays.asList("127.0.0.1");
|
||||||
|
+ @Getter
|
||||||
+ private Collection<String> antibotProxyLists = Arrays.asList(
|
+ private Collection<String> antibotProxyLists = Arrays.asList(
|
||||||
+ "https://raw.githubusercontent.com/TheSpeedX/PROXY-List/master/http.txt",
|
+ "https://raw.githubusercontent.com/TheSpeedX/PROXY-List/master/http.txt",
|
||||||
+ "https://raw.githubusercontent.com/clarketm/proxy-list/master/proxy-list-raw.txt",
|
+ "https://raw.githubusercontent.com/clarketm/proxy-list/master/proxy-list-raw.txt",
|
||||||
@ -1685,13 +1693,14 @@ index 14665b1f..c59227cb 100644
|
|||||||
+ this.antibotProxyFirewall = setIfUnexistant("antibot.proxy.firewall", this.antibotProxyFirewall, config);
|
+ this.antibotProxyFirewall = setIfUnexistant("antibot.proxy.firewall", this.antibotProxyFirewall, config);
|
||||||
+ this.antibotProxyOnlineCheck = setIfUnexistant("antibot.proxy.online-check", this.antibotProxyOnlineCheck, config);
|
+ this.antibotProxyOnlineCheck = setIfUnexistant("antibot.proxy.online-check", this.antibotProxyOnlineCheck, config);
|
||||||
+ this.antibotProxyEmail = setIfUnexistant("antibot.proxy.email", this.antibotProxyEmail, config);
|
+ this.antibotProxyEmail = setIfUnexistant("antibot.proxy.email", this.antibotProxyEmail, config);
|
||||||
|
+ this.antibotProxyWhitelist = setIfUnexistant("antibot.proxy.whitelist", this.antibotProxyWhitelist, config);
|
||||||
+ this.antibotProxyLists = setIfUnexistant("antibot.proxy.lists", this.antibotProxyLists, config);
|
+ this.antibotProxyLists = setIfUnexistant("antibot.proxy.lists", this.antibotProxyLists, config);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
// FlameCord - TCP Fast Open
|
// FlameCord - TCP Fast Open
|
||||||
@Getter
|
@Getter
|
||||||
private int tcpFastOpen = 3;
|
private int tcpFastOpen = 3;
|
||||||
@@ -132,6 +346,9 @@ public class FlameCordConfiguration extends FlameConfig {
|
@@ -132,6 +349,9 @@ public class FlameCordConfiguration extends FlameConfig {
|
||||||
this.fakePlayersMode = setIfUnexistant("custom-motd.fakeplayers.mode", this.fakePlayersMode, configuration);
|
this.fakePlayersMode = setIfUnexistant("custom-motd.fakeplayers.mode", this.fakePlayersMode, configuration);
|
||||||
|
|
||||||
this.tcpFastOpen = setIfUnexistant("tcp-fast-open", this.tcpFastOpen, configuration);
|
this.tcpFastOpen = setIfUnexistant("tcp-fast-open", this.tcpFastOpen, configuration);
|
||||||
@ -1929,7 +1938,7 @@ index fb81adee..173b47f3 100644
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
||||||
index bc3fd9eb..fabdb256 100644
|
index d48f9687..35850471 100644
|
||||||
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
||||||
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
||||||
@@ -533,6 +533,11 @@ public class BungeeCord extends ProxyServer
|
@@ -533,6 +533,11 @@ public class BungeeCord extends ProxyServer
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
From 542d393202ea9de9b5cafbf4acf34c49ca320b05 Mon Sep 17 00:00:00 2001
|
From aaeb99f3105cfd5d5ee8721fa1a57e4eb3c72066 Mon Sep 17 00:00:00 2001
|
||||||
From: LinsaFTW <25271111+linsaftw@users.noreply.github.com>
|
From: LinsaFTW <25271111+linsaftw@users.noreply.github.com>
|
||||||
Date: Fri, 4 Mar 2022 14:09:35 -0300
|
Date: Fri, 4 Mar 2022 14:09:35 -0300
|
||||||
Subject: [PATCH] Allow Invalid Names
|
Subject: [PATCH] Allow Invalid Names
|
||||||
|
|
||||||
|
|
||||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
||||||
index c59227cb..ad1bcf44 100644
|
index 950a189d..ad7f8c8e 100644
|
||||||
--- a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
--- a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
||||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
||||||
@@ -15,6 +15,10 @@ import net.md_5.bungee.config.Configuration;
|
@@ -15,6 +15,10 @@ import net.md_5.bungee.config.Configuration;
|
||||||
@ -19,7 +19,7 @@ index c59227cb..ad1bcf44 100644
|
|||||||
// Antibot accounts
|
// Antibot accounts
|
||||||
@Getter
|
@Getter
|
||||||
private boolean antibotAccountsEnabled = true;
|
private boolean antibotAccountsEnabled = true;
|
||||||
@@ -350,6 +354,9 @@ public class FlameCordConfiguration extends FlameConfig {
|
@@ -353,6 +357,9 @@ public class FlameCordConfiguration extends FlameConfig {
|
||||||
// FlameCord - Antibot System
|
// FlameCord - Antibot System
|
||||||
loadAntibot(configuration, whitelistedAddresses);
|
loadAntibot(configuration, whitelistedAddresses);
|
||||||
|
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
From 3239b8b4f31f0dab4647c938a32a9cf07a68c375 Mon Sep 17 00:00:00 2001
|
From 3bc1f1f17e6f7335fb1015936f220f279c7dc4c7 Mon Sep 17 00:00:00 2001
|
||||||
From: xIsm4 <soportexism4@gmail.com>
|
From: xIsm4 <soportexism4@gmail.com>
|
||||||
Date: Fri, 27 Jan 2023 14:12:44 +0100
|
Date: Fri, 27 Jan 2023 14:12:44 +0100
|
||||||
Subject: [PATCH] Implement libdeflate
|
Subject: [PATCH] Implement libdeflate
|
||||||
|
|
||||||
|
|
||||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
||||||
index ad1bcf44..70a783f9 100644
|
index ad7f8c8e..024398a1 100644
|
||||||
--- a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
--- a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
||||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
||||||
@@ -59,6 +59,8 @@ public class FlameCordConfiguration extends FlameConfig {
|
@@ -59,6 +59,8 @@ public class FlameCordConfiguration extends FlameConfig {
|
||||||
@ -17,7 +17,7 @@ index ad1bcf44..70a783f9 100644
|
|||||||
private boolean antibotFirewallLog = true;
|
private boolean antibotFirewallLog = true;
|
||||||
@Getter
|
@Getter
|
||||||
private boolean antibotFirewallIpset = true;
|
private boolean antibotFirewallIpset = true;
|
||||||
@@ -357,6 +359,9 @@ public class FlameCordConfiguration extends FlameConfig {
|
@@ -360,6 +362,9 @@ public class FlameCordConfiguration extends FlameConfig {
|
||||||
// FlameCord - Allow Invalid Names
|
// FlameCord - Allow Invalid Names
|
||||||
this.allowInvalidNames = setIfUnexistant("allow-invalid-names", this.allowInvalidNames, configuration);
|
this.allowInvalidNames = setIfUnexistant("allow-invalid-names", this.allowInvalidNames, configuration);
|
||||||
|
|
||||||
@ -2118,7 +2118,7 @@ index 02625018..37abc9f7 100644
|
|||||||
<groupId>io.github.waterfallmc</groupId>
|
<groupId>io.github.waterfallmc</groupId>
|
||||||
<artifactId>waterfall-module-cmd-alert</artifactId>
|
<artifactId>waterfall-module-cmd-alert</artifactId>
|
||||||
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
||||||
index 4e97d485..153ec3a9 100644
|
index c5fca906..78324f6a 100644
|
||||||
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
||||||
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
||||||
@@ -17,6 +17,7 @@ import dev._2lstudios.flamecord.commands.FlameCordCommand;
|
@@ -17,6 +17,7 @@ import dev._2lstudios.flamecord.commands.FlameCordCommand;
|
||||||
|
Loading…
Reference in New Issue
Block a user