clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

* Avoid problems with an empty domain in the blocklist

* Test code removed
This commit is contained in:
Michael Vogel 2024-02-19 07:22:19 +01:00 committed by GitHub
parent 9ad452a19b
commit cb294cf411
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Module/Moderation/Blocklist/Server/Index.php
View File

@ -57,11 +57,11 @@ class Index extends BaseModeration
// Edit the entries from blocklist // Edit the entries from blocklist
$blocklist = []; $blocklist = [];
foreach ($request['domain'] as $id => $domain) { foreach ((array)$request['domain'] as $id => $domain) {
// Trimming whitespaces as well as any lingering slashes // Trimming whitespaces as well as any lingering slashes
$domain = trim($domain); $domain = trim($domain);
$reason = trim($request['reason'][$id]); $reason = trim($request['reason'][$id]);
if (empty($request['delete'][$id])) { if (empty($request['delete'][$id]) && !empty($domain)) {
$blocklist[] = [ $blocklist[] = [
'domain' => $domain, 'domain' => $domain,
'reason' => $reason 'reason' => $reason

2
src/Util/Network.php
View File

@ -217,7 +217,7 @@ class Network
} }
foreach ($domain_blocklist as $domain_block) { 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; return true;
} }
} }