From 943964e14fe59b33a608e28e1ba3f940bb9a2bf0 Mon Sep 17 00:00:00 2001
From: TVo <thavo@redhat.com>
Date: Wed, 13 Nov 2024 12:16:25 -0700
Subject: [PATCH] 4.6_Backport changes made to aim.py from AWX. (#6739)

---
 awx/main/credential_plugins/aim.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/awx/main/credential_plugins/aim.py b/awx/main/credential_plugins/aim.py
index 2476042b5f..1e7af94e33 100644
--- a/awx/main/credential_plugins/aim.py
+++ b/awx/main/credential_plugins/aim.py
@@ -3,7 +3,7 @@ from .plugin import CredentialPlugin, CertFiles, raise_for_status
 from urllib.parse import quote, urlencode, urljoin
 
 from django.utils.translation import gettext_lazy as _
-import requests
+import requests as requests
 
 aim_inputs = {
     'fields': [
@@ -104,6 +104,20 @@ def aim_backend(**kwargs):
             verify=verify,
             allow_redirects=False,
         )
+    sensitive_query_params = {
+        'AppId': '****',
+        'Query': '****',
+        'QueryFormat': object_query_format,
+    }
+    if reason:
+        sensitive_query_params['reason'] = '****'
+    sensitive_request_qs = urlencode(
+        sensitive_query_params,
+        safe='*',
+        quote_via=quote,
+    )
+    res.url = f'{request_url}?{sensitive_request_qs}'
+
     raise_for_status(res)
     # CCP returns the property name capitalized, username is camel case
     # so we need to handle that case