[MediaWiki-commits] [Gerrit] OSM trying not to create empty groups - change (mediawiki...OpenStackManager)

2015-12-11 Thread Rush (Code Review) 
Rush has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/258462

Change subject: OSM trying not to create empty groups
..

OSM trying not to create empty groups

Change-Id: Idfe00340555edc11659cb3705368bd61813065d5
---
M nova/OpenStackNovaProject.php
M nova/OpenStackNovaProjectGroup.php
2 files changed, 11 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager 
refs/changes/62/258462/1

diff --git a/nova/OpenStackNovaProject.php b/nova/OpenStackNovaProject.php
index e4936a3..78182eb 100644
--- a/nova/OpenStackNovaProject.php
+++ b/nova/OpenStackNovaProject.php
@@ -135,7 +135,7 @@
// If we couldn't find an corresponding Project Group,
// then we should create one now.
if ( !$this->projectGroup->loaded or 
$this->projectGroup->isVirtual() ) {
-   $wgAuth->printDebug( 
$this->projectGroup->getProjectGroupName() . " either does not exist or is a 
virtual static group.  Recreating is as a real group and syncing members.", 
NONSENSITIVE );
+   $wgAuth->printDebug( 
$this->projectGroup->getProjectGroupName() . " either does not exist or is a 
virtual static group.  Recreating as a real group and syncing members.", 
NONSENSITIVE );
 
// Delete, recreate, and then sync the members.
$deleteSuccess = 
OpenStackNovaProjectGroup::deleteProjectGroup( $this->projectname );
diff --git a/nova/OpenStackNovaProjectGroup.php 
b/nova/OpenStackNovaProjectGroup.php
index 9d4a80b..ea075fa 100644
--- a/nova/OpenStackNovaProjectGroup.php
+++ b/nova/OpenStackNovaProjectGroup.php
@@ -251,11 +251,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;
@@ -269,6 +278,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: newchange
Gerrit-Change-Id: Idfe00340555edc11659cb3705368bd61813065d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: Rush 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] OSM trying not to create empty groups - change (mediawiki...OpenStackManager)

2015-12-11 Thread coren (Code Review) 
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 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Rush 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: coren 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] OSM trying not to create empty groups - change (mediawiki...OpenStackManager)

2015-12-11 Thread 20after4 (Code Review) 
20after4 has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/258515

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
(cherry picked from commit c77d206e0ec9d9fc3837249f508070e09aa51af1)
---
M nova/OpenStackNovaProjectGroup.php
1 file changed, 10 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager 
refs/changes/15/258515/1

diff --git a/nova/OpenStackNovaProjectGroup.php 
b/nova/OpenStackNovaProjectGroup.php
index 9d4a80b..ea075fa 100644
--- a/nova/OpenStackNovaProjectGroup.php
+++ b/nova/OpenStackNovaProjectGroup.php
@@ -251,11 +251,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;
@@ -269,6 +278,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/258515
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idfe00340555edc11659cb3705368bd61813065d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: wmf/1.27.0-wmf.8
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] OSM trying not to create empty groups - change (mediawiki...OpenStackManager)

2015-12-11 Thread jenkins-bot (Code Review) 
jenkins-bot 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
(cherry picked from commit c77d206e0ec9d9fc3837249f508070e09aa51af1)
---
M nova/OpenStackNovaProjectGroup.php
1 file changed, 10 insertions(+), 0 deletions(-)

Approvals:
  20after4: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/nova/OpenStackNovaProjectGroup.php 
b/nova/OpenStackNovaProjectGroup.php
index 9d4a80b..ea075fa 100644
--- a/nova/OpenStackNovaProjectGroup.php
+++ b/nova/OpenStackNovaProjectGroup.php
@@ -251,11 +251,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;
@@ -269,6 +278,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/258515
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Idfe00340555edc11659cb3705368bd61813065d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: wmf/1.27.0-wmf.8
Gerrit-Owner: 20after4 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Rush 
Gerrit-Reviewer: coren 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] OSM trying not to create empty groups - change (mediawiki...OpenStackManager)

2015-12-10 Thread Rush (Code Review) 
Rush has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/258355

Change subject: OSM trying not to create empty groups
..

OSM trying not to create empty groups

Change-Id: I967343fc7c7426fff7e6ac46dc32a38f228764b0
---
M nova/OpenStackNovaProject.php
M nova/OpenStackNovaProjectGroup.php
2 files changed, 5 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager 
refs/changes/55/258355/1

diff --git a/nova/OpenStackNovaProject.php b/nova/OpenStackNovaProject.php
index e4936a3..78182eb 100644
--- a/nova/OpenStackNovaProject.php
+++ b/nova/OpenStackNovaProject.php
@@ -135,7 +135,7 @@
// If we couldn't find an corresponding Project Group,
// then we should create one now.
if ( !$this->projectGroup->loaded or 
$this->projectGroup->isVirtual() ) {
-   $wgAuth->printDebug( 
$this->projectGroup->getProjectGroupName() . " either does not exist or is a 
virtual static group.  Recreating is as a real group and syncing members.", 
NONSENSITIVE );
+   $wgAuth->printDebug( 
$this->projectGroup->getProjectGroupName() . " either does not exist or is a 
virtual static group.  Recreating as a real group and syncing members.", 
NONSENSITIVE );
 
// Delete, recreate, and then sync the members.
$deleteSuccess = 
OpenStackNovaProjectGroup::deleteProjectGroup( $this->projectname );
diff --git a/nova/OpenStackNovaProjectGroup.php 
b/nova/OpenStackNovaProjectGroup.php
index 9d4a80b..9018491 100644
--- a/nova/OpenStackNovaProjectGroup.php
+++ b/nova/OpenStackNovaProjectGroup.php
@@ -251,11 +251,15 @@
static function createProjectGroup( $projectname ) {
global $wgAuth;
global $wgOpenStackManagerLDAPProjectGroupBaseDN;
+global $wgOpenStackManagerLDAPUsername;
 
OpenStackNovaLdapConnection::connect();
 
+$user = new OpenStackNovaUser( $wgOpenStackManagerLDAPUsername 
);
+
$projectGroupName = self::$prefix . $projectname;
$projectGroup = array();
+   $projectGroup['member'][] = $user->userDN;
$projectGroup['objectclass'][] = 'posixgroup';
$projectGroup['objectclass'][] = 'groupofnames';
$projectGroup['cn'] = $projectGroupName;

-- 
To view, visit https://gerrit.wikimedia.org/r/258355
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I967343fc7c7426fff7e6ac46dc32a38f228764b0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: Rush 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits