diff options
| author | Bill Marquette <billm@pfsense.org> | 2005-05-18 02:18:21 +0000 |
|---|---|---|
| committer | Bill Marquette <billm@pfsense.org> | 2005-05-18 02:18:21 +0000 |
| commit | 7b52f88daa39fb03987d0f3a84d7f3ceb1ad050e (patch) | |
| tree | 2374352c90f78a7b120f407a434b16195f3f3d00 /etc/inc/auth.inc | |
| parent | 63e53e7da1da69164d9a343e5358dfb46c879298 (diff) | |
| download | pfsense-7b52f88daa39fb03987d0f3a84d7f3ceb1ad050e.zip pfsense-7b52f88daa39fb03987d0f3a84d7f3ceb1ad050e.tar.gz | |
Better regexp
Courtesy-of: strgout
Diffstat (limited to 'etc/inc/auth.inc')
| -rw-r--r-- | etc/inc/auth.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/etc/inc/auth.inc b/etc/inc/auth.inc index 49aeabd..57900a4 100644 --- a/etc/inc/auth.inc +++ b/etc/inc/auth.inc @@ -57,11 +57,11 @@ function passwd_backed_basic_auth() { /* Check to see if user even exists */ $username = $HTTP_SERVER_VARS['AUTH_USER']; - if(!($line = array_shift(preg_grep("/$username:.*$/", $authfile)))) + if(!($line = array_shift(preg_grep("/^$username:.*$/", $authfile)))) continue; /* Get crypted password */ - preg_match("/$username:((...[0-9A-Za-z_\/]{8}.)[0-9A-Za-z_\/.]{22})/", $line, $matches); + preg_match("/^$username:((\\$1\\$[.\d\w_\/]{8}\\$)[.\d\w_\/]{22})$/", $line, $matches); $pass = $matches[1]; $salt = $matches[2]; @@ -96,11 +96,11 @@ function htpasswd_backed_basic_auth() { /* Check to see if user even exists */ $username = $HTTP_SERVER_VARS['AUTH_USER']; - if(!($line = array_shift(preg_grep("/$username:.*$/", $authfile)))) + if(!($line = array_shift(preg_grep("/^$username:.*$/", $authfile)))) continue; /* Get crypted password */ - preg_match("/$username:((...[0-9A-Za-z_\/]{8}.)[0-9A-Za-z_\/.]{22})/", $line, $matches); + preg_match("/^$username:((\\$1\\$[.\d\w_\/]{8}\\$)[.\d\w_\/]{22})$/", $line, $matches); $pass = $matches[1]; $salt = $matches[2]; |
