Changes -> Changes for the network update to DataPacket

NeoProtect · Jul 27, 2023 · f482bcc · f482bcc
1 parent eaf5265
commit f482bcc
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>de.cubeattack</groupId>
     <artifactId>neoprotect</artifactId>
-    <version>1.2.0-Beta</version>
+    <version>1.2.1-Beta</version>
     <packaging>jar</packaging>
 
     <name>NeoProtect</name>

diff --git a/src/main/java/de/cubeattack/neoprotect/bungee/proxyprotocol/ProxyProtocol.java b/src/main/java/de/cubeattack/neoprotect/bungee/proxyprotocol/ProxyProtocol.java
@@ -58,8 +58,8 @@ protected void initChannel(Channel channel) {
                             return;
                         }
 
-                        if (instance.getCore().isSetup() && (instance.getCore().getRestAPI().getNeoServerIPs() == null || !instance.getCore().getRestAPI().getNeoServerIPs().toList().
-                                contains(((InetSocketAddress) channel.remoteAddress()).getAddress().getHostAddress()))) {
+                        if (instance.getCore().isSetup() && (instance.getCore().getRestAPI().getNeoServerIPs() == null ||
+                                instance.getCore().getRestAPI().getNeoServerIPs().toList().stream().noneMatch(ipRange -> isIPInRange((String) ipRange, ((InetSocketAddress) channel.remoteAddress()).getAddress().getHostAddress())))) {
                             channel.close();
                             instance.getCore().debug("Close connection IP (" + channel.remoteAddress() + ") doesn't match to Neo-IPs (close / return)");
                             return;
@@ -191,4 +191,37 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
             }
         });
     }
+
+    public static boolean isIPInRange(String ipAddress, String ipRange) {
+        if(!ipRange.contains("/")){
+            ipRange = ipRange + "/32";
+        }
+
+        long targetIntAddress = ipToDecimal(ipAddress);
+
+        int range = Integer.parseInt(ipRange.split("/")[1]);
+        String startIP = ipRange.split("/")[0];
+
+        long startIntAddress = ipToDecimal(startIP);
+
+        return targetIntAddress <= (startIntAddress + (long) (32 - range) * (32 - range)) && targetIntAddress >= startIntAddress;
+    }
+
+    public static long ipToDecimal(String ipAddress) throws IllegalArgumentException {
+        String[] parts = ipAddress.split("\\.");
+        if (parts.length != 4) {
+            return -1;
+        }
+
+        long decimal = 0;
+        for (int i = 0; i < 4; i++) {
+            int octet = Integer.parseInt(parts[i]);
+            if (octet < 0 || octet > 255) {
+                return -1;
+            }
+            decimal += (long) (octet * Math.pow(256, 3 - i));
+        }
+
+        return decimal;
+    }
 }
diff --git a/src/main/java/de/cubeattack/neoprotect/spigot/proxyprotocol/ProxyProtocol.java b/src/main/java/de/cubeattack/neoprotect/spigot/proxyprotocol/ProxyProtocol.java
@@ -76,8 +76,9 @@ protected void initChannel(Channel channel) {
                     return;
                 }
 
-                if (instance.getCore().getRestAPI().getNeoServerIPs() == null || !instance.getCore().getRestAPI().getNeoServerIPs().toList().
-                        contains(((InetSocketAddress) channel.remoteAddress()).getAddress().getHostAddress())) {
+                if (instance.getCore().isSetup() && (instance.getCore().getRestAPI().getNeoServerIPs() == null ||
+                        instance.getCore().getRestAPI().getNeoServerIPs().toList().stream().noneMatch(ipRange -> isIPInRange((String) ipRange, ((InetSocketAddress) channel.remoteAddress()).getAddress().getHostAddress())))) {
+                    channel.close();
                     instance.getCore().debug("Player connected over IP (" + channel.remoteAddress() + ") doesn't match to Neo-IPs (warning)");
                     return;
                 }
@@ -189,6 +190,10 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) {
     }
 
     public static boolean isIPInRange(String ipAddress, String ipRange) {
+        if(!ipRange.contains("/")){
+            ipRange = ipRange + "/32";
+        }
+
         long targetIntAddress = ipToDecimal(ipAddress);
 
         int range = Integer.parseInt(ipRange.split("/")[1]);
@@ -199,8 +204,6 @@ public static boolean isIPInRange(String ipAddress, String ipRange) {
         return targetIntAddress <= (startIntAddress + (long) (32 - range) * (32 - range)) && targetIntAddress >= startIntAddress;
     }
 
-
-
     public static long ipToDecimal(String ipAddress) throws IllegalArgumentException {
         String[] parts = ipAddress.split("\\.");
         if (parts.length != 4) {

diff --git a/src/main/java/de/cubeattack/neoprotect/velocity/proxyprotocol/ProxyProtocol.java b/src/main/java/de/cubeattack/neoprotect/velocity/proxyprotocol/ProxyProtocol.java
@@ -63,8 +63,8 @@ protected void initChannel(Channel channel) {
                             return;
                         }
 
-                        if (instance.getCore().isSetup() && (instance.getCore().getRestAPI().getNeoServerIPs() == null || !instance.getCore().getRestAPI().getNeoServerIPs().toList().
-                                contains(((InetSocketAddress) channel.remoteAddress()).getAddress().getHostAddress()))) {
+                        if (instance.getCore().isSetup() && (instance.getCore().getRestAPI().getNeoServerIPs() == null ||
+                                instance.getCore().getRestAPI().getNeoServerIPs().toList().stream().noneMatch(ipRange -> isIPInRange((String) ipRange, ((InetSocketAddress) channel.remoteAddress()).getAddress().getHostAddress())))) {
                             channel.close();
                             instance.getCore().debug("Close connection IP (" + channel.remoteAddress() + ") doesn't match to Neo-IPs (close / return)");
                             return;
@@ -188,4 +188,37 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
             }
         });
     }
+
+    public static boolean isIPInRange(String ipAddress, String ipRange) {
+        if(!ipRange.contains("/")){
+            ipRange = ipRange + "/32";
+        }
+
+        long targetIntAddress = ipToDecimal(ipAddress);
+
+        int range = Integer.parseInt(ipRange.split("/")[1]);
+        String startIP = ipRange.split("/")[0];
+
+        long startIntAddress = ipToDecimal(startIP);
+
+        return targetIntAddress <= (startIntAddress + (long) (32 - range) * (32 - range)) && targetIntAddress >= startIntAddress;
+    }
+
+    public static long ipToDecimal(String ipAddress) throws IllegalArgumentException {
+        String[] parts = ipAddress.split("\\.");
+        if (parts.length != 4) {
+            return -1;
+        }
+
+        long decimal = 0;
+        for (int i = 0; i < 4; i++) {
+            int octet = Integer.parseInt(parts[i]);
+            if (octet < 0 || octet > 255) {
+                return -1;
+            }
+            decimal += (long) (octet * Math.pow(256, 3 - i));
+        }
+
+        return decimal;
+    }
 }