Add a new group template just as it is already there for adding users #219

blizzz · 2020-10-19T12:08:16Z

continuation and rebase of #214

blizzz · 2020-11-04T10:47:33Z

@rotdrop may I ask you to sign-off your commits?

rotdrop · 2020-11-04T10:56:20Z

@rotdrop may I ask you to sign-off your commits?

Oops. Yes. Does it still work as this is not my original pull request? I have a look ...

blizzz · 2020-11-10T11:34:16Z

will work with the membership. Then you can also create branches in repos of the nextcloud organization :)

rotdrop · 2020-11-10T11:50:06Z

Kind thanks, just joined! Am 10.11.20 um 12:34 schrieb blizzz:

…

will work with the membership. Then you can also create branches in repos of the nextcloud organization :) — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#219 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AALM54LH3JAOAYJ3QYAJFUTSPEQMPANCNFSM4SWBXCWA>.

-- Claus-Justus Heine himself@claus-justus-heine.de http://www.claus-justus-heine.de/ Schatzmeister der Camerata Academica Freiburg e.V. --- www.cafev.de

blizzz · 2021-01-29T17:08:15Z

@rotdrop may I ask you to sign-off your commits?

@rotdrop would you mind?

rotdrop · 2021-02-16T23:37:51Z

Sorry for the delay. Finally did it. However, this seems to have stripped the signature from your cleanup commit; I did a "rebase -i" to be able to sign my two old commits. AFAIK, there essentially is no other way to do this. Best Claus Am 29.01.21 um 18:08 schrieb blizzz:

…

@rotdrop <https://github.com/rotdrop> may I ask you to sign-off your commits? @rotdrop <https://github.com/rotdrop> would you mind? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#219 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AALM54JXHQ22CJJ2SSAX7DLS4LTRBANCNFSM4SWBXCWA>.

-- Claus-Justus Heine himself@claus-justus-heine.de http://www.claus-justus-heine.de/ Schatzmeister der Camerata Academica Freiburg e.V. --- www.cafev.de

lib/LDAPGroupManager.php

Rationale: this allows to support "custom" group LDAP classes, like the groupOfMembers class of the rfc2307bis draft. The core user_ldap app could also be changed to make this more handy, but already allows custom group filters. Signed-off-by: Claus-Justus Heine <himself@claus-justus-heine.de>

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

come-nc · 2022-10-01T21:28:02Z

lib/LDAPGroupManager.php

@@ -82,15 +92,27 @@ public function respondToActions() {
 	 * @return string|null
 	 */
 	public function createGroup($gid) {
+		$adminUser = $this->userSession->getUser();
+		$requireActorFromLDAP = $this->configuration->isLdapActorRequired();
+		if ($requireActorFromLDAP && !$adminUser instanceof IUser) {


Suggested change

if ($requireActorFromLDAP && !$adminUser instanceof IUser) {

if ($requireActorFromLDAP && !($adminUser instanceof IUser)) {

I was unsure of the precedence between operators here so I expect others might

come-nc · 2022-10-01T21:29:45Z

lib/LDAPGroupManager.php

+		try {
+			$connection = $this->ldapProvider->getLDAPConnection($adminUser->getUID());
+			// TODO: what about multiple bases?
+			$base = $this->ldapProvider->getLDAPBaseGroups($adminUser->getUID());


Suggested change

$base = $this->ldapProvider->getLDAPBaseGroups($adminUser->getUID());

$base = $this->ldapProvider->getLDAPBaseGroups($adminUser->getUID())[0];

To match line 112, no?

come-nc · 2022-10-01T21:31:13Z

lib/LDAPGroupManager.php

-			'cn' => $gid,
-			'member' => ['']
-		];
+	private function buildNewEntry($gid, $base): array {


Please type parameters

come-nc · 2022-10-01T21:32:06Z

lib/LDAPGroupManager.php

+			$value = trim($split[1]);
+			if (!isset($entry[$key])) {
+				$entry[$key] = $value;
+			} else if (is_array($entry[$key])) {


Suggested change

} else if (is_array($entry[$key])) {

} elseif (is_array($entry[$key])) {

come-nc · 2022-10-01T21:33:03Z

lib/LDAPUserManager.php

@@ -107,6 +107,8 @@ public function respondToActions() {
 	 * @throws ServerNotAvailableException
 	 */
 	public function setDisplayName($uid, $displayName) {
+        trigger_error(__METHOD__);


Suggested change

trigger_error(__METHOD__);

Forgotten debug?

come-nc · 2022-10-01T21:37:18Z

lib/Settings/Admin.php

@@ -51,7 +51,9 @@ public function getForm() {
 			'templates',
 			[
 				'user' => $this->config->getUserTemplate(),
-				'userDefault' => $this->config->getUserTemplateDefault(),
+				'userDefault' => $this->config->getGroupTemplateDefault(),


Suggested change

'userDefault' => $this->config->getGroupTemplateDefault(),

'userDefault' => $this->config->getUserTemplateDefault(),

come-nc · 2022-10-01T21:37:57Z

src/components/AdminSettings.vue

+		<h3>{{ t('ldap_write_support', 'Group template') }}</h3>
+		<p>{{ t('ldap_write_support', 'LDIF template for creating groups. Following placeholders may be used') }}</p>
+		<ul class="disc">
+			<li><span class="mono">{GID}</span> – {{ t('ldap_write_support', 'the group id provided by the (sub)admin') }}</li>


int or string? Should be made clear.

come-nc · 2022-10-01T21:39:08Z

src/components/AdminSettings.vue

+		<p>{{ t('ldap_write_support', 'LDIF template for creating groups. Following placeholders may be used') }}</p>
+		<ul class="disc">
+			<li><span class="mono">{GID}</span> – {{ t('ldap_write_support', 'the group id provided by the (sub)admin') }}</li>
+			<li><span class="mono">{BASE}</span> – {{ t('ldap_write_support', 'the LDAP node of the acting (sub)admin or the configured group base') }}</li>


The base of the acting subadmin, right?

come-nc · 2022-10-01T21:39:28Z

src/components/AdminSettings.vue

+				group: Object,
+				groupDefault: Object,


identation seems off

come-nc · 2022-10-01T21:40:49Z

src/components/AdminSettings.vue

+					});
+					return;
+				}
+				OCP.AppConfig.setValue('ldap_write_support', 'template.group', this.templates.group);


Should be this.groupTemplate to be consistent, or change the user template to this.templates.user.

blizzz mentioned this pull request Oct 19, 2020

Add a new group template just as it is already there for adding users. #214

Closed

rotdrop force-pushed the enh/noid/new-group-template branch from 406046b to 290411d Compare February 16, 2021 23:32

rotdrop force-pushed the enh/noid/new-group-template branch from 290411d to d324a20 Compare February 24, 2021 08:58

susnux added enhancement New feature or request 3. to review labels Sep 23, 2022

susnux linked an issue Sep 23, 2022 that may be closed by this pull request

Add group template to settings #446

Open

susnux force-pushed the enh/noid/new-group-template branch from d324a20 to d168db1 Compare September 23, 2022 08:16

susnux reviewed Sep 29, 2022

View reviewed changes

lib/LDAPGroupManager.php Show resolved Hide resolved

rotdrop and others added 2 commits October 1, 2022 17:40

fix constructor

d5a5555

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

blizzz force-pushed the enh/noid/new-group-template branch from d168db1 to d5a5555 Compare October 1, 2022 16:51

blizzz requested a review from come-nc October 1, 2022 18:07

come-nc requested changes Oct 1, 2022

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add a new group template just as it is already there for adding users #219

Add a new group template just as it is already there for adding users #219

blizzz commented Oct 19, 2020

blizzz commented Nov 4, 2020

rotdrop commented Nov 4, 2020

blizzz commented Nov 10, 2020

rotdrop commented Nov 10, 2020 via email

blizzz commented Jan 29, 2021

rotdrop commented Feb 16, 2021 via email

come-nc Oct 1, 2022

come-nc Oct 1, 2022

come-nc Oct 1, 2022

come-nc Oct 1, 2022

come-nc Oct 1, 2022

come-nc Oct 1, 2022

come-nc Oct 1, 2022

come-nc Oct 1, 2022

come-nc Oct 1, 2022

come-nc Oct 1, 2022

	if ($requireActorFromLDAP && !$adminUser instanceof IUser) {
	if ($requireActorFromLDAP && !($adminUser instanceof IUser)) {

	$base = $this->ldapProvider->getLDAPBaseGroups($adminUser->getUID());
	$base = $this->ldapProvider->getLDAPBaseGroups($adminUser->getUID())[0];

	} else if (is_array($entry[$key])) {
	} elseif (is_array($entry[$key])) {

	'userDefault' => $this->config->getGroupTemplateDefault(),
	'userDefault' => $this->config->getUserTemplateDefault(),

Add a new group template just as it is already there for adding users #219

Are you sure you want to change the base?

Add a new group template just as it is already there for adding users #219

Conversation

blizzz commented Oct 19, 2020

blizzz commented Nov 4, 2020

rotdrop commented Nov 4, 2020

blizzz commented Nov 10, 2020

rotdrop commented Nov 10, 2020 via email

blizzz commented Jan 29, 2021

rotdrop commented Feb 16, 2021 via email

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment