2013-01-21 11:04:44 +01:00
|
|
|
/*
|
|
|
|
* QEMU VNC display driver: Websockets support
|
|
|
|
*
|
|
|
|
* Copyright (C) 2010 Joel Martin
|
|
|
|
* Copyright (C) 2012 Tim Hardeck
|
|
|
|
*
|
|
|
|
* This is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This software is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this software; if not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*/
|
|
|
|
|
2016-01-29 18:49:51 +01:00
|
|
|
#include "qemu/osdep.h"
|
include/qemu/osdep.h: Don't include qapi/error.h
Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef. Since then, we've moved to include qemu/osdep.h
everywhere. Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h. That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h. Include qapi/error.h in .c files that need it and don't
get it now. Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly. Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third. Unfortunately, the number depending on
qapi-types.h shrinks only a little. More work is needed for that one.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-03-14 09:01:28 +01:00
|
|
|
#include "qapi/error.h"
|
2013-01-21 11:04:44 +01:00
|
|
|
#include "vnc.h"
|
2015-03-11 16:53:49 +01:00
|
|
|
#include "io/channel-websock.h"
|
2016-03-15 17:22:36 +01:00
|
|
|
#include "qemu/bswap.h"
|
2017-09-21 14:15:27 +02:00
|
|
|
#include "trace.h"
|
2013-04-23 16:33:01 +02:00
|
|
|
|
2016-08-11 16:20:58 +02:00
|
|
|
static void vncws_tls_handshake_done(QIOTask *task,
|
2015-03-02 20:01:05 +01:00
|
|
|
gpointer user_data)
|
|
|
|
{
|
|
|
|
VncState *vs = user_data;
|
2016-08-11 16:20:58 +02:00
|
|
|
Error *err = NULL;
|
2015-03-17 14:43:00 +01:00
|
|
|
|
2016-08-11 16:20:58 +02:00
|
|
|
if (qio_task_propagate_error(task, &err)) {
|
2015-03-02 20:01:05 +01:00
|
|
|
VNC_DEBUG("Handshake failed %s\n", error_get_pretty(err));
|
|
|
|
vnc_client_error(vs);
|
2016-08-11 16:20:58 +02:00
|
|
|
error_free(err);
|
2015-03-02 20:01:05 +01:00
|
|
|
} else {
|
2015-03-11 16:53:49 +01:00
|
|
|
VNC_DEBUG("TLS handshake complete, starting websocket handshake\n");
|
2017-09-12 17:21:47 +02:00
|
|
|
if (vs->ioc_tag) {
|
|
|
|
g_source_remove(vs->ioc_tag);
|
|
|
|
}
|
2015-02-27 17:20:57 +01:00
|
|
|
vs->ioc_tag = qio_channel_add_watch(
|
2015-03-02 20:01:05 +01:00
|
|
|
QIO_CHANNEL(vs->ioc), G_IO_IN, vncws_handshake_io, vs, NULL);
|
ui: convert VNC server to use QCryptoTLSSession
Switch VNC server over to using the QCryptoTLSSession object
for the TLS session. This removes the direct use of gnutls
from the VNC server code. It also removes most knowledge
about TLS certificate handling from the VNC server code.
This has the nice effect that all the CONFIG_VNC_TLS
conditionals go away and the user gets an actual error
message when requesting TLS instead of it being silently
ignored.
With this change, the existing configuration options for
enabling TLS with -vnc are deprecated.
Old syntax for anon-DH credentials:
-vnc hostname:0,tls
New syntax:
-object tls-creds-anon,id=tls0,endpoint=server \
-vnc hostname:0,tls-creds=tls0
Old syntax for x509 credentials, no client certs:
-vnc hostname:0,tls,x509=/path/to/certs
New syntax:
-object tls-creds-x509,id=tls0,dir=/path/to/certs,endpoint=server,verify-peer=no \
-vnc hostname:0,tls-creds=tls0
Old syntax for x509 credentials, requiring client certs:
-vnc hostname:0,tls,x509verify=/path/to/certs
New syntax:
-object tls-creds-x509,id=tls0,dir=/path/to/certs,endpoint=server,verify-peer=yes \
-vnc hostname:0,tls-creds=tls0
This aligns VNC with the way TLS credentials are to be
configured in the future for chardev, nbd and migration
backends. It also has the benefit that the same TLS
credentials can be shared across multiple VNC server
instances, if desired.
If someone uses the deprecated syntax, it will internally
result in the creation of a 'tls-creds' object with an ID
based on the VNC server ID. This allows backwards compat
with the CLI syntax, while still deleting all the original
TLS code from the VNC server.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2015-08-06 15:39:32 +02:00
|
|
|
}
|
2013-04-23 16:33:01 +02:00
|
|
|
}
|
|
|
|
|
2015-03-02 20:01:05 +01:00
|
|
|
|
2015-02-27 17:20:57 +01:00
|
|
|
gboolean vncws_tls_handshake_io(QIOChannel *ioc G_GNUC_UNUSED,
|
|
|
|
GIOCondition condition G_GNUC_UNUSED,
|
|
|
|
void *opaque)
|
2013-04-23 16:33:01 +02:00
|
|
|
{
|
2015-03-02 20:01:05 +01:00
|
|
|
VncState *vs = opaque;
|
|
|
|
QIOChannelTLS *tls;
|
ui: convert VNC server to use QCryptoTLSSession
Switch VNC server over to using the QCryptoTLSSession object
for the TLS session. This removes the direct use of gnutls
from the VNC server code. It also removes most knowledge
about TLS certificate handling from the VNC server code.
This has the nice effect that all the CONFIG_VNC_TLS
conditionals go away and the user gets an actual error
message when requesting TLS instead of it being silently
ignored.
With this change, the existing configuration options for
enabling TLS with -vnc are deprecated.
Old syntax for anon-DH credentials:
-vnc hostname:0,tls
New syntax:
-object tls-creds-anon,id=tls0,endpoint=server \
-vnc hostname:0,tls-creds=tls0
Old syntax for x509 credentials, no client certs:
-vnc hostname:0,tls,x509=/path/to/certs
New syntax:
-object tls-creds-x509,id=tls0,dir=/path/to/certs,endpoint=server,verify-peer=no \
-vnc hostname:0,tls-creds=tls0
Old syntax for x509 credentials, requiring client certs:
-vnc hostname:0,tls,x509verify=/path/to/certs
New syntax:
-object tls-creds-x509,id=tls0,dir=/path/to/certs,endpoint=server,verify-peer=yes \
-vnc hostname:0,tls-creds=tls0
This aligns VNC with the way TLS credentials are to be
configured in the future for chardev, nbd and migration
backends. It also has the benefit that the same TLS
credentials can be shared across multiple VNC server
instances, if desired.
If someone uses the deprecated syntax, it will internally
result in the creation of a 'tls-creds' object with an ID
based on the VNC server ID. This allows backwards compat
with the CLI syntax, while still deleting all the original
TLS code from the VNC server.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2015-08-06 15:39:32 +02:00
|
|
|
Error *err = NULL;
|
2013-04-23 16:33:01 +02:00
|
|
|
|
2015-03-02 20:01:05 +01:00
|
|
|
if (vs->ioc_tag) {
|
|
|
|
g_source_remove(vs->ioc_tag);
|
|
|
|
vs->ioc_tag = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
tls = qio_channel_tls_new_server(
|
|
|
|
vs->ioc,
|
|
|
|
vs->vd->tlscreds,
|
|
|
|
vs->vd->tlsaclname,
|
|
|
|
&err);
|
|
|
|
if (!tls) {
|
|
|
|
VNC_DEBUG("Failed to setup TLS %s\n", error_get_pretty(err));
|
ui: convert VNC server to use QCryptoTLSSession
Switch VNC server over to using the QCryptoTLSSession object
for the TLS session. This removes the direct use of gnutls
from the VNC server code. It also removes most knowledge
about TLS certificate handling from the VNC server code.
This has the nice effect that all the CONFIG_VNC_TLS
conditionals go away and the user gets an actual error
message when requesting TLS instead of it being silently
ignored.
With this change, the existing configuration options for
enabling TLS with -vnc are deprecated.
Old syntax for anon-DH credentials:
-vnc hostname:0,tls
New syntax:
-object tls-creds-anon,id=tls0,endpoint=server \
-vnc hostname:0,tls-creds=tls0
Old syntax for x509 credentials, no client certs:
-vnc hostname:0,tls,x509=/path/to/certs
New syntax:
-object tls-creds-x509,id=tls0,dir=/path/to/certs,endpoint=server,verify-peer=no \
-vnc hostname:0,tls-creds=tls0
Old syntax for x509 credentials, requiring client certs:
-vnc hostname:0,tls,x509verify=/path/to/certs
New syntax:
-object tls-creds-x509,id=tls0,dir=/path/to/certs,endpoint=server,verify-peer=yes \
-vnc hostname:0,tls-creds=tls0
This aligns VNC with the way TLS credentials are to be
configured in the future for chardev, nbd and migration
backends. It also has the benefit that the same TLS
credentials can be shared across multiple VNC server
instances, if desired.
If someone uses the deprecated syntax, it will internally
result in the creation of a 'tls-creds' object with an ID
based on the VNC server ID. This allows backwards compat
with the CLI syntax, while still deleting all the original
TLS code from the VNC server.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2015-08-06 15:39:32 +02:00
|
|
|
error_free(err);
|
|
|
|
vnc_client_error(vs);
|
2015-02-27 17:20:57 +01:00
|
|
|
return TRUE;
|
2013-04-23 16:33:01 +02:00
|
|
|
}
|
ui: convert VNC server to use QCryptoTLSSession
Switch VNC server over to using the QCryptoTLSSession object
for the TLS session. This removes the direct use of gnutls
from the VNC server code. It also removes most knowledge
about TLS certificate handling from the VNC server code.
This has the nice effect that all the CONFIG_VNC_TLS
conditionals go away and the user gets an actual error
message when requesting TLS instead of it being silently
ignored.
With this change, the existing configuration options for
enabling TLS with -vnc are deprecated.
Old syntax for anon-DH credentials:
-vnc hostname:0,tls
New syntax:
-object tls-creds-anon,id=tls0,endpoint=server \
-vnc hostname:0,tls-creds=tls0
Old syntax for x509 credentials, no client certs:
-vnc hostname:0,tls,x509=/path/to/certs
New syntax:
-object tls-creds-x509,id=tls0,dir=/path/to/certs,endpoint=server,verify-peer=no \
-vnc hostname:0,tls-creds=tls0
Old syntax for x509 credentials, requiring client certs:
-vnc hostname:0,tls,x509verify=/path/to/certs
New syntax:
-object tls-creds-x509,id=tls0,dir=/path/to/certs,endpoint=server,verify-peer=yes \
-vnc hostname:0,tls-creds=tls0
This aligns VNC with the way TLS credentials are to be
configured in the future for chardev, nbd and migration
backends. It also has the benefit that the same TLS
credentials can be shared across multiple VNC server
instances, if desired.
If someone uses the deprecated syntax, it will internally
result in the creation of a 'tls-creds' object with an ID
based on the VNC server ID. This allows backwards compat
with the CLI syntax, while still deleting all the original
TLS code from the VNC server.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2015-08-06 15:39:32 +02:00
|
|
|
|
2016-09-30 12:57:14 +02:00
|
|
|
qio_channel_set_name(QIO_CHANNEL(tls), "vnc-ws-server-tls");
|
|
|
|
|
2015-03-02 20:01:05 +01:00
|
|
|
object_unref(OBJECT(vs->ioc));
|
|
|
|
vs->ioc = QIO_CHANNEL(tls);
|
2017-09-21 14:15:27 +02:00
|
|
|
trace_vnc_client_io_wrap(vs, vs->ioc, "tls");
|
2015-03-02 20:01:05 +01:00
|
|
|
vs->tls = qio_channel_tls_get_session(tls);
|
|
|
|
|
|
|
|
qio_channel_tls_handshake(tls,
|
|
|
|
vncws_tls_handshake_done,
|
|
|
|
vs,
|
2018-03-05 07:43:24 +01:00
|
|
|
NULL,
|
2015-03-02 20:01:05 +01:00
|
|
|
NULL);
|
|
|
|
|
2015-02-27 17:20:57 +01:00
|
|
|
return TRUE;
|
2013-04-23 16:33:01 +02:00
|
|
|
}
|
|
|
|
|
2013-01-21 11:04:44 +01:00
|
|
|
|
2016-08-11 16:20:58 +02:00
|
|
|
static void vncws_handshake_done(QIOTask *task,
|
2015-03-11 16:53:49 +01:00
|
|
|
gpointer user_data)
|
|
|
|
{
|
|
|
|
VncState *vs = user_data;
|
2016-08-11 16:20:58 +02:00
|
|
|
Error *err = NULL;
|
2013-01-21 11:04:44 +01:00
|
|
|
|
2016-08-11 16:20:58 +02:00
|
|
|
if (qio_task_propagate_error(task, &err)) {
|
2015-03-11 16:53:49 +01:00
|
|
|
VNC_DEBUG("Websock handshake failed %s\n", error_get_pretty(err));
|
|
|
|
vnc_client_error(vs);
|
2016-08-11 16:20:58 +02:00
|
|
|
error_free(err);
|
2015-03-11 16:53:49 +01:00
|
|
|
} else {
|
|
|
|
VNC_DEBUG("Websock handshake complete, starting VNC protocol\n");
|
2016-09-29 17:45:40 +02:00
|
|
|
vnc_start_protocol(vs);
|
2017-09-12 17:21:47 +02:00
|
|
|
if (vs->ioc_tag) {
|
|
|
|
g_source_remove(vs->ioc_tag);
|
|
|
|
}
|
2015-02-27 17:20:57 +01:00
|
|
|
vs->ioc_tag = qio_channel_add_watch(
|
|
|
|
vs->ioc, G_IO_IN, vnc_client_io, vs, NULL);
|
2013-01-21 11:04:44 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2015-02-27 17:20:57 +01:00
|
|
|
gboolean vncws_handshake_io(QIOChannel *ioc G_GNUC_UNUSED,
|
|
|
|
GIOCondition condition G_GNUC_UNUSED,
|
|
|
|
void *opaque)
|
|
|
|
{
|
|
|
|
VncState *vs = opaque;
|
2015-03-11 16:53:49 +01:00
|
|
|
QIOChannelWebsock *wioc;
|
2013-01-21 11:04:44 +01:00
|
|
|
|
2015-03-11 16:53:49 +01:00
|
|
|
if (vs->ioc_tag) {
|
|
|
|
g_source_remove(vs->ioc_tag);
|
|
|
|
vs->ioc_tag = 0;
|
2013-01-21 11:04:44 +01:00
|
|
|
}
|
|
|
|
|
2015-03-11 16:53:49 +01:00
|
|
|
wioc = qio_channel_websock_new_server(vs->ioc);
|
2016-09-30 12:57:14 +02:00
|
|
|
qio_channel_set_name(QIO_CHANNEL(wioc), "vnc-ws-server-websock");
|
2013-01-21 11:04:44 +01:00
|
|
|
|
2015-03-11 16:53:49 +01:00
|
|
|
object_unref(OBJECT(vs->ioc));
|
|
|
|
vs->ioc = QIO_CHANNEL(wioc);
|
2017-09-21 14:15:27 +02:00
|
|
|
trace_vnc_client_io_wrap(vs, vs->ioc, "websock");
|
2013-01-21 11:04:44 +01:00
|
|
|
|
2015-03-11 16:53:49 +01:00
|
|
|
qio_channel_websock_handshake(wioc,
|
|
|
|
vncws_handshake_done,
|
|
|
|
vs,
|
|
|
|
NULL);
|
2013-01-21 11:04:44 +01:00
|
|
|
|
2015-03-11 16:53:49 +01:00
|
|
|
return TRUE;
|
2013-01-21 11:04:44 +01:00
|
|
|
}
|