Frank Kobzik has uploaded a new change for review.
Change subject: frontend: Add secure-channels to .vv file
......................................................................
frontend: Add secure-channels to .vv file
This patch adds secure-channels line to SPICE .vv descriptor.
Change-Id: Ie3868ed99c915e0444c94f502075bbe1e8b05339
Signed-off-by: Frantisek Kobzik <fkob...@redhat.com>
---
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceNativeImpl.java
1 file changed, 10 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/46/22346/1
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceNativeImpl.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceNativeImpl.java
index b7ca3b1..0ceee69 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceNativeImpl.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceNativeImpl.java
@@ -77,9 +77,19 @@
configBuilder.append("\nproxy=").append(getSpiceProxy());
//$NON-NLS-1$
}
+ if (!StringHelper.isNullOrEmpty(getSslChanels())) {
+
configBuilder.append("\nsecure-channels=").append(formatSecureChannels(getSslChanels()));
//$NON-NLS-1$
+ }
+
ConsoleModel.makeConsoleConfigRequest("console.vv",
"application/x-virt-viewer; charset=UTF-8", configBuilder.toString());
//$NON-NLS-1$ $NON-NLS-2$
}
+ private static String formatSecureChannels(String sslChanels) {
+ return (sslChanels == null)
+ ? "" //$NON-NLS-1$
+ : sslChanels.replace(',', ';');
+ }
+
@Override
public void install() {
}
--
To view, visit http://gerrit.ovirt.org/22346
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3868ed99c915e0444c94f502075bbe1e8b05339
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Frank Kobzik <fkob...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
