Launches a privileged utility process.

chrome/utility/chrome_content_utility_client.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/utility/chrome_content_utility_client.h"
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/json/json_reader.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/time/time.h"
 #include "chrome/common/chrome_utility_messages.h"
 #include "chrome/common/extensions/chrome_extensions_client.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/extensions/update_manifest.h"
 #include "chrome/common/safe_browsing/zip_analyzer.h"
+#include "chrome/utility/chrome_content_utility_ipc_whitelist.h"
 #include "chrome/utility/extensions/unpacker.h"
 #include "chrome/utility/profile_import_handler.h"
 #include "chrome/utility/web_resource_unpacker.h"
 #include "content/public/child/image_decoder_utils.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/utility/utility_thread.h"
 #include "extensions/common/manifest.h"
 #include "media/base/media.h"
 #include "media/base/media_file_checker.h"
 #include "printing/page_range.h"
@@ skipping 38 matching lines @@
 bool Send(IPC::Message* message) {
   return content::UtilityThread::Get()->Send(message);
 }
 
 void ReleaseProcessIfNeeded() {
   content::UtilityThread::Get()->ReleaseProcessIfNeeded();
 }
 
 }  // namespace
 
-ChromeContentUtilityClient::ChromeContentUtilityClient() {
+ChromeContentUtilityClient::ChromeContentUtilityClient()
+    : filter_messages_(false) {
 #if !defined(OS_ANDROID)
   handlers_.push_back(new ProfileImportHandler());
 #endif  // OS_ANDROID
 
 #if defined(ENABLE_MDNS)
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kUtilityProcessEnableMDns)) {
     handlers_.push_back(new local_discovery::ServiceDiscoveryMessageHandler());
   }
 #endif  // ENABLE_MDNS
@@ skipping 11 matching lines @@
       base::PathExists(pdf)) {
     bool rv = !!LoadLibrary(pdf.value().c_str());
     DCHECK(rv) << "Couldn't load PDF plugin";
   }
 #endif
 
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   std::string lang = command_line->GetSwitchValueASCII(switches::kLang);
   if (!lang.empty())
     extension_l10n_util::SetProcessLocale(lang);
+
+  if (command_line->HasSwitch(switches::kUtilityProcessRunningElevated)) {
+    DVLOG(0) << "Utility process is running elevated, restricting messages.";

[Nico, 2014/02/05 05:38:11]

Do you need this logging statement? (likely not, consider removing it.)

[Drew Haven, 2014/02/05 20:13:22]

Done.

+    for (size_t i = 0; i < kMessageWhitelistSize; i++) {
+      message_id_whitelist_.insert(kMessageWhitelist[i]);
+    }

[Nico, 2014/02/05 05:38:11]

message_id_whitelist_.insert(kMessageWhitelist, kMessageWhiteliste +
kMessageWhitelistSize);

[Drew Haven, 2014/02/05 20:13:22]

Done.

+    filter_messages_ = true;
+  }
 }
 
 bool ChromeContentUtilityClient::OnMessageReceived(
     const IPC::Message& message) {
+  if (filter_messages_
+      && message_id_whitelist_.find(message.type())

[Nico, 2014/02/05 05:38:11]

&& goes at the end of the line, not at the start.

(run `git cl format` to autoformat your current branch for style.)

[Drew Haven, 2014/02/05 20:13:22]

Oh, I didn't know about `git cl format`.  Thanks.

+         == message_id_whitelist_.end()) {
+    DVLOG(0) << "Message rejected, not in whitelist: "
+             << message.type();

[Nico, 2014/02/05 05:38:11]

remove logging

[Drew Haven, 2014/02/05 20:13:22]

Done.

+    return false;
+  }
+
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ChromeContentUtilityClient, message)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_UnpackExtension, OnUnpackExtension)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_UnpackWebResource,
                         OnUnpackWebResource)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_ParseUpdateManifest,
                         OnParseUpdateManifest)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_DecodeImage, OnDecodeImage)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_DecodeImageBase64, OnDecodeImageBase64)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_RenderPDFPagesToMetafile,
@@ skipping 476 matching lines @@
   picasa::PicasaAlbumsIndexer indexer(album_uids);
   indexer.ParseFolderINI(folders_inis);
 
   Send(new ChromeUtilityHostMsg_IndexPicasaAlbumsContents_Finished(
       indexer.albums_images()));
   ReleaseProcessIfNeeded();
 }
 #endif  // defined(OS_WIN) || defined(OS_MACOSX)
 
 }  // namespace chrome