mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: crash when loadExtension fails (#27561)

Browse source
This commit is contained in:
Samuel Maddock 2021-02-02 05:20:05 -05:00 • committed by GitHub
parent 20a71be849
commit b6df7cd327
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
shell/browser/extensions/electron_extension_loader.cc
View file

@ -112,22 +112,22 @@ void ElectronExtensionLoader::FinishExtensionLoad(
scoped_refptr<const Extension> extension = result.first; scoped_refptr<const Extension> extension = result.first;
if (extension) { if (extension) {
extension_registrar_.AddExtension(extension); extension_registrar_.AddExtension(extension);
}
// Write extension install time to ExtensionPrefs. This is required by // Write extension install time to ExtensionPrefs. This is required by
// WebRequestAPI which calls extensions::ExtensionPrefs::GetInstallTime. // WebRequestAPI which calls extensions::ExtensionPrefs::GetInstallTime.
// //
// Implementation for writing the pref was based on // Implementation for writing the pref was based on
// PreferenceAPIBase::SetExtensionControlledPref. // PreferenceAPIBase::SetExtensionControlledPref.
{ {
ExtensionPrefs* extension_prefs = ExtensionPrefs::Get(browser_context_); ExtensionPrefs* extension_prefs = ExtensionPrefs::Get(browser_context_);
ExtensionPrefs::ScopedDictionaryUpdate update( ExtensionPrefs::ScopedDictionaryUpdate update(
extension_prefs, extension.get()->id(), extension_prefs, extension.get()->id(),
extensions::pref_names::kPrefPreferences); extensions::pref_names::kPrefPreferences);
auto preference = update.Create(); auto preference = update.Create();
const base::Time install_time = base::Time().Now(); const base::Time install_time = base::Time().Now();
preference->SetString("install_time", preference->SetString(
base::NumberToString(install_time.ToInternalValue())); "install_time", base::NumberToString(install_time.ToInternalValue()));
}
} }
std::move(cb).Run(extension.get(), result.second); std::move(cb).Run(extension.get(), result.second);

6
spec-main/extensions-spec.ts
View file

@ -107,6 +107,12 @@ describe('chrome extensions', () => {
expect(bg).to.equal('red'); expect(bg).to.equal('red');
}); });
it('does not crash when failing to load an extension', async () => {
const customSession = session.fromPartition(`persist:${uuid.v4()}`);
const promise = customSession.loadExtension(path.join(fixtures, 'extensions', 'load-error'));
await expect(promise).to.eventually.be.rejected();
});
it('serializes a loaded extension', async () => { it('serializes a loaded extension', async () => {
const extensionPath = path.join(fixtures, 'extensions', 'red-bg'); const extensionPath = path.join(fixtures, 'extensions', 'red-bg');
const manifest = JSON.parse(fs.readFileSync(path.join(extensionPath, 'manifest.json'), 'utf-8')); const manifest = JSON.parse(fs.readFileSync(path.join(extensionPath, 'manifest.json'), 'utf-8'));

8
spec-main/fixtures/extensions/load-error/manifest.json Normal file
View file

@ -0,0 +1,8 @@
{
"name": "load-error",
"version": "1.0",
"icons": {
"16": "/images/error.png"
},
"manifest_version": 2
}