coren has submitted this change and it was merged. Change subject: OSM trying not to create empty groups ......................................................................
OSM trying not to create empty groups The move to openldap has broken project creation seemingly based on openldap's sane coherence to rfc's Bug: T121064 Change-Id: Idfe00340555edc11659cb3705368bd61813065d5 --- M nova/OpenStackNovaProjectGroup.php 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: Andrew Bogott: Looks good to me, but someone else must approve coren: Looks good to me, approved jenkins-bot: Verified diff --git a/nova/OpenStackNovaProjectGroup.php b/nova/OpenStackNovaProjectGroup.php index d533842..479a79d 100644 --- a/nova/OpenStackNovaProjectGroup.php +++ b/nova/OpenStackNovaProjectGroup.php @@ -235,11 +235,20 @@ static function createProjectGroup( $projectname ) { global $wgAuth; global $wgOpenStackManagerLDAPProjectGroupBaseDN; + global $wgOpenStackManagerLDAPUsername; OpenStackNovaLdapConnection::connect(); + $user = new OpenStackNovaUser( $wgOpenStackManagerLDAPUsername ); + + if ( ! $user->userDN ) { + $wgAuth->printDebug( "Failed to find userDN in createProjectGroup", NONSENSITIVE ); + return false; + } + $projectGroupName = self::$prefix . $projectname; $projectGroup = array(); + $projectGroup['member'][] = $user->userDN; $projectGroup['objectclass'][] = 'posixgroup'; $projectGroup['objectclass'][] = 'groupofnames'; $projectGroup['cn'] = $projectGroupName; @@ -253,6 +262,7 @@ } else { $wgAuth->printDebug( "Failed to add project group $projectGroupName: " . ldap_error( $wgAuth->ldapconn ), NONSENSITIVE ); + return false; } return $success; } -- To view, visit https://gerrit.wikimedia.org/r/258462 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idfe00340555edc11659cb3705368bd61813065d5 Gerrit-PatchSet: 5 Gerrit-Project: mediawiki/extensions/OpenStackManager Gerrit-Branch: master Gerrit-Owner: Rush <r...@wikimedia.org> Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org> Gerrit-Reviewer: Rush <r...@wikimedia.org> Gerrit-Reviewer: Yuvipanda <yuvipa...@wikimedia.org> Gerrit-Reviewer: coren <mpellet...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits