OLD | NEW |
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/extension_creator.h" | 5 #include "chrome/browser/extensions/extension_creator.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
11 #include "base/callback.h" | 11 #include "base/callback.h" |
12 #include "base/file_util.h" | 12 #include "base/file_util.h" |
13 #include "base/files/scoped_temp_dir.h" | 13 #include "base/files/scoped_temp_dir.h" |
14 #include "base/memory/scoped_handle.h" | 14 #include "base/memory/scoped_handle.h" |
15 #include "base/string_util.h" | 15 #include "base/string_util.h" |
16 #include "chrome/browser/extensions/crx_file.h" | |
17 #include "chrome/browser/extensions/extension_creator_filter.h" | 16 #include "chrome/browser/extensions/extension_creator_filter.h" |
18 #include "chrome/common/extensions/extension.h" | 17 #include "chrome/common/extensions/extension.h" |
19 #include "chrome/common/extensions/extension_file_util.h" | 18 #include "chrome/common/extensions/extension_file_util.h" |
20 #include "chrome/common/zip.h" | 19 #include "chrome/common/zip.h" |
21 #include "crypto/rsa_private_key.h" | 20 #include "crypto/rsa_private_key.h" |
22 #include "crypto/signature_creator.h" | 21 #include "crypto/signature_creator.h" |
| 22 #include "extensions/common/crx_file.h" |
| 23 #include "extensions/common/id_util.h" |
23 #include "grit/generated_resources.h" | 24 #include "grit/generated_resources.h" |
24 #include "ui/base/l10n/l10n_util.h" | 25 #include "ui/base/l10n/l10n_util.h" |
25 | 26 |
26 namespace { | 27 namespace { |
27 const int kRSAKeySize = 1024; | 28 const int kRSAKeySize = 1024; |
28 }; | 29 }; |
29 | 30 |
30 namespace extensions { | 31 namespace extensions { |
31 | 32 |
32 ExtensionCreator::ExtensionCreator() : error_type_(kOtherError) { | 33 ExtensionCreator::ExtensionCreator() : error_type_(kOtherError) { |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
90 if (!key_pair->ExportPublicKey(&public_key_bytes)) { | 91 if (!key_pair->ExportPublicKey(&public_key_bytes)) { |
91 error_message_ = | 92 error_message_ = |
92 l10n_util::GetStringUTF8(IDS_EXTENSION_PUBLIC_KEY_FAILED_TO_EXPORT); | 93 l10n_util::GetStringUTF8(IDS_EXTENSION_PUBLIC_KEY_FAILED_TO_EXPORT); |
93 return false; | 94 return false; |
94 } | 95 } |
95 | 96 |
96 std::string public_key; | 97 std::string public_key; |
97 public_key.insert(public_key.begin(), | 98 public_key.insert(public_key.begin(), |
98 public_key_bytes.begin(), public_key_bytes.end()); | 99 public_key_bytes.begin(), public_key_bytes.end()); |
99 | 100 |
100 std::string extension_id; | 101 std::string extension_id = id_util::GenerateId(public_key); |
101 if (!Extension::GenerateId(public_key, &extension_id)) | |
102 return false; | |
103 | 102 |
104 // Load the extension once. We don't really need it, but this does a lot of | 103 // Load the extension once. We don't really need it, but this does a lot of |
105 // useful validation of the structure. | 104 // useful validation of the structure. |
106 int create_flags = | 105 int create_flags = |
107 Extension::FOLLOW_SYMLINKS_ANYWHERE | Extension::ERROR_ON_PRIVATE_KEY; | 106 Extension::FOLLOW_SYMLINKS_ANYWHERE | Extension::ERROR_ON_PRIVATE_KEY; |
108 if (run_flags & kRequireModernManifestVersion) | 107 if (run_flags & kRequireModernManifestVersion) |
109 create_flags |= Extension::REQUIRE_MODERN_MANIFEST_VERSION; | 108 create_flags |= Extension::REQUIRE_MODERN_MANIFEST_VERSION; |
110 | 109 |
111 scoped_refptr<Extension> extension( | 110 scoped_refptr<Extension> extension( |
112 extension_file_util::LoadExtension( | 111 extension_file_util::LoadExtension( |
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
320 SignZip(zip_path, key_pair.get(), &signature) && | 319 SignZip(zip_path, key_pair.get(), &signature) && |
321 WriteCRX(zip_path, key_pair.get(), signature, crx_path)) { | 320 WriteCRX(zip_path, key_pair.get(), signature, crx_path)) { |
322 result = true; | 321 result = true; |
323 } | 322 } |
324 | 323 |
325 file_util::Delete(zip_path, false); | 324 file_util::Delete(zip_path, false); |
326 return result; | 325 return result; |
327 } | 326 } |
328 | 327 |
329 } // namespace extensions | 328 } // namespace extensions |
OLD | NEW |