Skip to contentSkip to conversation

websock: treat upgrade header in case insensitive way

PATCH In review Denis V. Lunev 2 participants 3 messages Sep 29, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 websock: treat upgrade header in case insensitive way

According to rfc6455 section 4.2.1. Reading the Client's Opening Handshake
An |Upgrade| header field containing the value "websocket", treated as an ASCII case-insensitive value.

Current implementation in QEMU accepts this header in lower-case only, which is revealed to have broken some real-life clients. We need to convert the value of this header to lower case before comparison. Unfortunately we can not do that for all headers. Only this specific one should be converted this way.

CC Daniel P. Berrange <[email protected]>
---
 io/channel-websock.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)
io/channel-websock.c +12 -5
index 5a3badbec2..d925f0a275 100644
@@ -123,6 +123,14 @@ enum {
     QIO_CHANNEL_WEBSOCK_OPCODE_PONG = 0xA
 };
 
+static void str_tolower(char *buffer)
+{
+    char *tmp;
+    for (tmp = buffer; *tmp; tmp++) {
+        *tmp = g_ascii_tolower(*tmp);
+    }
+}
+
 static size_t
 qio_channel_websock_extract_headers(char *buffer,
                                     QIOChannelWebsockHTTPHeader *hdrs,
@@ -221,9 +229,7 @@ qio_channel_websock_extract_headers(char *buffer,
         hdr->value = sep;
 
         /* Canonicalize header name for easier identification later */
-        for (tmp = hdr->name; *tmp; tmp++) {
-            *tmp = g_ascii_tolower(*tmp);
-        }
+        str_tolower(hdr->name);
 
         if (nl) {
             buffer = nl + strlen(QIO_CHANNEL_WEBSOCK_HANDSHAKE_DELIM);
@@ -233,7 +239,7 @@ qio_channel_websock_extract_headers(char *buffer,
     return nhdrs;
 }
 
-static const char *
+static char *
 qio_channel_websock_find_header(QIOChannelWebsockHTTPHeader *hdrs,
                                 size_t nhdrs,
                                 const char *name)
@@ -291,7 +297,7 @@ static int qio_channel_websock_handshake_process(QIOChannelWebsock *ioc,
 {
     QIOChannelWebsockHTTPHeader hdrs[32];
     size_t nhdrs = G_N_ELEMENTS(hdrs);
-    const char *protocols = NULL, *version = NULL, *key = NULL,
+    char *protocols = NULL, *version = NULL, *key = NULL,
         *host = NULL, *connection = NULL, *upgrade = NULL;
 
     nhdrs = qio_channel_websock_extract_headers(buffer, hdrs, nhdrs, errp);
@@ -340,6 +346,7 @@ static int qio_channel_websock_handshake_process(QIOChannelWebsock *ioc,
         error_setg(errp, "Missing websocket upgrade header data");
         return -1;
     }
+    str_tolower(upgrade);
 
     if (!g_strrstr(protocols, QIO_CHANNEL_WEBSOCK_PROTOCOL_BINARY)) {
         error_setg(errp, "No '%s' protocol is supported by client '%s'",
Signature · 1 line
2.11.0
#1 lore raw
Quoted 4 lines · Denis V. Lunev

According to rfc6455 section 4.2.1. Reading the Client's Opening Handshake
An |Upgrade| header field containing the value "websocket", treated as an ASCII case-insensitive value.

Quoted 8 lines

Current implementation in QEMU accepts this header in lower-case only, which is revealed to have broken some real-life clients. We need to convert the value of this header to lower case before comparison. Unfortunately we can not do that for all headers. Only this specific one should be converted this way.

CC Daniel P. Berrange <[email protected]>

FYI, I already have a fix for this problem queued:

https://lists.gnu.org/archive/html/qemu-devel/2017-09/msg02982.html

Regards,
Daniel

Signature · 3 lines
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
#2 lore raw
Quoted 13 lines · Daniel P. Berrange
Quoted 4 lines · Denis V. Lunev

According to rfc6455 section 4.2.1. Reading the Client's Opening Handshake
An |Upgrade| header field containing the value "websocket", treated as an ASCII case-insensitive value.

Quoted 8 lines

Current implementation in QEMU accepts this header in lower-case only, which is revealed to have broken some real-life clients. We need to convert the value of this header to lower case before comparison. Unfortunately we can not do that for all headers. Only this specific one should be converted this way.

CC Daniel P. Berrange <[email protected]>
Quoted 7 lines

FYI, I already have a fix for this problem queued:

https://lists.gnu.org/archive/html/qemu-devel/2017-09/msg02982.html

Regards,
Daniel

cool, thanks