Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
A
auth
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lib
unicaen
auth
Commits
7717101f
Commit
7717101f
authored
Dec 05, 2019
by
Laurent Lécluse
Browse files
Options
Browse Files
Download
Plain Diff
Merge branches 'develop' and 'master' of
https://git.unicaen.fr/lib/unicaen/auth
parents
c67e1b3e
090ecaa5
Pipeline
#5943
failed with stage
in 10 seconds
Changes
10
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
48 additions
and
37 deletions
+48
-37
config/module.config.php
config/module.config.php
+1
-0
src/UnicaenAuth/Authentication/Adapter/AbstractFactory.php
src/UnicaenAuth/Authentication/Adapter/AbstractFactory.php
+5
-2
src/UnicaenAuth/Authentication/Adapter/Cas.php
src/UnicaenAuth/Authentication/Adapter/Cas.php
+0
-9
src/UnicaenAuth/Authentication/Adapter/Db.php
src/UnicaenAuth/Authentication/Adapter/Db.php
+0
-9
src/UnicaenAuth/Authentication/Adapter/Ldap.php
src/UnicaenAuth/Authentication/Adapter/Ldap.php
+1
-10
src/UnicaenAuth/Authentication/Storage/Chain.php
src/UnicaenAuth/Authentication/Storage/Chain.php
+0
-3
src/UnicaenAuth/Authentication/Storage/ChainServiceFactory.php
...nicaenAuth/Authentication/Storage/ChainServiceFactory.php
+2
-2
src/UnicaenAuth/Event/EventManager.php
src/UnicaenAuth/Event/EventManager.php
+8
-0
src/UnicaenAuth/Event/EventManagerFactory.php
src/UnicaenAuth/Event/EventManagerFactory.php
+29
-0
src/UnicaenAuth/Provider/Identity/ChainServiceFactory.php
src/UnicaenAuth/Provider/Identity/ChainServiceFactory.php
+2
-2
No files found.
config/module.config.php
View file @
7717101f
...
...
@@ -494,6 +494,7 @@ return [
'UnicaenApp\HistoriqueListener'
=>
HistoriqueListenerFactory
::
class
,
'UnicaenAuth\HistoriqueListener'
=>
HistoriqueListenerFactory
::
class
,
\
UnicaenAuth\Event\EventManager
::
class
=>
\
UnicaenAuth\Event\EventManagerFactory
::
class
,
],
'lazy_services'
=>
[
// Mapping services to their class names is required since the ServiceManager is not a declarative DIC.
...
...
src/UnicaenAuth/Authentication/Adapter/AbstractFactory.php
View file @
7717101f
...
...
@@ -6,7 +6,7 @@ use Interop\Container\ContainerInterface;
use
UnicaenApp\Exception\LogicException
;
use
UnicaenAuth\Options\ModuleOptions
;
use
UnicaenAuth\Service\User
;
use
Zend\EventManager
\EventManager
;
use
UnicaenAuth\Event
\EventManager
;
use
Zend\EventManager\EventManagerAwareInterface
;
use
Zend\Router\Http\TreeRouteStack
;
use
Zend\ServiceManager\AbstractFactoryInterface
;
...
...
@@ -62,10 +62,13 @@ class AbstractFactory implements AbstractFactoryInterface
if
(
$adapter
instanceof
EventManagerAwareInterface
)
{
/** @var EventManager $eventManager */
$eventManager
=
$container
->
get
(
'EventManager'
);
$eventManager
=
$container
->
get
(
EventManager
::
class
);
$adapter
->
setEventManager
(
$eventManager
);
$userService
=
$container
->
get
(
'unicaen-auth_user_service'
);
/* @var $userService \UnicaenAuth\Service\User */
$eventManager
->
attach
(
'userAuthenticated'
,
[
$userService
,
'userAuthenticated'
],
100
);
$eventManager
->
attach
(
'clear'
,
function
()
use
(
$adapter
){
$adapter
->
getStorage
()
->
clear
();
});
}
return
$adapter
;
...
...
src/UnicaenAuth/Authentication/Adapter/Cas.php
View file @
7717101f
...
...
@@ -78,15 +78,6 @@ class Cas extends AbstractAdapter implements EventManagerAwareInterface
$this
->
router
=
$router
;
}
public
function
getStorage
()
{
if
(
null
===
$this
->
storage
)
{
$this
->
setStorage
(
new
Session
());
}
return
$this
->
storage
;
}
/**
* Réalise l'authentification.
*
...
...
src/UnicaenAuth/Authentication/Adapter/Db.php
View file @
7717101f
...
...
@@ -37,15 +37,6 @@ class Db extends \ZfcUser\Authentication\Adapter\Db implements ServiceLocatorAwa
return
$this
;
}
public
function
getStorage
()
{
if
(
null
===
$this
->
storage
)
{
$this
->
setStorage
(
new
Session
());
}
return
$this
->
storage
;
}
/**
* Authentification.
*
...
...
src/UnicaenAuth/Authentication/Adapter/Ldap.php
View file @
7717101f
...
...
@@ -78,15 +78,6 @@ class Ldap extends AbstractAdapter implements EventManagerAwareInterface
$this
->
appModuleOptions
=
$appModuleOptions
;
}
public
function
getStorage
()
{
if
(
null
===
$this
->
storage
)
{
$this
->
setStorage
(
new
Session
());
}
return
$this
->
storage
;
}
/**
*
* @param EventInterface $e
...
...
@@ -224,7 +215,7 @@ class Ldap extends AbstractAdapter implements EventManagerAwareInterface
// verif existence du login usurpé
if
(
$this
->
usernameUsurpe
)
{
// s'il nexiste pas, échec de l'authentification
if
(
!
$this
->
getLdapAuthAdapter
()
->
getLdap
()
->
searchEntries
(
"(supannAliasLogin
=
$this->usernameUsurpe
)"
))
{
if
(
!
@
$this
->
getLdapAuthAdapter
()
->
getLdap
()
->
searchEntries
(
"("
.
$this
->
getOptions
()
->
getLdapUsername
()
.
"
=
$this->usernameUsurpe
)"
))
{
$this
->
usernameUsurpe
=
null
;
$success
=
false
;
}
...
...
src/UnicaenAuth/Authentication/Storage/Chain.php
View file @
7717101f
...
...
@@ -163,9 +163,6 @@ class Chain implements StorageInterface, EventManagerAwareInterface
*/
public
function
getEventManager
()
{
if
(
null
===
$this
->
eventManager
)
{
$this
->
eventManager
=
new
EventManager
();
}
return
$this
->
eventManager
;
}
...
...
src/UnicaenAuth/Authentication/Storage/ChainServiceFactory.php
View file @
7717101f
...
...
@@ -4,7 +4,7 @@ namespace UnicaenAuth\Authentication\Storage;
use
Interop\Container\ContainerInterface
;
use
UnicaenAuth\Options\ModuleOptions
;
use
Zend\EventManager
\EventManager
;
use
UnicaenAuth\Event
\EventManager
;
use
Zend\ServiceManager\FactoryInterface
;
use
Zend\ServiceManager\ServiceLocatorInterface
;
...
...
@@ -33,7 +33,7 @@ class ChainServiceFactory implements FactoryInterface
$chain
=
new
Chain
();
/** @var EventManager $eventManager */
$eventManager
=
$container
->
get
(
'EventManager'
);
$eventManager
=
$container
->
get
(
EventManager
::
class
);
$chain
->
setEventManager
(
$eventManager
);
...
...
src/UnicaenAuth/Event/EventManager.php
0 → 100644
View file @
7717101f
<?php
namespace
UnicaenAuth\Event
;
class
EventManager
extends
\
Zend\EventManager\EventManager
{
}
\ No newline at end of file
src/UnicaenAuth/Event/EventManagerFactory.php
0 → 100644
View file @
7717101f
<?php
namespace
UnicaenAuth\Event
;
use
Interop\Container\ContainerInterface
;
/**
* Description of EventManagerFactory
*
* @author LECLUSE Laurent <laurent.lecluse at unicaen.fr>
*/
class
EventManagerFactory
{
/**
* @param ContainerInterface $container
* @param string $requestedName
* @param array|null $options
*
* @return EventManager
*/
public
function
__invoke
(
ContainerInterface
$container
,
$requestedName
,
$options
=
null
)
{
$shared
=
$container
->
has
(
'SharedEventManager'
)
?
$container
->
get
(
'SharedEventManager'
)
:
null
;
$eventManager
=
new
EventManager
(
$shared
);
return
$eventManager
;
}
}
\ No newline at end of file
src/UnicaenAuth/Provider/Identity/ChainServiceFactory.php
View file @
7717101f
...
...
@@ -4,8 +4,8 @@ namespace UnicaenAuth\Provider\Identity;
use
BjyAuthorize\Service\Authorize
;
use
Interop\Container\ContainerInterface
;
use
UnicaenAuth\Event\EventManager
;
use
UnicaenAuth\Service\UserContext
;
use
Zend\EventManager\EventManager
;
use
Zend\ServiceManager\FactoryInterface
;
use
Zend\ServiceManager\ServiceLocatorInterface
;
...
...
@@ -32,7 +32,7 @@ class ChainServiceFactory implements FactoryInterface
$authorizeService
=
$container
->
get
(
'BjyAuthorize\Service\Authorize'
);
/** @var EventManager $eventManager */
$eventManager
=
$container
->
get
(
'EventManager'
);
$eventManager
=
$container
->
get
(
EventManager
::
class
);
$chain
->
setUserContextService
(
$userContextService
);
$chain
->
setAuthorizeService
(
$authorizeService
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment