PPB_TCPSocket_Private/PPB_UDPSocket_Private are exposed to Browser

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index c8d35b7ad626b7e5a8acc177c9059cb61547314c..258cc94001f4adfd70368c9c39d32f9822730020 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -84,6 +84,7 @@
 #include "net/base/net_errors.h"
 #include "net/http/http_util.h"
 #include "ppapi/c/private/ppb_flash_net_connector.h"
+#include "ppapi/proxy/ppapi_messages.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityObject.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h"
@@ -278,6 +279,10 @@ static const float kScalingIncrement = 0.1f;
 
 static const float kScalingIncrementForGesture = 0.01f;
 
+static const char* kPredefinedAllowedSocketOrigins[] = {
+  "okddffdblfhhnmhodogpojmfkjmhinfp"

[brettw, 2011/12/02 03:56:14]

What is this?

[Dmitry Polukhin, 2011/12/05 11:29:06]

Added comment.

+};
+
 static void GetRedirectChain(WebDataSource* ds, std::vector<GURL>* result) {
   WebVector<WebURL> urls;
   ds->redirectChain(urls);
@@ -426,6 +431,18 @@ RenderViewImpl::RenderViewImpl(
         RenderThreadImpl::current()->video_capture_impl_manager());
   }
 
+  for (size_t i = 0; i < arraysize(kPredefinedAllowedSocketOrigins); ++i)
+    allowed_socket_origins_.insert(kPredefinedAllowedSocketOrigins[i]);
+
+  std::string allowed_list =
+      command_line.GetSwitchValueASCII(switches::kAllowNaClSocketAPI);

[jam, 2011/12/01 19:50:31]

here and in the header, please don't mention nacl in content. see
http://www.chromium.org/developers/content-module

if you want to have the core code in content, you can ask the embedder whether
to allow this feature or not through the ContentRendererClient interface.
Chrome's implementation can then use the nacl flag

[Dmitry Polukhin, 2011/12/02 11:37:33]

Will do it in next cl, see my replay in header.

[Dmitry Polukhin, 2011/12/05 11:29:06]

Done.

+  if (!allowed_list.empty()) {
+    StringTokenizer t(allowed_list, ",");
+    while (t.GetNext()) {
+      allowed_socket_origins_.insert(t.token());
+    }
+  }
+
   content::GetContentClient()->renderer()->RenderViewCreated(this);
 }
 
@@ -578,6 +595,16 @@ bool RenderViewImpl::GetPluginInfo(const GURL& url,
   return found;
 }
 
+bool RenderViewImpl::CanUseSocketAPIs() {
+  WebFrame* main_frame = webview() ? webview()->mainFrame() : NULL;
+  GURL url(main_frame ? GURL(main_frame->document().url()) : GURL());
+  if (!url.is_valid())
+    return false;
+
+  return allowed_socket_origins_.find(url.host()) !=
+      allowed_socket_origins_.end();
+}
+
 bool RenderViewImpl::OnMessageReceived(const IPC::Message& message) {
   WebFrame* main_frame = webview() ? webview()->mainFrame() : NULL;
   if (main_frame)
@@ -685,6 +712,16 @@ bool RenderViewImpl::OnMessageReceived(const IPC::Message& message) {
 #if defined(ENABLE_FLAPPER_HACKS)
     IPC_MESSAGE_HANDLER(PepperMsg_ConnectTcpACK, OnConnectTcpACK)
 #endif
+    IPC_MESSAGE_HANDLER(PpapiMsg_PPBTCPSocket_ConnectACK,
+                        OnTCPSocketConnectACK)
+    IPC_MESSAGE_HANDLER(PpapiMsg_PPBTCPSocket_SSLHandshakeACK,
+                        OnTCPSocketSSLHandshakeACK)
+    IPC_MESSAGE_HANDLER(PpapiMsg_PPBTCPSocket_ReadACK, OnTCPSocketReadACK)
+    IPC_MESSAGE_HANDLER(PpapiMsg_PPBTCPSocket_WriteACK, OnTCPSocketWriteACK)
+    IPC_MESSAGE_HANDLER(PpapiMsg_PPBUDPSocket_BindACK, OnUDPSocketBindACK)
+    IPC_MESSAGE_HANDLER(PpapiMsg_PPBUDPSocket_RecvFromACK,
+                        OnUDPSocketRecvFromACK)
+    IPC_MESSAGE_HANDLER(PpapiMsg_PPBUDPSocket_SendToACK, OnUDPSocketSendToACK)
 #if defined(OS_MACOSX)
     IPC_MESSAGE_HANDLER(ViewMsg_SetInLiveResize, OnSetInLiveResize)
 #endif
@@ -4714,6 +4751,62 @@ void RenderViewImpl::OnConnectTcpACK(
 }
 #endif
 
+void RenderViewImpl::OnTCPSocketConnectACK(
+    uint32 /* plugin_dispatcher_id */,

[jam, 2011/12/01 19:50:31]

nit: here and below, commenting out parameter names because they're not used
goes against convention

[Dmitry Polukhin, 2011/12/02 11:37:33]

Done.

+    uint32 socket_id,
+    bool succeeded,
+    const PP_NetAddress_Private& local_addr,
+    const PP_NetAddress_Private& remote_addr) {
+  pepper_delegate_.OnTCPSocketConnectACK(

[brettw, 2011/12/02 03:56:14]

Is it possible to add a filter from the pepper delegate rather than have all
these modifications here? This is a lot of modifications to this critical file.

You can see the beginning of OnMessageReceived does some dispatch to various
observers before falling through to the regular message handling.

[Dmitry Polukhin, 2011/12/02 11:37:33]

Potential yes but not in given time frame before branch point. Added TODO. Other
interfaces do the same. So it is general thing to move bunch of messages
handlers to PepperPluginDelegateImpl.

[Dmitry Polukhin, 2011/12/05 11:29:06]

RenderViewObserver is huge interface but for message filtering we need to
implement much smaller interface IPC::Channel::Listener. If you think that
PepperPluginDelegateImpl should implement RenderViewObserver, please let me and
I'll use observers mechanism instead of explicit message forwarding to
pepper_delegate_.

+      socket_id, succeeded, local_addr, remote_addr);
+}
+
+void RenderViewImpl::OnTCPSocketSSLHandshakeACK(
+    uint32 /* plugin_dispatcher_id */,
+    uint32 socket_id,
+    bool succeeded) {
+  pepper_delegate_.OnTCPSocketSSLHandshakeACK(socket_id, succeeded);
+}
+
+void RenderViewImpl::OnTCPSocketReadACK(uint32 /* plugin_dispatcher_id */,
+                                        uint32 socket_id,
+                                        bool succeeded,
+                                        const std::string& data) {
+  pepper_delegate_.OnTCPSocketReadACK(socket_id, succeeded, data);
+}
+
+void RenderViewImpl::OnTCPSocketWriteACK(uint32 /* plugin_dispatcher_id */,
+                                         uint32 socket_id,
+                                         bool succeeded,
+                                         int32_t bytes_written) {
+  pepper_delegate_.OnTCPSocketWriteACK(socket_id, succeeded, bytes_written);
+}
+
+void RenderViewImpl::OnUDPSocketBindACK(uint32 /* plugin_dispatcher_id */,
+                                        uint32 socket_id,
+                                        bool succeeded) {
+  pepper_delegate_.OnUDPSocketBindACK(socket_id, succeeded);
+}
+
+void RenderViewImpl::OnUDPSocketRecvFromACK(
+    uint32 /* plugin_dispatcher_id */,
+    uint32 socket_id,
+    bool succeeded,
+    const std::string& data,
+    const PP_NetAddress_Private& remote_addr) {
+  pepper_delegate_.OnUDPSocketRecvFromACK(socket_id,
+                                          succeeded,
+                                          data,
+                                          remote_addr);
+}
+
+void RenderViewImpl::OnUDPSocketSendToACK(uint32 /* plugin_dispatcher_id */,
+                                          uint32 socket_id,
+                                          bool succeeded,
+                                          int32_t bytes_written) {
+  pepper_delegate_.OnUDPSocketSendToACK(socket_id, succeeded, bytes_written);
+}
+
 void RenderViewImpl::OnContextMenuClosed(
     const webkit_glue::CustomContextMenuContext& custom_context) {
   if (custom_context.is_pepper_menu)