| Index: sandbox/win/src/named_pipe_policy_test.cc
|
| diff --git a/sandbox/win/src/named_pipe_policy_test.cc b/sandbox/win/src/named_pipe_policy_test.cc
|
| index b89a1913d069f380e36ede61859b2c22b838d398..13e3df2f266ad2e9107310f12bf9de2550e743cd 100644
|
| --- a/sandbox/win/src/named_pipe_policy_test.cc
|
| +++ b/sandbox/win/src/named_pipe_policy_test.cc
|
| @@ -2,17 +2,19 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "testing/gtest/include/gtest/gtest.h"
|
| +#include "base/win/windows_version.h"
|
| +#include "sandbox/win/src/handle_closer.h"
|
| #include "sandbox/win/src/sandbox.h"
|
| #include "sandbox/win/src/sandbox_policy.h"
|
| #include "sandbox/win/src/sandbox_factory.h"
|
| #include "sandbox/win/tests/common/controller.h"
|
| +#include "testing/gtest/include/gtest/gtest.h"
|
|
|
| namespace sandbox {
|
|
|
|
|
| SBOX_TESTS_COMMAND int NamedPipe_Create(int argc, wchar_t **argv) {
|
| - if (argc != 1) {
|
| + if (argc < 1 || argc > 2) {
|
| return SBOX_TEST_FAILED_TO_EXECUTE_COMMAND;
|
| }
|
| if ((NULL == argv) || (NULL == argv[0])) {
|
| @@ -26,6 +28,18 @@ SBOX_TESTS_COMMAND int NamedPipe_Create(int argc, wchar_t **argv) {
|
| if (INVALID_HANDLE_VALUE == pipe)
|
| return SBOX_TEST_DENIED;
|
|
|
| + // The second parameter allows us to enforce a whitelist for where the
|
| + // pipe should be in the object namespace after creation.
|
| + if (argc == 2) {
|
| + base::string16 handle_name;
|
| + if (GetHandleName(pipe, &handle_name)) {
|
| + if (handle_name.compare(0, wcslen(argv[1]), argv[1]) != 0)
|
| + return SBOX_TEST_FAILED;
|
| + } else {
|
| + return SBOX_TEST_FAILED;
|
| + }
|
| + }
|
| +
|
| OVERLAPPED overlapped = {0};
|
| overlapped.hEvent = ::CreateEvent(NULL, TRUE, TRUE, NULL);
|
| BOOL result = ::ConnectNamedPipe(pipe, &overlapped);
|
| @@ -45,9 +59,7 @@ SBOX_TESTS_COMMAND int NamedPipe_Create(int argc, wchar_t **argv) {
|
| return SBOX_TEST_SUCCEEDED;
|
| }
|
|
|
| -// Tests if we can create a pipe in the sandbox. On XP, the sandbox can create
|
| -// a pipe without any help but it fails on Vista, this is why we do not test
|
| -// the "denied" case.
|
| +// Tests if we can create a pipe in the sandbox.
|
| TEST(NamedPipePolicyTest, CreatePipe) {
|
| TestRunner runner;
|
| // TODO(nsylvain): This policy is wrong because "*" is a valid char in a
|
| @@ -58,6 +70,33 @@ TEST(NamedPipePolicyTest, CreatePipe) {
|
|
|
| EXPECT_EQ(SBOX_TEST_SUCCEEDED,
|
| runner.RunTest(L"NamedPipe_Create \\\\.\\pipe\\testbleh"));
|
| +
|
| + // On XP, the sandbox can create a pipe without any help but it fails on
|
| + // Vista+, this is why we do not test the "denied" case.
|
| + if (base::win::OSInfo::GetInstance()->version() >= base::win::VERSION_VISTA) {
|
| + EXPECT_EQ(SBOX_TEST_DENIED,
|
| + runner.RunTest(L"NamedPipe_Create \\\\.\\pipe\\bleh"));
|
| + }
|
| +}
|
| +
|
| +// Tests if we can create a pipe with a path traversal in the sandbox.
|
| +TEST(NamedPipePolicyTest, CreatePipeTraversal) {
|
| + TestRunner runner;
|
| + // TODO(nsylvain): This policy is wrong because "*" is a valid char in a
|
| + // namedpipe name. Here we apply it like a wildcard. http://b/893603
|
| + EXPECT_TRUE(runner.AddRule(TargetPolicy::SUBSYS_NAMED_PIPES,
|
| + TargetPolicy::NAMEDPIPES_ALLOW_ANY,
|
| + L"\\\\.\\pipe\\test*"));
|
| +
|
| + // On XP, the sandbox can create a pipe without any help.
|
| + if (base::win::OSInfo::GetInstance()->version() >= base::win::VERSION_VISTA) {
|
| + // This test verifies that the pipe name does not get canonicalized before
|
| + // being passed to the OS. A failure here would mean we have sucessfully
|
| + // created a pipe called \\.\pipe\bleh and escaped the sandbox policy.
|
| + EXPECT_EQ(SBOX_TEST_SUCCEEDED,
|
| + runner.RunTest(L"NamedPipe_Create \\\\.\\pipe\\test\\..\\bleh"
|
| + L" \\Device\\NamedPipe\\test"));
|
| + }
|
| }
|
|
|
| // The same test as CreatePipe but this time using strict interceptions.
|
| @@ -73,6 +112,13 @@ TEST(NamedPipePolicyTest, CreatePipeStrictInterceptions) {
|
|
|
| EXPECT_EQ(SBOX_TEST_SUCCEEDED,
|
| runner.RunTest(L"NamedPipe_Create \\\\.\\pipe\\testbleh"));
|
| +
|
| + // On XP, the sandbox can create a pipe without any help but it fails on
|
| + // Vista+, this is why we do not test the "denied" case.
|
| + if (base::win::OSInfo::GetInstance()->version() >= base::win::VERSION_VISTA) {
|
| + EXPECT_EQ(SBOX_TEST_DENIED,
|
| + runner.RunTest(L"NamedPipe_Create \\\\.\\pipe\\bleh"));
|
| + }
|
| }
|
|
|
| } // namespace sandbox
|
|
|