From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58556) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ciRhG-0003v5-JB for qemu-devel@nongnu.org; Mon, 27 Feb 2017 15:15:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ciRhF-0004VE-ST for qemu-devel@nongnu.org; Mon, 27 Feb 2017 15:15:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47844) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ciRhF-0004V5-N4 for qemu-devel@nongnu.org; Mon, 27 Feb 2017 15:15:01 -0500 From: "Daniel P. Berrange" Date: Mon, 27 Feb 2017 20:14:56 +0000 Message-Id: <20170227201456.31814-1-berrange@redhat.com> Subject: [Qemu-devel] [PATCH] io: ignore case when matching websockets HTTP headers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Denis V. Lunev" , Anton Nefedov , "Daniel P. Berrange" According to RFC7230 Section 3.2, header field name is case-insensitive. Convert the header data into all lowercase before doing string matching on the headers. Signed-off-by: Daniel P. Berrange --- io/channel-websock.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/io/channel-websock.c b/io/channel-websock.c index a06a4a8..32b7f37 100644 --- a/io/channel-websock.c +++ b/io/channel-websock.c @@ -33,9 +33,9 @@ #define QIO_CHANNEL_WEBSOCK_GUID "258EAFA5-E914-47DA-95CA-C5AB0DC85B11" #define QIO_CHANNEL_WEBSOCK_GUID_LEN strlen(QIO_CHANNEL_WEBSOCK_GUID) -#define QIO_CHANNEL_WEBSOCK_HEADER_PROTOCOL "Sec-WebSocket-Protocol" -#define QIO_CHANNEL_WEBSOCK_HEADER_VERSION "Sec-WebSocket-Version" -#define QIO_CHANNEL_WEBSOCK_HEADER_KEY "Sec-WebSocket-Key" +#define QIO_CHANNEL_WEBSOCK_HEADER_PROTOCOL "sec-websocket-protocol" +#define QIO_CHANNEL_WEBSOCK_HEADER_VERSION "sec-websocket-version" +#define QIO_CHANNEL_WEBSOCK_HEADER_KEY "sec-websocket-key" #define QIO_CHANNEL_WEBSOCK_PROTOCOL_BINARY "binary" @@ -223,7 +223,7 @@ static int qio_channel_websock_handshake_process(QIOChannelWebsock *ioc, static int qio_channel_websock_handshake_read(QIOChannelWebsock *ioc, Error **errp) { - char *handshake_end; + char *handshake_end, *tmp; ssize_t ret; /* Typical HTTP headers from novnc are 512 bytes, so limiting * total header size to 4096 is easily enough. */ @@ -249,9 +249,13 @@ static int qio_channel_websock_handshake_read(QIOChannelWebsock *ioc, } } + for (tmp = (char *)ioc->encinput.buffer; tmp < handshake_end; tmp++) { + *tmp = g_ascii_tolower(*tmp); + } + if (qio_channel_websock_handshake_process(ioc, (char *)ioc->encinput.buffer, - ioc->encinput.offset, + handshake_end - (char *)ioc->encinput.buffer, errp) < 0) { return -1; } -- 2.9.3