WebSocket Pepper API: use net::IsPortAllowedByDefault() to validate port

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"
@@ skipping 20 matching lines @@
 using ppapi::StringVar;
 using ppapi::thunk::PPB_WebSocket_API;
 using ppapi::VarTracker;
 using WebKit::WebData;
 using WebKit::WebDocument;
 using WebKit::WebString;
 using WebKit::WebSocket;
 using WebKit::WebSocketClient;
 using WebKit::WebURL;
 
-namespace {
-
 const uint32_t kMaxReasonSizeInBytes = 123;
 const size_t kHybiBaseFramingOverhead = 2;
 const size_t kHybiMaskingKeyLength = 4;
 const size_t kMinimumPayloadSizeWithTwoByteExtendedPayloadLength = 126;
 const size_t kMinimumPayloadSizeWithEightByteExtendedPayloadLength = 0x10000;
 
+namespace {
+

[dmichael (off chromium), 2011/12/01 16:46:08]

Why did you move the namespace? It would seem better to have them within the
unnamed namespace, unless that's causing you some kind of problem.

[Takashi Toyoshima, 2011/12/02 02:20:27]

Yuta suggest me this change because constant variables are handled as static, or
private in the file by default in C++.
So, we can just place them out of unnamed namespace.

 uint64_t SaturateAdd(uint64_t a, uint64_t b) {
   if (kuint64max - a < b)
     return kuint64max;
   return a + b;
 }
 
 uint64_t GetFrameSize(uint64_t payload_size) {
   if (!payload_size)
     return 0;
 
@@ skipping 73 matching lines @@
     return PP_ERROR_BADARGUMENT;
   GURL gurl(url_string->value());
   url_ = new StringVar(
       PpapiGlobals::Get()->GetModuleForInstance(pp_instance()), gurl.spec());
   if (!gurl.is_valid())
     return PP_ERROR_BADARGUMENT;
   if (!gurl.SchemeIs("ws") && !gurl.SchemeIs("wss"))
     return PP_ERROR_BADARGUMENT;
   if (gurl.has_ref())
     return PP_ERROR_BADARGUMENT;
-  // TODO(toyoshim): Must check if the port is allowed by default.
-  // We could not just use net::IsPortAllowedByDefault() because it doesn't
-  // be exported over the shared library.
+  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;
   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;
@@ skipping 74 matching lines @@
   close_callback_ = callback;
 
   if (state_ == PP_WEBSOCKETREADYSTATE_CONNECTING_DEV) {
     state_ = PP_WEBSOCKETREADYSTATE_CLOSING_DEV;
     PP_RunAndClearCompletionCallback(&connect_callback_, PP_ERROR_ABORTED);
     websocket_->fail(
         "WebSocket was closed before the connection was established.");
     return PP_OK_COMPLETIONPENDING;
   }
 
-  // TODO(toyoshim): Handle bufferedAmount here.
-
   state_ = PP_WEBSOCKETREADYSTATE_CLOSING_DEV;
   WebString web_reason = WebString::fromUTF8(reason_string->value());
   websocket_->close(code, web_reason);
 
   return PP_OK_COMPLETIONPENDING;
 }
 
 int32_t PPB_WebSocket_Impl::ReceiveMessage(PP_Var* message,
                                            PP_CompletionCallback callback) {
   // Check state.
@@ skipping 178 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