Attachment 619894 Details for Bug 861214 – don't ask for password when controller is in use

[patch] don't ask for password when controller is in use

0001-Don-t-ask-for-password-when-using-the-controller.patch (text/plain), 2.57 KB, created by Christophe Fergeau on 2012-10-01 17:04:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christophe Fergeau

Created: 2012-10-01 17:04:11 UTC

Size: 2.57 KB

patch

obsolete

>From 5de0edd71a1791eaa45f1230f7efaf1149ccfb0f Mon Sep 17 00:00:00 2001
>From: Christophe Fergeau <cfergeau@redhat.com>
>Date: Fri, 28 Sep 2012 14:31:58 +0200
>Subject: [virt-viewer] Don't ask for password when using the controller
>
>This has been requested by oVirt/RHEV people because that's the way
>spicec behaved.
>On Windows, if downloading the client from the activex plugin takes
>too long, the ticket which was set by the portal through the controller
>may no longer be valid. This causes the client to fail to connect.
>spicec used to silently exits in this case, and remote-viewer asks
>for a password which the user will have a hard time providing.
>The right fix is for the user portal to wait until the client has
>been downloaded before setting the ticket, but we've been asked to
>mimic spicec behaviour when this occurs until the user portal is fixed...
>See rhbz#857504
>---
> src/virt-viewer-session-spice.c | 29 +++++++++++++++++++++++++++++
> 1 file changed, 29 insertions(+)
>
>diff --git a/src/virt-viewer-session-spice.c b/src/virt-viewer-session-spice.c
>index 2577f2b..214837c 100644
>--- a/src/virt-viewer-session-spice.c
>+++ b/src/virt-viewer-session-spice.c
>@@ -290,6 +290,31 @@ virt_viewer_session_spice_channel_open_fd_request(SpiceChannel *channel,
>     g_signal_emit_by_name(session, "session-channel-open", channel);
> }
> 
>+#if HAVE_SPICE_GTK
>+static gboolean
>+controller_in_use(VirtViewerSession *session)
>+{
>+    VirtViewerApp *app;
>+    GObject *controller;
>+
>+    g_object_get(G_OBJECT(session), "app", &app, NULL);
>+    if (app != NULL) {
>+        g_object_get(G_OBJECT(app), "controller", &controller, NULL);
>+        if (controller != NULL) {
>+            g_object_unref(G_OBJECT(controller));
>+        }
>+        g_object_unref(G_OBJECT(app));
>+    }
>+    return (controller != NULL);
>+}
>+#else
>+static gboolean
>+controller_in_use(VirtViewerSession *session)
>+{
>+    return FALSE;
>+}
>+#endif
>+
> static void
> virt_viewer_session_spice_main_channel_event(SpiceChannel *channel G_GNUC_UNUSED,
>                                              SpiceChannelEvent event,
>@@ -316,6 +341,10 @@ virt_viewer_session_spice_main_channel_event(SpiceChannel *channel G_GNUC_UNUSED
>         break;
>     case SPICE_CHANNEL_ERROR_AUTH:
>         DEBUG_LOG("main channel: auth failure (wrong password?)");
>+        if (controller_in_use(session)) {
>+            gtk_main_quit();
>+            break;
>+        }
>         int ret = virt_viewer_auth_collect_credentials(self->priv->main_window,
>                                                        "SPICE",
>                                                        NULL,
>-- 
>1.7.12.1
>

Actions: View | Diff

Attachments on bug 861214: 619894