Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
auth
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
lib
unicaen
auth
Commits
40bb0af6
Commit
40bb0af6
authored
Jul 20, 2021
by
Bertrand Gauthier
Browse files
Options
Downloads
Patches
Plain Diff
[FIX] Meilleure gestion d'erreur en cas de demande d'usurpation d'un compte inexistant
parent
3f5c91a5
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Pipeline
#10522
passed
Jul 20, 2021
Stage: publish
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.md
+4
-0
4 additions, 0 deletions
CHANGELOG.md
src/UnicaenAuth/Controller/UtilisateurController.php
+14
-8
14 additions, 8 deletions
src/UnicaenAuth/Controller/UtilisateurController.php
with
18 additions
and
8 deletions
CHANGELOG.md
+
4
−
0
View file @
40bb0af6
CHANGELOG
=========
3.
2.3
-----
-
[FIX] Meilleure gestion d'erreur en cas de demande d'usurpation d'un compte inexistant : retour à l'accueil + message.
3.
2.2
-----
-
L'URL de connexion accepte désormais role=ROLE_ID pour sélectionner automatiquement ce rôle une fois authentifié.
...
...
This diff is collapsed.
Click to expand it.
src/UnicaenAuth/Controller/UtilisateurController.php
+
14
−
8
View file @
40bb0af6
...
...
@@ -2,6 +2,7 @@
namespace
UnicaenAuth\Controller
;
use
Exception
;
use
UnicaenApp\Exception\RuntimeException
;
use
UnicaenApp\Mapper\Ldap\People
as
LdapPeopleMapper
;
use
UnicaenAuth\Entity\Db\AbstractUser
;
...
...
@@ -132,10 +133,19 @@ class UtilisateurController extends AbstractActionController
return
$this
->
redirect
()
->
toRoute
(
'home'
);
}
$utilisateurUsurpe
=
$this
->
getUserMapper
()
->
findByUsername
(
$usernameUsurpe
);
/** @var AbstractUser $utilisateurUsurpe */
if
(
$utilisateurUsurpe
===
null
)
{
$this
->
flashMessenger
()
->
addErrorMessage
(
"La demande d'usurpation du compte '
$usernameUsurpe
' a échoué car aucun compte utilisateur correspondant "
.
"n'a été trouvé."
);
return
$this
->
redirect
()
->
toRoute
(
'home'
);
}
$sessionIdentity
=
$this
->
serviceUserContext
->
usurperIdentite
(
$usernameUsurpe
);
if
(
$sessionIdentity
!==
null
)
{
// cuisine spéciale si l'utilisateur courant s'est authentifié via Shibboleth
$this
->
usurperIdentiteShib
(
$u
sername
Usurpe
);
$this
->
usurperIdentiteShib
(
$u
tilisateur
Usurpe
);
}
return
$this
->
redirect
()
->
toRoute
(
'home'
);
...
...
@@ -144,19 +154,15 @@ class UtilisateurController extends AbstractActionController
/**
* Cuisine spéciale pour l'usurpation si l'utilisateur courant s'est authentifié via Shibboleth.
*
* @param str
ing $usernameUsurpe Ex tartempion@unicaen.f
r
* @param
Ab
str
actUser $utilisateurUsurpe Utilisateur à usurpe
r
*/
protected
function
usurperIdentiteShib
(
str
ing
$username
Usurpe
)
protected
function
usurperIdentiteShib
(
Ab
str
actUser
$utilisateur
Usurpe
)
{
$currentIdentityArray
=
$this
->
serviceUserContext
->
getIdentity
();
if
(
isset
(
$currentIdentityArray
[
'shib'
])
&&
$currentIdentityArray
[
'shib'
]
instanceof
ShibUser
)
{
$fromShibUser
=
$currentIdentityArray
[
'shib'
];
$toUtilisateur
=
$this
->
getUserMapper
()
->
findByUsername
(
$usernameUsurpe
);
/** @var AbstractUser $toUtilisateur */
if
(
$toUtilisateur
===
null
)
{
throw
new
RuntimeException
(
"L'utilisateur '
$usernameUsurpe
' n'existe pas dans la table des utilisateurs"
);
}
$this
->
shibService
->
activateUsurpation
(
$fromShibUser
,
$toUtilisateur
);
$this
->
shibService
->
activateUsurpation
(
$fromShibUser
,
$utilisateurUsurpe
);
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment