diff --git a/pandora_console/include/auth/mysql.php b/pandora_console/include/auth/mysql.php index b6d46a5c06..2aaf004465 100644 --- a/pandora_console/include/auth/mysql.php +++ b/pandora_console/include/auth/mysql.php @@ -101,18 +101,30 @@ function process_user_login($login, $pass, $api=false) } // 2. Try local. - if ($login_remote === false - && ($config['fallback_local_auth'] - || is_user_admin($login) - || $local_user === true - || strtolower($config['auth']) == 'mysql') - ) { - return process_user_login_local($login, $pass, $api); + if ($login_remote === false) { + if ($api === true) { + $user_not_login = db_get_value( + 'not_login', + 'tusuario', + 'id_user', + $login + ); + } + + if ($config['fallback_local_auth'] + || is_user_admin($login) + || $local_user === true + || strtolower($config['auth']) == 'mysql' + || (bool) $user_not_login === true + ) { + return process_user_login_local($login, $pass, $api); + } else { + return false; + } } else { return $login_remote; } - return false; } diff --git a/pandora_console/update_manager_client/tests/ClientTest.php b/pandora_console/update_manager_client/tests/ClientTest.php index 5ce99b54f0..247abd99e4 100644 --- a/pandora_console/update_manager_client/tests/ClientTest.php +++ b/pandora_console/update_manager_client/tests/ClientTest.php @@ -10,16 +10,15 @@ namespace UpdateManager; require_once __DIR__.'/../vendor/autoload.php'; // Load Config class from updatemanager project to read test.ini settings. - // Embeebed mode. -@include_once __DIR__.'/../../src/lib/Config.php'; -@include_once __DIR__.'/../../src/lib/License.php'; -@include_once __DIR__.'/../../src/lib/DB.php'; +@require_once __DIR__.'/../../src/lib/Config.php'; +@require_once __DIR__.'/../../src/lib/License.php'; +@require_once __DIR__.'/../../src/lib/DB.php'; // Referenced mode. -@include_once __DIR__.'/../../updatemanager/src/lib/Config.php'; -@include_once __DIR__.'/../../updatemanager/src/lib/License.php'; -@include_once __DIR__.'/../../updatemanager/src/lib/DB.php'; +@require_once __DIR__.'/../../updatemanager/src/lib/Config.php'; +@require_once __DIR__.'/../../updatemanager/src/lib/License.php'; +@require_once __DIR__.'/../../updatemanager/src/lib/DB.php'; /** * Test the Client class. @@ -69,7 +68,7 @@ class ClientTest extends \PHPUnit\Framework\TestCase if ($online === true) { $target = '/var/www/html/updatemanager/repo/test'; - } elseif (substr($target, 0, 1) !== '/') { + } else if (substr($target, 0, 1) !== '/') { $target = __DIR__.'/../../'.$target; } @@ -562,4 +561,6 @@ class ClientTest extends \PHPUnit\Framework\TestCase // Cleanup. $umc_enterprise->getDBH()->query('DROP DATABASE `ent`'); } + + }