{"id":811759,"url":"http://patchwork.ozlabs.org/api/patches/811759/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170908173801.15205-6-brandon.carpenter@cypherpath.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170908173801.15205-6-brandon.carpenter@cypherpath.com>","list_archive_url":null,"date":"2017-09-08T17:38:00","name":"[v2,5/6] io: Ignore websocket PING and PONG frames","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"2105643cdd1f9dc2d83ad98d30fb2afc73f5ced4","submitter":{"id":72031,"url":"http://patchwork.ozlabs.org/api/people/72031/?format=json","name":"Brandon Carpenter","email":"brandon.carpenter@cypherpath.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170908173801.15205-6-brandon.carpenter@cypherpath.com/mbox/","series":[{"id":2262,"url":"http://patchwork.ozlabs.org/api/series/2262/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2262","date":"2017-09-08T17:37:56","name":"Update websocket code to more fully support the RFC","version":2,"mbox":"http://patchwork.ozlabs.org/series/2262/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/811759/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/811759/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=cypherpath.com header.i=@cypherpath.com\n\theader.b=\"C+pUs/o6\"; dkim-atps=neutral"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xplLR2PNPz9s8J\n\tfor ;\n\tSat, 9 Sep 2017 03:53:51 +1000 (AEST)","from localhost ([::1]:46746 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dqNTR-00056R-Fh\n\tfor incoming@patchwork.ozlabs.org; Fri, 08 Sep 2017 13:53:49 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:40111)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from )\n\tid 1dqNFQ-0000L1-Q2\n\tfor qemu-devel@nongnu.org; Fri, 08 Sep 2017 13:39:21 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from )\n\tid 1dqNFP-0008L2-Ig\n\tfor qemu-devel@nongnu.org; Fri, 08 Sep 2017 13:39:20 -0400","from mail-pg0-x22a.google.com ([2607:f8b0:400e:c05::22a]:32777)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.71) (envelope-from )\n\tid 1dqNFP-0008KG-DB\n\tfor qemu-devel@nongnu.org; Fri, 08 Sep 2017 13:39:19 -0400","by mail-pg0-x22a.google.com with SMTP id t3so5955942pgt.0\n\tfor ; Fri, 08 Sep 2017 10:39:19 -0700 (PDT)","from servo.cypherpath.com (68-113-0-218.static.knwc.wa.charter.com.\n\t[68.113.0.218]) by smtp.gmail.com with ESMTPSA id\n\tc30sm4556833pgn.33.2017.09.08.10.39.17\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tFri, 08 Sep 2017 10:39:17 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=cypherpath.com; s=google;\n\th=mime-version:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:in-reply-to:references;\n\tbh=0VmBw3vqQ+DycFtgUChZiVJJOdmH1XwXIJ2fJl1tV2Y=;\n\tb=C+pUs/o6UATmy2etRmysHkM9dB406XIulWlcyKH5RABk4GUlgT7+FboPh7xN5PFAaa\n\tzPvGnPd+Q0+1vULkbmv6SjhCeBQocJ2SwASJOP6Nuhsm3Jm8ih6AJYQ70c237gOFCqx3\n\tJVJzbcJPE0OgABq/QHAU/+Okpq/t2aIODnTjI=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:mime-version:from:to:cc:subject:date:message-id\n\t:in-reply-to:references:in-reply-to:references;\n\tbh=0VmBw3vqQ+DycFtgUChZiVJJOdmH1XwXIJ2fJl1tV2Y=;\n\tb=io28GhFXMo6Ahlq1+/F7WUKykNiMhJukgNA1YSCgmQQF9QLGboq5LWCUMNWnXmCFFJ\n\ty7xOk1NfTt7yk5tsZLPw2g7+JXG/FHpOe3/XGF5qrkS+QwE5Vu+i26EmNtk/FrBfifAP\n\t26R+Lm1HmXViOUIKVH4arWprIaduZtx3ByQYS8Z960gWvNVGrG2mu9VLajvgteTZ8/a+\n\tavqI/HQTOWEHWkQKkitW/1cXGSqQXLD+IBSoZt3AuGd6Gkcf5ExmZFOVTD/j4F0K+4Ed\n\tGbZsrK98UhNB1mgDRdgwUg4EbzCDmyc+5D9y37PM927YLAgnKOGRKNiQEWCcmnNeOPG5\n\tWdLQ==","X-Gm-Message-State":"AHPjjUhU9fs2iNb8Zt2DPiGXV1/zxGFu3WHla699fTS6+Yhz8WXmD9lQ\n\ttLqnsAr8pHSk5cCGyU6QHy7jtRPhayvPtclJKitNVCRnKznYkL9yjtKGxNxt9VvvjvEWJzs9+//\n\tTvkyr","MIME-Version":"1.0","X-Google-Smtp-Source":"ADKCNb6PeYMMQp82PO5dpEqBv4nG4WPR+7sHHbg6WnEGo+ub+sH/736q9SYFdWf+xtn0T9f0Cd2Ncg==","X-Received":"by 10.98.152.209 with SMTP id d78mr3907996pfk.58.1504892358323; \n\tFri, 08 Sep 2017 10:39:18 -0700 (PDT)","From":"Brandon Carpenter ","To":"qemu-devel@nongnu.org","Date":"Fri, 8 Sep 2017 10:38:00 -0700","Message-Id":"<20170908173801.15205-6-brandon.carpenter@cypherpath.com>","X-Mailer":"git-send-email 2.14.1","In-Reply-To":["<20170908173801.15205-1-brandon.carpenter@cypherpath.com>","<20170724184217.21381-1-brandon.carpenter@cypherpath.com>"],"References":["<20170908173801.15205-1-brandon.carpenter@cypherpath.com>","<20170724184217.21381-1-brandon.carpenter@cypherpath.com>"],"Content-Type":"text/plain; charset=\"US-ASCII\"","X-detected-operating-system":"by eggs.gnu.org: Genre and OS details not\n\trecognized.","X-Received-From":"2607:f8b0:400e:c05::22a","Subject":"[Qemu-devel] [PATCH v2 5/6] io: Ignore websocket PING and PONG\n\tframes","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"brandon.carpenter@cypherpath.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Keep pings and gratuitous pongs generated by web browsers from killing\nwebsocket connections.\n\nSigned-off-by: Brandon Carpenter \n---\n io/channel-websock.c | 21 +++++++++++++++++----\n 1 file changed, 17 insertions(+), 4 deletions(-)","diff":"diff --git a/io/channel-websock.c b/io/channel-websock.c\nindex 3183aeff77..50387050d5 100644\n--- a/io/channel-websock.c\n+++ b/io/channel-websock.c\n@@ -86,6 +86,7 @@\n #define QIO_CHANNEL_WEBSOCK_HEADER_FIELD_OPCODE 0x0f\n #define QIO_CHANNEL_WEBSOCK_HEADER_FIELD_HAS_MASK 0x80\n #define QIO_CHANNEL_WEBSOCK_HEADER_FIELD_PAYLOAD_LEN 0x7f\n+#define QIO_CHANNEL_WEBSOCK_CONTROL_OPCODE_MASK 0x8\n \n typedef struct QIOChannelWebsockHeader QIOChannelWebsockHeader;\n \n@@ -565,8 +566,11 @@ static int qio_channel_websock_decode_header(QIOChannelWebsock *ioc,\n return -1;\n }\n } else {\n- if (opcode != QIO_CHANNEL_WEBSOCK_OPCODE_BINARY_FRAME) {\n- error_setg(errp, \"only binary websocket frames are supported\");\n+ if (opcode != QIO_CHANNEL_WEBSOCK_OPCODE_BINARY_FRAME &&\n+ opcode != QIO_CHANNEL_WEBSOCK_OPCODE_PING &&\n+ opcode != QIO_CHANNEL_WEBSOCK_OPCODE_PONG) {\n+ error_setg(errp, \"unsupported opcode: %#04x; only binary, ping, \"\n+ \"and pong websocket frames are supported\", opcode);\n return -1;\n }\n }\n@@ -579,6 +583,9 @@ static int qio_channel_websock_decode_header(QIOChannelWebsock *ioc,\n ioc->payload_remain = payload_len;\n header_size = QIO_CHANNEL_WEBSOCK_HEADER_LEN_7_BIT;\n ioc->mask = header->u.m;\n+ } else if (opcode & QIO_CHANNEL_WEBSOCK_CONTROL_OPCODE_MASK) {\n+ error_setg(errp, \"websocket control frame is too large\");\n+ return -1;\n } else if (payload_len == QIO_CHANNEL_WEBSOCK_PAYLOAD_LEN_MAGIC_16_BIT &&\n ioc->encinput.offset >= QIO_CHANNEL_WEBSOCK_HEADER_LEN_16_BIT) {\n ioc->payload_remain = be16_to_cpu(header->u.s16.l16);\n@@ -634,9 +641,15 @@ static int qio_channel_websock_decode_payload(QIOChannelWebsock *ioc,\n }\n }\n \n+ /* Drop the payload of ping/pong packets */\n+ if (ioc->opcode == QIO_CHANNEL_WEBSOCK_OPCODE_BINARY_FRAME) {\n+ if (payload_len) {\n+ buffer_reserve(&ioc->rawinput, payload_len);\n+ buffer_append(&ioc->rawinput, ioc->encinput.buffer, payload_len);\n+ }\n+ }\n+\n if (payload_len) {\n- buffer_reserve(&ioc->rawinput, payload_len);\n- buffer_append(&ioc->rawinput, ioc->encinput.buffer, payload_len);\n buffer_advance(&ioc->encinput, payload_len);\n }\n return 0;\n","prefixes":["v2","5/6"]}