Merge "Don't log sensitive auth data"0.10.1

2 files changed, 7 insertions, 2 deletions

diff --git a/keystoneclient/auth/identity/v2.py b/keystoneclient/auth/identity/v2.py
index 4342251..ad93dba 100644
--- a/keystoneclient/auth/identity/v2.py
+++ b/keystoneclient/auth/identity/v2.py
@@ -11,6 +11,7 @@
 # under the License.
 
 import abc
+import logging
 
 from oslo.config import cfg
 import six
@@ -20,6 +21,8 @@ from keystoneclient.auth.identity import base
 from keystoneclient import exceptions
 from keystoneclient import utils
 
+_logger = logging.getLogger(__name__)
+
 
 @six.add_metaclass(abc.ABCMeta)
 class Auth(base.BaseIdentityPlugin):
@@ -66,8 +69,9 @@ class Auth(base.BaseIdentityPlugin):
         if self.trust_id:
             params['auth']['trust_id'] = self.trust_id
 
+        _logger.debug('Making authentication request to %s', url)
         resp = session.post(url, json=params, headers=headers,
-                            authenticated=False)
+                            authenticated=False, log=False)
 
         try:
             resp_data = resp.json()['access']
diff --git a/keystoneclient/auth/identity/v3.py b/keystoneclient/auth/identity/v3.py
index 63a0230..010c80d 100644
--- a/keystoneclient/auth/identity/v3.py
+++ b/keystoneclient/auth/identity/v3.py
@@ -105,8 +105,9 @@ class Auth(base.BaseIdentityPlugin):
         elif self.trust_id:
             body['auth']['scope'] = {'OS-TRUST:trust': {'id': self.trust_id}}
 
+        _logger.debug('Making authentication request to %s', self.token_url)
         resp = session.post(self.token_url, json=body, headers=headers,
-                            authenticated=False)
+                            authenticated=False, log=False)
 
         try:
             resp_data = resp.json()['token']