External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-16 13:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Perform length validation on notification lists

Browse Source 
Wherever we use a list for notification template configuration we'll now
validate that it contains at least one item at submission time.
This commit is contained in:
Matthew Jones
2016-06-23 11:31:22 -04:00
parent 09c3762a08
commit a9162278f8
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/api/serializers.py
View File

@@ -2440,6 +2440,7 @@ class NotificationTemplateSerializer(BaseSerializer):
notification_class = NotificationTemplate.CLASS_FOR_NOTIFICATION_TYPE[attrs['notification_type']] notification_class = NotificationTemplate.CLASS_FOR_NOTIFICATION_TYPE[attrs['notification_type']]
missing_fields = [] missing_fields = []
incorrect_type_fields = [] incorrect_type_fields = []
error_list = []
if 'notification_configuration' not in attrs: if 'notification_configuration' not in attrs:
return attrs return attrs
if self.context['view'].kwargs and isinstance(self.context['view'], NotificationTemplateDetail): if self.context['view'].kwargs and isinstance(self.context['view'], NotificationTemplateDetail):
@@ -2456,9 +2457,11 @@ class NotificationTemplateSerializer(BaseSerializer):
if not type(field_val) in expected_types: if not type(field_val) in expected_types:
incorrect_type_fields.append((field, field_type)) incorrect_type_fields.append((field, field_type))
continue continue
if field_type == "list" and len(field_val) < 1:
error_list.append("No values specified for field '{}'".format(field))
continue
if field_type == "password" and field_val == "$encrypted$" and object_actual is not None: if field_type == "password" and field_val == "$encrypted$" and object_actual is not None:
attrs['notification_configuration'][field] = object_actual.notification_configuration[field] attrs['notification_configuration'][field] = object_actual.notification_configuration[field]
error_list = []
if missing_fields: if missing_fields:
error_list.append("Missing required fields for Notification Configuration: {}.".format(missing_fields)) error_list.append("Missing required fields for Notification Configuration: {}.".format(missing_fields))
if incorrect_type_fields: if incorrect_type_fields: