Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-04-27 20:24:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1683 from mdujava/basic_auth

Browse Source 
Url of adlist can contain userinfo (basicauth)
This commit is contained in:
Adam Warner
2021-01-13 20:41:50 +00:00
committed by GitHub
parent 012116a58d 509a082d02
commit 952c1572f5
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/pi-hole/php/groups.php
View File

@@ -937,7 +937,11 @@ if ($_POST['action'] == 'get_groups') {
continue;
}
if(preg_match("/[^a-zA-Z0-9:\/?&%=~._()-;]/", $address) !== 0) {
// this will remove first @ that is after schema and before domain
// $1 is optional schema, $2 is userinfo
$check_address = preg_replace("|([^:/]*://)?([^/]+)@|", "$1$2", $address, 1);
if(preg_match("/[^a-zA-Z0-9:\/?&%=~._()-;]/", $check_address) !== 0) {
throw new Exception('<strong>Invalid adlist URL ' . htmlentities($address) . '</strong><br>'.
'Added ' . $added . " out of ". $total . " adlists");
}