Avoid problems with an empty domain in the blocklist (#13919)

* Avoid problems with an empty domain in the blocklist

* Test code removed

diff --git a/src/Module/Moderation/Blocklist/Server/Index.php b/src/Module/Moderation/Blocklist/Server/Index.php
index 740d7b0..3b6dc73 100644 (file)
--- a/src/Module/Moderation/Blocklist/Server/Index.php
+++ b/src/Module/Moderation/Blocklist/Server/Index.php
@@ -57,11 +57,11 @@ class Index extends BaseModeration
 
                // Edit the entries from blocklist
                $blocklist = [];
-               foreach ($request['domain'] as $id => $domain) {
+               foreach ((array)$request['domain'] as $id => $domain) {
                        // Trimming whitespaces as well as any lingering slashes
                        $domain = trim($domain);
                        $reason = trim($request['reason'][$id]);
-                       if (empty($request['delete'][$id])) {
+                       if (empty($request['delete'][$id]) && !empty($domain)) {
                                $blocklist[] = [
                                        'domain' => $domain,
                                        'reason' => $reason

diff --git a/src/Util/Network.php b/src/Util/Network.php
index 02124a4..12dde0a 100644 (file)
--- a/src/Util/Network.php
+++ b/src/Util/Network.php
@@ -217,7 +217,7 @@ class Network
                }
 
                foreach ($domain_blocklist as $domain_block) {
-                       if (fnmatch(strtolower($domain_block['domain']), strtolower($uri->getHost()))) {
+                       if (!empty($domain_block['domain']) && fnmatch(strtolower($domain_block['domain']), strtolower($uri->getHost()))) {
                                return true;
                        }
                }