Merge 868269b into 98e975e

collective · Apr 18, 2020 · e092ad9 · e092ad9
2 parents 98e975e + 868269b
commit e092ad9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/src/pas/plugins/ldap/defaults.py b/src/pas/plugins/ldap/defaults.py
@@ -26,6 +26,7 @@
     "users.objectClasses": ["inetOrgPerson"],
     "users.defaults": {},
     "users.memberOfSupport": False,
+    "users.recursiveGroups": False,
     "users.memberOfExternalGroupDNs": [],
     "users.account_expiration": False,
     "users.expires_attr": "shadowExpire",
@@ -42,6 +43,7 @@
     "groups.objectClasses": ["groupOfNames"],
     "groups.defaults": {},
     "groups.memberOfSupport": False,
+    "groups.recursiveGroups": False,
     "groups.memberOfExternalGroupDNs": [],
     "groups.expires_attr": "unused",
     "groups.expires_unit": 0,

diff --git a/src/pas/plugins/ldap/properties.py b/src/pas/plugins/ldap/properties.py
@@ -146,6 +146,7 @@ def fetch(name, default=UNSET):
         objectClasses = fetch("users.object_classes")
         users.objectClasses = objectClasses
         users.memberOfSupport = fetch("users.memberOfSupport")
+        users.recursiveGroups = fetch("users.recursiveGroups")
         users.memberOfExternalGroupDNs = fetch("users.memberOfExternalGroupDNs")
         users.account_expiration = fetch("users.account_expiration")
         users._expiresAttr = fetch("users.expires_attr")
@@ -163,6 +164,7 @@ def fetch(name, default=UNSET):
         objectClasses = fetch("groups.object_classes")
         groups.objectClasses = objectClasses
         groups.memberOfSupport = fetch("groups.memberOfSupport")
+        groups.recursiveGroups = fetch("groups.recursiveGroups")
         groups.memberOfExternalGroupDNs = fetch("groups.memberOfExternalGroupDNs")
 
     def userpassanon_extractor(self, widget, data):
@@ -294,6 +296,7 @@ def __init__(self, plugin):
     objectClasses = propproxy("users.objectClasses")
     defaults = propproxy("users.defaults")
     memberOfSupport = propproxy("users.memberOfSupport")
+    recursiveGroups = propproxy("users.recursiveGroups")
     memberOfExternalGroupDNs = propproxy("users.memberOfExternalGroupDNs")
     account_expiration = propproxy("users.account_expiration")
     _expiresAttr = propproxy("users.expires_attr")
@@ -323,6 +326,7 @@ def __init__(self, plugin):
     objectClasses = propproxy("groups.objectClasses")
     defaults = propproxy("groups.defaults")
     memberOfSupport = propproxy("groups.memberOfSupport")
+    recursiveGroups = propproxy("groups.recursiveGroups")
     memberOfExternalGroupDNs = propproxy("groups.memberOfExternalGroupDNs")
     expiresAttr = propproxy("groups.expires_attr")
     expiresUnit = propproxy("groups.expires_unit")
diff --git a/src/pas/plugins/ldap/properties.yaml b/src/pas/plugins/ldap/properties.yaml
@@ -88,6 +88,12 @@ widgets:
         value: expr:context.users.memberOfSupport
         props:
             label: memberOf attribute supported?
+    - recursiveGroups:
+        factory: '#field:checkbox'
+        value: expr:context.users.recursiveGroups
+        props:
+            label: Support recursive/nested groups?
+            help: If your LDAP/AD supports it this will use LDAP_MATCHING_RULE_IN_CHAIN.
     - memberOfExternalGroupDNs:
         factory: '#array'
         value: expr:context.users.memberOfExternalGroupDNs
@@ -169,6 +175,12 @@ widgets:
         value: expr:context.groups.memberOfSupport
         props:
             label: memberOf attribute supported?
+    - recursiveGroups:
+        factory: '#field:checkbox'
+        value: expr:context.groups.recursiveGroups
+        props:
+            label: Support recursive/nested groups?
+            help: If your LDAP/AD supports it this will use LDAP_MATCHING_RULE_IN_CHAIN
     - memberOfExternalGroupDNs:
         factory: '#array'
         value: expr:context.groups.memberOfExternalGroupDNs