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

Side by Side Diff: chrome/browser/component_updater/component_unpacker.cc

Issue 25883006: Support asynchronous patching operations in the component updater. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@tests
Patch Set: sorin@ review Created 6 years, 10 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
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/component_updater/component_unpacker.h" 5 #include "chrome/browser/component_updater/component_unpacker.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/file_util.h" 11 #include "base/file_util.h"
12 #include "base/files/file_path.h"
11 #include "base/json/json_file_value_serializer.h" 13 #include "base/json/json_file_value_serializer.h"
12 #include "base/logging.h" 14 #include "base/logging.h"
13 #include "base/memory/scoped_handle.h" 15 #include "base/memory/scoped_handle.h"
14 #include "base/strings/string_number_conversions.h" 16 #include "base/strings/string_number_conversions.h"
15 #include "base/strings/stringprintf.h" 17 #include "base/strings/stringprintf.h"
16 #include "base/values.h" 18 #include "base/values.h"
17 #include "chrome/browser/component_updater/component_patcher.h" 19 #include "chrome/browser/component_updater/component_patcher.h"
18 #include "chrome/browser/component_updater/component_updater_service.h" 20 #include "chrome/browser/component_updater/component_updater_service.h"
19 #include "chrome/common/extensions/extension_constants.h" 21 #include "chrome/common/extensions/extension_constants.h"
22 #include "content/public/browser/browser_thread.h"
20 #include "crypto/secure_hash.h" 23 #include "crypto/secure_hash.h"
21 #include "crypto/signature_verifier.h" 24 #include "crypto/signature_verifier.h"
22 #include "extensions/common/crx_file.h" 25 #include "extensions/common/crx_file.h"
23 #include "third_party/zlib/google/zip.h" 26 #include "third_party/zlib/google/zip.h"
24 27
25 using crypto::SecureHash; 28 using crypto::SecureHash;
26 29
27 namespace component_updater { 30 namespace component_updater {
28 31
29 namespace { 32 namespace {
30 33
31 // This class makes sure that the CRX digital signature is valid 34 // This class makes sure that the CRX digital signature is valid
32 // and well formed. 35 // and well formed.
33 class CRXValidator { 36 class CRXValidator {
34 public: 37 public:
35 explicit CRXValidator(FILE* crx_file) : valid_(false), delta_(false) { 38 explicit CRXValidator(FILE* crx_file) : valid_(false), is_delta_(false) {
36 extensions::CrxFile::Header header; 39 extensions::CrxFile::Header header;
37 size_t len = fread(&header, 1, sizeof(header), crx_file); 40 size_t len = fread(&header, 1, sizeof(header), crx_file);
38 if (len < sizeof(header)) 41 if (len < sizeof(header))
39 return; 42 return;
40 43
41 extensions::CrxFile::Error error; 44 extensions::CrxFile::Error error;
42 scoped_ptr<extensions::CrxFile> crx( 45 scoped_ptr<extensions::CrxFile> crx(
43 extensions::CrxFile::Parse(header, &error)); 46 extensions::CrxFile::Parse(header, &error));
44 if (!crx.get()) 47 if (!crx.get())
45 return; 48 return;
46 delta_ = extensions::CrxFile::HeaderIsDelta(header); 49 is_delta_ = extensions::CrxFile::HeaderIsDelta(header);
47 50
48 std::vector<uint8> key(header.key_size); 51 std::vector<uint8> key(header.key_size);
49 len = fread(&key[0], sizeof(uint8), header.key_size, crx_file); 52 len = fread(&key[0], sizeof(uint8), header.key_size, crx_file);
50 if (len < header.key_size) 53 if (len < header.key_size)
51 return; 54 return;
52 55
53 std::vector<uint8> signature(header.signature_size); 56 std::vector<uint8> signature(header.signature_size);
54 len = fread(&signature[0], sizeof(uint8), header.signature_size, crx_file); 57 len = fread(&signature[0], sizeof(uint8), header.signature_size, crx_file);
55 if (len < header.signature_size) 58 if (len < header.signature_size)
56 return; 59 return;
(...skipping 15 matching lines...) Expand all
72 75
73 if (!verifier.VerifyFinal()) 76 if (!verifier.VerifyFinal())
74 return; 77 return;
75 78
76 public_key_.swap(key); 79 public_key_.swap(key);
77 valid_ = true; 80 valid_ = true;
78 } 81 }
79 82
80 bool valid() const { return valid_; } 83 bool valid() const { return valid_; }
81 84
82 bool delta() const { return delta_; } 85 bool is_delta() const { return is_delta_; }
83 86
84 const std::vector<uint8>& public_key() const { return public_key_; } 87 const std::vector<uint8>& public_key() const { return public_key_; }
85 88
86 private: 89 private:
87 bool valid_; 90 bool valid_;
88 bool delta_; 91 bool is_delta_;
89 std::vector<uint8> public_key_; 92 std::vector<uint8> public_key_;
90 }; 93 };
91 94
92 } // namespace. 95 } // namespace
96
97 ComponentUnpacker::ComponentUnpacker(
98 const std::vector<uint8>& pk_hash,
99 const base::FilePath& path,
100 const std::string& fingerprint,
101 ComponentPatcher* patcher,
102 ComponentInstaller* installer,
103 scoped_refptr<base::SequencedTaskRunner> task_runner)
104 : pk_hash_(pk_hash),
105 path_(path),
106 is_delta_(false),
107 fingerprint_(fingerprint),
108 patcher_(patcher),
109 installer_(installer),
110 error_(kNone),
111 extended_error_(0),
112 ptr_factory_(this),
113 task_runner_(task_runner) {
114 }
93 115
94 // TODO(cpu): add a specific attribute check to a component json that the 116 // TODO(cpu): add a specific attribute check to a component json that the
95 // extension unpacker will reject, so that a component cannot be installed 117 // extension unpacker will reject, so that a component cannot be installed
96 // as an extension. 118 // as an extension.
97 scoped_ptr<base::DictionaryValue> ReadManifest( 119 scoped_ptr<base::DictionaryValue> ReadManifest(
98 const base::FilePath& unpack_path) { 120 const base::FilePath& unpack_path) {
99 base::FilePath manifest = 121 base::FilePath manifest =
100 unpack_path.Append(FILE_PATH_LITERAL("manifest.json")); 122 unpack_path.Append(FILE_PATH_LITERAL("manifest.json"));
101 if (!base::PathExists(manifest)) 123 if (!base::PathExists(manifest))
102 return scoped_ptr<base::DictionaryValue>(); 124 return scoped_ptr<base::DictionaryValue>();
103 JSONFileValueSerializer serializer(manifest); 125 JSONFileValueSerializer serializer(manifest);
104 std::string error; 126 std::string error;
105 scoped_ptr<base::Value> root(serializer.Deserialize(NULL, &error)); 127 scoped_ptr<base::Value> root(serializer.Deserialize(NULL, &error));
106 if (!root.get()) 128 if (!root.get())
107 return scoped_ptr<base::DictionaryValue>(); 129 return scoped_ptr<base::DictionaryValue>();
108 if (!root->IsType(base::Value::TYPE_DICTIONARY)) 130 if (!root->IsType(base::Value::TYPE_DICTIONARY))
109 return scoped_ptr<base::DictionaryValue>(); 131 return scoped_ptr<base::DictionaryValue>();
110 return scoped_ptr<base::DictionaryValue>( 132 return scoped_ptr<base::DictionaryValue>(
111 static_cast<base::DictionaryValue*>(root.release())).Pass(); 133 static_cast<base::DictionaryValue*>(root.release())).Pass();
112 } 134 }
113 135
114 ComponentUnpacker::ComponentUnpacker(const std::vector<uint8>& pk_hash, 136 bool ComponentUnpacker::UnpackInternal() {
115 const base::FilePath& path, 137 return Verify() && Unzip() && BeginPatching();
116 const std::string& fingerprint, 138 }
117 ComponentPatcher* patcher, 139
118 ComponentInstaller* installer) 140 void ComponentUnpacker::Unpack(
119 : error_(kNone), 141 const base::Callback<void(Error, int)>& callback) {
120 extended_error_(0) { 142 callback_ = callback;
121 if (pk_hash.empty() || path.empty()) { 143 if (!UnpackInternal())
144 Finish();
145 }
146
147 bool ComponentUnpacker::Verify() {
148 if (pk_hash_.empty() || path_.empty()) {
122 error_ = kInvalidParams; 149 error_ = kInvalidParams;
123 return; 150 return false;
124 } 151 }
125 // First, validate the CRX header and signature. As of today 152 // First, validate the CRX header and signature. As of today
126 // this is SHA1 with RSA 1024. 153 // this is SHA1 with RSA 1024.
127 ScopedStdioHandle file(base::OpenFile(path, "rb")); 154 ScopedStdioHandle file(base::OpenFile(path_, "rb"));
128 if (!file.get()) { 155 if (!file.get()) {
129 error_ = kInvalidFile; 156 error_ = kInvalidFile;
130 return; 157 return false;
131 } 158 }
132 CRXValidator validator(file.get()); 159 CRXValidator validator(file.get());
160 file.Close();
133 if (!validator.valid()) { 161 if (!validator.valid()) {
134 error_ = kInvalidFile; 162 error_ = kInvalidFile;
135 return; 163 return false;
136 } 164 }
137 file.Close(); 165 is_delta_ = validator.is_delta();
138 166
139 // File is valid and the digital signature matches. Now make sure 167 // File is valid and the digital signature matches. Now make sure
140 // the public key hash matches the expected hash. If they do we fully 168 // the public key hash matches the expected hash. If they do we fully
141 // trust this CRX. 169 // trust this CRX.
142 uint8 hash[32]; 170 uint8 hash[32] = {};
143 scoped_ptr<SecureHash> sha256(SecureHash::Create(SecureHash::SHA256)); 171 scoped_ptr<SecureHash> sha256(SecureHash::Create(SecureHash::SHA256));
144 sha256->Update(&(validator.public_key()[0]), validator.public_key().size()); 172 sha256->Update(&(validator.public_key()[0]), validator.public_key().size());
145 sha256->Finish(hash, arraysize(hash)); 173 sha256->Finish(hash, arraysize(hash));
146 174
147 if (!std::equal(pk_hash.begin(), pk_hash.end(), hash)) { 175 if (!std::equal(pk_hash_.begin(), pk_hash_.end(), hash)) {
148 error_ = kInvalidId; 176 error_ = kInvalidId;
177 return false;
178 }
179 return true;
180 }
181
182 bool ComponentUnpacker::Unzip() {
183 base::FilePath& destination = is_delta_ ? unpack_diff_path_ : unpack_path_;
184 if (!base::CreateNewTempDirectory(base::FilePath::StringType(),
185 &destination)) {
186 error_ = kUnzipPathError;
187 return false;
188 }
189 if (!zip::Unzip(path_, destination)) {
190 error_ = kUnzipFailed;
191 return false;
192 }
193 return true;
194 }
195
196
197 bool ComponentUnpacker::BeginPatching() {
198 if (is_delta_) { // Package is a diff package.
199 // Use a different temp directory for the patch output files.
200 if (!base::CreateNewTempDirectory(base::FilePath::StringType(),
201 &unpack_path_)) {
202 error_ = kUnzipPathError;
203 return false;
204 }
205 task_runner_->PostTask(
206 FROM_HERE, base::Bind(&DifferentialUpdatePatch,
207 unpack_diff_path_,
208 unpack_path_,
209 patcher_,
210 installer_,
211 base::Bind(&ComponentUnpacker::EndPatching,
212 GetWeakPtr())));
213 } else {
214 task_runner_->PostTask(
215 FROM_HERE, base::Bind(&ComponentUnpacker::EndPatching,
216 GetWeakPtr(),
217 kNone,
218 0));
219 }
220 return true;
221 }
222
223 void ComponentUnpacker::EndPatching(Error error, int extended_error) {
224 error_ = error;
225 extended_error_ = extended_error;
226 if (error_ != kNone) {
227 Finish();
149 return; 228 return;
150 } 229 }
151 if (!base::CreateNewTempDirectory(base::FilePath::StringType(), 230 // Optimization: clean up patch files early, in case disk space is too low to
152 &unpack_path_)) { 231 // install otherwise.
153 error_ = kUnzipPathError; 232 if (!unpack_diff_path_.empty()) {
233 base::DeleteFile(unpack_diff_path_, true);
234 unpack_diff_path_.clear();
235 }
236 Install();
237 Finish();
238 }
239
240 void ComponentUnpacker::Install() {
241 // Write the fingerprint to disk.
242 if (static_cast<int>(fingerprint_.size()) !=
243 file_util::WriteFile(
244 unpack_path_.Append(FILE_PATH_LITERAL("manifest.fingerprint")),
245 fingerprint_.c_str(),
246 fingerprint_.size())) {
247 error_ = kFingerprintWriteFailed;
154 return; 248 return;
155 } 249 }
156 if (validator.delta()) { // Package is a diff package.
157 // We want a different temp directory for the delta files; we'll put the
158 // patch output into unpack_path_.
159 base::FilePath unpack_diff_path;
160 if (!base::CreateNewTempDirectory(base::FilePath::StringType(),
161 &unpack_diff_path)) {
162 error_ = kUnzipPathError;
163 return;
164 }
165 if (!zip::Unzip(path, unpack_diff_path)) {
166 error_ = kUnzipFailed;
167 return;
168 }
169 ComponentUnpacker::Error result = DifferentialUpdatePatch(unpack_diff_path,
170 unpack_path_,
171 patcher,
172 installer,
173 &extended_error_);
174 base::DeleteFile(unpack_diff_path, true);
175 unpack_diff_path.clear();
176 error_ = result;
177 if (error_ != kNone) {
178 return;
179 }
180 } else {
181 // Package is a normal update/install; unzip it into unpack_path_ directly.
182 if (!zip::Unzip(path, unpack_path_)) {
183 error_ = kUnzipFailed;
184 return;
185 }
186 }
187 scoped_ptr<base::DictionaryValue> manifest(ReadManifest(unpack_path_)); 250 scoped_ptr<base::DictionaryValue> manifest(ReadManifest(unpack_path_));
188 if (!manifest.get()) { 251 if (!manifest.get()) {
189 error_ = kBadManifest; 252 error_ = kBadManifest;
190 return; 253 return;
191 } 254 }
192 // Write the fingerprint to disk. 255 DCHECK(error_ == kNone);
193 if (static_cast<int>(fingerprint.size()) != 256 if (!installer_->Install(*manifest, unpack_path_)) {
194 file_util::WriteFile(
195 unpack_path_.Append(FILE_PATH_LITERAL("manifest.fingerprint")),
196 fingerprint.c_str(),
197 fingerprint.size())) {
198 error_ = kFingerprintWriteFailed;
199 return;
200 }
201 if (!installer->Install(*manifest, unpack_path_)) {
202 error_ = kInstallerError; 257 error_ = kInstallerError;
203 return; 258 return;
204 } 259 }
205 // Installation successful. The directory is not our concern now. 260 }
206 unpack_path_.clear(); 261
262 void ComponentUnpacker::Finish() {
263 if (!unpack_diff_path_.empty())
264 base::DeleteFile(unpack_diff_path_, true);
265 if (!unpack_path_.empty())
266 base::DeleteFile(unpack_path_, true);
267 callback_.Run(error_, extended_error_);
268 }
269
270 base::WeakPtr<ComponentUnpacker> ComponentUnpacker::GetWeakPtr() {
271 return ptr_factory_.GetWeakPtr();
207 } 272 }
208 273
209 ComponentUnpacker::~ComponentUnpacker() { 274 ComponentUnpacker::~ComponentUnpacker() {
210 if (!unpack_path_.empty())
211 base::DeleteFile(unpack_path_, true);
212 } 275 }
213 276
214 } // namespace component_updater 277 } // namespace component_updater
215
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698