Convert VNC server to QIOChannel
cover Convert VNC server to QIOChannel
This is an update of patches previously shown in an RFC posting
RFC: https://lists.gnu.org/archive/html/qemu-devel/2015-09/msg00829.html
This series depends on the previously posted series:
"[PATCH v3 0/9] Introduce I/O channels framework"
This short series converts the VNC server to use the new QIOChannel framework. This removes all the websocket protocol code from the VNC server and further simplifies the TLS handling in the VNC server
The conversion has been tested against the virt-viewer/ remote-viewer programs in the various TLS modes, and also against the noVNC proxy websockets client with and without TLS support.
Daniel P. Berrange (3):
ui: convert VNC server to use QIOChannelSocket
ui: convert VNC server to use QIOChannelTLS
ui: convert VNC server to use QIOChannelWebsock
ui/vnc-auth-sasl.c | 57 ++++- ui/vnc-auth-vencrypt.c | 93 +++----- ui/vnc-jobs.c | 20 +- ui/vnc-ws.c | 400 ++++++-------------------------- ui/vnc-ws.h | 71 +----- ui/vnc.c | 608 ++++++++++++++++++++++--------------------------- ui/vnc.h | 31 ++- 7 files changed, 448 insertions(+), 832 deletions(-)
Signature · 1 line
2.5.0
PATCH 1/3 ui: convert VNC server to use QIOChannelSocket
The minimal first step conversion to use QIOChannelSocket classes instead of directly using POSIX sockets API. This will later be extended to also cover the TLS, SASL and websockets code.
--- ui/vnc-auth-sasl.c | 57 +++-- ui/vnc-auth-vencrypt.c | 27 ++- ui/vnc-jobs.c | 20 +- ui/vnc-ws.c | 51 ++++- ui/vnc-ws.h | 8 +- ui/vnc.c | 574 +++++++++++++++++++++++++------------------------ ui/vnc.h | 22 +- 7 files changed, 433 insertions(+), 326 deletions(-)
ui/vnc-auth-sasl.c +45 -12
@@ -62,7 +62,7 @@ long vnc_client_write_sasl(VncState *vs) (const char **)&vs->sasl.encoded, &vs->sasl.encodedLength);if (err !=SASL_OK ) -return vnc_client_io_error (vs,-1 ,EIO ); +return vnc_client_io_error (vs,-1 ,NULL ); vs->sasl.encodedOffset =0 ; }
@@ -86,7 +86,11 @@ long vnc_client_write_sasl(VncState *vs)* SASL encoded output */ if (vs->output.offset ==0 ) { -qemu_set_fd_handler (vs->csock, vnc_client_read,NULL , vs); +if (vs->ioc_tag) { +g_source_remove (vs->ioc_tag); + } + vs->ioc_tag =qio_channel_add_watch ( + vs->ioc,G_IO_IN , vnc_client_io, vs,NULL ); }return ret;
@@ -110,7 +114,7 @@ long vnc_client_read_sasl(VncState *vs) &decoded, &decodedLen);if (err !=SASL_OK ) -return vnc_client_io_error (vs,-1 , -EIO ); +return vnc_client_io_error (vs,-1 ,NULL );VNC_DEBUG ("Read SASL Encoded %p size %ld Decoded %p size %d\n" , encoded, ret, decoded, decodedLen);buffer_reserve (&vs->input, decodedLen);
@@ -255,17 +259,17 @@ static int protocol_client_auth_sasl_step(VncState *vs, uint8_t *data, size_t levnc_read_when (vs, protocol_client_auth_sasl_step_len,4 ); }else {if (!vnc_auth_sasl_check_ssf (vs)) { -VNC_DEBUG ("Authentication rejected for weak SSF %d\n" , vs->csock); +VNC_DEBUG ("Authentication rejected for weak SSF %p\n" , vs->ioc); goto authreject; }/* Check username whitelist ACL */ if (vnc_auth_sasl_check_access (vs) <0 ) { -VNC_DEBUG ("Authentication rejected for ACL %d\n" , vs->csock); +VNC_DEBUG ("Authentication rejected for ACL %p\n" , vs->ioc); goto authreject; } -VNC_DEBUG ("Authentication successful %d\n" , vs->csock); +VNC_DEBUG ("Authentication successful %p\n" , vs->ioc);vnc_write_u32 (vs,0 );/* Accept auth */ /* * Delay writing in SSF encoded mode until pending output
@@ -383,17 +387,17 @@ static int protocol_client_auth_sasl_start(VncState *vs, uint8_t *data, size_t lvnc_read_when (vs, protocol_client_auth_sasl_step_len,4 ); }else {if (!vnc_auth_sasl_check_ssf (vs)) { -VNC_DEBUG ("Authentication rejected for weak SSF %d\n" , vs->csock); +VNC_DEBUG ("Authentication rejected for weak SSF %p\n" , vs->ioc); goto authreject; }/* Check username whitelist ACL */ if (vnc_auth_sasl_check_access (vs) <0 ) { -VNC_DEBUG ("Authentication rejected for ACL %d\n" , vs->csock); +VNC_DEBUG ("Authentication rejected for ACL %p\n" , vs->ioc); goto authreject; } -VNC_DEBUG ("Authentication successful %d\n" , vs->csock); +VNC_DEBUG ("Authentication successful %p\n" , vs->ioc);vnc_write_u32 (vs,0 );/* Accept auth */ start_client_init (vs); }
@@ -487,6 +491,32 @@ static int protocol_client_auth_sasl_mechname_len(VncState *vs, uint8_t *data, sreturn 0 ; } +static char * +vnc_socket_ip_addr_string (QIOChannelSocket *ioc, +bool local, +Error **errp) +{ +SocketAddress *addr; +char *ret; + +if (local) { + addr =qio_channel_socket_get_local_address (ioc, errp); + }else { + addr =qio_channel_socket_get_remote_address (ioc, errp); + } +if (!addr) { +return NULL ; + } + +if (addr->type !=SOCKET_ADDRESS_KIND_INET ) { +error_setg (errp,"Not an inet socket type" ); +return NULL ; + } + ret =g_strdup_printf ("%s;%s" , addr->u.inet->host, addr->u.inet->port); +qapi_free_SocketAddress (addr); +return ret; +} +void start_auth_sasl (VncState *vs) {const char *mechlist =NULL ;
@@ -495,13 +525,16 @@ void start_auth_sasl(VncState *vs)char *localAddr, *remoteAddr;int mechlistlen; -VNC_DEBUG ("Initialize SASL auth %d\n" , vs->csock); +VNC_DEBUG ("Initialize SASL auth %p\n" , vs->ioc);/* Get local & remote client addresses in form IPADDR;PORT */ -if (!(localAddr =vnc_socket_local_addr ("%s;%s" , vs->csock))) + localAddr =vnc_socket_ip_addr_string (vs->sioc, true,NULL ); +if (!localAddr) { goto authabort; + } -if (!(remoteAddr =vnc_socket_remote_addr ("%s;%s" , vs->csock))) { + remoteAddr =vnc_socket_ip_addr_string (vs->sioc, false,NULL ); +if (!remoteAddr) {g_free (localAddr); goto authabort; }
ui/vnc-auth-vencrypt.c +22 -5
@@ -63,7 +63,9 @@ static void start_auth_vencrypt_subauth(VncState *vs) } } -static void vnc_tls_handshake_io (void *opaque); +static gboolean vnc_tls_handshake_io (QIOChannel *ioc, +GIOCondition condition, +void *opaque);static int vnc_start_vencrypt_handshake (VncState *vs) {
@@ -80,19 +82,31 @@ static int vnc_start_vencrypt_handshake(VncState *vs) goto error; }VNC_DEBUG ("Client verification passed, starting TLS I/O\n" ); -qemu_set_fd_handler (vs->csock, vnc_client_read, vnc_client_write, vs); +if (vs->ioc_tag) { +g_source_remove (vs->ioc_tag); + } + vs->ioc_tag =qio_channel_add_watch ( + vs->ioc,G_IO_IN |G_IO_OUT , vnc_client_io, vs,NULL );start_auth_vencrypt_subauth (vs);break ;case QCRYPTO_TLS_HANDSHAKE_RECVING :VNC_DEBUG ("Handshake interrupted (blocking read)\n" ); -qemu_set_fd_handler (vs->csock, vnc_tls_handshake_io,NULL , vs); +if (vs->ioc_tag) { +g_source_remove (vs->ioc_tag); + } + vs->ioc_tag =qio_channel_add_watch ( + vs->ioc,G_IO_IN , vnc_tls_handshake_io, vs,NULL );break ;case QCRYPTO_TLS_HANDSHAKE_SENDING :VNC_DEBUG ("Handshake interrupted (blocking write)\n" ); -qemu_set_fd_handler (vs->csock,NULL , vnc_tls_handshake_io, vs); +if (vs->ioc_tag) { +g_source_remove (vs->ioc_tag); + } + vs->ioc_tag =qio_channel_add_watch ( + vs->ioc,G_IO_OUT , vnc_tls_handshake_io, vs,NULL );break ; }
@@ -105,12 +119,15 @@ static int vnc_start_vencrypt_handshake(VncState *vs)return -1 ; } -static void vnc_tls_handshake_io (void *opaque) +static gboolean vnc_tls_handshake_io(QIOChannel *ioc G_GNUC_UNUSED, + GIOCondition condition G_GNUC_UNUSED, +void *opaque) {VncState *vs = (VncState *)opaque;VNC_DEBUG ("Handshake IO continue\n" );vnc_start_vencrypt_handshake (vs); +return TRUE; }
ui/vnc-jobs.c +12 -8
@@ -166,13 +166,16 @@ void vnc_jobs_consume_buffer(VncState *vs)vnc_lock_output (vs);if (vs->jobs_buffer.offset) { -if (vs->csock !=-1 &&buffer_empty (&vs->output)) { -qemu_set_fd_handler (vs->csock, vnc_client_read, - vnc_client_write, vs); +if (vs->ioc !=NULL &&buffer_empty (&vs->output)) { +if (vs->ioc_tag) { +g_source_remove (vs->ioc_tag); + } + vs->ioc_tag =qio_channel_add_watch ( + vs->ioc,G_IO_IN |G_IO_OUT , vnc_client_io, vs,NULL ); }buffer_move (&vs->output, &vs->jobs_buffer); } - flush = vs->csock !=-1 && vs->abort != true; + flush = vs->ioc !=NULL && vs->abort != true;vnc_unlock_output (vs);if (flush) {
@@ -186,7 +189,8 @@ void vnc_jobs_consume_buffer(VncState *vs)static void vnc_async_encoding_start (VncState *orig,VncState *local) {buffer_init (&local->output,"vnc-worker-output" ); - local->csock =-1 ;/* Don't do any network work on this thread */ + local->sioc =NULL ;/* Don't do any network work on this thread */ + local->ioc =NULL ;/* Don't do any network work on this thread */ local->vnc_encoding = orig->vnc_encoding; local->features = orig->features;
@@ -231,7 +235,7 @@ static int vnc_worker_thread_loop(VncJobQueue *queue) }vnc_lock_output (job->vs); -if (job->vs->csock ==-1 || job->vs->abort == true) { +if (job->vs->ioc ==NULL || job->vs->abort == true) {vnc_unlock_output (job->vs); goto disconnected; }
@@ -259,7 +263,7 @@ static int vnc_worker_thread_loop(VncJobQueue *queue) QLIST_FOREACH_SAFE(entry, &job->rectangles, next, tmp) {int n; -if (job->vs->csock ==-1 ) { +if (job->vs->ioc ==NULL ) {vnc_unlock_display (job->vs->vd);/* Copy persistent encoding data */ vnc_async_encoding_end (job->vs, &vs);
@@ -281,7 +285,7 @@ static int vnc_worker_thread_loop(VncJobQueue *queue) vs.output.buffer[saved_offset +1 ] = n_rectangles &0xFF ;vnc_lock_output (job->vs); -if (job->vs->csock !=-1 ) { +if (job->vs->ioc !=NULL ) {buffer_move (&job->vs->jobs_buffer, &vs.output);/* Copy persistent encoding data */ vnc_async_encoding_end (job->vs, &vs);
ui/vnc-ws.c +41 -10
110 lines not on this page · raw message
ui/vnc-ws.h +6 -2
@@ -72,8 +72,12 @@ enum { WS_OPCODE_PONG = 0xA }; -void vncws_tls_handshake_io (void *opaque); -void vncws_handshake_read (void *opaque); +gboolean vncws_tls_handshake_io (QIOChannel *ioc, +GIOCondition condition, +void *opaque); +gboolean vncws_handshake_io (QIOChannel *ioc, +GIOCondition condition, +void *opaque);long vnc_client_write_ws (VncState *vs);long vnc_client_read_ws (VncState *vs);void vncws_process_handshake (VncState *vs,uint8_t *line,size_t size);
ui/vnc.c +294 -280
925 lines not on this page · raw message
ui/vnc.h +13 -9
@@ -35,6 +35,7 @@#include "qemu/bitmap.h" #include "crypto/tlssession.h" #include "qemu/buffer.h" +#include "io/channel-socket.h" #include <zlib.h> #include <stdbool.h>
@@ -145,8 +146,10 @@ struct VncDisplayint num_exclusive;int connections_limit;VncSharePolicy share_policy; -int lsock; -int lwebsock; +QIOChannelSocket *lsock; +guint lsock_tag; +QIOChannelSocket *lwebsock; +guint lwebsock_tag;bool ws_enabled;DisplaySurface *ds;DisplayChangeListener dcl;
@@ -248,7 +251,10 @@ struct VncJobstruct VncState { -int csock; +QIOChannelSocket *sioc;/* The underlying socket */ +QIOChannel *ioc;/* The channel currently used for I/O */ +guint ioc_tag; +gboolean disconnecting; DECLARE_BITMAP(dirty[VNC_MAX_HEIGHT], VNC_DIRTY_BITS);uint8_t **lossy_rect;/* Not an Array to avoid costly memcpy in
@@ -499,8 +505,9 @@ enum {*****************************************************************************/ /* Event loop functions */ -void vnc_client_read (void *opaque); -void vnc_client_write (void *opaque); +gboolean vnc_client_io (QIOChannel *ioc, +GIOCondition condition, +void *opaque);ssize_t vnc_client_read_buf (VncState *vs,uint8_t *data,size_t datalen);ssize_t vnc_client_write_buf (VncState *vs,const uint8_t *data,size_t datalen);
@@ -524,7 +531,7 @@ uint32_t read_u32(uint8_t *data, size_t offset);/* Protocol stage functions */ void vnc_client_error (VncState *vs); -ssize_t vnc_client_io_error (VncState *vs,ssize_t ret,int last_errno); +ssize_t vnc_client_io_error (VncState *vs,ssize_t ret,Error **errp);void start_client_init (VncState *vs);void start_auth_vnc (VncState *vs);
@@ -532,9 +539,6 @@ void start_auth_vnc(VncState *vs);/* Misc helpers */ -char *vnc_socket_local_addr (const char *format,int fd); -char *vnc_socket_remote_addr (const char *format,int fd); -static inline uint32_t vnc_has_feature (VncState *vs,int feature) {return (vs->features & (1 << feature)); }
Signature · 1 line
2.5.0
PATCH 2/3 ui: convert VNC server to use QIOChannelTLS
In reply to Daniel P. BerrangeSwitch VNC server over to using the QIOChannelTLS object for the TLS session. This removes all remaining VNC specific code for dealing with TLS handshakes.
--- ui/vnc-auth-vencrypt.c | 106 ++++++++++++++----------------------------------- ui/vnc-ws.c | 95 +++++++++++++++++--------------------------- ui/vnc.c | 69 +++----------------------------- ui/vnc.h | 5 +-- 4 files changed, 73 insertions(+), 202 deletions(-)
ui/vnc-auth-vencrypt.c +30 -76
@@ -63,71 +63,21 @@ static void start_auth_vencrypt_subauth(VncState *vs) } } -static gboolean vnc_tls_handshake_io (QIOChannel *ioc, -GIOCondition condition, -void *opaque); - -static int vnc_start_vencrypt_handshake (VncState *vs) +static void vnc_tls_handshake_done (Object *source, +Error *err, +gpointer user_data) { -Error *err =NULL ; - -if (qcrypto_tls_session_handshake (vs->tls, &err) <0 ) { - goto error; - } +VncState *vs = user_data; -switch (qcrypto_tls_session_get_handshake_status (vs->tls)) { -case QCRYPTO_TLS_HANDSHAKE_COMPLETE : -VNC_DEBUG ("Handshake done, checking credentials\n" ); -if (qcrypto_tls_session_check_credentials (vs->tls, &err) <0 ) { - goto error; - } -VNC_DEBUG ("Client verification passed, starting TLS I/O\n" ); -if (vs->ioc_tag) { -g_source_remove (vs->ioc_tag); - } +if (err) { +VNC_DEBUG ("Handshake failed %s\n" , +error_get_pretty (err)); +vnc_client_error (vs); + }else { vs->ioc_tag =qio_channel_add_watch ( vs->ioc,G_IO_IN |G_IO_OUT , vnc_client_io, vs,NULL ); -start_auth_vencrypt_subauth (vs); -break ; - -case QCRYPTO_TLS_HANDSHAKE_RECVING : -VNC_DEBUG ("Handshake interrupted (blocking read)\n" ); -if (vs->ioc_tag) { -g_source_remove (vs->ioc_tag); - } - vs->ioc_tag =qio_channel_add_watch ( - vs->ioc,G_IO_IN , vnc_tls_handshake_io, vs,NULL ); -break ; - -case QCRYPTO_TLS_HANDSHAKE_SENDING : -VNC_DEBUG ("Handshake interrupted (blocking write)\n" ); -if (vs->ioc_tag) { -g_source_remove (vs->ioc_tag); - } - vs->ioc_tag =qio_channel_add_watch ( - vs->ioc,G_IO_OUT , vnc_tls_handshake_io, vs,NULL ); -break ; } - -return 0 ; - - error: -VNC_DEBUG ("Handshake failed %s\n" ,error_get_pretty (err)); -error_free (err); -vnc_client_error (vs); -return -1 ; -} - -static gboolean vnc_tls_handshake_io(QIOChannel *ioc G_GNUC_UNUSED, - GIOCondition condition G_GNUC_UNUSED, -void *opaque) -{ -VncState *vs = (VncState *)opaque; - -VNC_DEBUG ("Handshake IO continue\n" ); -vnc_start_vencrypt_handshake (vs); -return TRUE; }
@@ -142,33 +92,37 @@ static int protocol_client_vencrypt_auth(VncState *vs, uint8_t *data, size_t lenvnc_client_error (vs); }else {Error *err =NULL ; +QIOChannelTLS *tls;VNC_DEBUG ("Accepting auth %d, setting up TLS for handshake\n" , auth);vnc_write_u8 (vs,1 );/* Accept auth */ vnc_flush (vs); - vs->tls =qcrypto_tls_session_new (vs->vd->tlscreds, -NULL , - vs->vd->tlsaclname, -QCRYPTO_TLS_CREDS_ENDPOINT_SERVER , - &err); -if (!vs->tls) { -VNC_DEBUG ("Failed to setup TLS %s\n" , -error_get_pretty (err)); +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));error_free (err);vnc_client_error (vs);return 0 ; } -qcrypto_tls_session_set_callbacks (vs->tls, - vnc_tls_push, - vnc_tls_pull, - vs); -VNC_DEBUG ("Start TLS VeNCrypt handshake process\n" ); -if (vnc_start_vencrypt_handshake (vs) <0 ) { -VNC_DEBUG ("Failed to start TLS handshake\n" ); -return 0 ; - } +object_unref (OBJECT (vs->ioc)); + vs->ioc =QIO_CHANNEL (tls); + vs->tls =qio_channel_tls_get_session (tls); + +qio_channel_tls_handshake (tls, + vnc_tls_handshake_done, + vs, +NULL ); }return 0 ; }
ui/vnc-ws.c +36 -59
119 lines not on this page · raw message
ui/vnc.c +5 -64
99 lines not on this page · raw message
ui/vnc.h +2 -3
@@ -36,6 +36,7 @@#include "crypto/tlssession.h" #include "qemu/buffer.h" #include "io/channel-socket.h" +#include "io/channel-tls.h" #include <zlib.h> #include <stdbool.h>
@@ -281,7 +282,7 @@ struct VncStateint auth;int subauth;/* Used by VeNCrypt */ char challenge[VNC_AUTH_CHALLENGE_SIZE ]; -QCryptoTLSSession *tls; +QCryptoTLSSession *tls;/* Borrowed pointer from channel, don't free */ #ifdef CONFIG_VNC_SASL VncStateSASL sasl;#endif
@@ -511,8 +512,6 @@ gboolean vnc_client_io(QIOChannel *ioc,ssize_t vnc_client_read_buf (VncState *vs,uint8_t *data,size_t datalen);ssize_t vnc_client_write_buf (VncState *vs,const uint8_t *data,size_t datalen); -ssize_t vnc_tls_pull (char *buf,size_t len,void *opaque); -ssize_t vnc_tls_push (const char *buf,size_t len,void *opaque);/* Protocol I/O functions */ void vnc_write (VncState *vs,const void *data,size_t len);
Signature · 1 line
2.5.0
PATCH 3/3 ui: convert VNC server to use QIOChannelWebsock
In reply to Daniel P. BerrangeRemove custom websock handling code from the VNC server and use the QIOChannelWebsock class instead.
--- ui/vnc-ws.c | 328 +++++------------------------------------------------------- ui/vnc-ws.h | 63 ------------ ui/vnc.c | 27 +---- ui/vnc.h | 4 - 4 files changed, 30 insertions(+), 392 deletions(-)
ui/vnc-ws.c +26 -302
@@ -19,10 +19,7 @@*/ #include "vnc.h" -#include "qemu/main-loop.h" -#include "crypto/hash.h" - -static void vncws_handshake_read (VncState *vs); +#include "io/channel-websock.h" static void vncws_tls_handshake_done(Object *source, Error *err,
@@ -34,6 +31,7 @@ static void vncws_tls_handshake_done(Object *source,VNC_DEBUG ("Handshake failed %s\n" ,error_get_pretty (err));vnc_client_error (vs); }else { +VNC_DEBUG ("TLS handshake complete, starting websocket handshake\n" ); vs->ioc_tag =qio_channel_add_watch (QIO_CHANNEL (vs->ioc),G_IO_IN , vncws_handshake_io, vs,NULL ); }
@@ -79,38 +77,21 @@ gboolean vncws_tls_handshake_io(QIOChannel *ioc G_GNUC_UNUSED,return TRUE; } -static void vncws_handshake_read (VncState *vs) -{ -uint8_t *handshake_end; -long ret; -/* Typical HTTP headers from novnc are 512 bytes, so limiting -* total header size to 4096 is easily enough. */ -size_t want =4096 - vs->ws_input.offset; -buffer_reserve (&vs->ws_input, want); - ret =vnc_client_read_buf (vs,buffer_end (&vs->ws_input), want); -if (!ret) { -if (vs->disconnecting) { -vnc_disconnect_finish (vs); - } -return ; - } - vs->ws_input.offset += ret; +static void vncws_handshake_done (Object *source, +Error *err, +gpointer user_data) +{ +VncState *vs = user_data; - handshake_end = (uint8_t *)g_strstr_len ((char *)vs->ws_input.buffer, - vs->ws_input.offset,WS_HANDSHAKE_END ); -if (handshake_end) { -if (vs->ioc_tag) { -g_source_remove (vs->ioc_tag); - } +if (err) { +VNC_DEBUG ("Websock handshake failed %s\n" ,error_get_pretty (err)); +vnc_client_error (vs); + }else { +VNC_DEBUG ("Websock handshake complete, starting VNC protocol\n" ); +vnc_init_state (vs); vs->ioc_tag =qio_channel_add_watch ( vs->ioc,G_IO_IN , vnc_client_io, vs,NULL ); -vncws_process_handshake (vs, vs->ws_input.buffer, vs->ws_input.offset); -buffer_advance (&vs->ws_input, handshake_end - vs->ws_input.buffer + -strlen (WS_HANDSHAKE_END )); - }else if (vs->ws_input.offset >=4096 ) { -VNC_DEBUG ("End of headers not found in first 4096 bytes\n" ); -vnc_client_error (vs); } }
@@ -120,280 +101,23 @@ gboolean vncws_handshake_io(QIOChannel *ioc G_GNUC_UNUSED, void *opaque) {VncState *vs = opaque; -vncws_handshake_read (vs); -return TRUE; -} - -long vnc_client_read_ws (VncState *vs) -{ -int ret, err; -uint8_t *payload; -size_t payload_size, header_size; -VNC_DEBUG ("Read websocket %p size %zd offset %zd\n" , vs->ws_input.buffer, - vs->ws_input.capacity, vs->ws_input.offset); -buffer_reserve (&vs->ws_input,4096 ); - ret =vnc_client_read_buf (vs,buffer_end (&vs->ws_input),4096 ); -if (!ret) { -return 0 ; - } - vs->ws_input.offset += ret; - - ret =0 ; -/* consume as much of ws_input buffer as possible */ -do { -if (vs->ws_payload_remain ==0 ) { - err =vncws_decode_frame_header (&vs->ws_input, - &header_size, - &vs->ws_payload_remain, - &vs->ws_payload_mask); -if (err <=0 ) { -return err; - } - -buffer_advance (&vs->ws_input, header_size); - } -if (vs->ws_payload_remain !=0 ) { - err =vncws_decode_frame_payload (&vs->ws_input, - &vs->ws_payload_remain, - &vs->ws_payload_mask, - &payload, - &payload_size); -if (err <0 ) { -return err; - } -if (err ==0 ) { -return ret; - } - ret += err; - -buffer_reserve (&vs->input, payload_size); -buffer_append (&vs->input, payload, payload_size); - -buffer_advance (&vs->ws_input, payload_size); - } - }while (vs->ws_input.offset >0 ); - -return ret; -} - -long vnc_client_write_ws (VncState *vs) -{ -long ret; -VNC_DEBUG ("Write WS: Pending output %p size %zd offset %zd\n" , - vs->output.buffer, vs->output.capacity, vs->output.offset); -vncws_encode_frame (&vs->ws_output, vs->output.buffer, vs->output.offset); -buffer_reset (&vs->output); - ret =vnc_client_write_buf (vs, vs->ws_output.buffer, vs->ws_output.offset); -if (!ret) { -return 0 ; - } - -buffer_advance (&vs->ws_output, ret); - -if (vs->ws_output.offset ==0 ) { -if (vs->ioc_tag) { -g_source_remove (vs->ioc_tag); - } - vs->ioc_tag =qio_channel_add_watch ( - vs->ioc,G_IO_IN , vnc_client_io, vs,NULL ); - } - -return ret; -} - -static char *vncws_extract_handshake_entry (const char *handshake, -size_t handshake_len,const char *name) -{ -char *begin, *end, *ret =NULL ; -char *line =g_strdup_printf ("%s%s: " ,WS_HANDSHAKE_DELIM , name); - begin =g_strstr_len (handshake, handshake_len, line); -if (begin !=NULL ) { - begin +=strlen (line); - end =g_strstr_len (begin, handshake_len - (begin - handshake), -WS_HANDSHAKE_DELIM ); -if (end !=NULL ) { - ret =g_strndup (begin, end - begin); - } - } -g_free (line); -return ret; -} - -static void vncws_send_handshake_response (VncState *vs,const char * key) -{ -char combined_key[WS_CLIENT_KEY_LEN +WS_GUID_LEN +1 ]; -char *accept =NULL , *response =NULL ; -Error *err =NULL ; - -g_strlcpy (combined_key, key,WS_CLIENT_KEY_LEN +1 ); -g_strlcat (combined_key,WS_GUID ,WS_CLIENT_KEY_LEN +WS_GUID_LEN +1 ); - -/* hash and encode it */ -if (qcrypto_hash_base64 (QCRYPTO_HASH_ALG_SHA1 , - combined_key, -WS_CLIENT_KEY_LEN +WS_GUID_LEN , - &accept, - &err) <0 ) { -VNC_DEBUG ("Hashing Websocket combined key failed %s\n" , -error_get_pretty (err)); -error_free (err); -vnc_client_error (vs); -return ; - } - - response =g_strdup_printf (WS_HANDSHAKE , accept); -vnc_client_write_buf (vs, (const uint8_t *)response,strlen (response)); +QIOChannelWebsock *wioc; -g_free (accept); -g_free (response); - - vs->encode_ws =1 ; -vnc_init_state (vs); -} - -void vncws_process_handshake (VncState *vs,uint8_t *line,size_t size) -{ -char *protocols =vncws_extract_handshake_entry ((const char *)line, size, -"Sec-WebSocket-Protocol" ); -char *version =vncws_extract_handshake_entry ((const char *)line, size, -"Sec-WebSocket-Version" ); -char *key =vncws_extract_handshake_entry ((const char *)line, size, -"Sec-WebSocket-Key" ); - -if (protocols && version && key - &&g_strrstr (protocols,"binary" ) - && !strcmp (version,WS_SUPPORTED_VERSION ) - &&strlen (key) ==WS_CLIENT_KEY_LEN ) { -vncws_send_handshake_response (vs, key); - }else { -VNC_DEBUG ("Defective Websockets header or unsupported protocol\n" ); -vnc_client_error (vs); - } - -g_free (protocols); -g_free (version); -g_free (key); -} - -void vncws_encode_frame (Buffer *output,const void *payload, -const size_t payload_size) -{ -size_t header_size =0 ; -unsigned char opcode =WS_OPCODE_BINARY_FRAME ; -union { -char buf[WS_HEAD_MAX_LEN ]; -WsHeader ws; - } header; - -if (!payload_size) { -return ; - } - - header.ws.b0 =0x80 | (opcode &0x0f ); -if (payload_size <=125 ) { - header.ws.b1 = (uint8_t )payload_size; - header_size =2 ; - }else if (payload_size <65536 ) { - header.ws.b1 =0x7e ; - header.ws.u.s16.l16 =cpu_to_be16 ((uint16_t )payload_size); - header_size =4 ; - }else { - header.ws.b1 =0x7f ; - header.ws.u.s64.l64 =cpu_to_be64 (payload_size); - header_size =10 ; - } - -buffer_reserve (output, header_size + payload_size); -buffer_append (output, header.buf, header_size); -buffer_append (output, payload, payload_size); -} - -int vncws_decode_frame_header (Buffer *input, -size_t *header_size, -size_t *payload_remain, -WsMask *payload_mask) -{ -unsigned char opcode =0 , fin =0 , has_mask =0 ; -size_t payload_len; -WsHeader *header = (WsHeader *)input->buffer; - -if (input->offset <WS_HEAD_MIN_LEN +4 ) { -/* header not complete */ -return 0 ; - } - - fin = (header->b0 &0x80 ) >>7 ; - opcode = header->b0 &0x0f ; - has_mask = (header->b1 &0x80 ) >>7 ; - payload_len = header->b1 &0x7f ; - -if (opcode ==WS_OPCODE_CLOSE ) { -/* disconnect */ -return -1 ; - } - -/* Websocket frame sanity check: -* * Websocket fragmentation is not supported. -* * All websockets frames sent by a client have to be masked. -* * Only binary encoding is supported. -*/ -if (!fin || !has_mask || opcode !=WS_OPCODE_BINARY_FRAME ) { -VNC_DEBUG ("Received faulty/unsupported Websocket frame\n" ); -return -2 ; +VNC_DEBUG ("Websocket negotiate starting\n" ); +if (vs->ioc_tag) { +g_source_remove (vs->ioc_tag); + vs->ioc_tag =0 ; } -if (payload_len <126 ) { - *payload_remain = payload_len; - *header_size =6 ; - *payload_mask = header->u.m; - }else if (payload_len ==126 && input->offset >=8 ) { - *payload_remain =be16_to_cpu (header->u.s16.l16); - *header_size =8 ; - *payload_mask = header->u.s16.m16; - }else if (payload_len ==127 && input->offset >=14 ) { - *payload_remain =be64_to_cpu (header->u.s64.l64); - *header_size =14 ; - *payload_mask = header->u.s64.m64; - }else { -/* header not complete */ -return 0 ; - } + wioc =qio_channel_websock_new_server (vs->ioc); -return 1 ; -} - -int vncws_decode_frame_payload (Buffer *input, -size_t *payload_remain,WsMask *payload_mask, -uint8_t **payload,size_t *payload_size) -{ -size_t i; -uint32_t *payload32; - - *payload = input->buffer; -/* If we aren't at the end of the payload, then drop -* off the last bytes, so we're always multiple of 4 -* for purpose of unmasking, except at end of payload -*/ -if (input->offset < *payload_remain) { - *payload_size = input->offset - (input->offset %4 ); - }else { - *payload_size = *payload_remain; - } -if (*payload_size ==0 ) { -return 0 ; - } - *payload_remain -= *payload_size; +object_unref (OBJECT (vs->ioc)); + vs->ioc =QIO_CHANNEL (wioc); -/* unmask frame */ -/* process 1 frame (32 bit op) */ - payload32 = (uint32_t *)(*payload); -for (i =0 ; i < *payload_size /4 ; i++) { - payload32[i] ^= payload_mask->u; - } -/* process the remaining bytes (if any) */ -for (i *=4 ; i < *payload_size; i++) { - (*payload)[i] ^= payload_mask->c[i %4 ]; - } +qio_channel_websock_handshake (wioc, + vncws_handshake_done, + vs, +NULL ); -return 1 ; +return TRUE; }
ui/vnc-ws.h +0 -63
74 lines not on this page · raw message
ui/vnc.c +4 -23
@@ -1187,8 +1187,6 @@ void vnc_disconnect_finish(VncState *vs)buffer_free (&vs->input);buffer_free (&vs->output); -buffer_free (&vs->ws_input); -buffer_free (&vs->ws_output);qapi_free_VncClientInfo (vs->info);
@@ -1347,11 +1345,7 @@ static void vnc_client_write_locked(VncState *vs) } else#endif /* CONFIG_VNC_SASL */ { -if (vs->encode_ws) { -vnc_client_write_ws (vs); - }else { -vnc_client_write_plain (vs); - } +vnc_client_write_plain (vs); } }
@@ -1359,7 +1353,7 @@ static void vnc_client_write(VncState *vs) {vnc_lock_output (vs); -if (vs->output.offset || vs->ws_output.offset) { +if (vs->output.offset) {vnc_client_write_locked (vs); }else if (vs->ioc !=NULL ) {if (vs->ioc_tag) {
@@ -1446,18 +1440,7 @@ static void vnc_client_read(VncState *vs) ret =vnc_client_read_sasl (vs); else#endif /* CONFIG_VNC_SASL */ -if (vs->encode_ws) { - ret =vnc_client_read_ws (vs); -if (ret ==-1 ) { -vnc_disconnect_start (vs); -return ; - }else if (ret ==-2 ) { -vnc_client_error (vs); -return ; - } - }else { - ret =vnc_client_read_plain (vs); - } + ret =vnc_client_read_plain (vs);if (!ret) {if (vs->disconnecting) {vnc_disconnect_finish (vs);
@@ -1547,7 +1530,7 @@ void vnc_write_u8(VncState *vs, uint8_t value)void vnc_flush (VncState *vs) {vnc_lock_output (vs); -if (vs->ioc !=NULL && (vs->output.offset || vs->ws_output.offset)) { +if (vs->ioc !=NULL && vs->output.offset) {vnc_client_write_locked (vs); }vnc_unlock_output (vs);
@@ -2945,8 +2928,6 @@ static void vnc_connect(VncDisplay *vd, QIOChannelSocket *sioc,buffer_init (&vs->input,"vnc-input/%p" , sioc);buffer_init (&vs->output,"vnc-output/%p" , sioc); -buffer_init (&vs->ws_input,"vnc-ws_input/%p" , sioc); -buffer_init (&vs->ws_output,"vnc-ws_output/%p" , sioc);buffer_init (&vs->jobs_buffer,"vnc-jobs_buffer/%p" , sioc);buffer_init (&vs->tight.tight,"vnc-tight/%p" , sioc);
ui/vnc.h +0 -4
@@ -293,10 +293,6 @@ struct VncStateBuffer output;Buffer input; -Buffer ws_input; -Buffer ws_output; -size_t ws_payload_remain; -WsMask ws_payload_mask;/* current output mode information */ VncWritePixels *write_pixels;PixelFormat client_pf;
Signature · 1 line
2.5.0
Quoted 13 lines · Daniel P. Berrange
This is an update of patches previously shown in an RFC posting
RFC: https://lists.gnu.org/archive/html/qemu-devel/2015-09/msg00829.html
This series depends on the previously posted series:
"[PATCH v3 0/9] Introduce I/O channels framework"
This short series converts the VNC server to use the new QIOChannel framework. This removes all the websocket protocol code from the VNC server and further simplifies the TLS handling in the VNC server
Quoted 4 lines
The conversion has been tested against the virt-viewer/ remote-viewer programs in the various TLS modes, and also against the noVNC proxy websockets client with and without TLS support.
Looks good to me. In case you want send the pull request yourself:
Otherwise ping me when the depending patch series is merged.
thanks,
Gerd