[Win10 sandbox mitigations] Four new Win10 mitigations added.

sandbox/win/tests/common/controller.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 "sandbox/win/tests/common/controller.h"
 
 #include <string>
 
 #include "base/memory/shared_memory.h"
 #include "base/process/process.h"
@@ skipping 72 matching lines @@
   if (!is_initialized) {
     if (SBOX_ALL_OK != broker->Init())
       return NULL;
 
     is_initialized = true;
   }
 
   return broker;
 }
 
-TestRunner::TestRunner(JobLevel job_level, TokenLevel startup_token,
+TestRunner::TestRunner(JobLevel job_level,
+                       TokenLevel startup_token,
                        TokenLevel main_token)
-    : is_init_(false), is_async_(false), no_sandbox_(false),
+    : is_init_(false),
+      is_async_(false),
+      no_sandbox_(false),
+      disable_csrss_(true),
       target_process_id_(0) {
   Init(job_level, startup_token, main_token);
 }
 
 TestRunner::TestRunner()
-    : is_init_(false), is_async_(false), no_sandbox_(false),
+    : is_init_(false),
+      is_async_(false),
+      no_sandbox_(false),
+      disable_csrss_(true),
       target_process_id_(0) {
   Init(JOB_LOCKDOWN, USER_RESTRICTED_SAME_ACCESS, USER_LOCKDOWN);
 }
 
-void TestRunner::Init(JobLevel job_level, TokenLevel startup_token,
+void TestRunner::Init(JobLevel job_level,
+                      TokenLevel startup_token,
                       TokenLevel main_token) {
   broker_ = NULL;
   policy_ = NULL;
   timeout_ = kDefaultTimeout;
   state_ = AFTER_REVERT;
   is_async_= false;
   kill_on_destruction_ = true;
   target_process_id_ = 0;
 
   broker_ = GetBroker();
   if (!broker_)
     return;
 
   policy_ = broker_->CreatePolicy();
   if (!policy_)
     return;
 
   policy_->SetJobLevel(job_level, 0);
   policy_->SetTokenLevel(startup_token, main_token);
 
-  // Close all ALPC ports.
-  if (base::win::GetVersion() >= base::win::VERSION_WIN8) {
-    policy_->AddKernelObjectToClose(L"ALPC Port", NULL);
-  }
-
   is_init_ = true;
 }
 
 TargetPolicy* TestRunner::GetPolicy() {
   return policy_;
 }
 
 TestRunner::~TestRunner() {
   if (target_process_.IsValid() && kill_on_destruction_)
     ::TerminateProcess(target_process_.Get(), 0);
@@ skipping 61 matching lines @@
     return SBOX_TEST_FAILED_TO_RUN_TEST;
 
   // For simplicity TestRunner supports only one process per instance.
   if (target_process_.IsValid()) {
     if (IsProcessRunning(target_process_.Get()))
       return SBOX_TEST_FAILED_TO_RUN_TEST;
     target_process_.Close();
     target_process_id_ = 0;
   }
 
+  if (disable_csrss_) {
+    // Close all ALPC ports to disable CSRSS.
+    if (base::win::GetVersion() >= base::win::VERSION_WIN8) {
+      policy_->AddKernelObjectToClose(L"ALPC Port", NULL);
+    }
+  }
+
   // Get the path to the sandboxed process.
   wchar_t prog_name[MAX_PATH];
   GetModuleFileNameW(NULL, prog_name, MAX_PATH);
 
   // Launch the sandboxed process.
   ResultCode result = SBOX_ALL_OK;
   PROCESS_INFORMATION target = {0};
 
   base::string16 arguments(L"\"");
   arguments += prog_name;
@@ skipping 138 matching lines @@
 
     target->LowerToken();
   } else if (0 != _wcsicmp(argv[1], L"-child-no-sandbox")) {
     return SBOX_TEST_FAILED_TO_EXECUTE_COMMAND;
   }
 
   return command(argc - 4, argv + 4);
 }
 
 }  // namespace sandbox