Skip to content

require entries not to exist before doing init #293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
simonLeary42 merged 1 commit into from
Sep 9, 2025
Merged

require entries not to exist before doing init #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 11 additions & 13 deletions resources/lib/UnityGroup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,12 +258,11 @@ public function cancelGroupJoinRequest($user, $send_mail = true)
// $users = $this->getGroupMembers();

// // now we delete the ldap entry
// if ($this->entry->exists()) {
// $this->entry->delete();
// $this->REDIS->removeCacheArray("sorted_groups", "", $this->gid);
// foreach ($users as $user) {
// $this->REDIS->removeCacheArray($user->uid, "groups", $this->gid);
// }
// assert($this->entry->exists());
// $this->entry->delete();
// $this->REDIS->removeCacheArray("sorted_groups", "", $this->gid);
// foreach ($users as $user) {
// $this->REDIS->removeCacheArray($user->uid, "groups", $this->gid);
// }

// // send email to every user of the now deleted PI group
Expand Down Expand Up @@ -521,14 +520,13 @@ private function init()
// make this user a PI
$owner = $this->getOwner();

if (!$this->entry->exists()) {
$nextGID = $this->LDAP->getNextPiGIDNumber($this->SQL);
assert(!$this->entry->exists());
$nextGID = $this->LDAP->getNextPiGIDNumber($this->SQL);

$this->entry->setAttribute("objectclass", UnityLDAP::POSIX_GROUP_CLASS);
$this->entry->setAttribute("gidnumber", strval($nextGID));
$this->entry->setAttribute("memberuid", array($owner->uid));
$this->entry->write();
}
$this->entry->setAttribute("objectclass", UnityLDAP::POSIX_GROUP_CLASS);
$this->entry->setAttribute("gidnumber", strval($nextGID));
$this->entry->setAttribute("memberuid", array($owner->uid));
$this->entry->write();

$this->REDIS->appendCacheArray("sorted_groups", "", $this->gid);

Expand Down
11 changes: 5 additions & 6 deletions resources/lib/UnityOrg.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,12 @@ public function __construct($gid, $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK)

public function init()
{
if (!$this->entry->exists()) {
$nextGID = $this->LDAP->getNextOrgGIDNumber($this->SQL);
assert(!$this->entry->exists());
$nextGID = $this->LDAP->getNextOrgGIDNumber($this->SQL);

$this->entry->setAttribute("objectclass", UnityLDAP::POSIX_GROUP_CLASS);
$this->entry->setAttribute("gidnumber", strval($nextGID));
$this->entry->write();
}
$this->entry->setAttribute("objectclass", UnityLDAP::POSIX_GROUP_CLASS);
$this->entry->setAttribute("gidnumber", strval($nextGID));
$this->entry->write();

$this->REDIS->appendCacheArray("sorted_orgs", "", $this->gid);
}
Expand Down
82 changes: 38 additions & 44 deletions resources/lib/UnityUser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,33 +63,30 @@ public function init($firstname, $lastname, $email, $org, $send_mail = true)
//
$ldapGroupEntry = $this->getGroupEntry();
$id = $this->LDAP->getUnassignedID($this->uid, $this->SQL);

if (!$ldapGroupEntry->exists()) {
$ldapGroupEntry->setAttribute("objectclass", UnityLDAP::POSIX_GROUP_CLASS);
$ldapGroupEntry->setAttribute("gidnumber", strval($id));
$ldapGroupEntry->write();
}
assert(!$ldapGroupEntry->exists());
$ldapGroupEntry->setAttribute("objectclass", UnityLDAP::POSIX_GROUP_CLASS);
$ldapGroupEntry->setAttribute("gidnumber", strval($id));
$ldapGroupEntry->write();

//
// Create LDAP user
//
if (!$this->entry->exists()) {
$this->entry->setAttribute("objectclass", UnityLDAP::POSIX_ACCOUNT_CLASS);
$this->entry->setAttribute("uid", $this->uid);
$this->entry->setAttribute("givenname", $firstname);
$this->entry->setAttribute("sn", $lastname);
$this->entry->setAttribute(
"gecos",
\transliterator_transliterate("Latin-ASCII", "$firstname $lastname")
);
$this->entry->setAttribute("mail", $email);
$this->entry->setAttribute("o", $org);
$this->entry->setAttribute("homedirectory", self::HOME_DIR . $this->uid);
$this->entry->setAttribute("loginshell", $this->LDAP->getDefUserShell());
$this->entry->setAttribute("uidnumber", strval($id));
$this->entry->setAttribute("gidnumber", strval($id));
$this->entry->write();
}
assert(!$this->entry->exists());
$this->entry->setAttribute("objectclass", UnityLDAP::POSIX_ACCOUNT_CLASS);
$this->entry->setAttribute("uid", $this->uid);
$this->entry->setAttribute("givenname", $firstname);
$this->entry->setAttribute("sn", $lastname);
$this->entry->setAttribute(
"gecos",
\transliterator_transliterate("Latin-ASCII", "$firstname $lastname")
);
$this->entry->setAttribute("mail", $email);
$this->entry->setAttribute("o", $org);
$this->entry->setAttribute("homedirectory", self::HOME_DIR . $this->uid);
$this->entry->setAttribute("loginshell", $this->LDAP->getDefUserShell());
$this->entry->setAttribute("uidnumber", strval($id));
$this->entry->setAttribute("gidnumber", strval($id));
$this->entry->write();

// update cache
$this->REDIS->setCache($this->uid, "firstname", $firstname);
Expand Down Expand Up @@ -353,10 +350,9 @@ public function setSSHKeys($keys, $operator = null, $send_mail = true)
{
$operator = is_null($operator) ? $this->uid : $operator->uid;
$keys_filt = array_values(array_unique($keys));
if ($this->entry->exists()) {
$this->entry->setAttribute("sshpublickey", $keys_filt);
$this->entry->write();
}
assert($this->entry->exists());
$this->entry->setAttribute("sshpublickey", $keys_filt);
$this->entry->write();

$this->REDIS->setCache($this->uid, "sshkeys", $keys_filt);

Expand Down Expand Up @@ -429,10 +425,9 @@ public function setLoginShell($shell, $operator = null, $send_mail = true)
if (empty($shell)) {
throw new Exception("login shell must not be empty!");
}
if ($this->entry->exists()) {
$this->entry->setAttribute("loginshell", $shell);
$this->entry->write();
}
assert($this->entry->exists());
$this->entry->setAttribute("loginshell", $shell);
$this->entry->write();

$operator = is_null($operator) ? $this->uid : $operator->uid;

Expand Down Expand Up @@ -484,20 +479,19 @@ public function getLoginShell($ignorecache = false)

public function setHomeDir($home, $operator = null)
{
if ($this->entry->exists()) {
$this->entry->setAttribute("homedirectory", $home);
$this->entry->write();
$operator = is_null($operator) ? $this->uid : $operator->uid;

$this->SQL->addLog(
$operator,
$_SERVER['REMOTE_ADDR'],
"homedir_changed",
$this->uid
);
assert($this->entry->exists());
$this->entry->setAttribute("homedirectory", $home);
$this->entry->write();
$operator = is_null($operator) ? $this->uid : $operator->uid;

$this->REDIS->setCache($this->uid, "homedir", $home);
}
$this->SQL->addLog(
$operator,
$_SERVER['REMOTE_ADDR'],
"homedir_changed",
$this->uid
);

$this->REDIS->setCache($this->uid, "homedir", $home);
}

/**
Expand Down