qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Daniel P. Berrange" <berrange@redhat.com>
To: Eric Blake <eblake@redhat.com>
Cc: qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH v1 6/7] io: cope with websock 'Connection' header having multiple values
Date: Wed, 11 Oct 2017 10:18:00 +0100	[thread overview]
Message-ID: <20171011091800.GD20372@redhat.com> (raw)
In-Reply-To: <5c734ef0-5cb3-30eb-1b9a-1f2238deaa96@redhat.com>

On Tue, Oct 10, 2017 at 12:42:55PM -0500, Eric Blake wrote:
> On 10/10/2017 10:43 AM, Daniel P. Berrange wrote:
> > The noVNC server sends a header "Connection: keep-alive, Upgrade" which
> > fails our simple equality test. Split the header on ',', trim whitespace
> > and then check for 'upgrade' token.
> > 
> > Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> > ---
> >  io/channel-websock.c | 14 +++++++++++++-
> >  1 file changed, 13 insertions(+), 1 deletion(-)
> > 
> 
> > @@ -440,7 +443,16 @@ static void qio_channel_websock_handshake_process(QIOChannelWebsock *ioc,
> >          goto bad_request;
> >      }
> >  
> > -    if (strcasecmp(connection, QIO_CHANNEL_WEBSOCK_CONNECTION_UPGRADE) != 0) {
> 
> My first thought was whether you could just use strcasestr() instead of
> strcasecmp(), rather than the malloc overhead of g_strsplit().  But that
> would treat "noUpgradeGarbage" as success, making your approach a bit
> stricter.

Also note that when reading HTTP headers we've already limited max data
size to 4k for the entire HTTP header set. So we're doing g_strsplit
over a pretty short piece of data, so negligible perf implications
of that.

> 
> Reviewed-by: Eric Blake <eblake@redhat.com>

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-10-11  9:18 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-10 15:43 [Qemu-devel] [PATCH v1 0/7] Limit websockets memory usage & other bug fixes Daniel P. Berrange
2017-10-10 15:43 ` [Qemu-devel] [PATCH v1 1/7] io: monitor encoutput buffer size from websocket GSource Daniel P. Berrange
2017-10-10 16:51   ` Eric Blake
2017-10-10 17:34     ` Daniel P. Berrange
2017-10-10 15:43 ` [Qemu-devel] [PATCH v1 2/7] io: simplify websocket ping reply handling Daniel P. Berrange
2017-10-10 16:55   ` Eric Blake
2017-10-10 17:34     ` Daniel P. Berrange
2017-10-10 15:43 ` [Qemu-devel] [PATCH v1 3/7] io: get rid of qio_channel_websock_encode helper method Daniel P. Berrange
2017-10-10 16:59   ` Eric Blake
2017-10-10 15:43 ` [Qemu-devel] [PATCH v1 4/7] io: pass a struct iovec into qio_channel_websock_encode Daniel P. Berrange
2017-10-10 17:18   ` Eric Blake
2017-10-10 17:36     ` Daniel P. Berrange
2017-10-10 15:43 ` [Qemu-devel] [PATCH v1 5/7] io: get rid of bounce buffering in websock write path Daniel P. Berrange
2017-10-10 17:29   ` Eric Blake
2017-10-10 15:43 ` [Qemu-devel] [PATCH v1 6/7] io: cope with websock 'Connection' header having multiple values Daniel P. Berrange
2017-10-10 17:42   ` Eric Blake
2017-10-11  9:18     ` Daniel P. Berrange [this message]
2017-10-10 15:43 ` [Qemu-devel] [PATCH v1 7/7] io: add trace points for websocket HTTP protocol headers Daniel P. Berrange
2017-10-10 17:43   ` Eric Blake

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=20171011091800.GD20372@redhat.com \
    --to=berrange@redhat.com \
    --cc=eblake@redhat.com \
    --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).