chromeos: Replace "/tmp" with a call to PathService::Get()

chrome/browser/net/chrome_network_delegate.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/net/chrome_network_delegate.h"
 
 #include <stddef.h>
 #include <stdlib.h>
 
 #include <vector>
@@ skipping 458 matching lines @@
 }
 
 // static
 bool ChromeNetworkDelegate::IsAccessAllowed(
     const base::FilePath& path,
     const base::FilePath& profile_path) {
 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
   return true;
 #else
 
+  std::vector<base::FilePath> whitelist;
 #if defined(OS_CHROMEOS)
   // Use a whitelist to only allow access to files residing in the list of
   // directories below.
-  static const char* const kLocalAccessWhiteList[] = {
+  static const base::FilePath::CharType* const kLocalAccessWhiteList[] = {
       "/home/chronos/user/Downloads",

[satorux1, 2017/06/06 08:19:05]

tried to replace this with DIR_DEFAULT_DOWNLOADS or DIR_DEFAULT_DOWNLOADS_SAFE
but didn't work. In production these constants are mapped to:

DIR_DEFAULT_DOWNLOADS => /home/chronos/user
DIR_DEFAULT_DOWNLOADS_SAFE => /home/chronos/u-<hash>/Downloads

       "/home/chronos/user/log",
       "/home/chronos/user/WebRTC Logs",
       "/media",
       "/opt/oem",
       "/usr/share/chromeos-assets",
-      "/tmp",
       "/var/log",
   };
 
+  base::FilePath temp_dir;
+  if (PathService::Get(base::DIR_TEMP, &temp_dir))
+    whitelist.push_back(temp_dir);
+
   // The actual location of "/home/chronos/user/Xyz" is the Xyz directory under
   // the profile path ("/home/chronos/user' is a hard link to current primary
   // logged in profile.) For the support of multi-profile sessions, we are
   // switching to use explicit "$PROFILE_PATH/Xyz" path and here whitelist such
   // access.
   if (!profile_path.empty()) {
     const base::FilePath downloads = profile_path.AppendASCII("Downloads");
-    if (downloads == path.StripTrailingSeparators() || downloads.IsParent(path))
-      return true;
+    whitelist.push_back(downloads);
     const base::FilePath webrtc_logs = profile_path.AppendASCII("WebRTC Logs");
-    if (webrtc_logs == path.StripTrailingSeparators() ||
-        webrtc_logs.IsParent(path)) {
-      return true;
-    }
+    whitelist.push_back(webrtc_logs);
   }
 #elif defined(OS_ANDROID)
   // Access to files in external storage is allowed.
   base::FilePath external_storage_path;
   PathService::Get(base::DIR_ANDROID_EXTERNAL_STORAGE, &external_storage_path);
   if (external_storage_path.IsParent(path))
     return true;
 
   // Whitelist of other allowed directories.
-  static const char* const kLocalAccessWhiteList[] = {
-      "/sdcard",
-      "/mnt/sdcard",
+  static const base::FilePath::CharType* const kLocalAccessWhiteList[] = {
+      "/sdcard", "/mnt/sdcard",

[satorux1, 2017/06/06 08:19:05]

by clang format.

   };
 #endif
 
-  for (size_t i = 0; i < arraysize(kLocalAccessWhiteList); ++i) {
-    const base::FilePath white_listed_path(kLocalAccessWhiteList[i]);
+  for (size_t i = 0; i < arraysize(kLocalAccessWhiteList); ++i)

[mmenke, 2017/06/06 15:49:07]

optional:  Could switch this to something like "for (const auto& path :
kLocalAccessWhiteList)"

[satorux1, 2017/06/08 02:13:44]

Done.

+    whitelist.push_back(base::FilePath(kLocalAccessWhiteList[i]));
+
+  for (const auto& white_listed_path : whitelist) {
     // base::FilePath::operator== should probably handle trailing separators.
     if (white_listed_path == path.StripTrailingSeparators() ||
         white_listed_path.IsParent(path)) {
       return true;
     }
   }
 
   DVLOG(1) << "File access denied - " << path.value().c_str();
   return false;
 #endif  // !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
@@ skipping 63 matching lines @@
   if (!data_use_aggregator_)
     return;
 
   if (is_data_usage_off_the_record_) {
     data_use_aggregator_->ReportOffTheRecordDataUse(tx_bytes, rx_bytes);
     return;
   }
 
   data_use_aggregator_->ReportDataUse(request, tx_bytes, rx_bytes);
 }