Refactor configuration of sandboxes - first steps

content/browser/plugin_process_host.cc

 // 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.
 
 #include "content/browser/plugin_process_host.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #elif defined(OS_POSIX)
 #include <utility>  // for pair<>
@@ skipping 18 matching lines @@
 #include "content/common/child_process_host_impl.h"
 #include "content/common/plugin_process_messages.h"
 #include "content/common/resource_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/resource_context.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/process_type.h"
+#include "content/public/common/sandboxed_process_launcher_delegate.h"
 #include "ipc/ipc_switches.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gl/gl_switches.h"
 
 #if defined(USE_X11)
 #include "ui/gfx/gtk_native_view_id_manager.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #include "content/common/plugin_carbon_interpose_constants_mac.h"
 #include "ui/gfx/rect.h"
 #endif
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #include "content/common/plugin_constants_win.h"
-#include "content/public/common/sandboxed_process_launcher_delegate.h"
 #include "ui/gfx/switches.h"
 #endif
 
 namespace content {
 
 #if defined(OS_WIN)
 void PluginProcessHost::OnPluginWindowDestroyed(HWND window, HWND parent) {
   // The window is destroyed at this point, we just care about its parent, which
   // is the intermediate window we created.
   std::set<HWND>::iterator window_index =
       plugin_parent_windows_set_.find(parent);
   if (window_index == plugin_parent_windows_set_.end())
     return;
 
   plugin_parent_windows_set_.erase(window_index);
   PostMessage(parent, WM_CLOSE, 0, 0);
 }
 
 void PluginProcessHost::AddWindow(HWND window) {
   plugin_parent_windows_set_.insert(window);
 }
 
 // NOTE: changes to this class need to be reviewed by the security team.
 class PluginSandboxedProcessLauncherDelegate
     : public SandboxedProcessLauncherDelegate {
  public:
-  PluginSandboxedProcessLauncherDelegate() {}
+  explicit PluginSandboxedProcessLauncherDelegate(ChildProcessHost* /*host*/) {}
   virtual ~PluginSandboxedProcessLauncherDelegate() {}
 
   virtual void ShouldSandbox(bool* in_sandbox) OVERRIDE {
     *in_sandbox = false;
   }
-
  private:
   DISALLOW_COPY_AND_ASSIGN(PluginSandboxedProcessLauncherDelegate);
 };
 
+#elif defined(OS_POSIX)
+
+// NOTE: changes to this class need to be reviewed by the security team.
+class PluginSandboxedProcessLauncherDelegate

[jam, 2014/02/26 19:47:52]

ditto

[aberent, 2014/02/28 08:51:06]

Done.

+    : public SandboxedProcessLauncherDelegate {
+ public:
+  explicit PluginSandboxedProcessLauncherDelegate(ChildProcessHost* host)
+      : ipc_fd_(host->TakeClientFileDescriptor()) {}
+
+  virtual ~PluginSandboxedProcessLauncherDelegate() {}
+
+  virtual int IpcFd() OVERRIDE {
+    return ipc_fd_;
+  }
+ private:
+  int ipc_fd_;
+  DISALLOW_COPY_AND_ASSIGN(PluginSandboxedProcessLauncherDelegate);
+};
 #endif  // defined(OS_WIN)
 
 #if defined(TOOLKIT_GTK)
 void PluginProcessHost::OnMapNativeViewId(gfx::NativeViewId id,
                                           gfx::PluginWindowHandle* output) {
   *output = 0;
 #if !defined(USE_AURA)
   GtkNativeViewManager::GetInstance()->GetXIDForId(output, id);
 #endif
 }
@@ skipping 134 matching lines @@
         interpose_list.insert(0, ":");
         interpose_list.insert(0, existing_list);
       }
     }
     env[kDYLDInsertLibrariesKey] = interpose_list;
   }
 #endif
 #endif
 
   process_->Launch(
-#if defined(OS_WIN)
-      new PluginSandboxedProcessLauncherDelegate,
-      false,
-#elif defined(OS_POSIX)
-      false,
-      env,
-#endif
+      new PluginSandboxedProcessLauncherDelegate(process_->GetHost()),
       cmd_line);
 
   // The plugin needs to be shutdown gracefully, i.e. NP_Shutdown needs to be
   // called on the plugin. The plugin process exits when it receives the
   // OnChannelError notification indicating that the browser plugin channel has
   // been destroyed.
   process_->SetTerminateChildOnShutdown(false);
 
   ResourceMessageFilter::GetContextsCallback get_contexts_callback(
       base::Bind(&PluginProcessHost::GetContexts,
@@ skipping 163 matching lines @@
 
 void PluginProcessHost::GetContexts(const ResourceHostMsg_Request& request,
                                     ResourceContext** resource_context,
                                     net::URLRequestContext** request_context) {
   *resource_context =
       resource_context_map_[request.origin_pid].resource_context;
   *request_context = (*resource_context)->GetRequestContext();
 }
 
 }  // namespace content