io: use case insensitive check for Connection & Upgrade websock headers

PATCH In review Daniel P. Berrange 2 participants 2 messages Sep 6, 2017

Share & tools

Daniel P. Berrange

author

2017-09-06 13:59 UTC #0 lore raw

PATCH 1/1 io: use case insensitive check for Connection & Upgrade websock headers

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.

Signed-off-by Daniel P. Berrange <[email protected]>

---
 io/channel-websock.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

io/channel-websock.c +2 -2

index 463c04b0aa..abb2470146 100644
@@ -427,12 +427,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;
     }

Signature · 1 line

2.13.5

Eric Blake

Reviewed-by on v1 1/1

2017-09-06 14:09 UTC #1 lore raw

Quoted 7 lines · Daniel P. Berrange

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.
Signed-off-by Daniel P. Berrange <[email protected]>
---
 io/channel-websock.c | 4 ++--

Reviewed-by Eric Blake <[email protected]>

Signature · 3 lines

Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org