From 87093ec8af4fa7ff912051dedb9fba49056c4b9a Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Wed, 4 May 2016 13:56:31 -0400 Subject: [PATCH] reject runtime extra vars that are strings --- awx/api/serializers.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index 5eab0bea9a..572b4246ad 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -2234,8 +2234,9 @@ class JobLaunchSerializer(BaseSerializer): except (ValueError, TypeError): try: extra_vars = yaml.safe_load(extra_vars) - except (yaml.YAMLError, TypeError, AttributeError): - errors['extra_vars'] = 'Must be valid JSON or YAML' + assert isinstance(extra_vars, dict) + except (yaml.YAMLError, TypeError, AttributeError, AssertionError): + errors['extra_vars'] = 'Must be a valid JSON or YAML dictionary' if not isinstance(extra_vars, dict): extra_vars = {}