[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v1 09/11] io: cope with websock 'Connection' header h
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PULL v1 09/11] io: cope with websock 'Connection' header having multiple values |
Date: |
Mon, 16 Oct 2017 21:16:48 +0100 |
The noVNC server sends a header "Connection: keep-alive, Upgrade" which
fails our simple equality test. Split the header on ',', trim whitespace
and then check for 'upgrade' token.
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
---
io/channel-websock.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/io/channel-websock.c b/io/channel-websock.c
index e82b1beab3..0354845e52 100644
--- a/io/channel-websock.c
+++ b/io/channel-websock.c
@@ -374,6 +374,9 @@ static void
qio_channel_websock_handshake_process(QIOChannelWebsock *ioc,
size_t nhdrs = G_N_ELEMENTS(hdrs);
const char *protocols = NULL, *version = NULL, *key = NULL,
*host = NULL, *connection = NULL, *upgrade = NULL;
+ char **connectionv;
+ bool upgraded = false;
+ size_t i;
nhdrs = qio_channel_websock_extract_headers(ioc, buffer, hdrs, nhdrs,
errp);
if (!nhdrs) {
@@ -440,7 +443,16 @@ static void
qio_channel_websock_handshake_process(QIOChannelWebsock *ioc,
goto bad_request;
}
- if (strcasecmp(connection, QIO_CHANNEL_WEBSOCK_CONNECTION_UPGRADE) != 0) {
+ connectionv = g_strsplit(connection, ",", 0);
+ for (i = 0; connectionv != NULL && connectionv[i] != NULL; i++) {
+ g_strstrip(connectionv[i]);
+ if (strcasecmp(connectionv[i],
+ QIO_CHANNEL_WEBSOCK_CONNECTION_UPGRADE) == 0) {
+ upgraded = true;
+ }
+ }
+ g_strfreev(connectionv);
+ if (!upgraded) {
error_setg(errp, "No connection upgrade requested '%s'", connection);
goto bad_request;
}
--
2.13.5
- [Qemu-devel] [PULL v1 00/11] Merge QIO 2017-10-16, Daniel P. Berrange, 2017/10/16
- [Qemu-devel] [PULL v1 03/11] sockets: Handle race condition between binds to the same port, Daniel P. Berrange, 2017/10/16
- [Qemu-devel] [PULL v1 02/11] sockets: factor out create_fast_reuse_socket, Daniel P. Berrange, 2017/10/16
- [Qemu-devel] [PULL v1 01/11] sockets: factor out a new try_bind() function, Daniel P. Berrange, 2017/10/16
- [Qemu-devel] [PULL v1 04/11] io: monitor encoutput buffer size from websocket GSource, Daniel P. Berrange, 2017/10/16
- [Qemu-devel] [PULL v1 06/11] io: get rid of qio_channel_websock_encode helper method, Daniel P. Berrange, 2017/10/16
- [Qemu-devel] [PULL v1 05/11] io: simplify websocket ping reply handling, Daniel P. Berrange, 2017/10/16
- [Qemu-devel] [PULL v1 09/11] io: cope with websock 'Connection' header having multiple values,
Daniel P. Berrange <=
- [Qemu-devel] [PULL v1 08/11] io: get rid of bounce buffering in websock write path, Daniel P. Berrange, 2017/10/16
- [Qemu-devel] [PULL v1 07/11] io: pass a struct iovec into qio_channel_websock_encode, Daniel P. Berrange, 2017/10/16
- [Qemu-devel] [PULL v1 10/11] io: add trace points for websocket HTTP protocol headers, Daniel P. Berrange, 2017/10/16
- [Qemu-devel] [PULL v1 11/11] io: fix mem leak in websock error path, Daniel P. Berrange, 2017/10/16
- Re: [Qemu-devel] [PULL v1 00/11] Merge QIO 2017-10-16, Peter Maydell, 2017/10/17