summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Carrez <thierry@openstack.org>2012-01-24 14:25:26 +0100
committerThierry Carrez <thierry@openstack.org>2012-01-24 14:25:26 +0100
commitfa10e7ad5b3f6ab5de5b7b187da7a8bf05a263d5 (patch)
tree342e8656b10b220512d45779ad53805d238b2584
parent0fc18408d93aa30a2cb2650951dc1171b4ef6bcd (diff)
Do not output admin_password in debug logs
Sanitize run_instance's admin_password argument from nova.rpc 'received' debug logging. Fixes bug 915025. Change-Id: I9004dee422a9e5411b8e440ab80030849d137dab
-rw-r--r--nova/rpc/common.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/nova/rpc/common.py b/nova/rpc/common.py
index dbec572ea..3686215b2 100644
--- a/nova/rpc/common.py
+++ b/nova/rpc/common.py
@@ -107,7 +107,10 @@ class Connection(object):
def _safe_log(log_func, msg, msg_data):
"""Sanitizes the msg_data field before logging."""
- SANITIZE = {'set_admin_password': ('new_pass',)}
+ SANITIZE = {
+ 'set_admin_password': ('new_pass',),
+ 'run_instance': ('admin_password',),
+ }
method = msg_data['method']
if method in SANITIZE:
msg_data = copy.deepcopy(msg_data)