Allow chrome logging to pivot inside the users encrypted home dir
Allow chrome logging to pivot inside the users encrypted home dir on
chrome os, post-login. We also set the inital logs up to be
timestamped, so that we don't lose them when crashes happen.
BUG=None
TEST=Enable chrome logging on chrome os, log in, and check for chrome logs in /home/chronos/user
Review URL: http://codereview.chromium.org/2723007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49689 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc
index 2273c2c..906ea66 100644
--- a/chrome/browser/chromeos/login/login_utils.cc
+++ b/chrome/browser/chromeos/login/login_utils.cc
@@ -6,6 +6,7 @@
#include "base/command_line.h"
#include "base/file_path.h"
+#include "base/file_util.h"
#include "base/lock.h"
#include "base/nss_util.h"
#include "base/path_service.h"
@@ -24,6 +25,7 @@
#include "chrome/browser/chrome_thread.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/profile_manager.h"
+#include "chrome/common/logging_chrome.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/net/url_request_context_getter.h"
@@ -202,6 +204,12 @@
// will process the notification that the UserManager sends out.
Profile* profile = profile_manager->GetDefaultProfile(user_data_dir);
+ logging::RedirectChromeLogging(
+ user_data_dir.Append(profile_manager->GetCurrentProfileDir()),
+ *(CommandLine::ForCurrentProcess()),
+ logging::DELETE_OLD_LOG_FILE);
+
+
// Take the credentials passed in and try to exchange them for
// full-fledged Google authentication cookies. This is
// best-effort; it's possible that we'll fail due to network
diff --git a/chrome/common/logging_chrome.cc b/chrome/common/logging_chrome.cc
index 4120aa1..9954cca 100644
--- a/chrome/common/logging_chrome.cc
+++ b/chrome/common/logging_chrome.cc
@@ -39,6 +39,7 @@
#include "base/file_util.h"
#include "base/logging.h"
#include "base/path_service.h"
+#include "base/time.h"
#include "base/utf_string_conversions.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
@@ -97,15 +98,7 @@
namespace logging {
-void InitChromeLogging(const CommandLine& command_line,
- OldFileDeletionState delete_old_log_file) {
- DCHECK(!chrome_logging_initialized_) <<
- "Attempted to initialize logging when it was already initialized.";
-
-#if defined(OS_POSIX) && defined(IPC_MESSAGE_LOG_ENABLED)
- IPC::Logging::SetLoggerFunctions(g_log_function_mapping);
-#endif
-
+LoggingDestination DetermineLogMode(const CommandLine& command_line) {
// only use OutputDebugString in debug mode
#ifdef NDEBUG
bool enable_logging = false;
@@ -133,9 +126,67 @@
} else {
log_mode = logging::LOG_NONE;
}
+ return log_mode;
+}
- logging::InitLogging(GetLogFileName().value().c_str(),
- log_mode,
+#if defined(OS_CHROMEOS)
+void SetUpSymlink(const FilePath& symlink_path, const FilePath& new_log_path) {
+ if (access(symlink_path.value().c_str(), F_OK) == 0 &&
+ file_util::Delete(symlink_path, false)) {
+ PLOG(ERROR) << "Unable to unlink " << symlink_path.value();
+ }
+ if (symlink(new_log_path.value().c_str(),
+ symlink_path.value().c_str()) == -1) {
+ PLOG(ERROR) << "Unable to create symlink " << symlink_path.value()
+ << " pointing at " << new_log_path.value();
+ }
+}
+
+FilePath TimestampLog(const FilePath& new_log_file, base::Time timestamp) {
+ base::Time::Exploded time_deets;
+ timestamp.LocalExplode(&time_deets);
+ std::string suffix = StringPrintf("_%02d%02d%02d-%02d%02d%02d",
+ time_deets.year,
+ time_deets.month,
+ time_deets.day_of_month,
+ time_deets.hour,
+ time_deets.minute,
+ time_deets.second);
+ FilePath new_log_path = new_log_file.InsertBeforeExtension(suffix);
+ SetUpSymlink(new_log_file, new_log_path);
+
+ return new_log_path;
+}
+
+void RedirectChromeLogging(const FilePath& new_log_dir,
+ const CommandLine& command_line,
+ OldFileDeletionState delete_old_log_file) {
+ FilePath log_file_name = GetLogFileName().BaseName();
+ FilePath new_log_path =
+ TimestampLog(new_log_dir.Append(log_file_name), base::Time::Now());
+ InitLogging(new_log_path.value().c_str(),
+ DetermineLogMode(command_line),
+ logging::LOCK_LOG_FILE,
+ delete_old_log_file);
+}
+#endif
+
+void InitChromeLogging(const CommandLine& command_line,
+ OldFileDeletionState delete_old_log_file) {
+ DCHECK(!chrome_logging_initialized_) <<
+ "Attempted to initialize logging when it was already initialized.";
+
+#if defined(OS_POSIX) && defined(IPC_MESSAGE_LOG_ENABLED)
+ IPC::Logging::SetLoggerFunctions(g_log_function_mapping);
+#endif
+
+ FilePath log_path = GetLogFileName();
+#if defined(OS_CHROMEOS)
+ log_path = TimestampLog(log_path, base::Time::Now());
+#endif
+
+ logging::InitLogging(log_path.value().c_str(),
+ DetermineLogMode(command_line),
logging::LOCK_LOG_FILE,
delete_old_log_file);
diff --git a/chrome/common/logging_chrome.h b/chrome/common/logging_chrome.h
index f069523..57c3906 100644
--- a/chrome/common/logging_chrome.h
+++ b/chrome/common/logging_chrome.h
@@ -13,6 +13,10 @@
class CommandLine;
class FilePath;
+namespace base {
+class Time;
+}
+
namespace logging {
// Call to initialize logging for Chrome. This sets up the chrome-specific
@@ -31,6 +35,12 @@
void InitChromeLogging(const CommandLine& command_line,
OldFileDeletionState delete_old_log_file);
+#if defined(OS_CHROMEOS)
+void RedirectChromeLogging(const FilePath& new_log_dir,
+ const CommandLine& command_line,
+ OldFileDeletionState delete_old_log_file);
+#endif
+
// Call when done using logging for Chrome.
void CleanupChromeLogging();
