Use extensions socket permission for TCP/UDP socket APIs in Pepper

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 8eae62dc5a57a9ed4ec51690999daf81d92442ba..aa1b9ed8c86182b786cfd7bd621b35eea4d0f89d 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -78,6 +78,7 @@
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_process_policy.h"
 #include "chrome/common/extensions/extension_set.h"
+#include "chrome/common/extensions/permissions/socket_permission.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
@@ -1685,7 +1686,9 @@ void ChromeContentBrowserClient::DidCreatePpapiPlugin(
 }
 
 bool ChromeContentBrowserClient::AllowPepperSocketAPI(
-    content::BrowserContext* browser_context, const GURL& url) {
+    content::BrowserContext* browser_context,
+    const GURL& url,
+    const SocketPermissionParam& params) {
   if (!url.is_valid())
     return false;
 
@@ -1721,7 +1724,33 @@ bool ChromeContentBrowserClient::AllowPepperSocketAPI(
   if (!extension)
     return false;
 
-  if (extension->HasAPIPermission(APIPermission::kSocket))
+  extensions::SocketPermissionData::OperationType type =
+      extensions::SocketPermissionData::NONE;
+  switch (params.type) {
+    case SocketPermissionParam::TCP_CONNECT:
+      type = extensions::SocketPermissionData::TCP_CONNECT;
+      break;
+
+    case SocketPermissionParam::TCP_LISTEN:
+      type = extensions::SocketPermissionData::TCP_LISTEN;
+      break;
+
+    case SocketPermissionParam::UDP_BIND:
+      type = extensions::SocketPermissionData::UDP_BIND;
+      break;
+
+    case SocketPermissionParam::UDP_SEND_TO:
+      type = extensions::SocketPermissionData::UDP_SEND_TO;
+      break;
+
+    default:
+      NOTREACHED();
+  }

[miket_OOO, 2012/10/05 18:46:02]

This block seems like it could be a generally useful utility function.

[Dmitry Polukhin, 2012/10/08 09:50:35]

Done.

+
+  extensions::SocketPermission::CheckParam extension_params(
+      type, params.host, params.port);
+  if (extension->CheckAPIPermissionWithParam(APIPermission::kSocket,
+                                             &extension_params))
     return true;
 
   return false;