Fix feedback log collection.

chrome/browser/feedback/feedback_util.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 "chrome/browser/feedback/feedback_util.h"
 
 #include <sstream>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
-#include "base/file_util.h"
 #include "base/file_version_info.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
+#include "base/strings/string_compress.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/safe_browsing/safe_browsing_util.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
+#include "chrome/common/metrics/metrics_log_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_client.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_status.h"
 #include "third_party/icu/public/common/unicode/locid.h"
 #include "ui/base/l10n/l10n_util.h"
 
-#if defined(USE_ASH)
-#include "ash/shell.h"
-#include "ash/shell_delegate.h"
-#endif
-
 using content::WebContents;
 
-const char kSyncDataKey[] = "about_sync_data";
-
-#if defined(OS_CHROMEOS)
-const char kHUDLogDataKey[] = "hud_log";
-#endif
-
-namespace {
-
 const int kFeedbackVersion = 1;
 
 const char kReportPhishingUrl[] =
     "http://www.google.com/safebrowsing/report_phish/";
 
 // URL to post bug reports to.
 const char kFeedbackPostUrl[] =
     "https://www.google.com/tools/feedback/chrome/__submit";
 
 const char kProtBufMimeType[] = "application/x-protobuf";
 const char kPngMimeType[] = "image/png";
 
 // Tags we use in product specific data
 const char kChromeVersionTag[] = "CHROME VERSION";
 const char kOsVersionTag[] = "OS VERSION";
-#if defined(OS_CHROMEOS)
-const char kTimestampTag[] = "TIMESTAMP";
-#endif
 
 const int kHttpPostSuccessNoContent = 204;
 const int kHttpPostFailNoConnection = -1;
 const int kHttpPostFailClientError = 400;
 const int kHttpPostFailServerError = 500;
 
-#if defined(OS_CHROMEOS)
-const char kBZip2MimeType[] = "application/x-bzip2";
-const char kLogsAttachmentName[] = "system_logs.bz2";
-const char kArbitraryMimeType[] = "application/octet-stream";
-#endif
-
 const int64 kInitialRetryDelay = 900000;  // 15 minutes
 const int64 kRetryDelayIncreaseFactor = 2;
 const int64 kRetryDelayLimit = 14400000;  // 4 hours
 
-void ReadFileToStringNoResult(const base::FilePath& path,
-                              std::string* contents) {
-  if (!file_util::ReadFileToString(path, contents))
-    if (contents)
-      contents->clear();
+#if defined(OS_CHROMEOS)
+const size_t kFeedbackMaxLength = 4 * 1024;
+const size_t kFeedbackMaxLineCount = 40;
+
+const char kBZip2MimeType[] = "application/x-bzip2";
+const char kLogsAttachmentName[] = "system_logs.bz2";
+const char kArbitraryMimeType[] = "application/octet-stream";
+
+const char kMultilineIndicatorString[] = "<multiline>\n";
+const char kMultilineStartString[] = "---------- START ----------\n";
+const char kMultilineEndString[] = "---------- END ----------\n\n";
+
+const char kTimestampTag[] = "TIMESTAMP";
+#endif
+
+namespace {
+
+#if defined(OS_CHROMEOS)
+std::string ZipLogs(chromeos::SystemLogsResponse* sys_info) {
+  std::string syslogs_string;
+  for (chromeos::SystemLogsResponse::const_iterator it = sys_info->begin();
+      it != sys_info->end(); ++it) {
+    std::string key = it->first;
+    std::string value = it->second;
+
+    TrimString(key, "\n ", &key);
+    TrimString(value, "\n ", &value);
+
+    if (value.find("\n") != std::string::npos) {
+      syslogs_string.append(
+          key + "=" + kMultilineIndicatorString +
+          kMultilineStartString +
+          value + "\n" +
+          kMultilineEndString);
+    } else {
+      syslogs_string.append(key + "=" + value + "\n");
+    }
+  }
+  std::string compressed_logs;
+  if (base::Bzip2Compress(syslogs_string, &compressed_logs))
+    return compressed_logs;
+  else
+    return std::string();
 }
+#endif
 
 }  // namespace
 
 
 // Simple net::URLFetcherDelegate to clean up URLFetcher on completion.
 class FeedbackUtil::PostCleanup : public net::URLFetcherDelegate {
  public:
   PostCleanup(Profile* profile,
               std::string* post_body,
               int64 previous_delay) : profile_(profile),
@@ skipping 122 matching lines @@
   // Create log_value object and add it to the web_data object
   userfeedback::ProductSpecificData log_value;
   log_value.set_key(key);
   log_value.set_value(value);
   userfeedback::WebData* web_data = feedback_data->mutable_web_data();
   *(web_data->add_product_specific_data()) = log_value;
 }
 
 #if defined(OS_CHROMEOS)
 bool FeedbackUtil::ValidFeedbackSize(const std::string& content) {
-  if (content.length() > chromeos::system::kFeedbackMaxLength)
+  if (content.length() > kFeedbackMaxLength)
     return false;
   const size_t line_count = std::count(content.begin(), content.end(), '\n');
-  if (line_count > chromeos::system::kFeedbackMaxLineCount)
+  if (line_count > kFeedbackMaxLineCount)
     return false;
   return true;
 }
 #endif
 
 // static
-void FeedbackUtil::SendReport(const FeedbackData& data) {
-#if defined(OS_CHROMEOS)
-  if (data.attached_filename().size() &&
-      base::FilePath::IsSeparator(data.attached_filename()[0]) &&
-      !data.attached_filedata()) {
-    // Read the attached file and then send this report.
-    std::string* file_data = new std::string;
-
-    base::FilePath root =
-        ash::Shell::GetInstance()->delegate()->
-            GetCurrentBrowserContext()->GetPath();
-    base::FilePath filepath = root.Append(data.attached_filename().substr(1));
-    std::string stripped_filename = filepath.BaseName().value();
-
-    // Read the file into file_data, then call send report again with the
-    // stripped filename and file data (which will skip this code path).
-    content::BrowserThread::PostTaskAndReply(
-        content::BrowserThread::FILE, FROM_HERE,
-        base::Bind(&ReadFileToStringNoResult,
-                   filepath,
-                   file_data),
-        base::Bind(&FeedbackUtil::SendReport,
-                   FeedbackData(data.profile(),
-                                data.category_tag(),
-                                data.page_url(),
-                                data.description(),
-                                data.user_email(),
-                                data.image(),
-                                data.sys_info(),
-                                data.zip_content(),
-                                data.timestamp(),
-                                stripped_filename,
-                                file_data)));
+void FeedbackUtil::SendReport(scoped_refptr<FeedbackData> data) {
+  if (!data) {
+    LOG(ERROR) << "FeedbackUtil::SendReport called with NULL data!";
+    NOTREACHED();
     return;
   }
-#endif
 
   // Create google feedback protocol buffer objects
   userfeedback::ExtensionSubmit feedback_data;
   // type id set to 0, unused field but needs to be initialized to 0
   feedback_data.set_type_id(0);
 
   userfeedback::CommonData* common_data = feedback_data.mutable_common_data();
   userfeedback::WebData* web_data = feedback_data.mutable_web_data();
 
   // Set our user agent.
   userfeedback::Navigator* navigator = web_data->mutable_navigator();
   navigator->set_user_agent(content::GetUserAgent(GURL()));
 
   // Set GAIA id to 0. We're not using gaia id's for recording
   // use feedback - we're using the e-mail field, allows users to
   // submit feedback from incognito mode and specify any mail id
   // they wish
   common_data->set_gaia_id(0);
 
   // Add the user e-mail to the feedback object
-  common_data->set_user_email(data.user_email());
+  common_data->set_user_email(data->user_email());
 
   // Add the description to the feedback object
-  common_data->set_description(data.description());
+  common_data->set_description(data->description());
 
   // Add the language
   std::string chrome_locale = g_browser_process->GetApplicationLocale();
   common_data->set_source_description_language(chrome_locale);
 
   // Set the url
-  web_data->set_url(data.page_url());
+  web_data->set_url(data->page_url());
 
   // Add the Chrome version
   chrome::VersionInfo version_info;
   if (version_info.is_valid()) {
     std::string chrome_version = version_info.Name() + " - " +
         version_info.Version() +
         " (" + version_info.LastChange() + ")";
     AddFeedbackData(&feedback_data, std::string(kChromeVersionTag),
                     chrome_version);
   }
 
   // We don't need the OS version for ChromeOS since we get it in
   // CHROMEOS_RELEASE_VERSION from /etc/lsb-release
 #if !defined(OS_CHROMEOS)
   // Add OS version (eg, for WinXP SP2: "5.1.2600 Service Pack 2").
   std::string os_version = "";
   SetOSVersion(&os_version);
   AddFeedbackData(&feedback_data, std::string(kOsVersionTag), os_version);
 #endif
 
   // Include the page image if we have one.
-  if (data.image().get() && data.image()->size()) {
+  if (data->image().get() && data->image()->size()) {
     userfeedback::PostedScreenshot screenshot;
     screenshot.set_mime_type(kPngMimeType);
     // Set the dimensions of the screenshot
     userfeedback::Dimensions dimensions;
     gfx::Rect& screen_size = GetScreenshotSize();
     dimensions.set_width(static_cast<float>(screen_size.width()));
     dimensions.set_height(static_cast<float>(screen_size.height()));
     *(screenshot.mutable_dimensions()) = dimensions;
 
-    int image_data_size = data.image()->size();
-    char* image_data = reinterpret_cast<char*>(&(data.image()->front()));
+    int image_data_size = data->image()->size();
+    char* image_data = reinterpret_cast<char*>(&(data->image()->front()));
     screenshot.set_binary_content(std::string(image_data, image_data_size));
 
     // Set the screenshot object in feedback
     *(feedback_data.mutable_screenshot()) = screenshot;
   }
 
 #if defined(OS_CHROMEOS)
-  if (data.sys_info()) {
+  if (data->sys_info()) {
     // Add the product specific data
-    for (chromeos::system::LogDictionaryType::const_iterator i =
-        data.sys_info()->begin(); i != data.sys_info()->end(); ++i) {
-      if (i->first == kSyncDataKey ||
-          i->first == kHUDLogDataKey ||
-          ValidFeedbackSize(i->second)) {
+    for (chromeos::SystemLogsResponse::const_iterator i =
+        data->sys_info()->begin(); i != data->sys_info()->end(); ++i) {
+      if (ValidFeedbackSize(i->second)) {
         AddFeedbackData(&feedback_data, i->first, i->second);
       }
     }
 
-    // If we have zipped logs, add them here
-    if (data.zip_content()) {
+    std::string compressed_logs = ZipLogs(data->sys_info());
+    if (compressed_logs.size()) {
       userfeedback::ProductSpecificBinaryData attachment;
       attachment.set_mime_type(kBZip2MimeType);
       attachment.set_name(kLogsAttachmentName);
-      attachment.set_data(*data.zip_content());
-      delete data.zip_content();
+      attachment.set_data(compressed_logs);
       *(feedback_data.add_product_specific_binary_data()) = attachment;
     }
   }
-  delete data.sys_info();
 
-  if (data.timestamp() != "")
+  if (data->timestamp() != "")
     AddFeedbackData(&feedback_data, std::string(kTimestampTag),
-                    data.timestamp());
+                    data->timestamp());
 
-  if (data.attached_filename() != "" && data.attached_filedata() &&
-      data.attached_filedata()->size()) {
+  if (data->attached_filename() != "" &&
+      data->attached_filedata() &&
+      data->attached_filedata()->size()) {
     userfeedback::ProductSpecificBinaryData attached_file;
     attached_file.set_mime_type(kArbitraryMimeType);
-    attached_file.set_name(data.attached_filename());
-    attached_file.set_data(*data.attached_filedata());
-    delete data.attached_filedata();
+    attached_file.set_name(data->attached_filename());
+    attached_file.set_data(*data->attached_filedata());
+    delete data->attached_filedata();
     *(feedback_data.add_product_specific_binary_data()) = attached_file;
   }
 #endif
 
   // Set our category tag if we have one
-  if (data.category_tag().size())
-    feedback_data.set_category_tag(data.category_tag());
+  if (data->category_tag().size())
+    feedback_data.set_category_tag(data->category_tag());
 
   // Set our Chrome specific data
   userfeedback::ChromeData chrome_data;
   chrome_data.set_chrome_platform(
 #if defined(OS_CHROMEOS)
       userfeedback::ChromeData_ChromePlatform_CHROME_OS);
   userfeedback::ChromeOsData chrome_os_data;
   chrome_os_data.set_category(
       userfeedback::ChromeOsData_ChromeOsCategory_OTHER);
   *(chrome_data.mutable_chrome_os_data()) = chrome_os_data;
 #else
       userfeedback::ChromeData_ChromePlatform_CHROME_BROWSER);
   userfeedback::ChromeBrowserData chrome_browser_data;
   chrome_browser_data.set_category(
       userfeedback::ChromeBrowserData_ChromeBrowserCategory_OTHER);
   *(chrome_data.mutable_chrome_browser_data()) = chrome_browser_data;
 #endif
 
   *(feedback_data.mutable_chrome_data()) = chrome_data;
 
   // Serialize our report to a string pointer we can pass around
   std::string* post_body = new std::string;
   feedback_data.SerializeToString(post_body);
 
   // We have the body of our POST, so send it off to the server with 0 delay
-  DispatchFeedback(data.profile(), post_body, 0);
+  DispatchFeedback(data->profile(), post_body, 0);
 }
 
 #if defined(FULL_SAFE_BROWSING)
 // static
 void FeedbackUtil::ReportPhishing(WebContents* current_tab,
                                    const std::string& phishing_url) {
   current_tab->GetController().LoadURL(
       safe_browsing_util::GeneratePhishingReportUrl(
           kReportPhishingUrl, phishing_url,
           false /* not client-side detection */),
@@ skipping 24 matching lines @@
   if (screenshot_size == NULL)
     screenshot_size = new gfx::Rect();
   return *screenshot_size;
 }
 
 // static
 void FeedbackUtil::SetScreenshotSize(const gfx::Rect& rect) {
   gfx::Rect& screen_size = GetScreenshotSize();
   screen_size = rect;
 }