WebSocketExtensionParser: reject top-bit-set characters

net/websockets/websocket_extension_parser_test.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/websockets/websocket_extension_parser.h"
 
 #include <string>
 
 #include "net/websockets/websocket_extension.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 113 matching lines @@
       "foo; bar=b\\z",        // separator in parameter value
       "foo; bar=b?z",         // separator in parameter value
       "\"foo\"",              // quoted extension name
       "foo; \"bar\"",         // quoted parameter name
       "foo; bar=\"\a2\"",     // control in quoted parameter value
       "foo; bar=\"b@z\"",     // separator in quoted parameter value
       "foo; bar=\"b\\\\z\"",  // separator in quoted parameter value
       "foo; bar=\"\"",        // quoted empty parameter value
       "foo; bar=\"baz",       // unterminated quoted string
       "foo; bar=\"baz \"",    // space in quoted string
-      "foo; bar baz",         // mising '='
+      "foo; bar baz",         // missing '='
       "foo; bar - baz",  // '-' instead of '=' (note: "foo; bar-baz" is valid).
       "foo; bar=\r\nbaz",   // CRNL not followed by a space
       "foo; bar=\r\n baz",  // CRNL followed by a space
+      "f\xFFpp",            // 8-bit character in extension name
+      "foo; b\xFFr=baz"     // 8-bit character in parameter name
+      "foo; bar=b\xFF"      // 8-bit character in parameter value
+      "foo; bar=\"b\xFF\""  // 8-bit character in quoted parameter value
+      "foo; bar=\"baz\\"    // ends with backslash
   };
 
   for (size_t i = 0; i < arraysize(patterns); ++i) {
     WebSocketExtensionParser parser;
     EXPECT_FALSE(parser.Parse(patterns[i]));
     EXPECT_EQ(0U, parser.extensions().size());
   }
 }
 
 TEST(WebSocketExtensionParserTest, QuotedParameterValue) {
   WebSocketExtensionParser parser;
   WebSocketExtension expected("foo");
   expected.Add(WebSocketExtension::Parameter("bar", "baz"));
 
   EXPECT_TRUE(parser.Parse("foo; bar = \"ba\\z\" "));
 
   ASSERT_EQ(1U, parser.extensions().size());
   EXPECT_TRUE(expected.Equals(parser.extensions()[0]));
 }
 
+// This is a regression test for crbug.com/647156
+TEST(WebSocketExtensionParserTest, InvalidToken) {
+  static const char kInvalidInput[] = "\304;\304!*777\377=\377\254\377";
+  WebSocketExtensionParser parser;
+  EXPECT_FALSE(parser.Parse(kInvalidInput));
+}
+
 }  // namespace
 
 }  // namespace net