From: Magnus Therning <magnus.therning@citrix.com>
Date: Fri, 18 Jun 2010 12:53:21 +0000 (+0100)
Subject: [CA-40987]: Fix improper Secret log filtering in the CLI.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=31cc5858ababbeda7244ac83c84634766020bcf1;p=xcp%2Fxen-api.git

[CA-40987]: Fix improper Secret log filtering in the CLI.

Signed-off-by: Magnus Therning <magnus.therning@citrix.com>

diff -r 72b87539d3df ocaml/xapi/xapi_cli.ml--- a/ocaml/xapi/xapi_cli.ml	Tue May 04 12:25:34 2010 +0100
+++ b/ocaml/xapi/xapi_cli.ml	Wed May 05 16:23:20 2010 +0100
@@ -154,8 +154,13 @@
   let rpc = Helpers.get_rpc () req s in
   Cli_frontend.populate_cmdtable rpc Ref.null;
   (* Log the actual CLI command to help diagnose failures like CA-25516 *)
-  debug "xe %s %s" (get_cmdname cmd) (String.concat " " (List.map (fun (k, v) -> let v' = if k = "password" then "(omitted)" else v in k ^ "=" ^ v') params));
-  if get_cmdname cmd = "help"
+  let cmd_name = get_cmdname cmd in
+  if String.startswith "secret-" cmd_name
+	then
+		debug "xe %s %s" cmd_name (String.concat " " (List.map (fun (k, v) -> let v' = if k = "value" then "(omitted)" else v in k ^ "=" ^ v') params))
+	else
+		debug "xe %s %s" cmd_name (String.concat " " (List.map (fun (k, v) -> k ^ "=" ^ v) params));
+  if cmd_name = "help"
   then do_help is_compat cmd minimal s
   else do_rpcs req s u p minimal is_compat cmd session args
---