Module: check_mk
Branch: master
Commit: 45d942cf33bd4f787e7c85ae91eb7ef7f2b56666
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45d942cf33bd4f…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Feb 6 13:01:05 2017 +0100
4321 FIX LDAP: Improved validation of groups to attributes sync plugin
Change-Id: I70db5dbfef6014cc51537569eb25e2d68a52d227
---
.werks/4321 | 10 ++++++++++
ChangeLog | 1 +
web/plugins/userdb/ldap.py | 11 +++++++----
3 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/.werks/4321 b/.werks/4321
new file mode 100644
index 0000000..e3d3063
--- /dev/null
+++ b/.werks/4321
@@ -0,0 +1,10 @@
+Title: LDAP: Improved validation of groups to attributes sync plugin
+Level: 1
+Component: multisite
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.4.0i4
+Date: 1486382449
+
+
diff --git a/ChangeLog b/ChangeLog
index 4a8e9fc..f4aec0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -113,6 +113,7 @@
* 4015 FIX: Multisite events page: Fixed slow page generation caused by the event
delete icon...
* 4315 FIX: Logwatch problematic logfiles list was showing too many logfiles
* 4316 FIX: Views: Fixed editing of "hide from sidebar" and "show
context button" options
+ * 4321 FIX: LDAP: Improved validation of groups to attributes sync plugin
WATO:
* 4142 New extended search dialog for rulesets and rules...
diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py
index 5c10d00..842b886 100644
--- a/web/plugins/userdb/ldap.py
+++ b/web/plugins/userdb/ldap.py
@@ -1193,9 +1193,10 @@ def ldap_attribute_plugins_elements(connection_id):
)))
else:
elements.append((key, Dictionary(
- title = plugin['title'],
- help = plugin['help'],
- elements = plugin['parameters'],
+ title = plugin['title'],
+ help = plugin['help'],
+ elements = plugin['parameters'],
+ required_keys = plugin.get('required_parameters', []),
)))
return elements
@@ -1648,8 +1649,10 @@ ldap_attribute_plugins['groups_to_attributes'] = {
"not a member of a group, the attribute will be left at
it's default value. When "
"a single attribute is set by multiple groups and a user is
member of multiple "
"of these groups, the later plugin in the list will override
the others."),
+ allow_empty=False,
)),
- ]
+ ],
+ 'required_parameters': ["groups"],
}
#.