diff options
author | krstnmnlsn@chromium.org <krstnmnlsn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-05 14:09:05 +0000 |
---|---|---|
committer | krstnmnlsn@chromium.org <krstnmnlsn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-05 14:09:05 +0000 |
commit | 189a4aa7696453a1292fd4693335ef2fea292ec8 (patch) | |
tree | d6200ee819d0221346b74e080057971480b185d8 /chrome_elf/blacklist | |
parent | c22b60145ba4eddf64a1823d991d3ffb4932b33a (diff) | |
download | chromium_src-189a4aa7696453a1292fd4693335ef2fea292ec8.zip chromium_src-189a4aa7696453a1292fd4693335ef2fea292ec8.tar.gz chromium_src-189a4aa7696453a1292fd4693335ef2fea292ec8.tar.bz2 |
Finch Blacklist is now added to the Hardcoded blacklist.
The finch blacklist is collected from finch in chrome_elf_init_win.cc,
stored in a registry, and added to the blacklist in blacklist.cc.
BUG=
Review URL: https://codereview.chromium.org/300933002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275086 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_elf/blacklist')
-rw-r--r-- | chrome_elf/blacklist/blacklist.cc | 44 | ||||
-rw-r--r-- | chrome_elf/blacklist/blacklist.h | 4 | ||||
-rw-r--r-- | chrome_elf/blacklist/test/blacklist_test.cc | 88 | ||||
-rw-r--r-- | chrome_elf/blacklist/test/blacklist_test_main_dll.def | 1 |
4 files changed, 112 insertions, 25 deletions
diff --git a/chrome_elf/blacklist/blacklist.cc b/chrome_elf/blacklist/blacklist.cc index a168c9a..c42f682 100644 --- a/chrome_elf/blacklist/blacklist.cc +++ b/chrome_elf/blacklist/blacklist.cc @@ -7,6 +7,8 @@ #include <assert.h> #include <string.h> +#include <vector> + #include "base/basictypes.h" #include "chrome_elf/blacklist/blacklist_interceptions.h" #include "chrome_elf/chrome_elf_constants.h" @@ -342,7 +344,49 @@ bool Initialize(bool force) { RecordSuccessfulThunkSetup(&key); + AddDllsFromRegistryToBlacklist(); + return NT_SUCCESS(ret) && page_executable; } +bool AddDllsFromRegistryToBlacklist() { + HKEY key = NULL; + LONG result = ::RegOpenKeyEx(HKEY_CURRENT_USER, + kRegistryFinchListPath, + 0, + KEY_QUERY_VALUE | KEY_SET_VALUE, + &key); + + if (result != ERROR_SUCCESS) + return false; + + // We add dlls from the registry to the blacklist, and then clear registry. + DWORD value_len; + DWORD name_len = MAX_PATH; + std::vector<wchar_t> name_buffer(name_len); + for (int i = 0; result == ERROR_SUCCESS; ++i) { + name_len = MAX_PATH; + value_len = 0; + result = ::RegEnumValue( + key, i, &name_buffer[0], &name_len, NULL, NULL, NULL, &value_len); + name_len = name_len + 1; + value_len = value_len + 1; + std::vector<wchar_t> value_buffer(value_len); + result = ::RegEnumValue(key, i, &name_buffer[0], &name_len, NULL, NULL, + reinterpret_cast<BYTE*>(&value_buffer[0]), + &value_len); + value_buffer[value_len - 1] = L'\0'; + + if (result == ERROR_SUCCESS) { + AddDllToBlacklist(&value_buffer[0]); + } + } + + // Delete the finch registry key to clear the values. + result = ::RegDeleteKey(key, L""); + + ::RegCloseKey(key); + return result == ERROR_SUCCESS; +} + } // namespace blacklist diff --git a/chrome_elf/blacklist/blacklist.h b/chrome_elf/blacklist/blacklist.h index 9877c29..7b8d7a6 100644 --- a/chrome_elf/blacklist/blacklist.h +++ b/chrome_elf/blacklist/blacklist.h @@ -60,6 +60,10 @@ extern "C" bool RemoveDllFromBlacklist(const wchar_t* dll_name); // is only exposed in tests (and should stay that way). extern "C" void SuccessfullyBlocked(const wchar_t** blocked_dlls, int* size); +// Add the dlls, originally passed in through finch, from the registry to the +// blacklist so that they will be blocked identically to those hard coded in. +extern "C" bool AddDllsFromRegistryToBlacklist(); + // Record that the dll at the given index was blocked. void BlockedDll(size_t blocked_index); diff --git a/chrome_elf/blacklist/test/blacklist_test.cc b/chrome_elf/blacklist/test/blacklist_test.cc index 05aeb14..1f91956 100644 --- a/chrome_elf/blacklist/test/blacklist_test.cc +++ b/chrome_elf/blacklist/test/blacklist_test.cc @@ -32,6 +32,7 @@ extern "C" { // When modifying the blacklist in the test process, use the exported test dll // functions on the test blacklist dll, not the ones linked into the test // executable itself. +__declspec(dllimport) bool TestDll_AddDllsFromRegistryToBlacklist(); __declspec(dllimport) bool TestDll_AddDllToBlacklist(const wchar_t* dll_name); __declspec(dllimport) bool TestDll_IsBlacklistInitialized(); __declspec(dllimport) bool TestDll_RemoveDllFromBlacklist( @@ -54,6 +55,13 @@ class BlacklistTest : public testing::Test { } }; +namespace { + +struct TestData { + const wchar_t* dll_name; + const wchar_t* dll_beacon; +} test_data[] = {{kTestDllName2, kDll2Beacon}, {kTestDllName3, kDll3Beacon}}; + TEST_F(BlacklistTest, Beacon) { registry_util::RegistryOverrideManager override_manager; override_manager.OverrideRegistry(HKEY_CURRENT_USER, L"beacon_test"); @@ -138,34 +146,14 @@ TEST_F(BlacklistTest, SuccessfullyBlocked) { } } -TEST_F(BlacklistTest, LoadBlacklistedLibrary) { +void CheckBlacklistedDllsNotLoaded() { base::FilePath current_dir; ASSERT_TRUE(PathService::Get(base::DIR_EXE, ¤t_dir)); - // Ensure that the blacklist is loaded. - ASSERT_TRUE(TestDll_IsBlacklistInitialized()); - - // Test that an un-blacklisted DLL can load correctly. - base::ScopedNativeLibrary dll1(current_dir.Append(kTestDllName1)); - EXPECT_TRUE(dll1.is_valid()); - dll1.Reset(NULL); - - int num_blocked_dlls = 0; - TestDll_SuccessfullyBlocked(NULL, &num_blocked_dlls); - EXPECT_EQ(0, num_blocked_dlls); - - struct TestData { - const wchar_t* dll_name; - const wchar_t* dll_beacon; - } test_data[] = { - { kTestDllName2, kDll2Beacon }, - { kTestDllName3, kDll3Beacon } - }; - for (int i = 0 ; i < arraysize(test_data); ++i) { - // Add the DLL to the blacklist, ensure that it is not loaded both by - // inspecting the handle returned by LoadLibrary and by looking for an - // environment variable that is set when the DLL's entry point is called. - EXPECT_TRUE(TestDll_AddDllToBlacklist(test_data[i].dll_name)); + for (int i = 0; i < arraysize(test_data); ++i) { + // Ensure that the dll has not been loaded both by inspecting the handle + // returned by LoadLibrary and by looking for an environment variable that + // is set when the DLL's entry point is called. base::ScopedNativeLibrary dll_blacklisted( current_dir.Append(test_data[i].dll_name)); EXPECT_FALSE(dll_blacklisted.is_valid()); @@ -203,7 +191,57 @@ TEST_F(BlacklistTest, LoadBlacklistedLibrary) { // The blocked dll was removed, so we shouldn't get anything returned // here. + int num_blocked_dlls = 0; TestDll_SuccessfullyBlocked(NULL, &num_blocked_dlls); EXPECT_EQ(0, num_blocked_dlls); } } + +TEST_F(BlacklistTest, LoadBlacklistedLibrary) { + base::FilePath current_dir; + ASSERT_TRUE(PathService::Get(base::DIR_EXE, ¤t_dir)); + + // Ensure that the blacklist is loaded. + ASSERT_TRUE(TestDll_IsBlacklistInitialized()); + + // Test that an un-blacklisted DLL can load correctly. + base::ScopedNativeLibrary dll1(current_dir.Append(kTestDllName1)); + EXPECT_TRUE(dll1.is_valid()); + dll1.Reset(NULL); + + int num_blocked_dlls = 0; + TestDll_SuccessfullyBlocked(NULL, &num_blocked_dlls); + EXPECT_EQ(0, num_blocked_dlls); + + // Add all DLLs to the blacklist then check they are blocked. + for (int i = 0; i < arraysize(test_data); ++i) { + EXPECT_TRUE(TestDll_AddDllToBlacklist(test_data[i].dll_name)); + } + CheckBlacklistedDllsNotLoaded(); +} + +TEST_F(BlacklistTest, AddDllsFromRegistryToBlacklist) { + // Ensure that the blacklist is loaded. + ASSERT_TRUE(TestDll_IsBlacklistInitialized()); + + // Delete the finch registry key to clear its values. + base::win::RegKey key(HKEY_CURRENT_USER, + blacklist::kRegistryFinchListPath, + KEY_QUERY_VALUE | KEY_SET_VALUE); + key.DeleteKey(L""); + + // Add the test dlls to the registry (with their name as both key and value). + base::win::RegKey finch_blacklist_registry_key( + HKEY_CURRENT_USER, + blacklist::kRegistryFinchListPath, + KEY_QUERY_VALUE | KEY_SET_VALUE); + for (int i = 0; i < arraysize(test_data); ++i) { + finch_blacklist_registry_key.WriteValue(test_data[i].dll_name, + test_data[i].dll_name); + } + + EXPECT_TRUE(TestDll_AddDllsFromRegistryToBlacklist()); + CheckBlacklistedDllsNotLoaded(); +} + +} // namespace diff --git a/chrome_elf/blacklist/test/blacklist_test_main_dll.def b/chrome_elf/blacklist/test/blacklist_test_main_dll.def index 920dc6c..77cc500 100644 --- a/chrome_elf/blacklist/test/blacklist_test_main_dll.def +++ b/chrome_elf/blacklist/test/blacklist_test_main_dll.def @@ -5,6 +5,7 @@ LIBRARY "blacklist_test_main_dll.dll" EXPORTS + TestDll_AddDllsFromRegistryToBlacklist=AddDllsFromRegistryToBlacklist TestDll_AddDllToBlacklist=AddDllToBlacklist TestDll_IsBlacklistInitialized=IsBlacklistInitialized TestDll_SuccessfullyBlocked=SuccessfullyBlocked |