Support parsing a Sec-WebSocket-Extensions header with multiple elements

net/websockets/websocket_basic_handshake_stream.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_basic_handshake_stream.h"
 
 #include <algorithm>
 #include <iterator>
 #include <set>
 #include <string>
@@ skipping 285 matching lines @@
       return DeflateError(
           failure_message,
           "Received an unexpected permessage-deflate extension parameter");
     }
   }
   params->deflate_enabled = true;
   return true;
 }
 
 bool ValidateExtensions(const HttpResponseHeaders* headers,
-                        const std::vector<std::string>& requested_extensions,
-                        std::string* extensions,
+                        std::string* accepted_extensions_descriptor,
                         std::string* failure_message,
                         WebSocketExtensionParams* params) {
   void* state = nullptr;
-  std::string value;
-  std::vector<std::string> accepted_extensions;
+  std::string header_value;
+  std::vector<std::string> header_values;
   // TODO(ricea): If adding support for additional extensions, generalise this
   // code.
   bool seen_permessage_deflate = false;
-  while (headers->EnumerateHeader(
-             &state, websockets::kSecWebSocketExtensions, &value)) {
+  while (headers->EnumerateHeader(&state, websockets::kSecWebSocketExtensions,
+                                  &header_value)) {
     WebSocketExtensionParser parser;
-    parser.Parse(value);
+    parser.Parse(header_value);
     if (parser.has_error()) {
       // TODO(yhirano) Set appropriate failure message.
       *failure_message =
           "'Sec-WebSocket-Extensions' header value is "
           "rejected by the parser: " +
-          value;
+          header_value;
       return false;
     }
-    if (parser.extension().name() == "permessage-deflate") {
-      if (seen_permessage_deflate) {
-        *failure_message = "Received duplicate permessage-deflate response";
+
+    const std::vector<WebSocketExtension>& extensions = parser.extensions();
+    for (size_t i = 0; i < extensions.size(); ++i) {

[eroman, 2015/03/31 21:11:12]

optional: "for-in" loop

[tyoshino (SeeGerritForStatus), 2015/04/01 04:57:57]

Done.

+      const WebSocketExtension& extension = extensions[i];
+      if (extension.name() == "permessage-deflate") {
+        if (seen_permessage_deflate) {
+          *failure_message = "Received duplicate permessage-deflate response";
+          return false;
+        }
+        seen_permessage_deflate = true;
+
+        if (!ValidatePerMessageDeflateExtension(extension, failure_message,
+                                                params))

[eroman, 2015/03/31 21:11:12]

Add curly braces since the if occupies more than 1 line

[tyoshino (SeeGerritForStatus), 2015/04/01 04:57:57]

Done.

+          return false;
+        header_values.push_back(header_value);
+      } else {
+        *failure_message = "Found an unsupported extension '" +
+                           extension.name() +
+                           "' in 'Sec-WebSocket-Extensions' header";
         return false;
       }
-      seen_permessage_deflate = true;
-      if (!ValidatePerMessageDeflateExtension(
-              parser.extension(), failure_message, params))
-        return false;
-    } else {
-      *failure_message =
-          "Found an unsupported extension '" +
-          parser.extension().name() +
-          "' in 'Sec-WebSocket-Extensions' header";
-      return false;
     }
-    accepted_extensions.push_back(value);
   }
-  *extensions = JoinString(accepted_extensions, ", ");
+  *accepted_extensions_descriptor = JoinString(header_values, ", ");
   return true;
 }
 
 }  // namespace
 
 WebSocketBasicHandshakeStream::WebSocketBasicHandshakeStream(
     scoped_ptr<ClientSocketHandle> connection,
     WebSocketStream::ConnectDelegate* connect_delegate,
     bool using_proxy,
     std::vector<std::string> requested_sub_protocols,
@@ skipping 272 matching lines @@
   std::string failure_message;
   if (ValidateUpgrade(headers, &failure_message) &&
       ValidateSecWebSocketAccept(
           headers, handshake_challenge_response_, &failure_message) &&
       ValidateConnection(headers, &failure_message) &&
       ValidateSubProtocol(headers,
                           requested_sub_protocols_,
                           &sub_protocol_,
                           &failure_message) &&
       ValidateExtensions(headers,
-                         requested_extensions_,
                          &extensions_,
                          &failure_message,
                          extension_params_.get())) {
     return OK;
   }
   set_failure_message("Error during WebSocket handshake: " + failure_message);
   return ERR_INVALID_RESPONSE;
 }
 
 void WebSocketBasicHandshakeStream::set_failure_message(
     const std::string& failure_message) {
   *failure_message_ = failure_message;
 }
 
 }  // namespace net