[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v1 03/11] io: use case insensitive check for Connecti
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PULL v1 03/11] io: use case insensitive check for Connection & Upgrade websock headers |
Date: |
Wed, 4 Oct 2017 13:25:07 +0100 |
When checking the value of the Connection and Upgrade HTTP headers
the websock RFC (6455) requires the comparison to be case insensitive.
The Connection value should be an exact match not a substring.
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
---
io/channel-websock.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/io/channel-websock.c b/io/channel-websock.c
index 6ddcec1549..2258557a21 100644
--- a/io/channel-websock.c
+++ b/io/channel-websock.c
@@ -431,12 +431,12 @@ static void
qio_channel_websock_handshake_process(QIOChannelWebsock *ioc,
goto bad_request;
}
- if (!g_strrstr(connection, QIO_CHANNEL_WEBSOCK_CONNECTION_UPGRADE)) {
+ if (strcasecmp(connection, QIO_CHANNEL_WEBSOCK_CONNECTION_UPGRADE) != 0) {
error_setg(errp, "No connection upgrade requested '%s'", connection);
goto bad_request;
}
- if (!g_str_equal(upgrade, QIO_CHANNEL_WEBSOCK_UPGRADE_WEBSOCKET)) {
+ if (strcasecmp(upgrade, QIO_CHANNEL_WEBSOCK_UPGRADE_WEBSOCKET) != 0) {
error_setg(errp, "Incorrect upgrade method '%s'", upgrade);
goto bad_request;
}
--
2.13.5
- [Qemu-devel] [PULL v1 00/11] Merge qio 2017/10/04, Daniel P. Berrange, 2017/10/04
- [Qemu-devel] [PULL v1 02/11] io: include full error message in websocket handshake trace, Daniel P. Berrange, 2017/10/04
- [Qemu-devel] [PULL v1 03/11] io: use case insensitive check for Connection & Upgrade websock headers,
Daniel P. Berrange <=
- [Qemu-devel] [PULL v1 04/11] ui: Always remove an old VNC channel watch before adding a new one, Daniel P. Berrange, 2017/10/04
- [Qemu-devel] [PULL v1 01/11] io: send proper HTTP response for websocket errors, Daniel P. Berrange, 2017/10/04
- [Qemu-devel] [PULL v1 05/11] io: Small updates in preparation for websocket changes, Daniel P. Berrange, 2017/10/04
- [Qemu-devel] [PULL v1 08/11] io: Ignore websocket PING and PONG frames, Daniel P. Berrange, 2017/10/04
- [Qemu-devel] [PULL v1 06/11] io: Add support for fragmented websocket binary frames, Daniel P. Berrange, 2017/10/04
- [Qemu-devel] [PULL v1 07/11] io: Allow empty websocket payload, Daniel P. Berrange, 2017/10/04
- [Qemu-devel] [PULL v1 09/11] io: Reply to ping frames, Daniel P. Berrange, 2017/10/04
- [Qemu-devel] [PULL v1 10/11] io: Attempt to send websocket close messages to client, Daniel P. Berrange, 2017/10/04
- [Qemu-devel] [PULL v1 11/11] io: add trace events for websockets frame handling, Daniel P. Berrange, 2017/10/04
- Re: [Qemu-devel] [PULL v1 00/11] Merge qio 2017/10/04, Peter Maydell, 2017/10/05