Module: check_mk
Branch: master
Commit: 812149399e849bacbea55cc5b6a1b12a68407885
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=812149399e849b…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Feb 17 12:03:01 2016 +0100
#3222 FIX Fixed broken duplicate user id validation when creating new users
---
.werks/3222 | 10 ++++++++++
ChangeLog | 1 +
web/htdocs/wato.py | 10 +++-------
3 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/.werks/3222 b/.werks/3222
new file mode 100644
index 0000000..be7aa70
--- /dev/null
+++ b/.werks/3222
@@ -0,0 +1,10 @@
+Title: Fixed broken duplicate user id validation when creating new users
+Level: 1
+Component: wato
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.9i1
+Date: 1455706956
+
+
diff --git a/ChangeLog b/ChangeLog
index 6a3ec05..acb7bbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,7 @@
* 3203 FIX: Distributed WATO: Fixed exception in remote host service discovery...
* 3215 FIX: WATO git ignore files are now updated on each commit
* 3216 FIX: Fixed exception when trying to edit an already deleted user
+ * 3222 FIX: Fixed broken duplicate user id validation when creating new users
Event Console:
* 3058 FIX: Event Console is now allowing non loadable MIB modules on startup...
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 158112a..2f12de9 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -10056,7 +10056,6 @@ def mode_edit_user(phase):
if new:
vs_user_id = UserID(
- validate_value = validate_user_id,
allow_empty = False
)
else:
@@ -10101,6 +10100,9 @@ def mode_edit_user(phase):
id = vs_user_id.from_html_vars("user_id")
vs_user_id.validate_value(id, "user_id")
+ if id in users:
+ raise MKUserError("user_id", _("This username is already
being used by another user."))
+
new_user = {}
users[id] = new_user
else:
@@ -10489,12 +10491,6 @@ def filter_hidden_users(users):
return users
-def validate_user_id(value, varprefix):
- users = userdb.load_users(lock = phase == 'action')
- if new and id in users:
- raise MKUserError(varprefix, _("This username is already being used by
another user."))
-
-
def generate_wato_users_elements_function(none_value, only_contacts = False):
def get_wato_users(nv):
users = filter_hidden_users(userdb.load_users())