Alter the design of the bootstrap sandbox to only take over the bootstrap port of children when nec…

sandbox/mac/bootstrap_sandbox.h

 // Copyright 2014 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 SANDBOX_MAC_BOOTSTRAP_SANDBOX_H_
 #define SANDBOX_MAC_BOOTSTRAP_SANDBOX_H_
 
 #include <mach/mach.h>
 
 #include <map>
 #include <string>
 
 #include "base/mac/scoped_mach_port.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process/process_handle.h"
 #include "base/synchronization/lock.h"
 #include "sandbox/mac/policy.h"
 #include "sandbox/sandbox_export.h"
 
 namespace sandbox {
 
 class LaunchdInterceptionServer;
 
 // The BootstrapSandbox is a second-layer sandbox for Mac. It is used to limit
 // the bootstrap namespace attack surface of child processes. The parent
 // process creates an instance of this class and registers policies that it
 // can enforce on its children.
 //
 // With this sandbox, the bootstrap port of the parent process is replaced, so

[Mark Mentovai, 2014/06/19 18:40:12]

Revise.

[Robert Sesek, 2014/06/19 18:50:16]

Done.

 // that child processes is taken over by the sandbox. Bootstrap messages from
 // the parent are forwarded to launchd. Requests from the child that would
 // normally go to launchd are filtered based on the specified per-process
 // policies. If a request is permitted by the policy, it is forwarded on to
 // launchd for servicing. If it is not, then the sandbox will reply with a
 // primitive that does not grant additional capabilities to the receiver.
 //
 // Clients that which to use the sandbox must inform it of the creation and
 // death of child processes for which the sandbox should be enforced. The
 // client of the sandbox is intended to be an unsandboxed parent process that
@@ skipping 30 matching lines @@
   void FinishedFork(base::ProcessHandle handle);
 
   // Called in the parent when a process has died. It cleans up the references
   // to the process.
   void ChildDied(base::ProcessHandle handle);
 
   // Looks up the policy for a given process ID. If no policy is associated
   // with the |pid|, this returns NULL.
   const BootstrapSandboxPolicy* PolicyForProcess(pid_t pid) const;
 
+  std::string server_bootstrap_name() const { return server_bootstrap_name_; }
   mach_port_t real_bootstrap_port() const { return real_bootstrap_port_; }
 
  private:
   BootstrapSandbox();
 
   // A Mach IPC message server that is used to intercept and filter bootstrap
   // requests.
   scoped_ptr<LaunchdInterceptionServer> server_;
 
+  // The name in the system bootstrap server by which the |server_|'s port
+  // is known.
+  const std::string server_bootstrap_name_;
+
   // The original bootstrap port of the process, which is connected to the
   // real launchd server.
   base::mac::ScopedMachSendRight real_bootstrap_port_;
 
   // The |lock_| protects all the following variables.
   mutable base::Lock lock_;
 
   // The sandbox_policy_id that will be enforced for the new child.
   int effective_policy_id_;
 
   // All the policies that have been registered with this sandbox manager.
   std::map<int, const BootstrapSandboxPolicy> policies_;
 
   // The association between process ID and sandbox policy ID.
   std::map<base::ProcessHandle, int> sandboxed_processes_;
 };
 
 }  // namespace sandbox
 
 #endif  // SANDBOX_MAC_BOOTSTRAP_SANDBOX_H_