Allow relative paths to external extension files for some providers, error out for others.

chrome/browser/extensions/external_extension_provider_impl.cc

 // 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/browser/extensions/external_extension_provider_impl.h"
 
 #include "app/app_paths.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/linked_ptr.h"
 #include "base/path_service.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/extensions/external_extension_provider_interface.h"
 #include "chrome/browser/extensions/external_policy_extension_loader.h"
 #include "chrome/browser/extensions/external_pref_extension_loader.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/common/chrome_paths.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/extensions/external_registry_extension_loader_win.h"
 #endif
 
 // Constants for keeping track of extension preferences in a dictionary.
 const char ExternalExtensionProviderImpl::kLocation[] = "location";
 const char ExternalExtensionProviderImpl::kState[] = "state";
 const char ExternalExtensionProviderImpl::kExternalCrx[] = "external_crx";
 const char ExternalExtensionProviderImpl::kExternalVersion[] =
@@ skipping 84 matching lines @@
                      << "extensions from crx files.";
         continue;
       }
       if (external_crx.find(FilePath::kParentDirectory) !=
           base::StringPiece::npos) {
         LOG(WARNING) << "Path traversal not allowed in path: "
                      << external_crx.c_str();
         continue;
       }
 
-      // If the path is relative, make it absolute.
+      // If the path is relative, and the provider has a base path,
+      // build the absolute path to the crx file.
       FilePath path(external_crx);
       if (!path.IsAbsolute()) {
-        // Try path as relative path from external extension dir.
-        FilePath base_path;
-        PathService::Get(app::DIR_EXTERNAL_EXTENSIONS, &base_path);
+        FilePath base_path = loader_->GetBaseCrxFilePath();
+        if (base_path.empty()) {
+          LOG(WARNING) << "File path " << external_crx.c_str()
+                       << " is relative.  An absolute path is required.";
+          continue;
+        }
         path = base_path.Append(external_crx);
       }
 
       scoped_ptr<Version> version;
       version.reset(Version::GetVersionFromString(external_version));
       if (!version.get()) {
         LOG(WARNING) << "Malformed extension dictionary for extension: "
                      << extension_id.c_str() << ".  Invalid version string \""
                      << external_version << "\".";
         continue;
@@ skipping 76 matching lines @@
 
 // static
 void ExternalExtensionProviderImpl::CreateExternalProviders(
     VisitorInterface* service,
     Profile* profile,
     ProviderCollection* provider_list) {
   provider_list->push_back(
       linked_ptr<ExternalExtensionProviderInterface>(
           new ExternalExtensionProviderImpl(
               service,
-              new ExternalPrefExtensionLoader,
+              new ExternalPrefExtensionLoader(app::DIR_EXTERNAL_EXTENSIONS),
               Extension::EXTERNAL_PREF,
               Extension::EXTERNAL_PREF_DOWNLOAD)));
 #if defined(OS_WIN)
   provider_list->push_back(
       linked_ptr<ExternalExtensionProviderInterface>(
           new ExternalExtensionProviderImpl(
               service,
               new ExternalRegistryExtensionLoader,
               Extension::EXTERNAL_REGISTRY,
               Extension::INVALID)));
 #endif
   provider_list->push_back(
       linked_ptr<ExternalExtensionProviderInterface>(
           new ExternalExtensionProviderImpl(
               service,
               new ExternalPolicyExtensionLoader(profile),
               Extension::INVALID,
               Extension::EXTERNAL_POLICY_DOWNLOAD)));
 }