WebSocket Pepper API: validate redundant protocols in Connect()

webkit/plugins/ppapi/ppb_websocket_impl.cc

 // Copyright (c) 2011 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 "webkit/plugins/ppapi/ppb_websocket_impl.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
+#include "base/values.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/c/ppb_var.h"
 #include "ppapi/shared_impl/var.h"
 #include "ppapi/shared_impl/var_tracker.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebData.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
@@ skipping 118 matching lines @@
     return PP_ERROR_BADARGUMENT;
   if (!gurl.SchemeIs("ws") && !gurl.SchemeIs("wss"))
     return PP_ERROR_BADARGUMENT;
   if (gurl.has_ref())
     return PP_ERROR_BADARGUMENT;
   if (!net::IsPortAllowedByDefault(gurl.IntPort()))
     return PP_ERROR_BADARGUMENT;
   WebURL web_url(gurl);
 
   // Validate protocols and convert it to WebString.
-  // TODO(toyoshim): Detect duplicated protocols as error.
   std::string protocol_string;
+  base::DictionaryValue protocol_set;

[dmichael (off chromium), 2011/12/07 20:21:13]

Why not just use std::set? This seems like overkill to me. You don't need any
depth and you don't need to be able to serialize this.

[Takashi Toyoshima, 2011/12/08 05:12:46]

Oh, that's right.
I misunderstood about std::set<std::string>.
I use it instead of DictionaryValue.

   for (uint32_t i = 0; i < protocol_count; i++) {
     // TODO(toyoshim): Similar function exist in WebKit::WebSocket.
     // We must rearrange them into WebKit::WebChannel and share its protocol
     // related implementation via WebKit API.
     scoped_refptr<StringVar> string_var;
     string_var = StringVar::FromPPVar(protocols[i]);
+
+    // Check duplicated protocol entries.
+    if (protocol_set.HasKey(string_var->value()))
+      return PP_ERROR_BADARGUMENT;
+    protocol_set.SetBoolean(string_var->value(), true);
+
+    // Check invalid and empty entries.
     if (!string_var || !string_var->value().length())
       return PP_ERROR_BADARGUMENT;
+
+    // Check containing characters.
     for (std::string::const_iterator it = string_var->value().begin();
         it != string_var->value().end();
         ++it) {
       uint8_t character = static_cast<uint8_t>(*it);
       // WebSocket specification says "(Subprotocol string must consist of)
       // characters in the range U+0021 to U+007E not including separator
       // characters as defined in [RFC2616]."
       const uint8_t minimumProtocolCharacter = '!';  // U+0021.
       const uint8_t maximumProtocolCharacter = '~';  // U+007E.
       if (character < minimumProtocolCharacter ||
           character > maximumProtocolCharacter ||
           character == '"' || character == '(' || character == ')' ||
           character == ',' || character == '/' ||
           (character >= ':' && character <= '@') ||  // U+003A - U+0040
           (character >= '[' && character <= ']') ||  // U+005B - u+005D
           character == '{' || character == '}')
         return PP_ERROR_BADARGUMENT;
     }
+    // Join protocols with the comma separator.
     if (i != 0)
       protocol_string.append(",");
     protocol_string.append(string_var->value());
   }
   WebString web_protocols = WebString::fromUTF8(protocol_string);
 
   // Validate |callback| (Doesn't support blocking callback)
   if (!callback.func)
     return PP_ERROR_BLOCKS_MAIN_THREAD;
 
@@ skipping 305 matching lines @@
 
   *receive_callback_var_ = received_messages_.front();
   received_messages_.pop();
   receive_callback_var_ = NULL;
   wait_for_receive_ = false;
   return PP_OK;
 }
 
 }  // namespace ppapi
 }  // namespace webkit