{"id":812905,"url":"http://patchwork.ozlabs.org/api/patches/812905/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170912152153.7729-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":"<20170912152153.7729-6-brandon.carpenter@cypherpath.com>","list_archive_url":null,"date":"2017-09-12T15:21:51","name":"[v3,5/7] 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/20170912152153.7729-6-brandon.carpenter@cypherpath.com/mbox/","series":[{"id":2725,"url":"http://patchwork.ozlabs.org/api/series/2725/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2725","date":"2017-09-12T15:21:48","name":"Update websocket code to more fully support the RFC","version":3,"mbox":"http://patchwork.ozlabs.org/series/2725/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/812905/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/812905/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=\"k18e2+CU\"; 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 3xs7q05M0sz9s7f\n\tfor ;\n\tWed, 13 Sep 2017 01:23:24 +1000 (AEST)","from localhost ([::1]:36496 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1drn22-0004s1-Q3\n\tfor incoming@patchwork.ozlabs.org; Tue, 12 Sep 2017 11:23:22 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:40513)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from )\n\tid 1drn16-0004ky-7c\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 11:22:30 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from )\n\tid 1drn15-000731-27\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 11:22:24 -0400","from mail-pg0-x22a.google.com ([2607:f8b0:400e:c05::22a]:37855)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.71) (envelope-from )\n\tid 1drn14-00072e-Rd\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 11:22:22 -0400","by mail-pg0-x22a.google.com with SMTP id d8so21859357pgt.4\n\tfor ; Tue, 12 Sep 2017 08:22:22 -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\td18sm12753054pfk.11.2017.09.12.08.22.20\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tTue, 12 Sep 2017 08:22:21 -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; bh=0VmBw3vqQ+DycFtgUChZiVJJOdmH1XwXIJ2fJl1tV2Y=;\n\tb=k18e2+CUcRcZZn7aFFp+a2JqaVn62GTGMP2YX1cXRHBiX2IkmRtGi7MxOkTQUnu0zY\n\tGXksDfkY/3V1VIScv5WDbPvoBYgwuQpwIVHrXovPvLj+ZYKfY7TZs7sxoGgnJSqNBlRv\n\tq9qSaxqlL8T9TutKHEUb31G8XQ2kNz8g3619g=","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;\n\tbh=0VmBw3vqQ+DycFtgUChZiVJJOdmH1XwXIJ2fJl1tV2Y=;\n\tb=JfLtp3pUB6fMJ9yMltMGAiMLbM3+yvrwnKdXMyFsrPlYtSUhoBxDfqIA3jh/TXqTzp\n\tuySCu3lkdaLhxVAgtxBE9TObkaQRz2XQAaUrDZtNP5BDUoqQBJCc79sNnUKT7eNYc/HY\n\tGTWIbfx90JhhuJ1wVtEi9HkxdTwpPkgiiKPXXsbQC6bHV6cvJbcKhLNPeWwD9pT5+lBl\n\tn6UEUFp7ktJltbwxaWtyqje63867dFKCSo5M0FYpmCTfyHUvEPD48JiLqk37pUjcPvke\n\tTVkCkl/BH6wHCSCqD+wd4/21aXp+7z1yfMeyPPc3gSrGTOKvOT3CzDksWkcuHAhm5q5M\n\t8Z3w==","X-Gm-Message-State":"AHPjjUg89wPSCkcna8e7pcsYioaKvouXurdEqn+1OR1+maY+fCIsjP8O\n\t0WKmqUio1tcuAne4P6XvhvAtLUITkcaA76OizHruZCwe4ww7IC5ojZ36vJgG++o56uzTvQlI8wu\n\tj8Bss","MIME-Version":"1.0","X-Google-Smtp-Source":"AOwi7QCba1RkEpsOHy9dcUF6BoyRF+8i2OmlFU7U8uTzekyyxW1/H6759Tw+D/3sCIefWFO1k/qT+A==","X-Received":"by 10.84.235.65 with SMTP id g1mr1419404plt.353.1505229741742;\n\tTue, 12 Sep 2017 08:22:21 -0700 (PDT)","From":"Brandon Carpenter ","To":"qemu-devel@nongnu.org","Date":"Tue, 12 Sep 2017 08:21:51 -0700","Message-Id":"<20170912152153.7729-6-brandon.carpenter@cypherpath.com>","X-Mailer":"git-send-email 2.14.1","In-Reply-To":"<20170912152153.7729-1-brandon.carpenter@cypherpath.com>","References":"<20170912152153.7729-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 v3 5/7] 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":["v3","5/7"]}