From 28b8de41a8796d0d192582dce7b06751f9467ec6 Mon Sep 17 00:00:00 2001 From: Tanner Collin Date: Sun, 13 Sep 2020 20:14:42 +0000 Subject: [PATCH] Alert Tanner about LDAP server errors --- apiserver/apiserver/api/serializers.py | 5 ++++- apiserver/apiserver/api/utils.py | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/apiserver/apiserver/api/serializers.py b/apiserver/apiserver/api/serializers.py index 5e29659..b6a2e54 100644 --- a/apiserver/apiserver/api/serializers.py +++ b/apiserver/apiserver/api/serializers.py @@ -447,7 +447,10 @@ class MyPasswordChangeSerializer(PasswordChangeSerializer): if utils_ldap.is_configured(): if utils_ldap.set_password(data) != 200: - raise ValidationError(dict(non_field_errors='Problem connecting to LDAP server: set.')) + msg = 'Problem connecting to LDAP server: set.' + utils.alert_tanner(msg) + logger.info(msg) + raise ValidationError(dict(non_field_errors=msg)) super().save() diff --git a/apiserver/apiserver/api/utils.py b/apiserver/apiserver/api/utils.py index c82b22a..afbcce6 100644 --- a/apiserver/apiserver/api/utils.py +++ b/apiserver/apiserver/api/utils.py @@ -309,15 +309,18 @@ def link_old_member(data, user): if result == 200: if utils_ldap.set_password(data) != 200: msg = 'Problem connecting to LDAP server: set.' + alert_tanner(msg) logger.info(msg) raise ValidationError(dict(non_field_errors=msg)) elif result == 404: if utils_ldap.create_user(data) != 200: msg = 'Problem connecting to LDAP server: create.' + alert_tanner(msg) logger.info(msg) raise ValidationError(dict(non_field_errors=msg)) else: msg = 'Problem connecting to LDAP server: find.' + alert_tanner(msg) logger.info(msg) raise ValidationError(dict(non_field_errors=msg)) @@ -349,11 +352,13 @@ def create_new_member(data, user): pass else: msg = 'Problem connecting to LDAP server.' + alert_tanner(msg) logger.info(msg) raise ValidationError(dict(non_field_errors=msg)) if utils_ldap.create_user(data) != 200: msg = 'Problem connecting to LDAP server: create.' + alert_tanner(msg) logger.info(msg) raise ValidationError(dict(non_field_errors=msg))