From 44dd1ef6f6a3325d3a55550da95dd22bd96684dc Mon Sep 17 00:00:00 2001
From: discomrade <nice@try.fbi>
Date: Wed, 13 Oct 2021 13:32:23 +0000
Subject: [PATCH 1/2] Add IPv6 support for DNSBL

Should have used the library but didn't want to experiement and posiibly break the includes
---
 inc/functions.php | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/inc/functions.php b/inc/functions.php
index 44712b16..c2a7dc36 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1753,9 +1753,6 @@ function buildJavascript() {
 function checkDNSBL() {
 	global $config;
 
-	if (isIPv6())
-		return; // No IPv6 support yet.
-
 	if (!isset($_SERVER['REMOTE_ADDR']))
 		return; // Fix your web server configuration
 
@@ -1765,7 +1762,11 @@ function checkDNSBL() {
 	if (in_array($_SERVER['REMOTE_ADDR'], $config['dnsbl_exceptions']))
 		return;
 
-	$ipaddr = ReverseIPOctets($_SERVER['REMOTE_ADDR']);
+	if (isIPv6()) {
+		$ipaddr = ReverseIPv6Octets($_SERVER['REMOTE_ADDR']);
+	} else {
+		$ipaddr = ReverseIPv4Octets($_SERVER['REMOTE_ADDR']);
+	}
 
 	foreach ($config['dnsbl'] as $blacklist) {
 		if (!is_array($blacklist))
@@ -1801,10 +1802,30 @@ function isIPv6() {
 	return strstr($_SERVER['REMOTE_ADDR'], ':') !== false;
 }
 
-function ReverseIPOctets($ip) {
+function ReverseIPv4Octets($ip) {
 	return implode('.', array_reverse(explode('.', $ip)));
 }
 
+function ReverseIPv6Octets($ip) {
+	return strrev(implode(".", str_split(str_replace(':', '', inet_expand($ip)))));
+}
+
+// copypastad from lib/IP/Lifo/IP.php, TODO replace this with a proper include
+function inet_expand($ip)
+{
+	// strip possible cidr notation off
+	if (($pos = strpos($ip, '/')) !== false) {
+		$ip = substr($ip, 0, $pos);
+	}
+	$bytes = unpack('n*', inet_pton($ip));
+	if (count($bytes) > 2) {
+		return implode(':', array_map(function ($b) {
+			return sprintf("%04x", $b);
+		}, $bytes));
+	}
+	return $ip;
+}
+
 function wordfilters(&$body) {
         global $config;
 

From d0e445e444485375a05bc489c121167933e003a8 Mon Sep 17 00:00:00 2001
From: discomrade <nice@try.fbi>
Date: Thu, 14 Oct 2021 07:04:26 +0000
Subject: [PATCH 2/2] Clean up duplicate code

---
 inc/bans.php      |  6 +++---
 inc/functions.php | 21 ++++-----------------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/inc/bans.php b/inc/bans.php
index 81e38006..e629ddae 100644
--- a/inc/bans.php
+++ b/inc/bans.php
@@ -1,8 +1,8 @@
 <?php
 
-require 'inc/lib/IP/Lifo/IP/IP.php';
-require 'inc/lib/IP/Lifo/IP/BC.php';
-require 'inc/lib/IP/Lifo/IP/CIDR.php';
+require_once 'inc/lib/IP/Lifo/IP/IP.php';
+require_once 'inc/lib/IP/Lifo/IP/BC.php';
+require_once 'inc/lib/IP/Lifo/IP/CIDR.php';
 
 use Lifo\IP\CIDR;
 
diff --git a/inc/functions.php b/inc/functions.php
index c2a7dc36..821cb03e 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -23,10 +23,13 @@ require_once 'inc/mod/auth.php';
 require_once 'inc/lock.php';
 require_once 'inc/queue.php';
 require_once 'inc/polyfill.php';
+require_once 'inc/lib/IP/Lifo/IP/IP.php';
 @include_once 'inc/lib/parsedown/Parsedown.php'; // fail silently, this isn't a critical piece of code
 
 require_once 'inc/anti-bot.php'; // DELETE ME THIS IS FOR print_err function only!
 
+use Lifo\IP\IP; // for expanding IPv6 address in DNSBL()
+
 if (!extension_loaded('gettext')) {
 	require_once 'inc/lib/gettext/gettext.inc';
 }
@@ -1807,23 +1810,7 @@ function ReverseIPv4Octets($ip) {
 }
 
 function ReverseIPv6Octets($ip) {
-	return strrev(implode(".", str_split(str_replace(':', '', inet_expand($ip)))));
-}
-
-// copypastad from lib/IP/Lifo/IP.php, TODO replace this with a proper include
-function inet_expand($ip)
-{
-	// strip possible cidr notation off
-	if (($pos = strpos($ip, '/')) !== false) {
-		$ip = substr($ip, 0, $pos);
-	}
-	$bytes = unpack('n*', inet_pton($ip));
-	if (count($bytes) > 2) {
-		return implode(':', array_map(function ($b) {
-			return sprintf("%04x", $b);
-		}, $bytes));
-	}
-	return $ip;
+	return strrev(implode(".", str_split(str_replace(':', '', IP::inet_expand($ip)))));
 }
 
 function wordfilters(&$body) {