2009-03-07 04:27:13 +08:00
|
|
|
/*
|
|
|
|
* QEMU VNC display driver
|
|
|
|
*
|
|
|
|
* Copyright (C) 2006 Anthony Liguori <anthony@codemonkey.ws>
|
|
|
|
* Copyright (C) 2006 Fabrice Bellard
|
|
|
|
* Copyright (C) 2009 Red Hat, Inc
|
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
|
|
* in the Software without restriction, including without limitation the rights
|
|
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
|
|
* furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice shall be included in
|
|
|
|
* all copies or substantial portions of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
|
* THE SOFTWARE.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef __QEMU_VNC_H
|
|
|
|
#define __QEMU_VNC_H
|
|
|
|
|
|
|
|
#include "qemu-common.h"
|
2010-02-05 19:04:05 +08:00
|
|
|
#include "qemu-queue.h"
|
2010-07-08 02:58:02 +08:00
|
|
|
#ifdef CONFIG_VNC_THREAD
|
|
|
|
#include "qemu-thread.h"
|
|
|
|
#endif
|
2009-03-07 04:27:13 +08:00
|
|
|
#include "console.h"
|
|
|
|
#include "monitor.h"
|
|
|
|
#include "audio/audio.h"
|
2011-02-04 16:06:05 +08:00
|
|
|
#include "bitmap.h"
|
2009-03-07 04:27:13 +08:00
|
|
|
#include <zlib.h>
|
2010-07-08 02:57:51 +08:00
|
|
|
#include <stdbool.h>
|
2009-03-07 04:27:13 +08:00
|
|
|
|
|
|
|
#include "keymaps.h"
|
2011-02-04 16:06:01 +08:00
|
|
|
#include "vnc-palette.h"
|
|
|
|
#include "vnc-enc-zrle.h"
|
2009-03-07 04:27:13 +08:00
|
|
|
|
2009-03-07 04:27:23 +08:00
|
|
|
// #define _VNC_DEBUG 1
|
|
|
|
|
|
|
|
#ifdef _VNC_DEBUG
|
|
|
|
#define VNC_DEBUG(fmt, ...) do { fprintf(stderr, fmt, ## __VA_ARGS__); } while (0)
|
|
|
|
#else
|
|
|
|
#define VNC_DEBUG(fmt, ...) do { } while (0)
|
|
|
|
#endif
|
|
|
|
|
2009-03-07 04:27:13 +08:00
|
|
|
/*****************************************************************************
|
|
|
|
*
|
|
|
|
* Core data structures
|
|
|
|
*
|
|
|
|
*****************************************************************************/
|
|
|
|
|
|
|
|
typedef struct Buffer
|
|
|
|
{
|
|
|
|
size_t capacity;
|
|
|
|
size_t offset;
|
|
|
|
uint8_t *buffer;
|
|
|
|
} Buffer;
|
|
|
|
|
|
|
|
typedef struct VncState VncState;
|
2010-07-08 02:58:02 +08:00
|
|
|
typedef struct VncJob VncJob;
|
|
|
|
typedef struct VncRect VncRect;
|
|
|
|
typedef struct VncRectEntry VncRectEntry;
|
2009-03-07 04:27:13 +08:00
|
|
|
|
|
|
|
typedef int VncReadEvent(VncState *vs, uint8_t *data, size_t len);
|
|
|
|
|
2010-05-21 17:54:34 +08:00
|
|
|
typedef void VncWritePixels(VncState *vs, struct PixelFormat *pf, void *data, int size);
|
2009-03-07 04:27:13 +08:00
|
|
|
|
|
|
|
typedef void VncSendHextileTile(VncState *vs,
|
|
|
|
int x, int y, int w, int h,
|
|
|
|
void *last_bg,
|
|
|
|
void *last_fg,
|
|
|
|
int *has_bg, int *has_fg);
|
|
|
|
|
2011-03-04 04:37:55 +08:00
|
|
|
/* VNC_MAX_WIDTH must be a multiple of 16. */
|
2010-02-09 04:22:29 +08:00
|
|
|
#define VNC_MAX_WIDTH 2560
|
2009-03-07 04:27:13 +08:00
|
|
|
#define VNC_MAX_HEIGHT 2048
|
2011-03-04 04:37:55 +08:00
|
|
|
|
|
|
|
/* VNC_DIRTY_BITS is the number of bits in the dirty bitmap. */
|
|
|
|
#define VNC_DIRTY_BITS (VNC_MAX_WIDTH / 16)
|
2009-03-07 04:27:13 +08:00
|
|
|
|
2011-02-04 16:05:55 +08:00
|
|
|
#define VNC_STAT_RECT 64
|
|
|
|
#define VNC_STAT_COLS (VNC_MAX_WIDTH / VNC_STAT_RECT)
|
|
|
|
#define VNC_STAT_ROWS (VNC_MAX_HEIGHT / VNC_STAT_RECT)
|
|
|
|
|
2009-03-07 04:27:13 +08:00
|
|
|
#define VNC_AUTH_CHALLENGE_SIZE 16
|
|
|
|
|
|
|
|
typedef struct VncDisplay VncDisplay;
|
|
|
|
|
2009-03-07 04:27:23 +08:00
|
|
|
#ifdef CONFIG_VNC_TLS
|
|
|
|
#include "vnc-tls.h"
|
|
|
|
#include "vnc-auth-vencrypt.h"
|
|
|
|
#endif
|
Add SASL authentication support ("Daniel P. Berrange")
This patch adds the new SASL authentication protocol to the VNC server.
It is enabled by setting the 'sasl' flag when launching VNC. SASL can
optionally provide encryption via its SSF layer, if a suitable mechanism
is configured (eg, GSSAPI/Kerberos, or Digest-MD5). If an SSF layer is
not available, then it should be combined with the x509 VNC authentication
protocol which provides encryption.
eg, if using GSSAPI
qemu -vnc localhost:1,sasl
eg if using TLS/x509 for encryption
qemu -vnc localhost:1,sasl,tls,x509
By default the Cyrus SASL library will look for its configuration in
the file /etc/sasl2/qemu.conf. For non-root users, this can be overridden
by setting the SASL_CONF_PATH environment variable, eg to make it look in
$HOME/.sasl2. NB unprivileged users may not have access to the full range
of SASL mechanisms, since some of them require some administrative privileges
to configure. The patch includes an example SASL configuration file which
illustrates config for GSSAPI and Digest-MD5, though it should be noted that
the latter is not really considered secure any more.
Most of the SASL authentication code is located in a separate source file,
vnc-auth-sasl.c. The main vnc.c file only contains minimal integration
glue, specifically parsing of command line flags / setup, and calls to
start the SASL auth process, to do encoding/decoding for data.
There are several possible stacks for reading & writing of data, depending
on the combo of VNC authentication methods in use
- Clear. read/write straight to socket
- TLS. read/write via GNUTLS helpers
- SASL. encode/decode via SASL SSF layer, then read/write to socket
- SASL+TLS. encode/decode via SASL SSF layer, then read/write via GNUTLS
Hence, the vnc_client_read & vnc_client_write methods have been refactored
a little.
vnc_client_read: main entry point for reading, calls either
- vnc_client_read_plain reading, with no intermediate decoding
- vnc_client_read_sasl reading, with SASL SSF decoding
These two methods, then call vnc_client_read_buf(). This decides
whether to write to the socket directly or write via GNUTLS.
The situation is the same for writing data. More extensive comments
have been added in the code / patch. The vnc_client_read_sasl and
vnc_client_write_sasl method implementations live in the separate
vnc-auth-sasl.c file.
The state required for the SASL auth mechanism is kept in a separate
VncStateSASL struct, defined in vnc-auth-sasl.h and included in the
main VncState.
The configure script probes for SASL and automatically enables it
if found, unless --disable-vnc-sasl was given to override it.
Makefile | 7
Makefile.target | 5
b/qemu.sasl | 34 ++
b/vnc-auth-sasl.c | 626 ++++++++++++++++++++++++++++++++++++++++++++++++++++
b/vnc-auth-sasl.h | 67 +++++
configure | 34 ++
qemu-doc.texi | 97 ++++++++
vnc-auth-vencrypt.c | 12
vnc.c | 249 ++++++++++++++++++--
vnc.h | 31 ++
10 files changed, 1129 insertions(+), 33 deletions(-)
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6724 c046a42c-6fe2-441c-8c8c-71466251a162
2009-03-07 04:27:28 +08:00
|
|
|
#ifdef CONFIG_VNC_SASL
|
|
|
|
#include "vnc-auth-sasl.h"
|
|
|
|
#endif
|
|
|
|
|
2011-02-04 16:05:55 +08:00
|
|
|
struct VncRectStat
|
|
|
|
{
|
|
|
|
/* time of last 10 updates, to find update frequency */
|
|
|
|
struct timeval times[10];
|
|
|
|
int idx;
|
|
|
|
|
|
|
|
double freq; /* Update frequency (in Hz) */
|
|
|
|
bool updated; /* Already updated during this refresh */
|
|
|
|
};
|
|
|
|
|
|
|
|
typedef struct VncRectStat VncRectStat;
|
|
|
|
|
2009-08-03 17:54:32 +08:00
|
|
|
struct VncSurface
|
|
|
|
{
|
2011-02-04 16:05:55 +08:00
|
|
|
struct timeval last_freq_check;
|
2011-03-04 04:37:55 +08:00
|
|
|
DECLARE_BITMAP(dirty[VNC_MAX_HEIGHT], VNC_MAX_WIDTH / 16);
|
2011-02-04 16:05:55 +08:00
|
|
|
VncRectStat stats[VNC_STAT_ROWS][VNC_STAT_COLS];
|
2009-08-03 17:54:32 +08:00
|
|
|
DisplaySurface *ds;
|
|
|
|
};
|
2009-03-07 04:27:23 +08:00
|
|
|
|
2009-03-07 04:27:13 +08:00
|
|
|
struct VncDisplay
|
|
|
|
{
|
2010-02-05 19:04:05 +08:00
|
|
|
QTAILQ_HEAD(, VncState) clients;
|
2009-08-03 17:54:05 +08:00
|
|
|
QEMUTimer *timer;
|
2009-08-03 17:56:01 +08:00
|
|
|
int timer_interval;
|
2009-03-07 04:27:13 +08:00
|
|
|
int lsock;
|
|
|
|
DisplayState *ds;
|
2009-10-02 05:12:16 +08:00
|
|
|
kbd_layout_t *kbd_layout;
|
2010-03-11 00:12:02 +08:00
|
|
|
int lock_key_sync;
|
2010-07-08 02:58:02 +08:00
|
|
|
#ifdef CONFIG_VNC_THREAD
|
|
|
|
QemuMutex mutex;
|
|
|
|
#endif
|
2009-03-07 04:27:13 +08:00
|
|
|
|
2010-05-21 17:54:34 +08:00
|
|
|
QEMUCursor *cursor;
|
|
|
|
int cursor_msize;
|
|
|
|
uint8_t *cursor_mask;
|
|
|
|
|
2009-08-03 17:54:32 +08:00
|
|
|
struct VncSurface guest; /* guest visible surface (aka ds->surface) */
|
|
|
|
DisplaySurface *server; /* vnc server surface */
|
|
|
|
|
2009-03-07 04:27:13 +08:00
|
|
|
char *display;
|
|
|
|
char *password;
|
2010-10-07 17:50:45 +08:00
|
|
|
time_t expires;
|
2009-03-07 04:27:13 +08:00
|
|
|
int auth;
|
2010-07-08 02:57:51 +08:00
|
|
|
bool lossy;
|
2011-02-04 16:06:08 +08:00
|
|
|
bool non_adaptive;
|
2009-03-07 04:27:13 +08:00
|
|
|
#ifdef CONFIG_VNC_TLS
|
2009-03-07 04:27:23 +08:00
|
|
|
int subauth; /* Used by VeNCrypt */
|
|
|
|
VncDisplayTLS tls;
|
2009-03-07 04:27:13 +08:00
|
|
|
#endif
|
Support ACLs for controlling VNC access ("Daniel P. Berrange")
This patch introduces a generic internal API for access control lists
to be used by network servers in QEMU. It adds support for checking
these ACL in the VNC server, in two places. The first ACL is for the
SASL authentication mechanism, checking the SASL username. This ACL
is called 'vnc.username'. The second is for the TLS authentication
mechanism, when x509 client certificates are turned on, checking against
the Distinguished Name of the client. This ACL is called 'vnc.x509dname'
The internal API provides for an ACL with the following characteristics
- A unique name, eg vnc.username, and vnc.x509dname.
- A default policy, allow or deny
- An ordered series of match rules, with allow or deny policy
If none of the match rules apply, then the default policy is
used.
There is a monitor API to manipulate the ACLs, which I'll describe via
examples
(qemu) acl show vnc.username
policy: allow
(qemu) acl policy vnc.username denya
acl: policy set to 'deny'
(qemu) acl allow vnc.username fred
acl: added rule at position 1
(qemu) acl allow vnc.username bob
acl: added rule at position 2
(qemu) acl allow vnc.username joe 1
acl: added rule at position 1
(qemu) acl show vnc.username
policy: deny
0: allow fred
1: allow joe
2: allow bob
(qemu) acl show vnc.x509dname
policy: allow
(qemu) acl policy vnc.x509dname deny
acl: policy set to 'deny'
(qemu) acl allow vnc.x509dname C=GB,O=ACME,L=London,CN=*
acl: added rule at position 1
(qemu) acl allow vnc.x509dname C=GB,O=ACME,L=Boston,CN=bob
acl: added rule at position 2
(qemu) acl show vnc.x509dname
policy: deny
0: allow C=GB,O=ACME,L=London,CN=*
1: allow C=GB,O=ACME,L=Boston,CN=bob
By default the VNC server will not use any ACLs, allowing access to
the server if the user successfully authenticates. To enable use of
ACLs to restrict user access, the ',acl' flag should be given when
starting QEMU. The initial ACL activated will be a 'deny all' policy
and should be customized using monitor commands.
eg enable SASL auth and ACLs
qemu .... -vnc localhost:1,sasl,acl
The next patch will provide a way to load a pre-defined ACL when
starting up
Makefile | 6 +
b/acl.c | 185 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
b/acl.h | 74 ++++++++++++++++++++++
configure | 18 +++++
monitor.c | 95 ++++++++++++++++++++++++++++
qemu-doc.texi | 49 ++++++++++++++
vnc-auth-sasl.c | 16 +++-
vnc-auth-sasl.h | 7 ++
vnc-tls.c | 19 +++++
vnc-tls.h | 3
vnc.c | 21 ++++++
vnc.h | 3
12 files changed, 491 insertions(+), 5 deletions(-)
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6726 c046a42c-6fe2-441c-8c8c-71466251a162
2009-03-07 04:27:37 +08:00
|
|
|
#ifdef CONFIG_VNC_SASL
|
|
|
|
VncDisplaySASL sasl;
|
|
|
|
#endif
|
2009-03-07 04:27:13 +08:00
|
|
|
};
|
|
|
|
|
2010-07-08 02:57:59 +08:00
|
|
|
typedef struct VncTight {
|
|
|
|
int type;
|
|
|
|
uint8_t quality;
|
|
|
|
uint8_t compression;
|
|
|
|
uint8_t pixel24;
|
|
|
|
Buffer tight;
|
|
|
|
Buffer tmp;
|
|
|
|
Buffer zlib;
|
|
|
|
Buffer gradient;
|
|
|
|
#ifdef CONFIG_VNC_JPEG
|
|
|
|
Buffer jpeg;
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_VNC_PNG
|
|
|
|
Buffer png;
|
|
|
|
#endif
|
|
|
|
int levels[4];
|
|
|
|
z_stream stream[4];
|
|
|
|
} VncTight;
|
|
|
|
|
|
|
|
typedef struct VncHextile {
|
|
|
|
VncSendHextileTile *send_tile;
|
|
|
|
} VncHextile;
|
|
|
|
|
|
|
|
typedef struct VncZlib {
|
|
|
|
Buffer zlib;
|
|
|
|
Buffer tmp;
|
|
|
|
z_stream stream;
|
|
|
|
int level;
|
|
|
|
} VncZlib;
|
|
|
|
|
2011-02-04 16:06:01 +08:00
|
|
|
typedef struct VncZrle {
|
|
|
|
int type;
|
|
|
|
Buffer fb;
|
|
|
|
Buffer zrle;
|
|
|
|
Buffer tmp;
|
|
|
|
Buffer zlib;
|
|
|
|
z_stream stream;
|
|
|
|
VncPalette palette;
|
|
|
|
} VncZrle;
|
|
|
|
|
|
|
|
typedef struct VncZywrle {
|
|
|
|
int buf[VNC_ZRLE_TILE_WIDTH * VNC_ZRLE_TILE_HEIGHT];
|
|
|
|
} VncZywrle;
|
|
|
|
|
2010-07-08 02:58:02 +08:00
|
|
|
#ifdef CONFIG_VNC_THREAD
|
|
|
|
struct VncRect
|
|
|
|
{
|
|
|
|
int x;
|
|
|
|
int y;
|
|
|
|
int w;
|
|
|
|
int h;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct VncRectEntry
|
|
|
|
{
|
|
|
|
struct VncRect rect;
|
|
|
|
QLIST_ENTRY(VncRectEntry) next;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct VncJob
|
|
|
|
{
|
|
|
|
VncState *vs;
|
|
|
|
|
|
|
|
QLIST_HEAD(, VncRectEntry) rectangles;
|
|
|
|
QTAILQ_ENTRY(VncJob) next;
|
|
|
|
};
|
|
|
|
#else
|
|
|
|
struct VncJob
|
|
|
|
{
|
|
|
|
VncState *vs;
|
|
|
|
int rectangles;
|
|
|
|
size_t saved_offset;
|
|
|
|
};
|
|
|
|
#endif
|
|
|
|
|
2009-03-07 04:27:13 +08:00
|
|
|
struct VncState
|
|
|
|
{
|
|
|
|
int csock;
|
2009-03-20 23:59:14 +08:00
|
|
|
|
2009-03-07 04:27:13 +08:00
|
|
|
DisplayState *ds;
|
2011-03-04 04:37:55 +08:00
|
|
|
DECLARE_BITMAP(dirty[VNC_MAX_HEIGHT], VNC_DIRTY_BITS);
|
2011-02-04 16:05:56 +08:00
|
|
|
uint8_t **lossy_rect; /* Not an Array to avoid costly memcpy in
|
|
|
|
* vnc-jobs-async.c */
|
2009-03-20 23:59:14 +08:00
|
|
|
|
2009-03-07 04:27:13 +08:00
|
|
|
VncDisplay *vd;
|
|
|
|
int need_update;
|
2009-03-20 23:59:24 +08:00
|
|
|
int force_update;
|
2009-03-07 04:27:13 +08:00
|
|
|
uint32_t features;
|
|
|
|
int absolute;
|
|
|
|
int last_x;
|
|
|
|
int last_y;
|
2010-05-26 00:25:18 +08:00
|
|
|
int client_width;
|
|
|
|
int client_height;
|
2009-03-07 04:27:13 +08:00
|
|
|
|
|
|
|
uint32_t vnc_encoding;
|
|
|
|
|
|
|
|
int major;
|
|
|
|
int minor;
|
|
|
|
|
|
|
|
char challenge[VNC_AUTH_CHALLENGE_SIZE];
|
|
|
|
#ifdef CONFIG_VNC_TLS
|
2009-03-07 04:27:23 +08:00
|
|
|
VncStateTLS tls;
|
2009-03-07 04:27:13 +08:00
|
|
|
#endif
|
Add SASL authentication support ("Daniel P. Berrange")
This patch adds the new SASL authentication protocol to the VNC server.
It is enabled by setting the 'sasl' flag when launching VNC. SASL can
optionally provide encryption via its SSF layer, if a suitable mechanism
is configured (eg, GSSAPI/Kerberos, or Digest-MD5). If an SSF layer is
not available, then it should be combined with the x509 VNC authentication
protocol which provides encryption.
eg, if using GSSAPI
qemu -vnc localhost:1,sasl
eg if using TLS/x509 for encryption
qemu -vnc localhost:1,sasl,tls,x509
By default the Cyrus SASL library will look for its configuration in
the file /etc/sasl2/qemu.conf. For non-root users, this can be overridden
by setting the SASL_CONF_PATH environment variable, eg to make it look in
$HOME/.sasl2. NB unprivileged users may not have access to the full range
of SASL mechanisms, since some of them require some administrative privileges
to configure. The patch includes an example SASL configuration file which
illustrates config for GSSAPI and Digest-MD5, though it should be noted that
the latter is not really considered secure any more.
Most of the SASL authentication code is located in a separate source file,
vnc-auth-sasl.c. The main vnc.c file only contains minimal integration
glue, specifically parsing of command line flags / setup, and calls to
start the SASL auth process, to do encoding/decoding for data.
There are several possible stacks for reading & writing of data, depending
on the combo of VNC authentication methods in use
- Clear. read/write straight to socket
- TLS. read/write via GNUTLS helpers
- SASL. encode/decode via SASL SSF layer, then read/write to socket
- SASL+TLS. encode/decode via SASL SSF layer, then read/write via GNUTLS
Hence, the vnc_client_read & vnc_client_write methods have been refactored
a little.
vnc_client_read: main entry point for reading, calls either
- vnc_client_read_plain reading, with no intermediate decoding
- vnc_client_read_sasl reading, with SASL SSF decoding
These two methods, then call vnc_client_read_buf(). This decides
whether to write to the socket directly or write via GNUTLS.
The situation is the same for writing data. More extensive comments
have been added in the code / patch. The vnc_client_read_sasl and
vnc_client_write_sasl method implementations live in the separate
vnc-auth-sasl.c file.
The state required for the SASL auth mechanism is kept in a separate
VncStateSASL struct, defined in vnc-auth-sasl.h and included in the
main VncState.
The configure script probes for SASL and automatically enables it
if found, unless --disable-vnc-sasl was given to override it.
Makefile | 7
Makefile.target | 5
b/qemu.sasl | 34 ++
b/vnc-auth-sasl.c | 626 ++++++++++++++++++++++++++++++++++++++++++++++++++++
b/vnc-auth-sasl.h | 67 +++++
configure | 34 ++
qemu-doc.texi | 97 ++++++++
vnc-auth-vencrypt.c | 12
vnc.c | 249 ++++++++++++++++++--
vnc.h | 31 ++
10 files changed, 1129 insertions(+), 33 deletions(-)
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6724 c046a42c-6fe2-441c-8c8c-71466251a162
2009-03-07 04:27:28 +08:00
|
|
|
#ifdef CONFIG_VNC_SASL
|
|
|
|
VncStateSASL sasl;
|
|
|
|
#endif
|
2009-03-07 04:27:13 +08:00
|
|
|
|
2010-01-15 00:50:56 +08:00
|
|
|
QObject *info;
|
|
|
|
|
2009-03-07 04:27:13 +08:00
|
|
|
Buffer output;
|
|
|
|
Buffer input;
|
|
|
|
/* current output mode information */
|
|
|
|
VncWritePixels *write_pixels;
|
2009-03-20 23:59:14 +08:00
|
|
|
DisplaySurface clientds;
|
2009-03-07 04:27:13 +08:00
|
|
|
|
|
|
|
CaptureVoiceOut *audio_cap;
|
|
|
|
struct audsettings as;
|
|
|
|
|
|
|
|
VncReadEvent *read_handler;
|
|
|
|
size_t read_handler_expect;
|
|
|
|
/* input */
|
|
|
|
uint8_t modifiers_state[256];
|
2010-02-27 00:17:39 +08:00
|
|
|
QEMUPutLEDEntry *led;
|
2009-03-07 04:27:13 +08:00
|
|
|
|
2010-07-08 02:58:02 +08:00
|
|
|
bool abort;
|
|
|
|
#ifndef CONFIG_VNC_THREAD
|
|
|
|
VncJob job;
|
|
|
|
#else
|
|
|
|
QemuMutex output_mutex;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Encoding specific, if you add something here, don't forget to
|
|
|
|
* update vnc_async_encoding_start()
|
|
|
|
*/
|
2010-07-08 02:57:59 +08:00
|
|
|
VncTight tight;
|
|
|
|
VncZlib zlib;
|
|
|
|
VncHextile hextile;
|
2011-02-04 16:06:01 +08:00
|
|
|
VncZrle zrle;
|
|
|
|
VncZywrle zywrle;
|
2009-03-07 04:27:13 +08:00
|
|
|
|
2010-03-10 23:38:29 +08:00
|
|
|
Notifier mouse_mode_notifier;
|
|
|
|
|
2010-02-05 19:04:05 +08:00
|
|
|
QTAILQ_ENTRY(VncState) next;
|
2009-03-07 04:27:13 +08:00
|
|
|
};
|
|
|
|
|
2009-02-02 23:58:25 +08:00
|
|
|
|
|
|
|
/*****************************************************************************
|
|
|
|
*
|
|
|
|
* Authentication modes
|
|
|
|
*
|
|
|
|
*****************************************************************************/
|
|
|
|
|
|
|
|
enum {
|
|
|
|
VNC_AUTH_INVALID = 0,
|
|
|
|
VNC_AUTH_NONE = 1,
|
|
|
|
VNC_AUTH_VNC = 2,
|
|
|
|
VNC_AUTH_RA2 = 5,
|
|
|
|
VNC_AUTH_RA2NE = 6,
|
|
|
|
VNC_AUTH_TIGHT = 16,
|
|
|
|
VNC_AUTH_ULTRA = 17,
|
Add SASL authentication support ("Daniel P. Berrange")
This patch adds the new SASL authentication protocol to the VNC server.
It is enabled by setting the 'sasl' flag when launching VNC. SASL can
optionally provide encryption via its SSF layer, if a suitable mechanism
is configured (eg, GSSAPI/Kerberos, or Digest-MD5). If an SSF layer is
not available, then it should be combined with the x509 VNC authentication
protocol which provides encryption.
eg, if using GSSAPI
qemu -vnc localhost:1,sasl
eg if using TLS/x509 for encryption
qemu -vnc localhost:1,sasl,tls,x509
By default the Cyrus SASL library will look for its configuration in
the file /etc/sasl2/qemu.conf. For non-root users, this can be overridden
by setting the SASL_CONF_PATH environment variable, eg to make it look in
$HOME/.sasl2. NB unprivileged users may not have access to the full range
of SASL mechanisms, since some of them require some administrative privileges
to configure. The patch includes an example SASL configuration file which
illustrates config for GSSAPI and Digest-MD5, though it should be noted that
the latter is not really considered secure any more.
Most of the SASL authentication code is located in a separate source file,
vnc-auth-sasl.c. The main vnc.c file only contains minimal integration
glue, specifically parsing of command line flags / setup, and calls to
start the SASL auth process, to do encoding/decoding for data.
There are several possible stacks for reading & writing of data, depending
on the combo of VNC authentication methods in use
- Clear. read/write straight to socket
- TLS. read/write via GNUTLS helpers
- SASL. encode/decode via SASL SSF layer, then read/write to socket
- SASL+TLS. encode/decode via SASL SSF layer, then read/write via GNUTLS
Hence, the vnc_client_read & vnc_client_write methods have been refactored
a little.
vnc_client_read: main entry point for reading, calls either
- vnc_client_read_plain reading, with no intermediate decoding
- vnc_client_read_sasl reading, with SASL SSF decoding
These two methods, then call vnc_client_read_buf(). This decides
whether to write to the socket directly or write via GNUTLS.
The situation is the same for writing data. More extensive comments
have been added in the code / patch. The vnc_client_read_sasl and
vnc_client_write_sasl method implementations live in the separate
vnc-auth-sasl.c file.
The state required for the SASL auth mechanism is kept in a separate
VncStateSASL struct, defined in vnc-auth-sasl.h and included in the
main VncState.
The configure script probes for SASL and automatically enables it
if found, unless --disable-vnc-sasl was given to override it.
Makefile | 7
Makefile.target | 5
b/qemu.sasl | 34 ++
b/vnc-auth-sasl.c | 626 ++++++++++++++++++++++++++++++++++++++++++++++++++++
b/vnc-auth-sasl.h | 67 +++++
configure | 34 ++
qemu-doc.texi | 97 ++++++++
vnc-auth-vencrypt.c | 12
vnc.c | 249 ++++++++++++++++++--
vnc.h | 31 ++
10 files changed, 1129 insertions(+), 33 deletions(-)
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6724 c046a42c-6fe2-441c-8c8c-71466251a162
2009-03-07 04:27:28 +08:00
|
|
|
VNC_AUTH_TLS = 18, /* Supported in GTK-VNC & VINO */
|
|
|
|
VNC_AUTH_VENCRYPT = 19, /* Supported in GTK-VNC & VeNCrypt */
|
|
|
|
VNC_AUTH_SASL = 20, /* Supported in GTK-VNC & VINO */
|
2009-02-02 23:58:25 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
enum {
|
|
|
|
VNC_AUTH_VENCRYPT_PLAIN = 256,
|
|
|
|
VNC_AUTH_VENCRYPT_TLSNONE = 257,
|
|
|
|
VNC_AUTH_VENCRYPT_TLSVNC = 258,
|
|
|
|
VNC_AUTH_VENCRYPT_TLSPLAIN = 259,
|
|
|
|
VNC_AUTH_VENCRYPT_X509NONE = 260,
|
|
|
|
VNC_AUTH_VENCRYPT_X509VNC = 261,
|
|
|
|
VNC_AUTH_VENCRYPT_X509PLAIN = 262,
|
Add SASL authentication support ("Daniel P. Berrange")
This patch adds the new SASL authentication protocol to the VNC server.
It is enabled by setting the 'sasl' flag when launching VNC. SASL can
optionally provide encryption via its SSF layer, if a suitable mechanism
is configured (eg, GSSAPI/Kerberos, or Digest-MD5). If an SSF layer is
not available, then it should be combined with the x509 VNC authentication
protocol which provides encryption.
eg, if using GSSAPI
qemu -vnc localhost:1,sasl
eg if using TLS/x509 for encryption
qemu -vnc localhost:1,sasl,tls,x509
By default the Cyrus SASL library will look for its configuration in
the file /etc/sasl2/qemu.conf. For non-root users, this can be overridden
by setting the SASL_CONF_PATH environment variable, eg to make it look in
$HOME/.sasl2. NB unprivileged users may not have access to the full range
of SASL mechanisms, since some of them require some administrative privileges
to configure. The patch includes an example SASL configuration file which
illustrates config for GSSAPI and Digest-MD5, though it should be noted that
the latter is not really considered secure any more.
Most of the SASL authentication code is located in a separate source file,
vnc-auth-sasl.c. The main vnc.c file only contains minimal integration
glue, specifically parsing of command line flags / setup, and calls to
start the SASL auth process, to do encoding/decoding for data.
There are several possible stacks for reading & writing of data, depending
on the combo of VNC authentication methods in use
- Clear. read/write straight to socket
- TLS. read/write via GNUTLS helpers
- SASL. encode/decode via SASL SSF layer, then read/write to socket
- SASL+TLS. encode/decode via SASL SSF layer, then read/write via GNUTLS
Hence, the vnc_client_read & vnc_client_write methods have been refactored
a little.
vnc_client_read: main entry point for reading, calls either
- vnc_client_read_plain reading, with no intermediate decoding
- vnc_client_read_sasl reading, with SASL SSF decoding
These two methods, then call vnc_client_read_buf(). This decides
whether to write to the socket directly or write via GNUTLS.
The situation is the same for writing data. More extensive comments
have been added in the code / patch. The vnc_client_read_sasl and
vnc_client_write_sasl method implementations live in the separate
vnc-auth-sasl.c file.
The state required for the SASL auth mechanism is kept in a separate
VncStateSASL struct, defined in vnc-auth-sasl.h and included in the
main VncState.
The configure script probes for SASL and automatically enables it
if found, unless --disable-vnc-sasl was given to override it.
Makefile | 7
Makefile.target | 5
b/qemu.sasl | 34 ++
b/vnc-auth-sasl.c | 626 ++++++++++++++++++++++++++++++++++++++++++++++++++++
b/vnc-auth-sasl.h | 67 +++++
configure | 34 ++
qemu-doc.texi | 97 ++++++++
vnc-auth-vencrypt.c | 12
vnc.c | 249 ++++++++++++++++++--
vnc.h | 31 ++
10 files changed, 1129 insertions(+), 33 deletions(-)
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6724 c046a42c-6fe2-441c-8c8c-71466251a162
2009-03-07 04:27:28 +08:00
|
|
|
VNC_AUTH_VENCRYPT_X509SASL = 263,
|
|
|
|
VNC_AUTH_VENCRYPT_TLSSASL = 264,
|
2009-02-02 23:58:25 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************
|
|
|
|
*
|
|
|
|
* Encoding types
|
|
|
|
*
|
|
|
|
*****************************************************************************/
|
|
|
|
|
|
|
|
#define VNC_ENCODING_RAW 0x00000000
|
|
|
|
#define VNC_ENCODING_COPYRECT 0x00000001
|
|
|
|
#define VNC_ENCODING_RRE 0x00000002
|
|
|
|
#define VNC_ENCODING_CORRE 0x00000004
|
|
|
|
#define VNC_ENCODING_HEXTILE 0x00000005
|
|
|
|
#define VNC_ENCODING_ZLIB 0x00000006
|
|
|
|
#define VNC_ENCODING_TIGHT 0x00000007
|
|
|
|
#define VNC_ENCODING_ZLIBHEX 0x00000008
|
|
|
|
#define VNC_ENCODING_TRLE 0x0000000f
|
|
|
|
#define VNC_ENCODING_ZRLE 0x00000010
|
|
|
|
#define VNC_ENCODING_ZYWRLE 0x00000011
|
|
|
|
#define VNC_ENCODING_COMPRESSLEVEL0 0xFFFFFF00 /* -256 */
|
|
|
|
#define VNC_ENCODING_QUALITYLEVEL0 0xFFFFFFE0 /* -32 */
|
|
|
|
#define VNC_ENCODING_XCURSOR 0xFFFFFF10 /* -240 */
|
|
|
|
#define VNC_ENCODING_RICH_CURSOR 0xFFFFFF11 /* -239 */
|
|
|
|
#define VNC_ENCODING_POINTER_POS 0xFFFFFF18 /* -232 */
|
|
|
|
#define VNC_ENCODING_LASTRECT 0xFFFFFF20 /* -224 */
|
|
|
|
#define VNC_ENCODING_DESKTOPRESIZE 0xFFFFFF21 /* -223 */
|
|
|
|
#define VNC_ENCODING_POINTER_TYPE_CHANGE 0XFFFFFEFF /* -257 */
|
|
|
|
#define VNC_ENCODING_EXT_KEY_EVENT 0XFFFFFEFE /* -258 */
|
|
|
|
#define VNC_ENCODING_AUDIO 0XFFFFFEFD /* -259 */
|
2010-07-08 02:57:56 +08:00
|
|
|
#define VNC_ENCODING_TIGHT_PNG 0xFFFFFEFC /* -260 */
|
2009-02-02 23:58:25 +08:00
|
|
|
#define VNC_ENCODING_WMVi 0x574D5669
|
|
|
|
|
|
|
|
/*****************************************************************************
|
|
|
|
*
|
|
|
|
* Other tight constants
|
|
|
|
*
|
|
|
|
*****************************************************************************/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Vendors known by TightVNC: standard VNC/RealVNC, TridiaVNC, and TightVNC.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define VNC_TIGHT_CCB_RESET_MASK (0x0f)
|
|
|
|
#define VNC_TIGHT_CCB_TYPE_MASK (0x0f << 4)
|
|
|
|
#define VNC_TIGHT_CCB_TYPE_FILL (0x08 << 4)
|
|
|
|
#define VNC_TIGHT_CCB_TYPE_JPEG (0x09 << 4)
|
2010-07-08 02:57:56 +08:00
|
|
|
#define VNC_TIGHT_CCB_TYPE_PNG (0x0A << 4)
|
2009-02-02 23:58:25 +08:00
|
|
|
#define VNC_TIGHT_CCB_BASIC_MAX (0x07 << 4)
|
|
|
|
#define VNC_TIGHT_CCB_BASIC_ZLIB (0x03 << 4)
|
|
|
|
#define VNC_TIGHT_CCB_BASIC_FILTER (0x04 << 4)
|
|
|
|
|
|
|
|
/*****************************************************************************
|
|
|
|
*
|
|
|
|
* Features
|
|
|
|
*
|
|
|
|
*****************************************************************************/
|
|
|
|
|
|
|
|
#define VNC_FEATURE_RESIZE 0
|
|
|
|
#define VNC_FEATURE_HEXTILE 1
|
|
|
|
#define VNC_FEATURE_POINTER_TYPE_CHANGE 2
|
|
|
|
#define VNC_FEATURE_WMVI 3
|
|
|
|
#define VNC_FEATURE_TIGHT 4
|
|
|
|
#define VNC_FEATURE_ZLIB 5
|
2009-02-16 22:59:30 +08:00
|
|
|
#define VNC_FEATURE_COPYRECT 6
|
2010-05-21 17:54:34 +08:00
|
|
|
#define VNC_FEATURE_RICH_CURSOR 7
|
2010-07-08 02:57:56 +08:00
|
|
|
#define VNC_FEATURE_TIGHT_PNG 8
|
2011-02-04 16:06:01 +08:00
|
|
|
#define VNC_FEATURE_ZRLE 9
|
|
|
|
#define VNC_FEATURE_ZYWRLE 10
|
2009-02-02 23:58:25 +08:00
|
|
|
|
|
|
|
#define VNC_FEATURE_RESIZE_MASK (1 << VNC_FEATURE_RESIZE)
|
|
|
|
#define VNC_FEATURE_HEXTILE_MASK (1 << VNC_FEATURE_HEXTILE)
|
|
|
|
#define VNC_FEATURE_POINTER_TYPE_CHANGE_MASK (1 << VNC_FEATURE_POINTER_TYPE_CHANGE)
|
|
|
|
#define VNC_FEATURE_WMVI_MASK (1 << VNC_FEATURE_WMVI)
|
|
|
|
#define VNC_FEATURE_TIGHT_MASK (1 << VNC_FEATURE_TIGHT)
|
|
|
|
#define VNC_FEATURE_ZLIB_MASK (1 << VNC_FEATURE_ZLIB)
|
2009-02-16 22:59:30 +08:00
|
|
|
#define VNC_FEATURE_COPYRECT_MASK (1 << VNC_FEATURE_COPYRECT)
|
2010-05-21 17:54:34 +08:00
|
|
|
#define VNC_FEATURE_RICH_CURSOR_MASK (1 << VNC_FEATURE_RICH_CURSOR)
|
2010-07-08 02:57:56 +08:00
|
|
|
#define VNC_FEATURE_TIGHT_PNG_MASK (1 << VNC_FEATURE_TIGHT_PNG)
|
2011-02-04 16:06:01 +08:00
|
|
|
#define VNC_FEATURE_ZRLE_MASK (1 << VNC_FEATURE_ZRLE)
|
|
|
|
#define VNC_FEATURE_ZYWRLE_MASK (1 << VNC_FEATURE_ZYWRLE)
|
2009-02-02 23:58:25 +08:00
|
|
|
|
2009-03-07 04:27:23 +08:00
|
|
|
|
2010-04-01 01:20:43 +08:00
|
|
|
/* Client -> Server message IDs */
|
|
|
|
#define VNC_MSG_CLIENT_SET_PIXEL_FORMAT 0
|
|
|
|
#define VNC_MSG_CLIENT_SET_ENCODINGS 2
|
|
|
|
#define VNC_MSG_CLIENT_FRAMEBUFFER_UPDATE_REQUEST 3
|
|
|
|
#define VNC_MSG_CLIENT_KEY_EVENT 4
|
|
|
|
#define VNC_MSG_CLIENT_POINTER_EVENT 5
|
|
|
|
#define VNC_MSG_CLIENT_CUT_TEXT 6
|
|
|
|
#define VNC_MSG_CLIENT_VMWARE_0 127
|
|
|
|
#define VNC_MSG_CLIENT_CALL_CONTROL 249
|
|
|
|
#define VNC_MSG_CLIENT_XVP 250
|
|
|
|
#define VNC_MSG_CLIENT_SET_DESKTOP_SIZE 251
|
|
|
|
#define VNC_MSG_CLIENT_TIGHT 252
|
|
|
|
#define VNC_MSG_CLIENT_GII 253
|
|
|
|
#define VNC_MSG_CLIENT_VMWARE_1 254
|
|
|
|
#define VNC_MSG_CLIENT_QEMU 255
|
|
|
|
|
|
|
|
/* Server -> Client message IDs */
|
|
|
|
#define VNC_MSG_SERVER_FRAMEBUFFER_UPDATE 0
|
|
|
|
#define VNC_MSG_SERVER_SET_COLOUR_MAP_ENTRIES 1
|
|
|
|
#define VNC_MSG_SERVER_BELL 2
|
|
|
|
#define VNC_MSG_SERVER_CUT_TEXT 3
|
|
|
|
#define VNC_MSG_SERVER_VMWARE_0 127
|
|
|
|
#define VNC_MSG_SERVER_CALL_CONTROL 249
|
|
|
|
#define VNC_MSG_SERVER_XVP 250
|
|
|
|
#define VNC_MSG_SERVER_TIGHT 252
|
|
|
|
#define VNC_MSG_SERVER_GII 253
|
|
|
|
#define VNC_MSG_SERVER_VMWARE_1 254
|
|
|
|
#define VNC_MSG_SERVER_QEMU 255
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* QEMU client -> server message IDs */
|
|
|
|
#define VNC_MSG_CLIENT_QEMU_EXT_KEY_EVENT 0
|
|
|
|
#define VNC_MSG_CLIENT_QEMU_AUDIO 1
|
|
|
|
|
|
|
|
/* QEMU server -> client message IDs */
|
|
|
|
#define VNC_MSG_SERVER_QEMU_AUDIO 1
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* QEMU client -> server audio message IDs */
|
|
|
|
#define VNC_MSG_CLIENT_QEMU_AUDIO_ENABLE 0
|
|
|
|
#define VNC_MSG_CLIENT_QEMU_AUDIO_DISABLE 1
|
|
|
|
#define VNC_MSG_CLIENT_QEMU_AUDIO_SET_FORMAT 2
|
|
|
|
|
|
|
|
/* QEMU server -> client audio message IDs */
|
|
|
|
#define VNC_MSG_SERVER_QEMU_AUDIO_END 0
|
|
|
|
#define VNC_MSG_SERVER_QEMU_AUDIO_BEGIN 1
|
|
|
|
#define VNC_MSG_SERVER_QEMU_AUDIO_DATA 2
|
|
|
|
|
|
|
|
|
2009-03-07 04:27:23 +08:00
|
|
|
/*****************************************************************************
|
|
|
|
*
|
|
|
|
* Internal APIs
|
|
|
|
*
|
|
|
|
*****************************************************************************/
|
|
|
|
|
|
|
|
/* Event loop functions */
|
|
|
|
void vnc_client_read(void *opaque);
|
|
|
|
void vnc_client_write(void *opaque);
|
|
|
|
|
Add SASL authentication support ("Daniel P. Berrange")
This patch adds the new SASL authentication protocol to the VNC server.
It is enabled by setting the 'sasl' flag when launching VNC. SASL can
optionally provide encryption via its SSF layer, if a suitable mechanism
is configured (eg, GSSAPI/Kerberos, or Digest-MD5). If an SSF layer is
not available, then it should be combined with the x509 VNC authentication
protocol which provides encryption.
eg, if using GSSAPI
qemu -vnc localhost:1,sasl
eg if using TLS/x509 for encryption
qemu -vnc localhost:1,sasl,tls,x509
By default the Cyrus SASL library will look for its configuration in
the file /etc/sasl2/qemu.conf. For non-root users, this can be overridden
by setting the SASL_CONF_PATH environment variable, eg to make it look in
$HOME/.sasl2. NB unprivileged users may not have access to the full range
of SASL mechanisms, since some of them require some administrative privileges
to configure. The patch includes an example SASL configuration file which
illustrates config for GSSAPI and Digest-MD5, though it should be noted that
the latter is not really considered secure any more.
Most of the SASL authentication code is located in a separate source file,
vnc-auth-sasl.c. The main vnc.c file only contains minimal integration
glue, specifically parsing of command line flags / setup, and calls to
start the SASL auth process, to do encoding/decoding for data.
There are several possible stacks for reading & writing of data, depending
on the combo of VNC authentication methods in use
- Clear. read/write straight to socket
- TLS. read/write via GNUTLS helpers
- SASL. encode/decode via SASL SSF layer, then read/write to socket
- SASL+TLS. encode/decode via SASL SSF layer, then read/write via GNUTLS
Hence, the vnc_client_read & vnc_client_write methods have been refactored
a little.
vnc_client_read: main entry point for reading, calls either
- vnc_client_read_plain reading, with no intermediate decoding
- vnc_client_read_sasl reading, with SASL SSF decoding
These two methods, then call vnc_client_read_buf(). This decides
whether to write to the socket directly or write via GNUTLS.
The situation is the same for writing data. More extensive comments
have been added in the code / patch. The vnc_client_read_sasl and
vnc_client_write_sasl method implementations live in the separate
vnc-auth-sasl.c file.
The state required for the SASL auth mechanism is kept in a separate
VncStateSASL struct, defined in vnc-auth-sasl.h and included in the
main VncState.
The configure script probes for SASL and automatically enables it
if found, unless --disable-vnc-sasl was given to override it.
Makefile | 7
Makefile.target | 5
b/qemu.sasl | 34 ++
b/vnc-auth-sasl.c | 626 ++++++++++++++++++++++++++++++++++++++++++++++++++++
b/vnc-auth-sasl.h | 67 +++++
configure | 34 ++
qemu-doc.texi | 97 ++++++++
vnc-auth-vencrypt.c | 12
vnc.c | 249 ++++++++++++++++++--
vnc.h | 31 ++
10 files changed, 1129 insertions(+), 33 deletions(-)
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6724 c046a42c-6fe2-441c-8c8c-71466251a162
2009-03-07 04:27:28 +08:00
|
|
|
long vnc_client_read_buf(VncState *vs, uint8_t *data, size_t datalen);
|
|
|
|
long vnc_client_write_buf(VncState *vs, const uint8_t *data, size_t datalen);
|
2009-03-07 04:27:23 +08:00
|
|
|
|
|
|
|
/* Protocol I/O functions */
|
|
|
|
void vnc_write(VncState *vs, const void *data, size_t len);
|
|
|
|
void vnc_write_u32(VncState *vs, uint32_t value);
|
|
|
|
void vnc_write_s32(VncState *vs, int32_t value);
|
|
|
|
void vnc_write_u16(VncState *vs, uint16_t value);
|
|
|
|
void vnc_write_u8(VncState *vs, uint8_t value);
|
|
|
|
void vnc_flush(VncState *vs);
|
|
|
|
void vnc_read_when(VncState *vs, VncReadEvent *func, size_t expecting);
|
|
|
|
|
|
|
|
|
|
|
|
/* Buffer I/O functions */
|
|
|
|
uint8_t read_u8(uint8_t *data, size_t offset);
|
|
|
|
uint16_t read_u16(uint8_t *data, size_t offset);
|
|
|
|
int32_t read_s32(uint8_t *data, size_t offset);
|
|
|
|
uint32_t read_u32(uint8_t *data, size_t offset);
|
|
|
|
|
|
|
|
/* Protocol stage functions */
|
|
|
|
void vnc_client_error(VncState *vs);
|
Add SASL authentication support ("Daniel P. Berrange")
This patch adds the new SASL authentication protocol to the VNC server.
It is enabled by setting the 'sasl' flag when launching VNC. SASL can
optionally provide encryption via its SSF layer, if a suitable mechanism
is configured (eg, GSSAPI/Kerberos, or Digest-MD5). If an SSF layer is
not available, then it should be combined with the x509 VNC authentication
protocol which provides encryption.
eg, if using GSSAPI
qemu -vnc localhost:1,sasl
eg if using TLS/x509 for encryption
qemu -vnc localhost:1,sasl,tls,x509
By default the Cyrus SASL library will look for its configuration in
the file /etc/sasl2/qemu.conf. For non-root users, this can be overridden
by setting the SASL_CONF_PATH environment variable, eg to make it look in
$HOME/.sasl2. NB unprivileged users may not have access to the full range
of SASL mechanisms, since some of them require some administrative privileges
to configure. The patch includes an example SASL configuration file which
illustrates config for GSSAPI and Digest-MD5, though it should be noted that
the latter is not really considered secure any more.
Most of the SASL authentication code is located in a separate source file,
vnc-auth-sasl.c. The main vnc.c file only contains minimal integration
glue, specifically parsing of command line flags / setup, and calls to
start the SASL auth process, to do encoding/decoding for data.
There are several possible stacks for reading & writing of data, depending
on the combo of VNC authentication methods in use
- Clear. read/write straight to socket
- TLS. read/write via GNUTLS helpers
- SASL. encode/decode via SASL SSF layer, then read/write to socket
- SASL+TLS. encode/decode via SASL SSF layer, then read/write via GNUTLS
Hence, the vnc_client_read & vnc_client_write methods have been refactored
a little.
vnc_client_read: main entry point for reading, calls either
- vnc_client_read_plain reading, with no intermediate decoding
- vnc_client_read_sasl reading, with SASL SSF decoding
These two methods, then call vnc_client_read_buf(). This decides
whether to write to the socket directly or write via GNUTLS.
The situation is the same for writing data. More extensive comments
have been added in the code / patch. The vnc_client_read_sasl and
vnc_client_write_sasl method implementations live in the separate
vnc-auth-sasl.c file.
The state required for the SASL auth mechanism is kept in a separate
VncStateSASL struct, defined in vnc-auth-sasl.h and included in the
main VncState.
The configure script probes for SASL and automatically enables it
if found, unless --disable-vnc-sasl was given to override it.
Makefile | 7
Makefile.target | 5
b/qemu.sasl | 34 ++
b/vnc-auth-sasl.c | 626 ++++++++++++++++++++++++++++++++++++++++++++++++++++
b/vnc-auth-sasl.h | 67 +++++
configure | 34 ++
qemu-doc.texi | 97 ++++++++
vnc-auth-vencrypt.c | 12
vnc.c | 249 ++++++++++++++++++--
vnc.h | 31 ++
10 files changed, 1129 insertions(+), 33 deletions(-)
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6724 c046a42c-6fe2-441c-8c8c-71466251a162
2009-03-07 04:27:28 +08:00
|
|
|
int vnc_client_io_error(VncState *vs, int ret, int last_errno);
|
2009-03-07 04:27:23 +08:00
|
|
|
|
|
|
|
void start_client_init(VncState *vs);
|
|
|
|
void start_auth_vnc(VncState *vs);
|
|
|
|
|
Add SASL authentication support ("Daniel P. Berrange")
This patch adds the new SASL authentication protocol to the VNC server.
It is enabled by setting the 'sasl' flag when launching VNC. SASL can
optionally provide encryption via its SSF layer, if a suitable mechanism
is configured (eg, GSSAPI/Kerberos, or Digest-MD5). If an SSF layer is
not available, then it should be combined with the x509 VNC authentication
protocol which provides encryption.
eg, if using GSSAPI
qemu -vnc localhost:1,sasl
eg if using TLS/x509 for encryption
qemu -vnc localhost:1,sasl,tls,x509
By default the Cyrus SASL library will look for its configuration in
the file /etc/sasl2/qemu.conf. For non-root users, this can be overridden
by setting the SASL_CONF_PATH environment variable, eg to make it look in
$HOME/.sasl2. NB unprivileged users may not have access to the full range
of SASL mechanisms, since some of them require some administrative privileges
to configure. The patch includes an example SASL configuration file which
illustrates config for GSSAPI and Digest-MD5, though it should be noted that
the latter is not really considered secure any more.
Most of the SASL authentication code is located in a separate source file,
vnc-auth-sasl.c. The main vnc.c file only contains minimal integration
glue, specifically parsing of command line flags / setup, and calls to
start the SASL auth process, to do encoding/decoding for data.
There are several possible stacks for reading & writing of data, depending
on the combo of VNC authentication methods in use
- Clear. read/write straight to socket
- TLS. read/write via GNUTLS helpers
- SASL. encode/decode via SASL SSF layer, then read/write to socket
- SASL+TLS. encode/decode via SASL SSF layer, then read/write via GNUTLS
Hence, the vnc_client_read & vnc_client_write methods have been refactored
a little.
vnc_client_read: main entry point for reading, calls either
- vnc_client_read_plain reading, with no intermediate decoding
- vnc_client_read_sasl reading, with SASL SSF decoding
These two methods, then call vnc_client_read_buf(). This decides
whether to write to the socket directly or write via GNUTLS.
The situation is the same for writing data. More extensive comments
have been added in the code / patch. The vnc_client_read_sasl and
vnc_client_write_sasl method implementations live in the separate
vnc-auth-sasl.c file.
The state required for the SASL auth mechanism is kept in a separate
VncStateSASL struct, defined in vnc-auth-sasl.h and included in the
main VncState.
The configure script probes for SASL and automatically enables it
if found, unless --disable-vnc-sasl was given to override it.
Makefile | 7
Makefile.target | 5
b/qemu.sasl | 34 ++
b/vnc-auth-sasl.c | 626 ++++++++++++++++++++++++++++++++++++++++++++++++++++
b/vnc-auth-sasl.h | 67 +++++
configure | 34 ++
qemu-doc.texi | 97 ++++++++
vnc-auth-vencrypt.c | 12
vnc.c | 249 ++++++++++++++++++--
vnc.h | 31 ++
10 files changed, 1129 insertions(+), 33 deletions(-)
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6724 c046a42c-6fe2-441c-8c8c-71466251a162
2009-03-07 04:27:28 +08:00
|
|
|
/* Buffer management */
|
|
|
|
void buffer_reserve(Buffer *buffer, size_t len);
|
|
|
|
int buffer_empty(Buffer *buffer);
|
|
|
|
uint8_t *buffer_end(Buffer *buffer);
|
|
|
|
void buffer_reset(Buffer *buffer);
|
2010-05-19 15:24:07 +08:00
|
|
|
void buffer_free(Buffer *buffer);
|
Add SASL authentication support ("Daniel P. Berrange")
This patch adds the new SASL authentication protocol to the VNC server.
It is enabled by setting the 'sasl' flag when launching VNC. SASL can
optionally provide encryption via its SSF layer, if a suitable mechanism
is configured (eg, GSSAPI/Kerberos, or Digest-MD5). If an SSF layer is
not available, then it should be combined with the x509 VNC authentication
protocol which provides encryption.
eg, if using GSSAPI
qemu -vnc localhost:1,sasl
eg if using TLS/x509 for encryption
qemu -vnc localhost:1,sasl,tls,x509
By default the Cyrus SASL library will look for its configuration in
the file /etc/sasl2/qemu.conf. For non-root users, this can be overridden
by setting the SASL_CONF_PATH environment variable, eg to make it look in
$HOME/.sasl2. NB unprivileged users may not have access to the full range
of SASL mechanisms, since some of them require some administrative privileges
to configure. The patch includes an example SASL configuration file which
illustrates config for GSSAPI and Digest-MD5, though it should be noted that
the latter is not really considered secure any more.
Most of the SASL authentication code is located in a separate source file,
vnc-auth-sasl.c. The main vnc.c file only contains minimal integration
glue, specifically parsing of command line flags / setup, and calls to
start the SASL auth process, to do encoding/decoding for data.
There are several possible stacks for reading & writing of data, depending
on the combo of VNC authentication methods in use
- Clear. read/write straight to socket
- TLS. read/write via GNUTLS helpers
- SASL. encode/decode via SASL SSF layer, then read/write to socket
- SASL+TLS. encode/decode via SASL SSF layer, then read/write via GNUTLS
Hence, the vnc_client_read & vnc_client_write methods have been refactored
a little.
vnc_client_read: main entry point for reading, calls either
- vnc_client_read_plain reading, with no intermediate decoding
- vnc_client_read_sasl reading, with SASL SSF decoding
These two methods, then call vnc_client_read_buf(). This decides
whether to write to the socket directly or write via GNUTLS.
The situation is the same for writing data. More extensive comments
have been added in the code / patch. The vnc_client_read_sasl and
vnc_client_write_sasl method implementations live in the separate
vnc-auth-sasl.c file.
The state required for the SASL auth mechanism is kept in a separate
VncStateSASL struct, defined in vnc-auth-sasl.h and included in the
main VncState.
The configure script probes for SASL and automatically enables it
if found, unless --disable-vnc-sasl was given to override it.
Makefile | 7
Makefile.target | 5
b/qemu.sasl | 34 ++
b/vnc-auth-sasl.c | 626 ++++++++++++++++++++++++++++++++++++++++++++++++++++
b/vnc-auth-sasl.h | 67 +++++
configure | 34 ++
qemu-doc.texi | 97 ++++++++
vnc-auth-vencrypt.c | 12
vnc.c | 249 ++++++++++++++++++--
vnc.h | 31 ++
10 files changed, 1129 insertions(+), 33 deletions(-)
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6724 c046a42c-6fe2-441c-8c8c-71466251a162
2009-03-07 04:27:28 +08:00
|
|
|
void buffer_append(Buffer *buffer, const void *data, size_t len);
|
|
|
|
|
|
|
|
|
|
|
|
/* Misc helpers */
|
|
|
|
|
|
|
|
char *vnc_socket_local_addr(const char *format, int fd);
|
|
|
|
char *vnc_socket_remote_addr(const char *format, int fd);
|
|
|
|
|
2010-07-08 02:57:56 +08:00
|
|
|
static inline uint32_t vnc_has_feature(VncState *vs, int feature) {
|
|
|
|
return (vs->features & (1 << feature));
|
|
|
|
}
|
|
|
|
|
2010-05-03 20:31:34 +08:00
|
|
|
/* Framebuffer */
|
|
|
|
void vnc_framebuffer_update(VncState *vs, int x, int y, int w, int h,
|
|
|
|
int32_t encoding);
|
|
|
|
|
|
|
|
void vnc_convert_pixel(VncState *vs, uint8_t *buf, uint32_t v);
|
2011-02-04 16:05:55 +08:00
|
|
|
double vnc_update_freq(VncState *vs, int x, int y, int w, int h);
|
2011-02-04 16:05:56 +08:00
|
|
|
void vnc_sent_lossy_rect(VncState *vs, int x, int y, int w, int h);
|
2010-05-03 20:31:34 +08:00
|
|
|
|
|
|
|
/* Encodings */
|
2010-07-08 02:58:02 +08:00
|
|
|
int vnc_send_framebuffer_update(VncState *vs, int x, int y, int w, int h);
|
|
|
|
|
2010-05-19 15:24:09 +08:00
|
|
|
int vnc_raw_send_framebuffer_update(VncState *vs, int x, int y, int w, int h);
|
2010-05-03 20:31:34 +08:00
|
|
|
|
2010-05-19 15:24:09 +08:00
|
|
|
int vnc_hextile_send_framebuffer_update(VncState *vs, int x,
|
2010-05-03 20:31:34 +08:00
|
|
|
int y, int w, int h);
|
|
|
|
void vnc_hextile_set_pixel_conversion(VncState *vs, int generic);
|
|
|
|
|
2010-05-19 15:24:10 +08:00
|
|
|
void *vnc_zlib_zalloc(void *x, unsigned items, unsigned size);
|
|
|
|
void vnc_zlib_zfree(void *x, void *addr);
|
2010-05-19 15:24:09 +08:00
|
|
|
int vnc_zlib_send_framebuffer_update(VncState *vs, int x, int y, int w, int h);
|
2010-05-19 15:24:08 +08:00
|
|
|
void vnc_zlib_clear(VncState *vs);
|
2010-05-03 20:31:34 +08:00
|
|
|
|
2010-05-19 15:24:10 +08:00
|
|
|
int vnc_tight_send_framebuffer_update(VncState *vs, int x, int y, int w, int h);
|
2010-07-08 02:57:56 +08:00
|
|
|
int vnc_tight_png_send_framebuffer_update(VncState *vs, int x, int y,
|
|
|
|
int w, int h);
|
2010-05-19 15:24:10 +08:00
|
|
|
void vnc_tight_clear(VncState *vs);
|
|
|
|
|
2011-02-04 16:06:01 +08:00
|
|
|
int vnc_zrle_send_framebuffer_update(VncState *vs, int x, int y, int w, int h);
|
|
|
|
int vnc_zywrle_send_framebuffer_update(VncState *vs, int x, int y, int w, int h);
|
|
|
|
void vnc_zrle_clear(VncState *vs);
|
|
|
|
|
2009-03-07 04:27:13 +08:00
|
|
|
#endif /* __QEMU_VNC_H */
|