x
/
vmware-nsxlib
Code Issues Proposed changes

Mask passwords while logging REST requests 

This is needed for policy enforcement point config which contains
password

Change-Id: Ie09a2c919e6a596a897aad9140a240332875a998
This commit is contained in:
Anna Khmelnitsky 2017-05-25 16:52:08 -07:00
parent a4d4667768
commit 0812107cae
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
vmware_nsxlib/tests/unit/v3/test_client.py
View File

@ -282,6 +282,22 @@ class NsxV3JSONClientTestCase(nsxlib_testcase.NsxClientTestCase):
self.assertEqual(resp, {'result': {'ok': 200}})
def test_mask_password(self):
pwds = ('my!pwd0#', 'some0therlong$pwd', 'pwd')
body = {'name_pwd': 'name1',
'password': pwds[0],
'some_list': {'name_password': 'name2',
'password': pwds[1]},
'password': pwds[2]}
cl = client.RESTClient(None)
json_body = jsonutils.dumps(body)
masked_body = cl._mask_password(json_body)
for pwd in pwds:
json_body = json_body.replace('"' + pwd + '"', '"********"')
self.assertEqual(json_body, masked_body)
class NsxV3APIClientTestCase(nsxlib_testcase.NsxClientTestCase):

13
vmware_nsxlib/v3/client.py
View File

@ -13,6 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
#
import re
import requests
import six.moves.urllib.parse as urlparse
@ -161,6 +162,14 @@ class RESTClient(object):
uri = "%s://%s" % (prefix.scheme, uri)
return uri
def _mask_password(self, json):
'''Mask password value in json format'''
if not json:
return json
pattern = r'\"password\": [^,}]*'
return re.sub(pattern, '"password": "********"', json)
def _rest_call(self, url, method='GET', body=None, headers=None,
silent=False):
request_headers = headers.copy() if headers else {}
@ -169,8 +178,10 @@ class RESTClient(object):
do_request = getattr(self._conn, method.lower())
if not silent:
LOG.debug("REST call: %s %s. Headers: %s. Body: %s",
method, request_url, request_headers, body)
method, request_url, request_headers,
self._mask_password(body))
result = do_request(
request_url,