Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(27)

Side by Side Diff: chrome/browser/extensions/sandboxed_unpacker.cc

Issue 22794012: Rename extension_manifest_keys namespace to extensions::manifest_keys. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/extensions/sandboxed_unpacker.h" 5 #include "chrome/browser/extensions/sandboxed_unpacker.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/file_util.h" 12 #include "base/file_util.h"
13 #include "base/files/file_util_proxy.h" 13 #include "base/files/file_util_proxy.h"
14 #include "base/json/json_string_value_serializer.h" 14 #include "base/json/json_string_value_serializer.h"
15 #include "base/memory/scoped_handle.h" 15 #include "base/memory/scoped_handle.h"
16 #include "base/message_loop/message_loop.h" 16 #include "base/message_loop/message_loop.h"
17 #include "base/metrics/histogram.h" 17 #include "base/metrics/histogram.h"
18 #include "base/path_service.h" 18 #include "base/path_service.h"
19 #include "base/sequenced_task_runner.h" 19 #include "base/sequenced_task_runner.h"
20 #include "base/strings/utf_string_conversions.h" // TODO(viettrungluu): delete me. 20 #include "base/strings/utf_string_conversions.h" // TODO(viettrungluu): delete me.
21 #include "base/threading/sequenced_worker_pool.h" 21 #include "base/threading/sequenced_worker_pool.h"
22 #include "chrome/browser/extensions/extension_service.h" 22 #include "chrome/browser/extensions/extension_service.h"
23 #include "chrome/common/chrome_paths.h" 23 #include "chrome/common/chrome_paths.h"
24 #include "chrome/common/chrome_switches.h" 24 #include "chrome/common/chrome_switches.h"
25 #include "chrome/common/chrome_utility_messages.h" 25 #include "chrome/common/chrome_utility_messages.h"
26 #include "chrome/common/extensions/extension.h" 26 #include "chrome/common/extensions/extension.h"
27 #include "chrome/common/extensions/extension_file_util.h" 27 #include "chrome/common/extensions/extension_file_util.h"
28 #include "chrome/common/extensions/extension_l10n_util.h" 28 #include "chrome/common/extensions/extension_l10n_util.h"
29 #include "chrome/common/extensions/extension_manifest_constants.h"
30 #include "chrome/common/extensions/extension_manifest_constants.h"
31 #include "chrome/common/extensions/manifest_handlers/icons_handler.h" 29 #include "chrome/common/extensions/manifest_handlers/icons_handler.h"
32 #include "content/public/browser/browser_thread.h" 30 #include "content/public/browser/browser_thread.h"
33 #include "content/public/browser/utility_process_host.h" 31 #include "content/public/browser/utility_process_host.h"
34 #include "content/public/common/common_param_traits.h" 32 #include "content/public/common/common_param_traits.h"
35 #include "crypto/signature_verifier.h" 33 #include "crypto/signature_verifier.h"
36 #include "extensions/common/constants.h" 34 #include "extensions/common/constants.h"
37 #include "extensions/common/crx_file.h" 35 #include "extensions/common/crx_file.h"
38 #include "extensions/common/id_util.h" 36 #include "extensions/common/id_util.h"
37 #include "extensions/common/manifest_constants.h"
39 #include "grit/generated_resources.h" 38 #include "grit/generated_resources.h"
40 #include "third_party/skia/include/core/SkBitmap.h" 39 #include "third_party/skia/include/core/SkBitmap.h"
41 #include "ui/base/l10n/l10n_util.h" 40 #include "ui/base/l10n/l10n_util.h"
42 #include "ui/gfx/codec/png_codec.h" 41 #include "ui/gfx/codec/png_codec.h"
43 42
44 using content::BrowserThread; 43 using content::BrowserThread;
45 using content::UtilityProcessHost; 44 using content::UtilityProcessHost;
46 45
47 // The following macro makes histograms that record the length of paths 46 // The following macro makes histograms that record the length of paths
48 // in this file much easier to read. 47 // in this file much easier to read.
(...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 install_icon); 599 install_icon);
601 extension_ = NULL; 600 extension_ = NULL;
602 } 601 }
603 602
604 DictionaryValue* SandboxedUnpacker::RewriteManifestFile( 603 DictionaryValue* SandboxedUnpacker::RewriteManifestFile(
605 const DictionaryValue& manifest) { 604 const DictionaryValue& manifest) {
606 // Add the public key extracted earlier to the parsed manifest and overwrite 605 // Add the public key extracted earlier to the parsed manifest and overwrite
607 // the original manifest. We do this to ensure the manifest doesn't contain an 606 // the original manifest. We do this to ensure the manifest doesn't contain an
608 // exploitable bug that could be used to compromise the browser. 607 // exploitable bug that could be used to compromise the browser.
609 scoped_ptr<DictionaryValue> final_manifest(manifest.DeepCopy()); 608 scoped_ptr<DictionaryValue> final_manifest(manifest.DeepCopy());
610 final_manifest->SetString(extension_manifest_keys::kPublicKey, public_key_); 609 final_manifest->SetString(manifest_keys::kPublicKey, public_key_);
611 610
612 std::string manifest_json; 611 std::string manifest_json;
613 JSONStringValueSerializer serializer(&manifest_json); 612 JSONStringValueSerializer serializer(&manifest_json);
614 serializer.set_pretty_print(true); 613 serializer.set_pretty_print(true);
615 if (!serializer.Serialize(*final_manifest)) { 614 if (!serializer.Serialize(*final_manifest)) {
616 // Error serializing manifest.json. 615 // Error serializing manifest.json.
617 ReportFailure( 616 ReportFailure(
618 ERROR_SERIALIZING_MANIFEST_JSON, 617 ERROR_SERIALIZING_MANIFEST_JSON,
619 l10n_util::GetStringFUTF16( 618 l10n_util::GetStringFUTF16(
620 IDS_EXTENSION_PACKAGE_INSTALL_ERROR, 619 IDS_EXTENSION_PACKAGE_INSTALL_ERROR,
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
825 824
826 void SandboxedUnpacker::Cleanup() { 825 void SandboxedUnpacker::Cleanup() {
827 DCHECK(unpacker_io_task_runner_->RunsTasksOnCurrentThread()); 826 DCHECK(unpacker_io_task_runner_->RunsTasksOnCurrentThread());
828 if (!temp_dir_.Delete()) { 827 if (!temp_dir_.Delete()) {
829 LOG(WARNING) << "Can not delete temp directory at " 828 LOG(WARNING) << "Can not delete temp directory at "
830 << temp_dir_.path().value(); 829 << temp_dir_.path().value();
831 } 830 }
832 } 831 }
833 832
834 } // namespace extensions 833 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698