Change in vdsm[master]: virt: don't log password in update graphic device

Francesco Romani has uploaded a new change for review.

Change subject: virt: don't log password in update graphic device
......................................................................

virt: don't log password in update graphic device

updateDevice invoked against a graphics device
allows Engine (or any other caller) to change the
SPICE ticket.

This patch make sure the ticket is not logged.

Change-Id: I4c3d318a16eb4d1b10a12f650ba957057e090532
Signed-off-by: Francesco Romani <fromani(a)redhat.com&gt;
---
M vdsm/rpc/BindingXMLRPC.py
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/73/41073/1

diff --git a/vdsm/rpc/BindingXMLRPC.py b/vdsm/rpc/BindingXMLRPC.py
index fbce42d..80136c1 100644
--- a/vdsm/rpc/BindingXMLRPC.py
+++ b/vdsm/rpc/BindingXMLRPC.py
@@ -1159,6 +1159,12 @@
             elif f.__name__ == 'convertExternalVm':
                 if len(args) > 3:
                     displayArgs = args[:2] + ('****',) + args[3:]
+            elif f.__name__ == 'vmUpdateDevice':
+                if len(args) == 2 and args[1].get(
+                   'deviceType', '') == 'graphics':
+                    devParams = args[1].copy()
+                    devParams['password'] = '****'
+                    displayArgs = args[0] + [devParams]
 
             # Logging current call
             logStr = 'client [%s]::call %s with %s %s' % \


-- 
To view, visit https://gerrit.ovirt.org/41073
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c3d318a16eb4d1b10a12f650ba957057e090532
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com&gt;

automation(a)ovirt.org has posted comments on this change.

Change subject: virt: don't log password in update graphic device
......................................................................


Patch Set 1:

* Update tracker::IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and
is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5',
'ovirt-3.4', 'ovirt-3.3'])

-- 
To view, visit https://gerrit.ovirt.org/41073
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4c3d318a16eb4d1b10a12f650ba957057e090532
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: virt: don't log password in update graphic device
......................................................................


Patch Set 1:

(1 comment)

https://gerrit.ovirt.org/#/c/41073/1/vdsm/rpc/BindingXMLRPC.py
File vdsm/rpc/BindingXMLRPC.py:

Line 1159:             elif f.__name__ == 'convertExternalVm':
Line 1160:                 if len(args) > 3:
Line 1161:                     displayArgs = args[:2] + ('****',) + args[3:]
Line 1162:             elif f.__name__ == 'vmUpdateDevice':
Line 1163:                 if len(args) == 2 and args[1].get(
> =2 
Line 1164:                    'deviceType',
'') == 'graphics':
Line 1165:                     devParams = args[1].copy()
Line 1166:                     devParams['password'] = '****'
Line 1167:                     displayArgs = args[0] + [devParams]


-- 
To view, visit https://gerrit.ovirt.org/41073
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4c3d318a16eb4d1b10a12f650ba957057e090532
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: Yes

Francesco Romani has posted comments on this change.

Change subject: virt: don't log password in update graphic device
......................................................................


Patch Set 1:

(1 comment)

https://gerrit.ovirt.org/#/c/41073/1/vdsm/rpc/BindingXMLRPC.py
File vdsm/rpc/BindingXMLRPC.py:

Line 1159:             elif f.__name__ == 'convertExternalVm':
Line 1160:                 if len(args) > 3:
Line 1161:                     displayArgs = args[:2] + ('****',) + args[3:]
Line 1162:             elif f.__name__ == 'vmUpdateDevice':
Line 1163:                 if len(args) == 2 and args[1].get(
>  >=2 
Done
Line 1164:                    'deviceType', '') == 'graphics':
Line 1165:                     devParams = args[1].copy()
Line 1166:                     devParams['password'] = '****'
Line 1167:                     displayArgs = args[0] + [devParams]


-- 
To view, visit https://gerrit.ovirt.org/41073
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4c3d318a16eb4d1b10a12f650ba957057e090532
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: Yes

automation(a)ovirt.org has posted comments on this change.

Change subject: virt: don't log password in update graphic device
......................................................................


Patch Set 2:

* Update tracker::IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and
is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5',
'ovirt-3.4', 'ovirt-3.3'])

-- 
To view, visit https://gerrit.ovirt.org/41073
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4c3d318a16eb4d1b10a12f650ba957057e090532
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No

automation(a)ovirt.org has posted comments on this change.

Change subject: virt: don't log password in update graphic device
......................................................................


Patch Set 3:

* Update tracker::IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and
is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5',
'ovirt-3.4', 'ovirt-3.3'])

-- 
To view, visit https://gerrit.ovirt.org/41073
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4c3d318a16eb4d1b10a12f650ba957057e090532
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No

automation(a)ovirt.org has posted comments on this change.

Change subject: virt: don't log password in update graphic device
......................................................................


Patch Set 4:

* Update tracker::IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and
is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5',
'ovirt-3.4', 'ovirt-3.3'])

-- 
To view, visit https://gerrit.ovirt.org/41073
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4c3d318a16eb4d1b10a12f650ba957057e090532
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No

Francesco Romani has posted comments on this change.

Change subject: virt: don't log password in update graphic device
......................................................................


Patch Set 4: Verified+1

verified running patched VDSM and connecting to VM using spice through Engine webadmin.
without this patch: ticket in the logs
with this patch: OBFUSCATED ticket in the logs

-- 
To view, visit https://gerrit.ovirt.org/41073
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4c3d318a16eb4d1b10a12f650ba957057e090532
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: virt: don't log password in update graphic device
......................................................................


Patch Set 4: Code-Review+2

-- 
To view, visit https://gerrit.ovirt.org/41073
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4c3d318a16eb4d1b10a12f650ba957057e090532
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: virt: don't log password in update graphic device
......................................................................


virt: don't log password in update graphic device

updateDevice invoked against a graphics device
allows Engine (or any other caller) to change the
SPICE ticket.

This patch make sure the ticket is not logged.

Change-Id: I4c3d318a16eb4d1b10a12f650ba957057e090532
Signed-off-by: Francesco Romani <fromani(a)redhat.com&gt;
Reviewed-on: https://gerrit.ovirt.org/41073
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com&gt;
Continuous-Integration: Jenkins CI
---
M vdsm/rpc/bindingxmlrpc.py
1 file changed, 5 insertions(+), 0 deletions(-)

Approvals:
  Jenkins CI: Passed CI tests
  Dan Kenigsberg: Looks good to me, approved
  Francesco Romani: Verified



-- 
To view, visit https://gerrit.ovirt.org/41073
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4c3d318a16eb4d1b10a12f650ba957057e090532
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: automation(a)ovirt.org

automation(a)ovirt.org has posted comments on this change.

Change subject: virt: don't log password in update graphic device
......................................................................


Patch Set 5:

* Update tracker::IGNORE, no Bug-Url found
* Set MODIFIED::IGNORE, no Bug-Url found.

-- 
To view, visit https://gerrit.ovirt.org/41073
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4c3d318a16eb4d1b10a12f650ba957057e090532
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No