[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 76 matching lines @@
     is_initialized = true;
   }
 
   return broker;
 }
 
 TestRunner::TestRunner(JobLevel job_level, TokenLevel startup_token,
                        TokenLevel main_token)
     : is_init_(false), is_async_(false), no_sandbox_(false),
       target_process_id_(0) {
-  Init(job_level, startup_token, main_token);
+  Init(job_level, startup_token, main_token, false);
+}
+
+TestRunner::TestRunner(bool enable_create_process)
+    : is_init_(false),
+      is_async_(false),
+      no_sandbox_(false),
+      target_process_id_(0) {
+  Init(JOB_LOCKDOWN, USER_RESTRICTED_SAME_ACCESS, USER_LOCKDOWN,
+       enable_create_process);
 }
 
 TestRunner::TestRunner()
     : is_init_(false), is_async_(false), no_sandbox_(false),
       target_process_id_(0) {
-  Init(JOB_LOCKDOWN, USER_RESTRICTED_SAME_ACCESS, USER_LOCKDOWN);
+  Init(JOB_LOCKDOWN, USER_RESTRICTED_SAME_ACCESS, USER_LOCKDOWN, false);
 }
 
-void TestRunner::Init(JobLevel job_level, TokenLevel startup_token,
-                      TokenLevel main_token) {
+void TestRunner::Init(JobLevel job_level,
+                      TokenLevel startup_token,
+                      TokenLevel main_token,
+                      bool enable_create_process) {
   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);
+  if (!enable_create_process) {

[Will Harris, 2016/01/25 19:32:36]

Can this not be moved to InternalRunTest and a new method added on TestRunner to
disable CSRSS lockdown, rather than adding all these extra constructors?

[penny, 2016/01/26 22:37:10]

Done.  Excellent idea.  For some reason I didn't consider moving the existing
change to disable ALPCs out of init - certainly will next time.

+    // 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() {
@@ skipping 221 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