Merge branch 'master' into licenses-unstable

awx/api/permissions.py

@@ -108,7 +108,7 @@ class ModelAccessPermission(permissions.BasePermission):
             raise PermissionDenied('your account is inactive')
 
         # Always allow superusers (as long as they are active).
-        if request.user.is_superuser:
+        if getattr(view, 'always_allow_superuser', True) and request.user.is_superuser:
             return True
 
         # Check if view supports the request method before checking permission

awx/api/templates/api/job_template_callback.md

@@ -8,11 +8,15 @@ job template.
 
 For example, using curl:
 
-    curl --data-urlencode host_config_key=HOST_CONFIG_KEY http://server/api/v1/job_templates/N/callback/
+    curl -H "Content-Type: application/json" -d '{"host_config_key": "HOST_CONFIG_KEY"}'  http://server/api/v1/job_templates/N/callback/
 
 Or using wget:
 
-    wget -O /dev/null --post-data="host_config_key=HOST_CONFIG_KEY" http://server/api/v1/job_templates/N/callback/
+    wget -O /dev/null --post-data='{"host_config_key": "HOST_CONFIG_KEY"}' --header=Content-Type:application/json http://server/api/v1/job_templates/N/callback/
+
+You may also pass `extra_vars` to the callback:
+
+    curl -H "Content-Type: application/json" -d '{"host_config_key": "HOST_CONFIG_KEY", "extra_vars": {"key": "value"}}'  http://server/api/v1/job_templates/N/callback/
     
 The response will return status 202 if the request is valid, 403 for an
 invalid host config key, or 400 if the host cannot be determined from the

awx/api/views.py

@@ -1914,6 +1914,9 @@ class JobTemplateCallback(GenericAPIView):
         return Response(data)
 
     def post(self, request, *args, **kwargs):
+        extra_vars = None
+        if request.content_type == "application/json":
+            extra_vars = request.DATA.get("extra_vars", None)
         # Permission class should have already validated host_config_key.
         job_template = self.get_object()
         # Attempt to find matching hosts based on remote address.
@@ -1968,8 +1971,10 @@ class JobTemplateCallback(GenericAPIView):
             job = job_template.create_job(limit=limit, launch_type='callback')
 
         # Send a signal to celery that the job should be started.
-        isau = inventory_sources_already_updated
-        result = job.signal_start(inventory_sources_already_updated=isau)
+        kv = {"inventory_sources_already_updated": inventory_sources_already_updated}
+        if extra_vars is not None:
+            kv['extra_vars'] = extra_vars
+        result = job.signal_start(**kv)
         if not result:
             data = dict(msg='Error starting job!')
             return Response(data, status=status.HTTP_400_BAD_REQUEST)
@@ -2460,6 +2465,7 @@ class AdHocCommandList(ListCreateAPIView):
     model = AdHocCommand
     serializer_class = AdHocCommandListSerializer
     new_in_220 = True
+    always_allow_superuser = False
 
     @csrf_exempt
     @transaction.non_atomic_requests