Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Fix the wiki FPCA requirement

Browse source 
Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
This commit is contained in:
Aurélien Bompard 2021-04-29 10:46:46 +02:00
parent 911bb8ac4f
commit 7c03fc1954
No known key found for this signature in database
GPG key ID: 31584CFEB9BF64AD
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
roles/mediawiki/files/OpenIDConnect.php
View file

@ -166,14 +166,18 @@ class OpenIDConnect extends PluggableAuth {
wfDebugLog( 'OpenID Connect', 'Redirect URL: ' . $redirectURL ); wfDebugLog( 'OpenID Connect', 'Redirect URL: ' . $redirectURL );
if ( $oidc->authenticate() ) { if ( $oidc->authenticate() ) {
if(in_array($oidc->requestUserInfo('agreements'), "FPCA")) { if(!in_array("signed_fpca", $oidc->requestUserInfo('groups'))) {
$errorMessage = 'You need to have signed the FPCA'; $errorMessage = 'You need to have signed the FPCA';
return false; return false;
} }
if(count($oidc->requestUserInfo('groups')) < 1) { /*
$errorMessage = 'You need to have signed the FPCA+1 group'; * Enable the following block to require the equivalent of CLA+1
*
if(!in_array("fedora-contributor", $oidc->requestUserInfo('groups'))) {
$errorMessage = 'You need to be in at least one group';
return false; return false;
} }
*/
$realname = $oidc->requestUserInfo( 'name' ); $realname = $oidc->requestUserInfo( 'name' );
$email = $oidc->requestUserInfo( 'email' ); $email = $oidc->requestUserInfo( 'email' );