Frank Kobzik has uploaded a new change for review. Change subject: frontend: Include ticket validity time in .vv file ......................................................................
frontend: Include ticket validity time in .vv file Include "# Ticket is valid for XYZ seconds." in .vv file for SPICE and VNC. Change-Id: I821d1a0081f2755ac2d55094471247a1fc7ba7f5 Bug-Url: https://bugzilla.redhat.com/977306 Signed-off-by: Frantisek Kobzik <fkob...@redhat.com> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractSpice.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractVnc.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceNativeImpl.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/VncNativeImpl.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ConsoleModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ISpice.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/IVnc.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VncConsoleModel.java 9 files changed, 32 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/13/25813/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractSpice.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractSpice.java index 41b9e9a..300aceb 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractSpice.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractSpice.java @@ -61,6 +61,7 @@ protected String spiceBaseURL; protected boolean smartcardEnabled = false; protected String spiceProxy = null; + private int ticketValiditySeconds; // the user can choose to disable the smartcard even when it is enabled, but can not choose to enable it, when it is // disabled @@ -446,4 +447,11 @@ return consoleUtils.getRemapCtrlAltDelHotkey(); } + public int getTicketValiditySeconds() { + return ticketValiditySeconds; + } + + public void setTicketValiditySeconds(int ticketValiditySeconds) { + this.ticketValiditySeconds = ticketValiditySeconds; + } } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractVnc.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractVnc.java index 4b48694..eb541ad 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractVnc.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractVnc.java @@ -12,7 +12,7 @@ private boolean remapCtrlAltDelete; private final ConsoleUtils consoleUtils = (ConsoleUtils) TypeResolver.getInstance().resolve(ConsoleUtils.class); - + private int ticketValiditySeconds; public AbstractVnc() { setRemapCtrlAltDelete(true); @@ -62,4 +62,10 @@ return consoleUtils.getRemapCtrlAltDelHotkey(); } -} + public int getTicketValiditySeconds() { + return ticketValiditySeconds; + } + + public void setTicketValiditySeconds(int ticketValiditySeconds) { + this.ticketValiditySeconds = ticketValiditySeconds; + }} 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 97088bd..fc7f7bf 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 @@ -38,6 +38,7 @@ .append("\nhost=").append(getHost()) //$NON-NLS-1$ .append("\nport=").append(Integer.toString(getPort())) //$NON-NLS-1$ .append("\npassword=").append(getPassword()) //$NON-NLS-1$ + .append("\n# Password is valid for ").append(getTicketValiditySeconds()).append(" seconds.") //$$NON-NLS-1$NON-NLS-2$ .append("\ntls-port=").append(getSecurePort()) //$NON-NLS-1$ .append("\nfullscreen=").append(fullscreen) //$NON-NLS-1$ .append("\ntitle=").append(getTitle()) //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/VncNativeImpl.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/VncNativeImpl.java index 8824457..403af64 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/VncNativeImpl.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/VncNativeImpl.java @@ -13,6 +13,7 @@ .append("\nhost=").append(getVncHost()) //$NON-NLS-1$ .append("\nport=").append(getVncPort()) //$NON-NLS-1$ .append("\npassword=").append(getTicket()) //$NON-NLS-1$ + .append("\n# Password is valid for ").append(getTicketValiditySeconds()).append(" seconds.") //$$NON-NLS-1$NON-NLS-2$ .append("\ndelete-this-file=1") //$NON-NLS-1$ .append("\ntitle=").append(getTitle()); //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ConsoleModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ConsoleModel.java index f77eb47..49e5005 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ConsoleModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ConsoleModel.java @@ -31,6 +31,8 @@ public static final String GET_ATTACHMENT_SERVLET_URL = BaseContextPathData.getInstance().getPath() + "services/attachment/"; //$NON-NLS-1$ + protected static final int TICKET_VALIDITY_SECONDS = 120; + private static String EJECT_LABEL; public static String getEjectLabel() { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ISpice.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ISpice.java index cbff15d..b15aad3 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ISpice.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ISpice.java @@ -10,8 +10,7 @@ * case of WPF there will be direct Spice ActiveX instantiation, while Web implementor of Spice will generate * corresponding HTML. */ -public interface ISpice -{ +public interface ISpice { // event EventHandler<ErrorCodeEventArgs> Disconnected; // event EventHandler<SpiceMenuItemEventArgs> MenuItemSelected; @@ -160,4 +159,9 @@ void setSpiceProxyEnabled(boolean enabled); boolean isSpiceProxyEnabled(); + + void setTicketValiditySeconds(int seconds); + + int getTicketValiditySeconds(); + } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/IVnc.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/IVnc.java index a597437..2de2556 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/IVnc.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/IVnc.java @@ -8,6 +8,9 @@ void setTitle(String title); boolean isRemapCtrlAltDelete(); void setRemapCtrlAltDelete(boolean remapCtrlAltDelete); + void setTicketValiditySeconds(int seconds); + int getTicketValiditySeconds(); + void invokeClient(); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java index 5ac4ac2..2875944 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java @@ -382,6 +382,7 @@ getspice().setSmartcardEnabled(getEntity().isSmartcardEnabled()); getspice().setPort((getEntity().getDisplay() == null ? 0 : getEntity().getDisplay())); getspice().setPassword(ticket); + getspice().setTicketValiditySeconds(TICKET_VALIDITY_SECONDS); getspice().setNumberOfMonitors(getEntity().getNumOfMonitors()); getspice().setGuestHostName(getEntity().getVmHost().split("[ ]", -1)[0]); //$NON-NLS-1$ if (getEntity().getDisplaySecurePort() != null) @@ -544,7 +545,7 @@ private void setVmTicket() { // Create ticket for single sign on. - Frontend.getInstance().runAction(VdcActionType.SetVmTicket, new SetVmTicketParameters(getEntity().getId(), null, 120), + Frontend.getInstance().runAction(VdcActionType.SetVmTicket, new SetVmTicketParameters(getEntity().getId(), null, TICKET_VALIDITY_SECONDS), new IFrontendActionAsyncCallback() { @Override public void executed(FrontendActionAsyncResult result) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VncConsoleModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VncConsoleModel.java index 5753085..4adb409 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VncConsoleModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VncConsoleModel.java @@ -29,8 +29,6 @@ public enum ClientConsoleMode { Native, NoVnc } - private static final int TICKET_VALIDITY_SECONDS = 120; - private String host; private String otp64 = null; @@ -164,6 +162,7 @@ vncImpl.setVncPort(getPort()); vncImpl.setTicket(getOtp64()); vncImpl.setTitle(getTitle()); + vncImpl.setTicketValiditySeconds(TICKET_VALIDITY_SECONDS); vncImpl.invokeClient(); } -- To view, visit http://gerrit.ovirt.org/25813 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I821d1a0081f2755ac2d55094471247a1fc7ba7f5 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
