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

content/public/browser/content_browser_client.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
 
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 65 matching lines @@
 // Embedder API (or SPI) for participating in browser logic, to be implemented
 // by the client of the content browser. See ChromeContentBrowserClient for the
 // principal implementation. The methods are assumed to be called on the UI
 // thread unless otherwise specified. Use this "escape hatch" sparingly, to
 // avoid the embedder interface ballooning and becoming very specific to Chrome.
 // (Often, the call out to the client can happen in a different part of the code
 // that either already has a hook out to the embedder, or calls out to one of
 // the observer interfaces.)
 class CONTENT_EXPORT ContentBrowserClient {
  public:
+  struct SocketPermissionParam {

[jam, 2012/10/10 20:48:30]

please move this to a separate file (the convention in the content api is that
every struct or class should be in a separate file)

also, it seems unfortunate that this duplicates a subset of the
SocketPermissionData structure in chrome. can the latter be made to contain this
struct and add whatever other data it needs to it?

[Dmitry Polukhin, 2012/10/17 09:25:54]

Done.
I agree that it looks unfortunate to have this duplication. But if extension
internals use things from content, it also looks a bit strange to me and any
change there will require OWNER LGTM from content... But I'll switch extensions
code to content::SocketPermissionRequest if extensions team is OK with it.

[jam, 2012/10/17 15:22:42]

why do you say it's odd? extensions is in chrome, which depends on content (i.e.
like it depends on base). extensions code uses many objects from content
already.

[Dmitry Polukhin, 2012/10/18 08:57:38]

** Presubmit ERRORS **
You added one or more #includes that violate checkdeps rules.
  chrome/common/extensions/permissions/socket_permission_data.h
      Illegal include: "content/public/browser/socket_permission_request.h"
    Because of no rule applying.

Is it legal inclusion and I should add some checkdeps rule to remove this error?

[jam, 2012/10/18 15:37:15]

this is because chrome\common is including from content\public\browser, which
isn't allowed. just move the new header to content\public\common instead

+    enum OperationType {
+      NONE = 0,
+      TCP_CONNECT,
+      TCP_LISTEN,
+      UDP_BIND,
+      UDP_SEND_TO,
+    };
+
+    SocketPermissionParam(OperationType type,
+                          const std::string& host,
+                          int port)
+      : type(type),
+        host(host),
+        port(port) {
+    }
+
+    OperationType type;
+    std::string host;
+    int port;
+  };
+
   virtual ~ContentBrowserClient() {}
 
   // Allows the embedder to set any number of custom BrowserMainParts
   // implementations for the browser startup code. See comments in
   // browser_main_parts.h.
   virtual BrowserMainParts* CreateBrowserMainParts(
       const MainFunctionParams& parameters);
 
   // Allows an embedder to return their own WebContentsView implementation.
   // Return NULL to let the default one for the platform be created. Otherwise
@@ skipping 339 matching lines @@
   // Returns the default filename used in downloads when we have no idea what
   // else we should do with the file.
   virtual std::string GetDefaultDownloadName();
 
   // Notifification that a pepper plugin has just been spawned. This allows the
   // embedder to add filters onto the host to implement interfaces.
   // This is called on the IO thread.
   virtual void DidCreatePpapiPlugin(BrowserPpapiHost* browser_host) {}
 
   // Returns true if renderer processes can use Pepper TCP/UDP sockets from
-  // the given origin.
+  // the given origin and connection type.
   virtual bool AllowPepperSocketAPI(BrowserContext* browser_context,
-                                    const GURL& url);
+                                    const GURL& url,
+                                    const SocketPermissionParam& params);
 
   // Returns true if renderer processes can use private Pepper File APIs.
   virtual bool AllowPepperPrivateFileAPI();
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
   // Populates |mappings| with all files that need to be mapped before launching
   // a child process.
   virtual void GetAdditionalMappedFilesForChildProcess(
       const CommandLine& command_line,
       std::vector<FileDescriptorInfo>* mappings) {}
 #endif
 
 #if defined(OS_WIN)
   // Returns the name of the dll that contains cursors and other resources.
   virtual const wchar_t* GetResourceDllName();
 #endif
 
 #if defined(USE_NSS)
   // Return a delegate to authenticate and unlock |module|.
   // This is called on a worker thread.
   virtual
       crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate(
           const GURL& url);
 #endif
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_