msb/vpanel-stack
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update ADMINIP checks to work with array or single var

Browse Source
This commit is contained in:
Matthew Saunders Brown 2024-04-01 15:51:24 -07:00
parent 119d180e87
commit 5f494efeb0
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
panel/classes/Panel/Login.php
View File

@ -19,15 +19,30 @@ class Login extends \Panel {
static function get($f3) { static function get($f3) {
/* requests from ADMINIP are automatically authenticated */ /**
if ($f3->get('ADMINIP') != '' && $f3->get('ADMINIP') == $f3->get('IP')) { * Requests from ADMINIP are automatically authenticated
* ADMINIP can either be a single IP, or an array
*/
$autologin = FALSE;
if ($f3->get('ADMINIP') != '') {
if (is_array($f3->get('ADMINIP'))) {
if (in_array($f3->get('IP'), $f3->get('ADMINIP'))) {
$autologin = TRUE;
}
} elseif (($f3->get('ADMINIP') == $f3->get('IP'))) {
$autologin = TRUE;
}
}
if ($autologin === TRUE) {
$f3->set('SESSION.expiration', time() + $f3->get('TIMEOUT')); $f3->set('SESSION.expiration', time() + $f3->get('TIMEOUT'));
$f3->set('SESSION.access', 'admin'); $f3->set('SESSION.access', 'admin');
$messages[] = "You have been automatically logged in with connection from Admin IP " . $f3->get('IP'); $messages[] = "You have been automatically logged in with connection from Admin IP " . $f3->get('IP');
$f3->set('SESSION.messages', $messages); $f3->set('SESSION.messages', $messages);
$f3->reroute('/'); $f3->reroute('/');
} else { } else {
/* all others must log in with valid username */ /* ADMINIP checks returned false, client must log in with valid username */
echo \Template::instance()->render('login.html'); echo \Template::instance()->render('login.html');
} }

2
panel/config/config.ini
View File

@ -18,7 +18,7 @@ CASELESS=FALSE
CACHE=TRUE CACHE=TRUE
; Session lifetime in seconds ; Session lifetime in seconds
TIMEOUT=900 TIMEOUT=900
; Remote IP address that is automatically logged in without auth ; Remote IP address that is automatically logged in without auth (can be single IP or comma separated array of IPs)
ADMINIP= ADMINIP=
; Jail new users by default. 1 = Yes, blank or 0 = No ; Jail new users by default. 1 = Yes, blank or 0 = No
JAILUSER=1 JAILUSER=1