diff options
author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-23 20:20:02 +0000 |
---|---|---|
committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-23 20:20:02 +0000 |
commit | 15bb2f4987e01dbb765207d792edbfe48efe68d1 (patch) | |
tree | a8a59a5f87025e4b113c3ec754312d99456a8f45 /chrome_frame/crash_server_init.cc | |
parent | 710a98ded8a324b8ef534cd2ef9ad6735b1ee21c (diff) | |
download | chromium_src-15bb2f4987e01dbb765207d792edbfe48efe68d1.zip chromium_src-15bb2f4987e01dbb765207d792edbfe48efe68d1.tar.gz chromium_src-15bb2f4987e01dbb765207d792edbfe48efe68d1.tar.bz2 |
Fix up crash reporting in unit tests and the Chrome Frame helper processes:
Bother to initialize crash reporting in chrome_frame_tests.exe.
Correctly construct the crash reporting pipe name for non-admin installs.
BUG=86846
TEST=Crash dumps are reported when running Chrome Frame tests in headless mode, user-level Chrome Frame helper processes connect to the crash service.
Review URL: http://codereview.chromium.org/7219007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90255 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/crash_server_init.cc')
-rw-r--r-- | chrome_frame/crash_server_init.cc | 86 |
1 files changed, 74 insertions, 12 deletions
diff --git a/chrome_frame/crash_server_init.cc b/chrome_frame/crash_server_init.cc index 0f52215..44b4049 100644 --- a/chrome_frame/crash_server_init.cc +++ b/chrome_frame/crash_server_init.cc @@ -1,22 +1,75 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 "chrome_frame/crash_server_init.h" +#include <sddl.h> +#include <Shlobj.h> +#include <stdlib.h> #include "version.h" // NOLINT const wchar_t kChromePipeName[] = L"\\\\.\\pipe\\ChromeCrashServices"; const wchar_t kGoogleUpdatePipeName[] = L"\\\\.\\pipe\\GoogleCrashServices\\"; const wchar_t kSystemPrincipalSid[] = L"S-1-5-18"; -const wchar_t kFullMemoryCrashReport[] = L"full-memory-crash-report"; - const MINIDUMP_TYPE kLargerDumpType = static_cast<MINIDUMP_TYPE>( MiniDumpWithProcessThreadData | // Get PEB and TEB. MiniDumpWithUnloadedModules | // Get unloaded modules when available. MiniDumpWithIndirectlyReferencedMemory); // Get memory referenced by stack. +extern "C" IMAGE_DOS_HEADER __ImageBase; + +// Builds a string representation of the user's SID and places it in user_sid. +bool GetUserSidString(std::wstring* user_sid) { + bool success = false; + if (user_sid) { + struct { + TOKEN_USER token_user; + BYTE buffer[SECURITY_MAX_SID_SIZE]; + } token_info_buffer; + + HANDLE token = NULL; + if (OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) { + DWORD out_size; + if (GetTokenInformation(token, TokenUser, &token_info_buffer.token_user, + sizeof(token_info_buffer), &out_size)) { + wchar_t* user_sid_value = NULL; + if (token_info_buffer.token_user.User.Sid && + ConvertSidToStringSid(token_info_buffer.token_user.User.Sid, + &user_sid_value)) { + *user_sid = user_sid_value; + LocalFree(user_sid_value); + user_sid_value = NULL; + success = true; + } + } + CloseHandle(token); + } + } + + return success; +} + +bool IsRunningSystemInstall() { + wchar_t exe_path[MAX_PATH * 2] = {0}; + GetModuleFileName(reinterpret_cast<HMODULE>(&__ImageBase), + exe_path, + _countof(exe_path)); + + bool is_system = false; + + wchar_t program_files_path[MAX_PATH] = {0}; + if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_PROGRAM_FILES, NULL, + SHGFP_TYPE_CURRENT, program_files_path))) { + if (wcsstr(exe_path, program_files_path) == exe_path) { + is_system = true; + } + } + + return is_system; +} + google_breakpad::CustomClientInfo* GetCustomInfo() { static google_breakpad::CustomInfoEntry ver_entry( L"ver", TEXT(CHROME_VERSION_STRING)); @@ -31,22 +84,31 @@ google_breakpad::CustomClientInfo* GetCustomInfo() { } google_breakpad::ExceptionHandler* InitializeCrashReporting( - const wchar_t* cmd_line) { - if (cmd_line == NULL) { - return NULL; - } - + CrashReportingMode mode) { wchar_t temp_path[MAX_PATH + 1] = {0}; DWORD path_len = ::GetTempPath(MAX_PATH, temp_path); std::wstring pipe_name; - if (wcsstr(cmd_line, kFullMemoryCrashReport) != NULL) { + if (mode == HEADLESS) { + // This flag is used for testing, connect to the test crash service. pipe_name = kChromePipeName; } else { - // TODO(robertshield): Figure out if we're a per-user install and connect - // to the per-user named pipe instead. + // Otherwise, build a pipe name corresponding to either user or + // system-level Omaha. pipe_name = kGoogleUpdatePipeName; - pipe_name += kSystemPrincipalSid; + if (IsRunningSystemInstall()) { + pipe_name += kSystemPrincipalSid; + } else { + std::wstring user_sid; + if (GetUserSidString(&user_sid)) { + pipe_name += user_sid; + } else { + // We don't think we're a system install, but we couldn't get the + // user SID. Try connecting to the system-level crash service as a + // last ditch effort. + pipe_name += kSystemPrincipalSid; + } + } } google_breakpad::ExceptionHandler* breakpad = |