diff mbox

[v2,09/10] monitor: add query-vnc2 command

Message ID 1418634999.9400.2.camel@nilsson.home.kraxel.org
State New
Headers show

Commit Message

Gerd Hoffmann Dec. 15, 2014, 9:16 a.m. UTC 
Hi,

> > 
> > So better add a 'vencrypt-subauth' enum with this list?
> 
> Yeah probably a good idea

How does this look like (incremental fixup attached, docs to be
updated) ?

cheers,
  Gerd

Comments

Daniel P. Berrangé Dec. 15, 2014, 9:26 a.m. UTC | #1 
On Mon, Dec 15, 2014 at 10:16:39AM +0100, Gerd Hoffmann wrote:
>   Hi,
> 
> > > 
> > > So better add a 'vencrypt-subauth' enum with this list?
> > 
> > Yeah probably a good idea
> 
> How does this look like (incremental fixup attached, docs to be
> updated) ?

Looks fine to me.

Regards,
Daniel
Eric Blake Dec. 15, 2014, 4:22 p.m. UTC | #2 
On 12/15/2014 02:16 AM, Gerd Hoffmann wrote:
>   Hi,
> 
>>> > > 
>>> > > So better add a 'vencrypt-subauth' enum with this list?
>> > 
>> > Yeah probably a good idea
> How does this look like (incremental fixup attached, docs to be
> updated) ?
> 

> +++ b/qapi-schema.json
> @@ -785,12 +785,22 @@
>  #
>  # Since: 2.3
>  ##
> +{ 'enum': 'VncPriAuth',
> +  'data': [ 'none', 'vnc', 'ra2', 'ra2ne', 'tight', 'ultra',
> +            'tls', 'vencrypt', 'sasl' ] }
> +{ 'enum': 'VncVencryptSubAuth',
> +  'data': [ 'plain',
> +            'tls-none',  'x509-none',
> +            'tls-vnc',   'x509-vnc',
> +            'tls-plain', 'x509-plain',
> +            'tls-sasl',  'x509-sasl' ] }

Might be worth separate docs for the enums (we've done it elsewhere).

>  { 'type': 'VncInfo2',
> -  'data': { 'id'       : 'str',
> -            'server'   : ['VncBasicInfo'],
> -            'clients'  : ['VncClientInfo'],
> -            'auth'     : 'str',
> -            '*display' : 'str' } }
> +  'data': { 'id'        : 'str',
> +            'server'    : ['VncBasicInfo'],
> +            'clients'   : ['VncClientInfo'],
> +            'auth'      : 'VncPriAuth',
> +            '*vencrypt' : 'VncVencryptSubAuth',
> +            '*display'  : 'str' } }

And don't forget docs for 'vencrypt'.  But the interface looks fine to me.
diff mbox

Patch

From c2de144be939412f8923d20e22983e16ab418404 Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Mon, 15 Dec 2014 10:14:10 +0100
Subject: [PATCH] query-vnc2: auth fixup

---
 qapi-schema.json | 20 ++++++++++++----
 ui/vnc.c         | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 85 insertions(+), 6 deletions(-)

diff --git a/qapi-schema.json b/qapi-schema.json
index 5bba0c2..8ef2510 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -785,12 +785,22 @@ 
 #
 # Since: 2.3
 ##
+{ 'enum': 'VncPriAuth',
+  'data': [ 'none', 'vnc', 'ra2', 'ra2ne', 'tight', 'ultra',
+            'tls', 'vencrypt', 'sasl' ] }
+{ 'enum': 'VncVencryptSubAuth',
+  'data': [ 'plain',
+            'tls-none',  'x509-none',
+            'tls-vnc',   'x509-vnc',
+            'tls-plain', 'x509-plain',
+            'tls-sasl',  'x509-sasl' ] }
 { 'type': 'VncInfo2',
-  'data': { 'id'       : 'str',
-            'server'   : ['VncBasicInfo'],
-            'clients'  : ['VncClientInfo'],
-            'auth'     : 'str',
-            '*display' : 'str' } }
+  'data': { 'id'        : 'str',
+            'server'    : ['VncBasicInfo'],
+            'clients'   : ['VncClientInfo'],
+            'auth'      : 'VncPriAuth',
+            '*vencrypt' : 'VncVencryptSubAuth',
+            '*display'  : 'str' } }
 
 ##
 # @query-vnc:
diff --git a/ui/vnc.c b/ui/vnc.c
index 1e7eb4d..fb8068f 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -489,6 +489,75 @@  static VncBasicInfoList *qmp_query_server_entry(int socket,
     return list;
 }
 
+static void qmp_query_auth(VncDisplay *vd, VncInfo2 *info)
+{
+    switch (vd->auth) {
+    case VNC_AUTH_VNC:
+        info->auth = VNC_PRI_AUTH_VNC;
+        break;
+    case VNC_AUTH_RA2:
+        info->auth = VNC_PRI_AUTH_RA2;
+        break;
+    case VNC_AUTH_RA2NE:
+        info->auth = VNC_PRI_AUTH_RA2NE;
+        break;
+    case VNC_AUTH_TIGHT:
+        info->auth = VNC_PRI_AUTH_TIGHT;
+        break;
+    case VNC_AUTH_ULTRA:
+        info->auth = VNC_PRI_AUTH_ULTRA;
+        break;
+    case VNC_AUTH_TLS:
+        info->auth = VNC_PRI_AUTH_TLS;
+        break;
+    case VNC_AUTH_VENCRYPT:
+        info->auth = VNC_PRI_AUTH_VENCRYPT;
+#ifdef CONFIG_VNC_TLS
+        info->has_vencrypt = true;
+        switch (vd->subauth) {
+        case VNC_AUTH_VENCRYPT_PLAIN:
+            info->vencrypt = VNC_VENCRYPT_SUB_AUTH_PLAIN;
+            break;
+        case VNC_AUTH_VENCRYPT_TLSNONE:
+            info->vencrypt = VNC_VENCRYPT_SUB_AUTH_TLS_NONE;
+            break;
+        case VNC_AUTH_VENCRYPT_TLSVNC:
+            info->vencrypt = VNC_VENCRYPT_SUB_AUTH_TLS_VNC;
+            break;
+        case VNC_AUTH_VENCRYPT_TLSPLAIN:
+            info->vencrypt = VNC_VENCRYPT_SUB_AUTH_TLS_PLAIN;
+            break;
+        case VNC_AUTH_VENCRYPT_X509NONE:
+            info->vencrypt = VNC_VENCRYPT_SUB_AUTH_X509_NONE;
+            break;
+        case VNC_AUTH_VENCRYPT_X509VNC:
+            info->vencrypt = VNC_VENCRYPT_SUB_AUTH_X509_VNC;
+            break;
+        case VNC_AUTH_VENCRYPT_X509PLAIN:
+            info->vencrypt = VNC_VENCRYPT_SUB_AUTH_X509_PLAIN;
+            break;
+        case VNC_AUTH_VENCRYPT_TLSSASL:
+            info->vencrypt = VNC_VENCRYPT_SUB_AUTH_TLS_SASL;
+            break;
+        case VNC_AUTH_VENCRYPT_X509SASL:
+            info->vencrypt = VNC_VENCRYPT_SUB_AUTH_X509_SASL;
+            break;
+        default:
+            info->has_vencrypt = false;
+            break;
+        }
+#endif
+        break;
+    case VNC_AUTH_SASL:
+        info->auth = VNC_PRI_AUTH_SASL;
+        break;
+    case VNC_AUTH_NONE:
+    default:
+        info->auth = VNC_PRI_AUTH_NONE;
+        break;
+    }
+}
+
 VncInfo2List *qmp_query_vnc2(Error **errp)
 {
     VncInfo2List *item, *prev = NULL;
@@ -499,8 +568,8 @@  VncInfo2List *qmp_query_vnc2(Error **errp)
     QTAILQ_FOREACH(vd, &vnc_displays, next) {
         info = g_new0(VncInfo2, 1);
         info->id = g_strdup(vd->id);
-        info->auth = g_strdup(vnc_auth_name(vd));
         info->clients = qmp_query_client_list(vd);
+        qmp_query_auth(vd, info);
         if (vd->dcl.con) {
             dev = DEVICE(object_property_get_link(OBJECT(vd->dcl.con),
                                                   "device", NULL));
-- 
1.8.3.1