pi-hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2024-12-06 19:36:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix potential code injection on MAC address validator

Browse Source 
Co-authored-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This commit is contained in:
Adam Warner
2020-02-18 08:41:06 +00:00
committed by GitHub
parent 38d8e77f99
commit 4f824bec78
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/pi-hole/php/savesettings.php
+9 -1
View File
@@ -53,7 +53,15 @@ function validDomainWildcard($domain_name)
function validMAC($mac_addr)
{
// Accepted input format: 00:01:02:1A:5F:FF (characters may be lower case)
return (preg_match('/([a-fA-F0-9]{2}[:]?){6}/', $mac_addr) == 1);
return !filter_var($mac_addr, FILTER_VALIDATE_MAC) === false;
}
function formatMAC($mac_addr)
{
preg_match("/([0-9a-fA-F]{2}[:]){5}([0-9a-fA-F]{2})/", $mac_addr, $matches);
if(count($matches) > 0)
return $matches[0];
return null;
}
function validEmail($email)