Loading CHANGELOG.md +4 −0 Original line number Diff line number Diff line CHANGELOG ========= 3.2.10 ----- - Possibilité d'activer ou non (en config) les logs des échecs d'authentification LDAP. 3.2.8 ----- - [FIX] Données d'authentification : utilisation du SessionManager global pour avoir les durées de conservation des cookies correctes. Loading Module.php +40 −9 Original line number Diff line number Diff line Loading @@ -2,20 +2,37 @@ namespace UnicaenAuth; use UnicaenAuth\Event\Listener\LdapAuthenticationFailureLoggerListener; use UnicaenAuth\Options\ModuleOptions; use Zend\EventManager\EventInterface; use Zend\ModuleManager\Feature\AutoloaderProviderInterface; use Zend\ModuleManager\Feature\BootstrapListenerInterface; use Zend\ModuleManager\Feature\ConfigProviderInterface; use Zend\ModuleManager\Feature\ServiceProviderInterface; use ZfcUser\Form\Login; use ZfcUser\Form\LoginFilter; use Zend\Mvc\MvcEvent; /** * Point d'entrée du module d'authentification Unicaen. * * @author Bertrand GAUTHIER <bertrand.gauthier@unicaen.fr> */ class Module implements AutoloaderProviderInterface, ConfigProviderInterface, ServiceProviderInterface class Module implements AutoloaderProviderInterface, ConfigProviderInterface, ServiceProviderInterface, BootstrapListenerInterface { /** * @var \UnicaenAuth\Options\ModuleOptions */ private $moduleOptions; /** * @var \Zend\EventManager\EventManagerInterface */ private $eventManager; /** * @var \Zend\ServiceManager\ServiceManager */ private $serviceManager; /** * @return array * @see ConfigProviderInterface Loading @@ -41,16 +58,30 @@ class Module implements AutoloaderProviderInterface, ConfigProviderInterface, Se } /** * This method is called once the MVC bootstrapping is complete, * after the "loadModule.post" event, once $application->bootstrap() is called. * * @param EventInterface $e * * @see BootstrapListenerInterface * @inheritDoc */ public function onBootstrap(EventInterface $e) { if ($e instanceof MvcEvent) { /** @var \Zend\Mvc\Application $application */ $application = $e->getApplication(); $this->serviceManager = $application->getServiceManager(); $this->eventManager = $application->getEventManager(); $this->moduleOptions = $this->serviceManager->get(ModuleOptions::class); $this->attachEventListeners(); } } protected function attachEventListeners() { // log éventuel des erreurs d'authentification LDAP $logLdapAuthenticationFailure = $this->moduleOptions->getLdap()['log_failures'] ?? false; if ($logLdapAuthenticationFailure) { /** @var LdapAuthenticationFailureLoggerListener $listener */ $listener = $this->serviceManager->get(LdapAuthenticationFailureLoggerListener::class); $listener->attach($this->eventManager); } } /** Loading config/module.config.php +7 −1 Original line number Diff line number Diff line Loading @@ -24,6 +24,8 @@ use UnicaenAuth\Controller\AuthController; use UnicaenAuth\Controller\AuthControllerFactory; use UnicaenAuth\Controller\DroitsControllerFactory; use UnicaenAuth\Controller\UtilisateurControllerFactory; use UnicaenAuth\Event\Listener\LdapAuthenticationFailureLoggerListener; use UnicaenAuth\Event\Listener\LdapAuthenticationFailureLoggerListenerFactory; use UnicaenAuth\Form\CasLoginForm; use UnicaenAuth\Form\CasLoginFormFactory; use UnicaenAuth\Form\Droits\RoleFormFactory; Loading Loading @@ -155,6 +157,8 @@ $settings = [ 'enabled' => true, 'adapter' => Ldap::class, 'form' => LoginForm::class, 'log_failures' => false, /** @see \UnicaenAuth\Event\Listener\LdapAuthenticationFailureLoggerListener */ ], ], Loading Loading @@ -701,7 +705,9 @@ return [ 'UnicaenApp\HistoriqueListener' => HistoriqueListenerFactory::class, 'UnicaenAuth\HistoriqueListener' => HistoriqueListenerFactory::class, \UnicaenAuth\Event\EventManager::class => \UnicaenAuth\Event\EventManagerFactory::class \UnicaenAuth\Event\EventManager::class => \UnicaenAuth\Event\EventManagerFactory::class, LdapAuthenticationFailureLoggerListener::class => LdapAuthenticationFailureLoggerListenerFactory::class, ], 'lazy_services' => [ // Mapping services to their class names is required since the ServiceManager is not a declarative DIC. Loading config/unicaen-auth.local.php.dist +5 −0 Original line number Diff line number Diff line Loading @@ -57,6 +57,11 @@ return [ */ 'ldap' => [ 'enabled' => true, /** * Activation ou non des logs (via `error_log` par défaut) à propos des échecs d'authentification LDAP. */ 'log_failures' => false, /** @see \UnicaenAuth\Event\Listener\LdapAuthenticationFailureLoggerListener */ ], ], Loading src/UnicaenAuth/Authentication/Adapter/Ldap.php +12 −14 Original line number Diff line number Diff line Loading @@ -206,23 +206,21 @@ class Ldap extends AbstractAdapter implements EventManagerAwareInterface // LDAP auth $result = $this->getLdapAuthAdapter()->setUsername($username)->setPassword($credential)->authenticate(); $success = $result->isValid(); // Déclenchement d'un événement contenant le nécessaire pour réagir à l'échec d'authentification (log, etc.) if (!$success) { $errorEvent = new Event(self::LDAP_AUTHENTIFICATION_FAIL, $this, [ 'result' => $result, 'username' => $username, // Envoi des erreurs LDAP dans un événement if (!$result->isValid()) { $messages = "LDAP ERROR : "; $errorMessages = $result->getMessages(); if (count($errorMessages) > 0) { // Clé conservée pour compatibilité : 'messages' => implode(PHP_EOL, array_slice($result->getMessages(), 0, 2)), // On ne prend que les 2 premières lignes d'erreur (les suivantes contiennent souvent // les mots de passe de l'utilisateur, et les mot de passe dans les logs... bof bof). for ($i = 0; $i < 2 && count($errorMessages) >= $i; $i++) { $messages .= $errorMessages[$i] . " "; } // les mots de passe de l'utilisateur, et les mots de passe dans les logs... bof bof). ]); $this->eventManager->triggerEvent($errorEvent); } $errorEvent = new Event(self::LDAP_AUTHENTIFICATION_FAIL, null, ['messages' => $messages]); $this->getEventManager()->triggerEvent($errorEvent); } $success = $result->isValid(); // verif existence du login usurpé if ($this->usernameUsurpe) { Loading Loading
CHANGELOG.md +4 −0 Original line number Diff line number Diff line CHANGELOG ========= 3.2.10 ----- - Possibilité d'activer ou non (en config) les logs des échecs d'authentification LDAP. 3.2.8 ----- - [FIX] Données d'authentification : utilisation du SessionManager global pour avoir les durées de conservation des cookies correctes. Loading
Module.php +40 −9 Original line number Diff line number Diff line Loading @@ -2,20 +2,37 @@ namespace UnicaenAuth; use UnicaenAuth\Event\Listener\LdapAuthenticationFailureLoggerListener; use UnicaenAuth\Options\ModuleOptions; use Zend\EventManager\EventInterface; use Zend\ModuleManager\Feature\AutoloaderProviderInterface; use Zend\ModuleManager\Feature\BootstrapListenerInterface; use Zend\ModuleManager\Feature\ConfigProviderInterface; use Zend\ModuleManager\Feature\ServiceProviderInterface; use ZfcUser\Form\Login; use ZfcUser\Form\LoginFilter; use Zend\Mvc\MvcEvent; /** * Point d'entrée du module d'authentification Unicaen. * * @author Bertrand GAUTHIER <bertrand.gauthier@unicaen.fr> */ class Module implements AutoloaderProviderInterface, ConfigProviderInterface, ServiceProviderInterface class Module implements AutoloaderProviderInterface, ConfigProviderInterface, ServiceProviderInterface, BootstrapListenerInterface { /** * @var \UnicaenAuth\Options\ModuleOptions */ private $moduleOptions; /** * @var \Zend\EventManager\EventManagerInterface */ private $eventManager; /** * @var \Zend\ServiceManager\ServiceManager */ private $serviceManager; /** * @return array * @see ConfigProviderInterface Loading @@ -41,16 +58,30 @@ class Module implements AutoloaderProviderInterface, ConfigProviderInterface, Se } /** * This method is called once the MVC bootstrapping is complete, * after the "loadModule.post" event, once $application->bootstrap() is called. * * @param EventInterface $e * * @see BootstrapListenerInterface * @inheritDoc */ public function onBootstrap(EventInterface $e) { if ($e instanceof MvcEvent) { /** @var \Zend\Mvc\Application $application */ $application = $e->getApplication(); $this->serviceManager = $application->getServiceManager(); $this->eventManager = $application->getEventManager(); $this->moduleOptions = $this->serviceManager->get(ModuleOptions::class); $this->attachEventListeners(); } } protected function attachEventListeners() { // log éventuel des erreurs d'authentification LDAP $logLdapAuthenticationFailure = $this->moduleOptions->getLdap()['log_failures'] ?? false; if ($logLdapAuthenticationFailure) { /** @var LdapAuthenticationFailureLoggerListener $listener */ $listener = $this->serviceManager->get(LdapAuthenticationFailureLoggerListener::class); $listener->attach($this->eventManager); } } /** Loading
config/module.config.php +7 −1 Original line number Diff line number Diff line Loading @@ -24,6 +24,8 @@ use UnicaenAuth\Controller\AuthController; use UnicaenAuth\Controller\AuthControllerFactory; use UnicaenAuth\Controller\DroitsControllerFactory; use UnicaenAuth\Controller\UtilisateurControllerFactory; use UnicaenAuth\Event\Listener\LdapAuthenticationFailureLoggerListener; use UnicaenAuth\Event\Listener\LdapAuthenticationFailureLoggerListenerFactory; use UnicaenAuth\Form\CasLoginForm; use UnicaenAuth\Form\CasLoginFormFactory; use UnicaenAuth\Form\Droits\RoleFormFactory; Loading Loading @@ -155,6 +157,8 @@ $settings = [ 'enabled' => true, 'adapter' => Ldap::class, 'form' => LoginForm::class, 'log_failures' => false, /** @see \UnicaenAuth\Event\Listener\LdapAuthenticationFailureLoggerListener */ ], ], Loading Loading @@ -701,7 +705,9 @@ return [ 'UnicaenApp\HistoriqueListener' => HistoriqueListenerFactory::class, 'UnicaenAuth\HistoriqueListener' => HistoriqueListenerFactory::class, \UnicaenAuth\Event\EventManager::class => \UnicaenAuth\Event\EventManagerFactory::class \UnicaenAuth\Event\EventManager::class => \UnicaenAuth\Event\EventManagerFactory::class, LdapAuthenticationFailureLoggerListener::class => LdapAuthenticationFailureLoggerListenerFactory::class, ], 'lazy_services' => [ // Mapping services to their class names is required since the ServiceManager is not a declarative DIC. Loading
config/unicaen-auth.local.php.dist +5 −0 Original line number Diff line number Diff line Loading @@ -57,6 +57,11 @@ return [ */ 'ldap' => [ 'enabled' => true, /** * Activation ou non des logs (via `error_log` par défaut) à propos des échecs d'authentification LDAP. */ 'log_failures' => false, /** @see \UnicaenAuth\Event\Listener\LdapAuthenticationFailureLoggerListener */ ], ], Loading
src/UnicaenAuth/Authentication/Adapter/Ldap.php +12 −14 Original line number Diff line number Diff line Loading @@ -206,23 +206,21 @@ class Ldap extends AbstractAdapter implements EventManagerAwareInterface // LDAP auth $result = $this->getLdapAuthAdapter()->setUsername($username)->setPassword($credential)->authenticate(); $success = $result->isValid(); // Déclenchement d'un événement contenant le nécessaire pour réagir à l'échec d'authentification (log, etc.) if (!$success) { $errorEvent = new Event(self::LDAP_AUTHENTIFICATION_FAIL, $this, [ 'result' => $result, 'username' => $username, // Envoi des erreurs LDAP dans un événement if (!$result->isValid()) { $messages = "LDAP ERROR : "; $errorMessages = $result->getMessages(); if (count($errorMessages) > 0) { // Clé conservée pour compatibilité : 'messages' => implode(PHP_EOL, array_slice($result->getMessages(), 0, 2)), // On ne prend que les 2 premières lignes d'erreur (les suivantes contiennent souvent // les mots de passe de l'utilisateur, et les mot de passe dans les logs... bof bof). for ($i = 0; $i < 2 && count($errorMessages) >= $i; $i++) { $messages .= $errorMessages[$i] . " "; } // les mots de passe de l'utilisateur, et les mots de passe dans les logs... bof bof). ]); $this->eventManager->triggerEvent($errorEvent); } $errorEvent = new Event(self::LDAP_AUTHENTIFICATION_FAIL, null, ['messages' => $messages]); $this->getEventManager()->triggerEvent($errorEvent); } $success = $result->isValid(); // verif existence du login usurpé if ($this->usernameUsurpe) { Loading