summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-15 07:30:00 +0000
committerGerrit Code Review <review@openstack.org>2017-06-15 07:30:00 +0000
commit41fcc4fb5e8efc18e50ec77b26edd164cd007253 (patch)
tree28277ee235e4705943ca837c4ac143c6e8e695c7
parent18d241db6db0f947bcf5a4790c10ec754a275964 (diff)
parentd1af6cbbc8db9adc604ed91865ff0ed606359ec2 (diff)
Merge "Mask password when logging request body" into stable/newton
-rw-r--r--neutron/api/v2/base.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/neutron/api/v2/base.py b/neutron/api/v2/base.py
index 5ca5dde..1f68537 100644
--- a/neutron/api/v2/base.py
+++ b/neutron/api/v2/base.py
@@ -21,6 +21,7 @@ from neutron_lib import exceptions
21from oslo_log import log as logging 21from oslo_log import log as logging
22from oslo_policy import policy as oslo_policy 22from oslo_policy import policy as oslo_policy
23from oslo_utils import excutils 23from oslo_utils import excutils
24from oslo_utils import strutils
24import six 25import six
25import webob.exc 26import webob.exc
26 27
@@ -681,7 +682,8 @@ class Controller(object):
681 if not body: 682 if not body:
682 raise webob.exc.HTTPBadRequest(_("Resource body required")) 683 raise webob.exc.HTTPBadRequest(_("Resource body required"))
683 684
684 LOG.debug("Request body: %(body)s", {'body': body}) 685 LOG.debug("Request body: %(body)s",
686 {'body': strutils.mask_password(body)})
685 try: 687 try:
686 if collection in body: 688 if collection in body:
687 if not allow_bulk: 689 if not allow_bulk: