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

Fix required fields in notifier serializer

Browse Source 
Handle the situation where the password field was left as-is when
posting the existing encrypted field
This commit is contained in:
Matthew Jones
2016-04-04 12:04:31 -04:00
parent b01fe663af
commit 469bff1d0b
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/api/serializers.py
View File

@@ -2139,6 +2139,10 @@ class NotifierSerializer(BaseSerializer):
incorrect_type_fields = [] incorrect_type_fields = []
if 'notification_configuration' not in attrs: if 'notification_configuration' not in attrs:
return attrs return attrs
if self.context['view'].kwargs:
object_actual = self.context['view'].get_object()
else:
object_actual = None
for field in notification_class.init_parameters: for field in notification_class.init_parameters:
if field not in attrs['notification_configuration']: if field not in attrs['notification_configuration']:
missing_fields.append(field) missing_fields.append(field)
@@ -2149,8 +2153,8 @@ class NotifierSerializer(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 == "password" and field_val.startswith('$encrypted$'): if field_type == "password" and field_val == "$encrypted$" and object_actual is not None:
missing_fields.append(field) attrs['notification_configuration'][field] = object_actual.notification_configuration[field]
error_list = [] 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))

3
awx/main/models/notifications.py
View File

@@ -68,6 +68,8 @@ class Notifier(CommonModel):
update_fields = kwargs.get('update_fields', []) update_fields = kwargs.get('update_fields', [])
for field in filter(lambda x: self.notification_class.init_parameters[x]['type'] == "password", for field in filter(lambda x: self.notification_class.init_parameters[x]['type'] == "password",
self.notification_class.init_parameters): self.notification_class.init_parameters):
if self.notification_configuration[field].startswith("$encrypted$"):
continue
if new_instance: if new_instance:
value = self.notification_configuration[field] value = self.notification_configuration[field]
setattr(self, '_saved_{}_{}'.format("config", field), value) setattr(self, '_saved_{}_{}'.format("config", field), value)
@@ -84,7 +86,6 @@ class Notifier(CommonModel):
self.notification_class.init_parameters): self.notification_class.init_parameters):
saved_value = getattr(self, '_saved_{}_{}'.format("config", field), '') saved_value = getattr(self, '_saved_{}_{}'.format("config", field), '')
self.notification_configuration[field] = saved_value self.notification_configuration[field] = saved_value
#setattr(self.notification_configuration, field, saved_value)
if 'notification_configuration' not in update_fields: if 'notification_configuration' not in update_fields:
update_fields.append('notification_configuration') update_fields.append('notification_configuration')
self.save(update_fields=update_fields) self.save(update_fields=update_fields)