Group "Users" definitely needs to be hard-ignored.

Adambean · Adambean · commit 7f9a38fb8f54 · 2018-12-26T13:09:46.000Z
diff --git a/src/LdapSyncCommand.php b/src/LdapSyncCommand.php
@@ -1159,7 +1159,6 @@ private function deployGitlabUsersAndGroups(array $config, string $gitlabInstanc
                     continue;
                 }
 
-                /* Not sure if these groups actually need to be exempt yet.
                 if ("Root" == $gitlabGroupName) {
                     $this->logger->info("Gitlab built-in root group will be ignored.");
                     continue; // The Gitlab root group should never be updated from LDAP.
@@ -1169,7 +1168,6 @@ private function deployGitlabUsersAndGroups(array $config, string $gitlabInstanc
                     $this->logger->info("Gitlab built-in users group will be ignored.");
                     continue; // The Gitlab users group should never be updated from LDAP.
                 }
-                 */
 
                 $this->logger->info(sprintf("Found Gitlab group #%d \"%s\" [%s].", $gitlabGroupId, $gitlabGroupName, $gitlabGroupPath));
                 if (isset($groupsSync["found"][$gitlabGroupId]) || $this->in_array_i($gitlabGroupName, $groupsSync["found"])) {
@@ -1192,12 +1190,10 @@ private function deployGitlabUsersAndGroups(array $config, string $gitlabInstanc
                 continue; // The Gitlab root group should never be updated from LDAP.
             }
 
-            /* Not sure if these groups actually need to be exempt yet.
             if ("Users" == $ldapGroupName) {
                 $this->logger->info("Gitlab built-in users group will be ignored.");
                 continue; // The Gitlab users group should never be updated from LDAP.
             }
-             */
 
             if ($this->in_array_i($ldapGroupName, $config["gitlab"]["options"]["groupNamesToIgnore"])) {
                 $this->logger->info(sprintf("Group \"%s\" in ignore list.", $ldapGroupName));
@@ -1235,12 +1231,10 @@ private function deployGitlabUsersAndGroups(array $config, string $gitlabInstanc
                 continue; // The Gitlab root group should never be updated from LDAP.
             }
 
-            /* Not sure if these groups actually need to be exempt yet.
             if ("Users" == $gitlabGroupName) {
                 $this->logger->info("Gitlab built-in users group will be ignored.");
                 continue; // The Gitlab users group should never be updated from LDAP.
             }
-             */
 
             if ($this->in_array_i($gitlabGroupName, $config["gitlab"]["options"]["groupNamesToIgnore"])) {
                 $this->logger->info(sprintf("Group \"%s\" in ignore list.", $gitlabGroupName));
@@ -1280,12 +1274,10 @@ private function deployGitlabUsersAndGroups(array $config, string $gitlabInstanc
                 continue; // The Gitlab root group should never be updated from LDAP.
             }
 
-            /* Not sure if these groups actually need to be exempt yet.
             if ("Users" == $gitlabGroupName) {
                 $this->logger->info("Gitlab built-in users group will be ignored.");
                 continue; // The Gitlab users group should never be updated from LDAP.
             }
-             */
 
             if ($this->in_array_i($gitlabGroupName, $config["gitlab"]["options"]["groupNamesToIgnore"])) {
                 $this->logger->info(sprintf("Group \"%s\" in ignore list.", $gitlabGroupName));
@@ -1330,12 +1322,10 @@ private function deployGitlabUsersAndGroups(array $config, string $gitlabInstanc
                 continue; // The Gitlab root group should never be updated from LDAP.
             }
 
-            /* Not sure if these groups actually need to be exempt yet.
             if ("Users" == $gitlabGroupName) {
                 $this->logger->info("Gitlab built-in users group will be ignored.");
                 continue; // The Gitlab users group should never be updated from LDAP.
             }
-             */
 
             if ($this->in_array_i($gitlabGroupName, $config["gitlab"]["options"]["groupNamesToIgnore"])) {
                 $this->logger->info(sprintf("Group \"%s\" in ignore list.", $gitlabGroupName));

Original file line number	Diff line number	Diff line change
`@@ -1159,7 +1159,6 @@ private function deployGitlabUsersAndGroups(array $config, string $gitlabInstanc`
`1159`	`1159`	`continue;`
`1160`	`1160`	`}`
`1161`	`1161`
`1162`		`- /* Not sure if these groups actually need to be exempt yet.`
`1163`	`1162`	`if ("Root" == $gitlabGroupName) {`
`1164`	`1163`	`$this->logger->info("Gitlab built-in root group will be ignored.");`
`1165`	`1164`	`continue; // The Gitlab root group should never be updated from LDAP.`
`@@ -1169,7 +1168,6 @@ private function deployGitlabUsersAndGroups(array $config, string $gitlabInstanc`
`1169`	`1168`	`$this->logger->info("Gitlab built-in users group will be ignored.");`
`1170`	`1169`	`continue; // The Gitlab users group should never be updated from LDAP.`
`1171`	`1170`	`}`
`1172`		`- */`
`1173`	`1171`
`1174`	`1172`	`$this->logger->info(sprintf("Found Gitlab group #%d \"%s\" [%s].", $gitlabGroupId, $gitlabGroupName, $gitlabGroupPath));`
`1175`	`1173`	`if (isset($groupsSync["found"][$gitlabGroupId]) \|\| $this->in_array_i($gitlabGroupName, $groupsSync["found"])) {`
`@@ -1192,12 +1190,10 @@ private function deployGitlabUsersAndGroups(array $config, string $gitlabInstanc`
`1192`	`1190`	`continue; // The Gitlab root group should never be updated from LDAP.`
`1193`	`1191`	`}`
`1194`	`1192`
`1195`		`- /* Not sure if these groups actually need to be exempt yet.`
`1196`	`1193`	`if ("Users" == $ldapGroupName) {`
`1197`	`1194`	`$this->logger->info("Gitlab built-in users group will be ignored.");`
`1198`	`1195`	`continue; // The Gitlab users group should never be updated from LDAP.`
`1199`	`1196`	`}`
`1200`		`- */`
`1201`	`1197`
`1202`	`1198`	`if ($this->in_array_i($ldapGroupName, $config["gitlab"]["options"]["groupNamesToIgnore"])) {`
`1203`	`1199`	`$this->logger->info(sprintf("Group \"%s\" in ignore list.", $ldapGroupName));`
`@@ -1235,12 +1231,10 @@ private function deployGitlabUsersAndGroups(array $config, string $gitlabInstanc`
`1235`	`1231`	`continue; // The Gitlab root group should never be updated from LDAP.`
`1236`	`1232`	`}`
`1237`	`1233`
`1238`		`- /* Not sure if these groups actually need to be exempt yet.`
`1239`	`1234`	`if ("Users" == $gitlabGroupName) {`
`1240`	`1235`	`$this->logger->info("Gitlab built-in users group will be ignored.");`
`1241`	`1236`	`continue; // The Gitlab users group should never be updated from LDAP.`
`1242`	`1237`	`}`
`1243`		`- */`
`1244`	`1238`
`1245`	`1239`	`if ($this->in_array_i($gitlabGroupName, $config["gitlab"]["options"]["groupNamesToIgnore"])) {`
`1246`	`1240`	`$this->logger->info(sprintf("Group \"%s\" in ignore list.", $gitlabGroupName));`
`@@ -1280,12 +1274,10 @@ private function deployGitlabUsersAndGroups(array $config, string $gitlabInstanc`
`1280`	`1274`	`continue; // The Gitlab root group should never be updated from LDAP.`
`1281`	`1275`	`}`
`1282`	`1276`
`1283`		`- /* Not sure if these groups actually need to be exempt yet.`
`1284`	`1277`	`if ("Users" == $gitlabGroupName) {`
`1285`	`1278`	`$this->logger->info("Gitlab built-in users group will be ignored.");`
`1286`	`1279`	`continue; // The Gitlab users group should never be updated from LDAP.`
`1287`	`1280`	`}`
`1288`		`- */`
`1289`	`1281`
`1290`	`1282`	`if ($this->in_array_i($gitlabGroupName, $config["gitlab"]["options"]["groupNamesToIgnore"])) {`
`1291`	`1283`	`$this->logger->info(sprintf("Group \"%s\" in ignore list.", $gitlabGroupName));`
`@@ -1330,12 +1322,10 @@ private function deployGitlabUsersAndGroups(array $config, string $gitlabInstanc`
`1330`	`1322`	`continue; // The Gitlab root group should never be updated from LDAP.`
`1331`	`1323`	`}`
`1332`	`1324`
`1333`		`- /* Not sure if these groups actually need to be exempt yet.`
`1334`	`1325`	`if ("Users" == $gitlabGroupName) {`
`1335`	`1326`	`$this->logger->info("Gitlab built-in users group will be ignored.");`
`1336`	`1327`	`continue; // The Gitlab users group should never be updated from LDAP.`
`1337`	`1328`	`}`
`1338`		`- */`
`1339`	`1329`
`1340`	`1330`	`if ($this->in_array_i($gitlabGroupName, $config["gitlab"]["options"]["groupNamesToIgnore"])) {`
`1341`	`1331`	`$this->logger->info(sprintf("Group \"%s\" in ignore list.", $gitlabGroupName));`