Merge branch 'release-3.1.0' (1f0c2a2a) · Commits · lib / unicaen / auth

CHANGELOG.md

+13 −1

Original line number	Diff line number	Diff line
		@@ -17,3 +17,15 @@ Première version officielle sous ZF3.
		3.0.12 (05/11/2020)
		-------------------
		- Ajout d'une méthode pour pouvoir purger la liste des rôles courante.

		3.1.0
		-----
		- Typage des authentifications
		- Pages de connexion différentes selon le type d'authentification : shib ; db ou ldap ; cas.
		- Possibilité d'ordonner les formulaires de connexion proposés (config).
		- Possibilité d'ajouter une description HTML à chaque formulaire de connexion (config).
		- Chaque adapter peut désormais tester s'il est compétent pour traiter la requête d'authentification.
		- Création d'un adapter d'authentification comme les autres pour Shib.
		- Réparation du mécanisme de redirection vers l'URL demandée avant connexion.
		- Correction du bug de rémanence de l'authentification shibboleth simulée.
		- Authentification LDAP : levée d'une exception en cas de survenue d'une erreur LDAP.

Module.php

+0 −48

Original line number	Diff line number	Diff line
		@@ -2,16 +2,10 @@

		namespace UnicaenAuth;

		use UnicaenAuth\Authentication\Adapter\Cas as CasAdapter;
		use UnicaenAuth\Options\ModuleOptions;
		use UnicaenAuth\Service\ShibService;
		use Zend\EventManager\EventInterface;
		use Zend\ModuleManager\Feature\AutoloaderProviderInterface;
		use Zend\ModuleManager\Feature\ConfigProviderInterface;
		use Zend\ModuleManager\Feature\ServiceProviderInterface;
		use Zend\ModuleManager\ModuleManager;
		use Zend\ServiceManager\ServiceLocatorInterface;
		use Zend\View\Helper\Navigation;
		use ZfcUser\Form\Login;
		use ZfcUser\Form\LoginFilter;

		@@ -22,11 +16,6 @@ use ZfcUser\Form\LoginFilter;
		*/
		class Module implements AutoloaderProviderInterface, ConfigProviderInterface, ServiceProviderInterface
		{
		/**
		* @var ModuleOptions
		*/
		private $options;

		/**
		* @return array
		* @see ConfigProviderInterface
		@@ -43,9 +32,6 @@ class Module implements AutoloaderProviderInterface, ConfigProviderInterface, Se
		public function getAutoloaderConfig()
		{
		return [
		'Zend\Loader\ClassMapAutoloader' => [
		__DIR__ . '/autoload_classmap.php',
		],
		'Zend\Loader\StandardAutoloader' => [
		'namespaces' => [
		__NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__,
		@@ -64,41 +50,7 @@ class Module implements AutoloaderProviderInterface, ConfigProviderInterface, Se
		*/
		public function onBootstrap(EventInterface $e)
		{
		/* @var \Zend\Mvc\MvcEvent $e */
		$application = $e->getApplication();
		/* @var $services \Zend\ServiceManager\ServiceManager */
		$services = $application->getServiceManager();

		/* @var $options ModuleOptions */
		$this->options = $services->get('unicaen-auth_module_options');

		$this->reconfigureRoutesForAuth($services);
		}

		/**
		* @param ServiceLocatorInterface $sl
		*/
		private function reconfigureRoutesForAuth(ServiceLocatorInterface $sl)
		{
		/* @var $router \Zend\Router\Http\TreeRouteStack */
		$router = $sl->get('router');

		// si l'auth CAS est activée, modif de la route de connexion pour zapper le formulaire d'auth maison.
		$isCasEnable = (bool) $this->options->getCas();
		if ($isCasEnable && php_sapi_name() !== 'cli') {
		/** @var CasAdapter $casAdapter */
		$casAdapter = $sl->get('UnicaenAuth\Authentication\Adapter\Cas');
		$casAdapter->reconfigureRoutesForCasAuth($router);
		}

		// si l'auth Shibboleth est activée, modif de la route de déconnexion pour réaliser la déconnexion Shibboleth.
		$shibOptions = $this->options->getShibboleth();
		$isShibEnable = array_key_exists('enable', $shibOptions) && (bool) $shibOptions['enable'];
		if ($isShibEnable && php_sapi_name() !== 'cli') {
		/** @var ShibService $shibService */
		$shibService = $sl->get(ShibService::class);
		$shibService->reconfigureRoutesForShibAuth($router);
		}
		}

		/**

autoload_classmap.php

deleted100644 → 0

+0 −88

Original line number	Diff line number	Diff line
		<?php
		// Generated by ZF2's ./bin/classmap_generator.php
		return array(
		'UnicaenAuth\Module' => __DIR__ . '/Module.php',
		'UnicaenAuth\Guard\PrivilegeController' => __DIR__ . '/src/UnicaenAuth/Guard/PrivilegeController.php',
		'UnicaenAuth\Options\AuthenticationOptionsInterface' => __DIR__ . '/src/UnicaenAuth/Options/AuthenticationOptionsInterface.php',
		'UnicaenAuth\Options\Traits\ModuleOptionsAwareTrait' => __DIR__ . '/src/UnicaenAuth/Options/Traits/ModuleOptionsAwareTrait.php',
		'UnicaenAuth\Options\ModuleOptionsFactory' => __DIR__ . '/src/UnicaenAuth/Options/ModuleOptionsFactory.php',
		'UnicaenAuth\Options\ModuleOptions' => __DIR__ . '/src/UnicaenAuth/Options/ModuleOptions.php',
		'UnicaenAuth\Entity\Db\CategoriePrivilege' => __DIR__ . '/src/UnicaenAuth/Entity/Db/CategoriePrivilege.php',
		'UnicaenAuth\Entity\Db\User' => __DIR__ . '/src/UnicaenAuth/Entity/Db/User.php',
		'UnicaenAuth\Entity\Db\Privilege' => __DIR__ . '/src/UnicaenAuth/Entity/Db/Privilege.php',
		'UnicaenAuth\Entity\Db\Role' => __DIR__ . '/src/UnicaenAuth/Entity/Db/Role.php',
		'UnicaenAuth\Entity\Db\AbstractUser' => __DIR__ . '/src/UnicaenAuth/Entity/Db/AbstractUser.php',
		'UnicaenAuth\Entity\Ldap\People' => __DIR__ . '/src/UnicaenAuth/Entity/Ldap/People.php',
		'UnicaenAuth\Service\LdapUserAwareInterface' => __DIR__ . '/src/UnicaenAuth/Service/LdapUserAwareInterface.php',
		'UnicaenAuth\Service\AuthorizeService' => __DIR__ . '/src/UnicaenAuth/Service/AuthorizeService.php',
		'UnicaenAuth\Service\DbUserAwareInterface' => __DIR__ . '/src/UnicaenAuth/Service/DbUserAwareInterface.php',
		'UnicaenAuth\Service\User' => __DIR__ . '/src/UnicaenAuth/Service/User.php',
		'UnicaenAuth\Service\Traits\UserContextServiceAwareTrait' => __DIR__ . '/src/UnicaenAuth/Service/Traits/UserContextServiceAwareTrait.php',
		'UnicaenAuth\Service\Traits\RoleServiceAwareTrait' => __DIR__ . '/src/UnicaenAuth/Service/Traits/RoleServiceAwareTrait.php',
		'UnicaenAuth\Service\Traits\CategoriePrivilegeServiceAwareTrait' => __DIR__ . '/src/UnicaenAuth/Service/Traits/CategoriePrivilegeAwareTrait.php',
		'UnicaenAuth\Service\Traits\PrivilegeServiceAwareTrait' => __DIR__ . '/src/UnicaenAuth/Service/Traits/PrivilegeServiceAwareTrait.php',
		'UnicaenAuth\Service\UserAwareInitializer' => __DIR__ . '/src/UnicaenAuth/Service/UserAwareInitializer.php',
		'UnicaenAuth\Service\UserContext' => __DIR__ . '/src/UnicaenAuth/Service/UserContext.php',
		'UnicaenAuth\Service\PrivilegeService' => __DIR__ . '/src/UnicaenAuth/Service/PrivilegeService.php',
		'UnicaenAuth\Service\RoleService' => __DIR__ . '/src/UnicaenAuth/Service/RoleService.php',
		'UnicaenAuth\Service\CategoriePrivilegeService' => __DIR__ . '/src/UnicaenAuth/Service/CategoriePrivilegeService.php',
		'UnicaenAuth\Service\AbstractService' => __DIR__ . '/src/UnicaenAuth/Service/AbstractService.php',
		'UnicaenAuth\Service\AuthorizeServiceFactory' => __DIR__ . '/src/UnicaenAuth/Service/AuthorizeServiceFactory.php',
		'UnicaenAuth\Authentication\AuthenticationServiceFactory' => __DIR__ . '/src/UnicaenAuth/Authentication/AuthenticationServiceFactory.php',
		'UnicaenAuth\Authentication\Storage\Ldap' => __DIR__ . '/src/UnicaenAuth/Authentication/Storage/Ldap.php',
		'UnicaenAuth\Authentication\Storage\Db' => __DIR__ . '/src/UnicaenAuth/Authentication/Storage/Db.php',
		'UnicaenAuth\Authentication\Storage\Chain' => __DIR__ . '/src/UnicaenAuth/Authentication/Storage/Chain.php',
		'UnicaenAuth\Authentication\Storage\ChainableStorage' => __DIR__ . '/src/UnicaenAuth/Authentication/Storage/ChainableStorage.php',
		'UnicaenAuth\Authentication\Storage\ChainServiceFactory' => __DIR__ . '/src/UnicaenAuth/Authentication/Storage/ChainServiceFactory.php',
		'UnicaenAuth\Authentication\Storage\ChainEvent' => __DIR__ . '/src/UnicaenAuth/Authentication/Storage/ChainEvent.php',
		'UnicaenAuth\Authentication\Adapter\Ldap' => __DIR__ . '/src/UnicaenAuth/Authentication/Adapter/Ldap.php',
		'UnicaenAuth\Authentication\Adapter\Db' => __DIR__ . '/src/UnicaenAuth/Authentication/Adapter/Db.php',
		'UnicaenAuth\Authentication\Adapter\AbstractFactory' => __DIR__ . '/src/UnicaenAuth/Authentication/Adapter/AbstractFactory.php',
		'UnicaenAuth\Authentication\Adapter\Cas' => __DIR__ . '/src/UnicaenAuth/Authentication/Adapter/Cas.php',
		'UnicaenAuth\Assertion\AbstractAssertion' => __DIR__ . '/src/UnicaenAuth/Assertion/AbstractAssertion.php',
		'UnicaenAuth\Acl\NamedRole' => __DIR__ . '/src/UnicaenAuth/Acl/NamedRole.php',
		'UnicaenAuth\View\RedirectionStrategy' => __DIR__ . '/src/UnicaenAuth/View/RedirectionStrategy.php',
		'UnicaenAuth\View\Helper\AppConnection' => __DIR__ . '/src/UnicaenAuth/View/Helper/AppConnection.php',
		'UnicaenAuth\View\Helper\UserProfileSelectRadioItem' => __DIR__ . '/src/UnicaenAuth/View/Helper/UserProfileSelectRadioItem.php',
		'UnicaenAuth\View\Helper\UserProfileFactory' => __DIR__ . '/src/UnicaenAuth/View/Helper/UserProfileFactory.php',
		'UnicaenAuth\View\Helper\UserStatus' => __DIR__ . '/src/UnicaenAuth/View/Helper/UserStatus.php',
		'UnicaenAuth\View\Helper\UserStatusFactory' => __DIR__ . '/src/UnicaenAuth/View/Helper/UserStatusFactory.php',
		'UnicaenAuth\View\Helper\UserAbstract' => __DIR__ . '/src/UnicaenAuth/View/Helper/UserAbstract.php',
		'UnicaenAuth\View\Helper\UserProfileSelect' => __DIR__ . '/src/UnicaenAuth/View/Helper/UserProfileSelect.php',
		'UnicaenAuth\View\Helper\UserConnectionFactory' => __DIR__ . '/src/UnicaenAuth/View/Helper/UserConnectionFactory.php',
		'UnicaenAuth\View\Helper\UserInfoFactory' => __DIR__ . '/src/UnicaenAuth/View/Helper/UserInfoFactory.php',
		'UnicaenAuth\View\Helper\UserInfo' => __DIR__ . '/src/UnicaenAuth/View/Helper/UserInfo.php',
		'UnicaenAuth\View\Helper\UserCurrentFactory' => __DIR__ . '/src/UnicaenAuth/View/Helper/UserCurrentFactory.php',
		'UnicaenAuth\View\Helper\UserProfileSelectRadioItemFactory' => __DIR__ . '/src/UnicaenAuth/View/Helper/UserProfileSelectRadioItemFactory.php',
		'UnicaenAuth\View\Helper\UserProfileSelectFactory' => __DIR__ . '/src/UnicaenAuth/View/Helper/UserProfileSelectFactory.php',
		'UnicaenAuth\View\Helper\UserProfile' => __DIR__ . '/src/UnicaenAuth/View/Helper/UserProfile.php',
		'UnicaenAuth\View\Helper\UserCurrent' => __DIR__ . '/src/UnicaenAuth/View/Helper/UserCurrent.php',
		'UnicaenAuth\View\Helper\UserConnection' => __DIR__ . '/src/UnicaenAuth/View/Helper/UserConnection.php',
		'UnicaenAuth\Controller\DroitsController' => __DIR__ . '/src/UnicaenAuth/Controller/DroitsController.php',
		'UnicaenAuth\Controller\UtilisateurController' => __DIR__ . '/src/UnicaenAuth/Controller/UtilisateurController.php',
		'UnicaenAuth\Provider\Role\ConfigServiceFactory' => __DIR__ . '/src/UnicaenAuth/Provider/Role/ConfigServiceFactory.php',
		'UnicaenAuth\Provider\Role\Config' => __DIR__ . '/src/UnicaenAuth/Provider/Role/Config.php',
		'UnicaenAuth\Provider\Role\UsernameServiceFactory' => __DIR__ . '/src/UnicaenAuth/Provider/Role/UsernameServiceFactory.php',
		'UnicaenAuth\Provider\Role\DbRole' => __DIR__ . '/src/UnicaenAuth/Provider/Role/DbRole.php',
		'UnicaenAuth\Provider\Role\DbRoleServiceFactory' => __DIR__ . '/src/UnicaenAuth/Provider/Role/DbRoleServiceFactory.php',
		'UnicaenAuth\Provider\Role\Username' => __DIR__ . '/src/UnicaenAuth/Provider/Role/Username.php',
		'UnicaenAuth\Provider\Privilege\PrivilegeProviderAwareTrait' => __DIR__ . '/src/UnicaenAuth/Provider/Privilege/PrivilegeProviderAwareTrait.php',
		'UnicaenAuth\Provider\Privilege\PrivilegeProviderInterface' => __DIR__ . '/src/UnicaenAuth/Provider/Privilege/PrivilegeProviderInterface.php',
		'UnicaenAuth\Provider\Privilege\Privileges' => __DIR__ . '/src/UnicaenAuth/Provider/Privilege/Privileges.php',
		'UnicaenAuth\Provider\Rule\PrivilegeRuleProvider' => __DIR__ . '/src/UnicaenAuth/Provider/Rule/PrivilegeRuleProvider.php',
		'UnicaenAuth\Provider\Identity\DbServiceFactory' => __DIR__ . '/src/UnicaenAuth/Provider/Identity/DbServiceFactory.php',
		'UnicaenAuth\Provider\Identity\Basic' => __DIR__ . '/src/UnicaenAuth/Provider/Identity/Basic.php',
		'UnicaenAuth\Provider\Identity\Ldap' => __DIR__ . '/src/UnicaenAuth/Provider/Identity/Ldap.php',
		'UnicaenAuth\Provider\Identity\Db' => __DIR__ . '/src/UnicaenAuth/Provider/Identity/Db.php',
		'UnicaenAuth\Provider\Identity\Chain' => __DIR__ . '/src/UnicaenAuth/Provider/Identity/Chain.php',
		'UnicaenAuth\Provider\Identity\ChainableProvider' => __DIR__ . '/src/UnicaenAuth/Provider/Identity/ChainableProvider.php',
		'UnicaenAuth\Provider\Identity\LdapServiceFactory' => __DIR__ . '/src/UnicaenAuth/Provider/Identity/LdapServiceFactory.php',
		'UnicaenAuth\Provider\Identity\BasicServiceFactory' => __DIR__ . '/src/UnicaenAuth/Provider/Identity/BasicServiceFactory.php',
		'UnicaenAuth\Provider\Identity\ChainServiceFactory' => __DIR__ . '/src/UnicaenAuth/Provider/Identity/ChainServiceFactory.php',
		'UnicaenAuth\Provider\Identity\ChainEvent' => __DIR__ . '/src/UnicaenAuth/Provider/Identity/ChainEvent.php',
		'UnicaenAuth\Event\UserAuthenticatedEvent' => __DIR__ . '/src/UnicaenAuth/Event/UserAuthenticatedEvent.php',
		'UnicaenAuth\Event\Listener\AuthenticatedUserSavedAbstractListener' => __DIR__ . '/src/UnicaenAuth/Event/Listener/AuthenticatedUserSavedAbstractListener.php',
		'UnicaenAuth\Form\Droits\Traits\RoleFormAwareTrait' => __DIR__ . '/src/UnicaenAuth/Form/Droits/Traits/RoleFormAwareTrait.php',
		'UnicaenAuth\Form\Droits\RoleForm' => __DIR__ . '/src/UnicaenAuth/Form/Droits/RoleForm.php',
		'RoleFormHydrator' => __DIR__ . '/src/UnicaenAuth/Form/Droits/RoleForm.php',
		);

config/module.config.php

+155 −18

File changed.

Preview size limit exceeded, changes collapsed.

config/unicaen-auth.global.php.dist

+0 −41

Original line number	Diff line number	Diff line
		<?php
		/**
		* UnicaenAuth Global Configuration
		*
		* If you have a ./config/autoload/ directory set up for your project, you can
		* drop this config file in it and change the values as you wish.
		*/
		$settings = [

		/**
		* Configuration de l'authentification locale.
		*/
		'local' => [
		/**
		* Affichage ou non du formulaire d'authentification avec un compte local.
		*/
		'enabled' => false,
		],

		/**
		* Configuration de l'authentification LDAP.
		*/
		'ldap' => [
		/**
		* Affichage ou non du formulaire d'authentification via l'annuaire LDAP.
		* NB: en réalité cela permet aussi l'authentification avec un compte local.
		*/
		'enabled' => true,
		],

		/**
		* Configuration de l'authentification Shibboleth.
		*/
		'shibboleth' => [
		/**
		* Affichage ou non du formulaire d'authentification via l'annuaire LDAP.
		* NB: en réalité cela permet aussi l'authentification avec un compte local.
		*/
		'enable' => false,

		/**
		* URL de déconnexion.
		*/
		'logout_url' => '/Shibboleth.sso/Logout?return=', // NB: '?return=' semble obligatoire!
		],

		/**
		* Flag indiquant si l'utilisateur authenitifié avec succès via l'annuaire LDAP doit
		* être enregistré/mis à jour dans la table des utilisateurs de l'appli.