diff options
| -rw-r--r-- | engine/lib/pam.php | 11 | ||||
| -rw-r--r-- | services/api/rest.php | 3 |
2 files changed, 14 insertions, 0 deletions
diff --git a/engine/lib/pam.php b/engine/lib/pam.php index 04f29f412..17b10b5cc 100644 --- a/engine/lib/pam.php +++ b/engine/lib/pam.php @@ -45,6 +45,17 @@ function register_pam_handler($handler, $importance = "sufficient") { } /** + * Unregisters a PAM handler. + * + * @param string $handler The PAM handler function name + */ +function unregister_pam_handler($handler) { + global $_PAM_HANDLERS; + + unset($_PAM_HANDLERS[$handler]); +} + +/** * Attempt to authenticate. * This function will process all registered PAM handlers or stop when the first * handler fails. A handler fails by either returning false or throwing an diff --git a/services/api/rest.php b/services/api/rest.php index a569e7e26..46931f8b5 100644 --- a/services/api/rest.php +++ b/services/api/rest.php @@ -29,6 +29,9 @@ if ((isset($CONFIG->disable_api)) && ($CONFIG->disable_api == true)) { // plugins should return true to control what API and user authentication handlers are registered if (trigger_plugin_hook('rest', 'init', null, false) == false) { + // remove normal password pam (does not work by default with REST anyway) + unregister_pam_handler('pam_auth_userpass'); + // check session - this usually means a REST call from a web browser register_pam_handler('pam_auth_session'); // user token can also be used for user authentication |