Merge remote-tracking branch 'tower/release_3.2.2' into devel

awx/main/utils/common.py

@@ -729,6 +729,7 @@ def wrap_args_with_proot(args, cwd, **kwargs):
      - /var/log/supervisor
     '''
     from django.conf import settings
+    cwd = os.path.realpath(cwd)
     new_args = [getattr(settings, 'AWX_PROOT_CMD', 'bwrap'), '--unshare-pid', '--dev-bind', '/', '/']
     hide_paths = [settings.AWX_PROOT_BASE_PATH]
     if not kwargs.get('isolated'):
@@ -847,6 +848,7 @@ class OutputEventFilter(object):
     def __init__(self, fileobj=None, event_callback=None, raw_callback=None):
         self._fileobj = fileobj
         self._event_callback = event_callback
+        self._event_ct = 0
         self._raw_callback = raw_callback
         self._counter = 1
         self._start_line = 0
@@ -901,6 +903,7 @@ class OutputEventFilter(object):
             self._start_line += n_lines
             if self._event_callback:
                 self._event_callback(event_data)
+                self._event_ct += 1
 
         if next_event_data.get('uuid', None):
             self._current_event_data = next_event_data

awx/main/utils/encryption.py

@@ -1,6 +1,7 @@
 import base64
 import hashlib
 import logging
+from collections import namedtuple
 
 import six
 from cryptography.fernet import Fernet, InvalidToken
@@ -8,7 +9,8 @@ from cryptography.hazmat.backends import default_backend
 from django.utils.encoding import smart_str
 
 
-__all__ = ['get_encryption_key', 'encrypt_field', 'decrypt_field', 'decrypt_value']
+__all__ = ['get_encryption_key', 'encrypt_value', 'encrypt_field',
+           'decrypt_field', 'decrypt_value']
 
 logger = logging.getLogger('awx.main.utils.encryption')
 
@@ -50,6 +52,11 @@ def get_encryption_key(field_name, pk=None):
     return base64.urlsafe_b64encode(h.digest())
 
 
+def encrypt_value(value, pk=None):
+    TransientField = namedtuple('TransientField', ['pk', 'value'])
+    return encrypt_field(TransientField(pk=pk, value=value), 'value')
+
+
 def encrypt_field(instance, field_name, ask=False, subfield=None, skip_utf8=False):
     '''
     Return content of the given instance and field name encrypted.

awx/main/utils/formatters.py

@@ -120,6 +120,7 @@ class LogstashFormatter(LogstashFormatterVersion1):
             # exist if SQL_DEBUG is turned on in settings.
             headers = [
                 (float, 'X-API-Time'),  # may end with an 's' "0.33s"
+                (float, 'X-API-Total-Time'),
                 (int, 'X-API-Query-Count'),
                 (float, 'X-API-Query-Time'), # may also end with an 's'
                 (str, 'X-API-Node'),
@@ -131,9 +132,11 @@ class LogstashFormatter(LogstashFormatterVersion1):
                 'path': request.path,
                 'path_info': request.path_info,
                 'query_string': request.META['QUERY_STRING'],
-                'data': request.data,
             }
 
+            if hasattr(request, 'data'):
+                data_for_log['request']['data'] = request.data
+
         return data_for_log
 
     def get_extra_fields(self, record):