From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Daniel P. Berrange" <berrange@redhat.com>,
Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PULL 05/10] ui: refactor method for setting up VncDisplay auth types
Date: Thu, 13 Oct 2016 11:32:53 +0200 [thread overview]
Message-ID: <1476351178-32540-6-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1476351178-32540-1-git-send-email-kraxel@redhat.com>
From: "Daniel P. Berrange" <berrange@redhat.com>
There is a lot of repeated code in the auth type setup method,
particularly around checking TLS credential types. Refactor
it to reduce duplication and instead of having one method
do both plain and websockets at once, call it separately
for each.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 1475163940-26094-6-git-send-email-berrange@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
ui/vnc.c | 124 +++++++++++++++++++++++++++------------------------------------
ui/vnc.h | 1 +
2 files changed, 53 insertions(+), 72 deletions(-)
diff --git a/ui/vnc.c b/ui/vnc.c
index 1104697..2f3ebdc 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3325,7 +3325,9 @@ static QemuOptsList qemu_vnc_opts = {
static int
-vnc_display_setup_auth(VncDisplay *vd,
+vnc_display_setup_auth(int *auth,
+ int *subauth,
+ QCryptoTLSCreds *tlscreds,
bool password,
bool sasl,
bool websocket,
@@ -3378,86 +3380,56 @@ vnc_display_setup_auth(VncDisplay *vd,
* VNC auth mechs for plain VNC vs websockets VNC, the end
* result has the same security characteristics.
*/
- if (password) {
- if (vd->tlscreds) {
- vd->auth = VNC_AUTH_VENCRYPT;
- if (object_dynamic_cast(OBJECT(vd->tlscreds),
- TYPE_QCRYPTO_TLS_CREDS_X509)) {
+ if (websocket || !tlscreds) {
+ if (password) {
+ VNC_DEBUG("Initializing VNC server with password auth\n");
+ *auth = VNC_AUTH_VNC;
+ } else if (sasl) {
+ VNC_DEBUG("Initializing VNC server with SASL auth\n");
+ *auth = VNC_AUTH_SASL;
+ } else {
+ VNC_DEBUG("Initializing VNC server with no auth\n");
+ *auth = VNC_AUTH_NONE;
+ }
+ *subauth = VNC_AUTH_INVALID;
+ } else {
+ bool is_x509 = object_dynamic_cast(OBJECT(tlscreds),
+ TYPE_QCRYPTO_TLS_CREDS_X509) != NULL;
+ bool is_anon = object_dynamic_cast(OBJECT(tlscreds),
+ TYPE_QCRYPTO_TLS_CREDS_ANON) != NULL;
+
+ if (!is_x509 && !is_anon) {
+ error_setg(errp,
+ "Unsupported TLS cred type %s",
+ object_get_typename(OBJECT(tlscreds)));
+ return -1;
+ }
+ *auth = VNC_AUTH_VENCRYPT;
+ if (password) {
+ if (is_x509) {
VNC_DEBUG("Initializing VNC server with x509 password auth\n");
- vd->subauth = VNC_AUTH_VENCRYPT_X509VNC;
- } else if (object_dynamic_cast(OBJECT(vd->tlscreds),
- TYPE_QCRYPTO_TLS_CREDS_ANON)) {
+ *subauth = VNC_AUTH_VENCRYPT_X509VNC;
+ } else {
VNC_DEBUG("Initializing VNC server with TLS password auth\n");
- vd->subauth = VNC_AUTH_VENCRYPT_TLSVNC;
- } else {
- error_setg(errp,
- "Unsupported TLS cred type %s",
- object_get_typename(OBJECT(vd->tlscreds)));
- return -1;
+ *subauth = VNC_AUTH_VENCRYPT_TLSVNC;
}
- } else {
- VNC_DEBUG("Initializing VNC server with password auth\n");
- vd->auth = VNC_AUTH_VNC;
- vd->subauth = VNC_AUTH_INVALID;
- }
- if (websocket) {
- vd->ws_auth = VNC_AUTH_VNC;
- } else {
- vd->ws_auth = VNC_AUTH_INVALID;
- }
- } else if (sasl) {
- if (vd->tlscreds) {
- vd->auth = VNC_AUTH_VENCRYPT;
- if (object_dynamic_cast(OBJECT(vd->tlscreds),
- TYPE_QCRYPTO_TLS_CREDS_X509)) {
+
+ } else if (sasl) {
+ if (is_x509) {
VNC_DEBUG("Initializing VNC server with x509 SASL auth\n");
- vd->subauth = VNC_AUTH_VENCRYPT_X509SASL;
- } else if (object_dynamic_cast(OBJECT(vd->tlscreds),
- TYPE_QCRYPTO_TLS_CREDS_ANON)) {
+ *subauth = VNC_AUTH_VENCRYPT_X509SASL;
+ } else {
VNC_DEBUG("Initializing VNC server with TLS SASL auth\n");
- vd->subauth = VNC_AUTH_VENCRYPT_TLSSASL;
- } else {
- error_setg(errp,
- "Unsupported TLS cred type %s",
- object_get_typename(OBJECT(vd->tlscreds)));
- return -1;
+ *subauth = VNC_AUTH_VENCRYPT_TLSSASL;
}
} else {
- VNC_DEBUG("Initializing VNC server with SASL auth\n");
- vd->auth = VNC_AUTH_SASL;
- vd->subauth = VNC_AUTH_INVALID;
- }
- if (websocket) {
- vd->ws_auth = VNC_AUTH_SASL;
- } else {
- vd->ws_auth = VNC_AUTH_INVALID;
- }
- } else {
- if (vd->tlscreds) {
- vd->auth = VNC_AUTH_VENCRYPT;
- if (object_dynamic_cast(OBJECT(vd->tlscreds),
- TYPE_QCRYPTO_TLS_CREDS_X509)) {
+ if (is_x509) {
VNC_DEBUG("Initializing VNC server with x509 no auth\n");
- vd->subauth = VNC_AUTH_VENCRYPT_X509NONE;
- } else if (object_dynamic_cast(OBJECT(vd->tlscreds),
- TYPE_QCRYPTO_TLS_CREDS_ANON)) {
+ *subauth = VNC_AUTH_VENCRYPT_X509NONE;
+ } else {
VNC_DEBUG("Initializing VNC server with TLS no auth\n");
- vd->subauth = VNC_AUTH_VENCRYPT_TLSNONE;
- } else {
- error_setg(errp,
- "Unsupported TLS cred type %s",
- object_get_typename(OBJECT(vd->tlscreds)));
- return -1;
+ *subauth = VNC_AUTH_VENCRYPT_TLSNONE;
}
- } else {
- VNC_DEBUG("Initializing VNC server with no auth\n");
- vd->auth = VNC_AUTH_NONE;
- vd->subauth = VNC_AUTH_INVALID;
- }
- if (websocket) {
- vd->ws_auth = VNC_AUTH_NONE;
- } else {
- vd->ws_auth = VNC_AUTH_INVALID;
}
}
return 0;
@@ -3769,7 +3741,15 @@ void vnc_display_open(const char *id, Error **errp)
}
#endif
- if (vnc_display_setup_auth(vd, password, sasl, ws_enabled, errp) < 0) {
+ if (vnc_display_setup_auth(&vd->auth, &vd->subauth,
+ vd->tlscreds, password,
+ sasl, false, errp) < 0) {
+ goto fail;
+ }
+
+ if (vnc_display_setup_auth(&vd->ws_auth, &vd->ws_subauth,
+ vd->tlscreds, password,
+ sasl, true, errp) < 0) {
goto fail;
}
diff --git a/ui/vnc.h b/ui/vnc.h
index 223af38..d191d88 100644
--- a/ui/vnc.h
+++ b/ui/vnc.h
@@ -172,6 +172,7 @@ struct VncDisplay
int auth;
int subauth; /* Used by VeNCrypt */
int ws_auth; /* Used by websockets */
+ int ws_subauth; /* Used by websockets */
bool lossy;
bool non_adaptive;
QCryptoTLSCreds *tlscreds;
--
1.8.3.1
next prev parent reply other threads:[~2016-10-13 9:33 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-13 9:32 [Qemu-devel] [PULL 00/10] ui: vnc cleanups, input-linux kbd fix Gerd Hoffmann
2016-10-13 9:32 ` [Qemu-devel] [PULL 01/10] ui: remove misleading comment from vnc_init_state Gerd Hoffmann
2016-10-13 9:32 ` [Qemu-devel] [PULL 02/10] ui: remove 'enabled' and 'ws_enabled' fields from VncState Gerd Hoffmann
2016-10-13 9:32 ` [Qemu-devel] [PULL 03/10] ui: remove 'ws_tls' field " Gerd Hoffmann
2016-10-13 9:32 ` [Qemu-devel] [PULL 04/10] ui: rename misleading 'VncDisplay' variables Gerd Hoffmann
2016-10-13 9:32 ` Gerd Hoffmann [this message]
2016-10-13 9:32 ` [Qemu-devel] [PULL 06/10] ui: remove bogus call to graphic_hw_update() in vnc_listen_io Gerd Hoffmann
2016-10-13 9:32 ` [Qemu-devel] [PULL 07/10] ui: remove bogus call to reset_keys() in vnc_init_state Gerd Hoffmann
2016-10-13 9:32 ` [Qemu-devel] [PULL 08/10] ui: move some initialization out of vnc_init_state Gerd Hoffmann
2016-10-13 9:32 ` [Qemu-devel] [PULL 09/10] ui: rename vnc_init_state to vnc_start_protocol Gerd Hoffmann
2016-10-13 9:32 ` [Qemu-devel] [PULL 10/10] input-linux: initialize key state Gerd Hoffmann
2016-10-13 15:08 ` [Qemu-devel] [PULL 00/10] ui: vnc cleanups, input-linux kbd fix Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1476351178-32540-6-git-send-email-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=berrange@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).