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

Refactor cycle detector to prevent potential inf loop.

Browse Source
This commit is contained in:
Aaron Tan
2016-11-02 11:36:08 -04:00
parent d1ec44f20a
commit 843c48934e
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
awx/api/views.py
View File

@@ -2660,7 +2660,7 @@ class WorkflowJobTemplateNodeChildrenBaseList(EnforceParentRelationshipMixin, Su
mutex_list = ('success_nodes', 'failure_nodes') if self.relationship == 'always_nodes' else ('always_nodes',) mutex_list = ('success_nodes', 'failure_nodes') if self.relationship == 'always_nodes' else ('always_nodes',)
for relation in mutex_list: for relation in mutex_list:
if getattr(parent, relation).all().exists(): if getattr(parent, relation).all().exists():
return {'Error': _('Cannot associate {0} when {1} have been associated.'.format(self.relationship, relation))} return {'Error': 'Cannot associate {0} when {1} have been associated.'.format(self.relationship, relation)}
if created: if created:
return None return None
@@ -2669,7 +2669,7 @@ class WorkflowJobTemplateNodeChildrenBaseList(EnforceParentRelationshipMixin, Su
prefetch_related('success_nodes', 'failure_nodes', 'always_nodes') prefetch_related('success_nodes', 'failure_nodes', 'always_nodes')
graph = {} graph = {}
for workflow_node in workflow_nodes: for workflow_node in workflow_nodes:
graph[workflow_node.pk] = dict(node_object=workflow_node, metadata={'parent': None}) graph[workflow_node.pk] = dict(node_object=workflow_node, metadata={'parent': None, 'traversed': False})
find = False find = False
for node_type in ['success_nodes', 'failure_nodes', 'always_nodes']: for node_type in ['success_nodes', 'failure_nodes', 'always_nodes']:
@@ -2685,11 +2685,13 @@ class WorkflowJobTemplateNodeChildrenBaseList(EnforceParentRelationshipMixin, Su
sub_node = graph[sub.pk] sub_node = graph[sub.pk]
parent_node = graph[parent.pk] parent_node = graph[parent.pk]
if sub_node['metadata']['parent'] is not None: if sub_node['metadata']['parent'] is not None:
return {"Error": _("Multiple parent relationship not allowed.")} return {"Error": "Multiple parent relationship not allowed."}
iter_node = parent_node sub_node['metadata']['parent'] = parent_node
iter_node = sub_node
while iter_node is not None: while iter_node is not None:
if iter_node == sub_node: if iter_node['metadata']['traversed']:
return {"Error": _("Cycle detected.")} return {"Error": "Cycle detected."}
iter_node['metadata']['traversed'] = True
iter_node = iter_node['metadata']['parent'] iter_node = iter_node['metadata']['parent']
return None return None