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 <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceNativeImpl.java 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/68/22368/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..8141eb9 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,22 @@ 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$ } + /** + * Reformats the secure channels - the .vv file accepts semicolon-separated values (unlike SPICE browser plugin). + */ + 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/22368 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie3868ed99c915e0444c94f502075bbe1e8b05339 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.3 Gerrit-Owner: Frank Kobzik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
