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 #597 from pi-hole/fix/whitelist-no-password

Browse Source 
Fix whitelisting when no password is set
This commit is contained in:
Mcat12
2017-10-19 10:38:37 -04:00
committed by GitHub
parent 1b59d8eb7f c60b703680
commit d70084b60c
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/pi-hole/php/auth.php
View File

@@ -131,7 +131,7 @@ function check_domain() {
}
function list_verify($type) {
global $pwhash, $wrongpassword;
global $pwhash, $wrongpassword, $auth;
if(!isset($_POST['domain']) || !isset($_POST['list']) || !(isset($_POST['pw']) || isset($_POST['token']))) {
log_and_die("Missing POST variables");
}
@@ -144,11 +144,7 @@ function list_verify($type) {
elseif(isset($_POST['pw']))
{
require("password.php");
if(strlen($pwhash) == 0)
{
log_and_die("No password set - ".htmlspecialchars($type)."listing without password not supported");
}
elseif($wrongpassword)
if($wrongpassword || !$auth)
{
log_and_die("Wrong password - ".htmlspecialchars($type)."listing of ${_POST['domain']} not permitted");
}