qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Daniel P. Berrange" <berrange@redhat.com>
To: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
Cc: qemu-devel@nongnu.org, Eric Blake <eblake@redhat.com>,
	Brian Rak <brak@vultr.com>
Subject: Re: [Qemu-devel] [PATCH v2 3/3] io: use case insensitive check for Connection & Upgrade websock headers
Date: Fri, 8 Sep 2017 14:26:33 +0100	[thread overview]
Message-ID: <20170908132633.GE32645@redhat.com> (raw)
In-Reply-To: <70a0110b-8295-f0d1-a69c-29d83178d6e9@amsat.org>

On Fri, Sep 08, 2017 at 10:22:00AM -0300, Philippe Mathieu-Daudé wrote:
> Hi Daniel,
> 
> On 09/08/2017 07:30 AM, Daniel P. Berrange wrote:
> > 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 <eblake@redhat.com>
> > Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> > ---
> >   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 aed7a6c9b3..ab332ec907 100644
> > --- a/io/channel-websock.c
> > +++ b/io/channel-websock.c
> > @@ -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) {
> 
> Why not use g_ascii_strcasecmp() ?

Functionally it doesn't matter either way, but there's no usage of
g_ascii_strcasecmp in QEMU so I don't see a benefit to using that

> 
> >           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;
> >       }
> > 

Regards,
Daniel
-- 
|: 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 :|

  reply	other threads:[~2017-09-08 13:26 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-08 10:30 [Qemu-devel] [PATCH v2 0/3] Improve websock response / error handling Daniel P. Berrange
2017-09-08 10:30 ` [Qemu-devel] [PATCH v2 1/3] io: send proper HTTP response for websocket errors Daniel P. Berrange
2017-09-08 10:30 ` [Qemu-devel] [PATCH v2 2/3] io: include full error message in websocket handshake trace Daniel P. Berrange
2017-09-08 10:30 ` [Qemu-devel] [PATCH v2 3/3] io: use case insensitive check for Connection & Upgrade websock headers Daniel P. Berrange
2017-09-08 13:22   ` Philippe Mathieu-Daudé
2017-09-08 13:26     ` Daniel P. Berrange [this message]
2017-09-08 10:53 ` [Qemu-devel] [PATCH v2 0/3] Improve websock response / error handling no-reply
2017-09-08 13:41   ` Daniel P. Berrange

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170908132633.GE32645@redhat.com \
    --to=berrange@redhat.com \
    --cc=brak@vultr.com \
    --cc=eblake@redhat.com \
    --cc=f4bug@amsat.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).