From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47124) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cifjE-0003gq-SR for qemu-devel@nongnu.org; Tue, 28 Feb 2017 06:14:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cifjB-0004Gk-Lu for qemu-devel@nongnu.org; Tue, 28 Feb 2017 06:14:00 -0500 Received: from mail-db5eur01on0108.outbound.protection.outlook.com ([104.47.2.108]:61467 helo=EUR01-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cifjB-0004Df-0y for qemu-devel@nongnu.org; Tue, 28 Feb 2017 06:13:57 -0500 References: <20170227201456.31814-1-berrange@redhat.com> <20170228104828.GA2720@redhat.com> <0bb8488e-ee11-9401-7c40-a0ab1eb275c0@openvz.org> From: "Denis V. Lunev" Message-ID: Date: Tue, 28 Feb 2017 13:58:38 +0300 MIME-Version: 1.0 In-Reply-To: <0bb8488e-ee11-9401-7c40-a0ab1eb275c0@openvz.org> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] io: ignore case when matching websockets HTTP headers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Daniel P. Berrange" , qemu-devel@nongnu.org Cc: Anton Nefedov On 02/28/2017 01:54 PM, Denis V. Lunev wrote: > On 02/28/2017 01:48 PM, Daniel P. Berrange wrote: >> On Mon, Feb 27, 2017 at 08:14:56PM +0000, Daniel P. Berrange wrote: >>> 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); >>> + } >>> + >> self-nack - this does not in fact work - while it is fine to lowercase >> the header keys, we must not touch the header values as some data is >> case-sensitive >> >> Regards, >> Daniel > g-ascii-tolower() will help > > Den ah, sorry, wrong copy/paste. I meant 'g_ascii_strdown ()' Den