Agent Zero AI framework
Fix Chrome Web Store extension installs
Alessandrob6d6c1126ad0
diff --git a/plugins/_browser/api/extensions.py b/plugins/_browser/api/extensions.pyindex cb2a456a3..d2a5629f0 100644--- a/plugins/_browser/api/extensions.py+++ b/plugins/_browser/api/extensions.py@@ -1,3 +1,4 @@+import asynciofrom types import SimpleNamespacefrom helpers import plugins@@ -30,7 +31,10 @@ class Extensions(ApiHandler):if action == "install_web_store":try:- result = install_chrome_web_store_extension(str(input.get("url", "")))+ result = await asyncio.to_thread(+ install_chrome_web_store_extension,+ str(input.get("url", "")),+ )except ValueError as exc:return {"ok": False, "error": str(exc)}return {diff --git a/plugins/_browser/helpers/extension_manager.py b/plugins/_browser/helpers/extension_manager.pyindex 3fc0ef8e9..dc3257fb8 100644--- a/plugins/_browser/helpers/extension_manager.py+++ b/plugins/_browser/helpers/extension_manager.py@@ -16,6 +16,7 @@ from typing import Anyfrom helpers import files, pluginsfrom plugins._browser.helpers.config import PLUGIN_NAME, get_browser_config+from plugins._browser.helpers.runtime import close_all_runtimes_syncEXTENSIONS_ROOT_DIR = ("usr", "_browser", "extensions")@@ -65,6 +66,8 @@ def list_browser_extensions() -> list[dict[str, Any]]:root = get_extensions_root()if root.exists():for manifest_path in sorted(root.glob("**/manifest.json")):+ if any(part.startswith(".") for part in manifest_path.relative_to(root).parts):+ continueentry = _extension_entry(manifest_path.parent, enabled_paths)seen.add(entry["path"])entries.append(entry)@@ -89,16 +92,33 @@ def install_chrome_web_store_extension(source: str) -> dict[str, Any]:_download_crx(extension_id, archive_path)payload_path = Path(tmp) / f"{extension_id}.zip"payload_path.write_bytes(_crx_zip_payload(archive_path.read_bytes()))- extracted_path = Path(tmp) / "extracted"- _safe_extract_zip(payload_path, extracted_path)-- if not (extracted_path / "manifest.json").is_file():- raise ValueError("Downloaded extension did not contain a manifest.json file.")-- if target.exists():- shutil.rmtree(target)target.parent.mkdir(parents=True, exist_ok=True)- shutil.copytree(extracted_path, target)+ try:+ with zipfile.ZipFile(payload_path) as archive:+ manifest = json.loads(archive.read("manifest.json"))+ except KeyError as exc:+ raise ValueError("Downloaded extension did not contain a manifest.json file.") from exc+ except (json.JSONDecodeError, UnicodeDecodeError, zipfile.BadZipFile) as exc:+ raise ValueError("Downloaded extension contained an invalid manifest.json file.") from exc+ if not isinstance(manifest, dict):+ raise ValueError("Downloaded extension contained an invalid manifest.json file.")++ current_manifest = _read_manifest(target)+ if not (+ target.is_dir()+ and manifest.get("version")+ and manifest.get("version") == current_manifest.get("version")+ ):+ with tempfile.TemporaryDirectory(+ prefix=f".{extension_id}-install-",+ dir=target.parent,+ ) as extracted:+ extracted_path = Path(extracted)+ _safe_extract_zip(payload_path, extracted_path)+ config = get_browser_config()+ if target.exists() and str(target) in config["extension_paths"]:+ close_all_runtimes_sync()+ _replace_extension_dir(extracted_path, target)config = _enable_extension_path(target)manifest = _read_manifest(target)@@ -112,6 +132,24 @@ def install_chrome_web_store_extension(source: str) -> dict[str, Any]:}+def _replace_extension_dir(source: Path, target: Path) -> None:+ if not target.exists():+ source.rename(target)+ return++ with tempfile.TemporaryDirectory(+ prefix=f".{target.name}-previous-",+ dir=target.parent,+ ) as backup_dir:+ backup = Path(backup_dir) / target.name+ target.rename(backup)+ try:+ source.rename(target)+ except BaseException:+ backup.rename(target)+ raise++def set_browser_extension_enabled(extension_path: str, enabled: bool) -> dict[str, Any]:raw_path = str(extension_path or "").strip()if not raw_path:diff --git a/plugins/_browser/webui/browser-panel.html b/plugins/_browser/webui/browser-panel.htmlindex c92a1acec..0f543407b 100644--- a/plugins/_browser/webui/browser-panel.html+++ b/plugins/_browser/webui/browser-panel.html@@ -106,11 +106,12 @@placeholder="https://chromewebstore.google.com/detail/..." /><div class="browser-extension-url-actions"><button type="button" class="btn btn-ok" @click="$store.browserPage.installExtensionFromUrl()"- :disabled="$store.browserPage.extensionActionLoading">+ :disabled="$store.browserPage.extensionActionLoading"+ :aria-busy="$store.browserPage.extensionActionLoading.toString()"><span class="material-symbols-outlined":class="{ spinning: $store.browserPage.extensionActionLoading }"x-text="$store.browserPage.extensionActionLoading ? 'progress_activity' : 'download'"></span>- <span>Install URL</span>+ <span x-text="$store.browserPage.extensionActionLoading ? 'Installing…' : 'Install URL'">Install URL</span></button><button type="button" class="btn btn-field"@click="$store.browserPage.askAgentInstallExtension()">diff --git a/plugins/_browser/webui/browser-store.js b/plugins/_browser/webui/browser-store.jsindex 67c151383..150d5bf2b 100644--- a/plugins/_browser/webui/browser-store.js+++ b/plugins/_browser/webui/browser-store.js@@ -535,6 +535,7 @@ const model = {}this.extensionActionLoading = true;+ this.extensionActionMessage = "Installing extension… Large packages may take a few minutes.";try {const response = await callJsonApi("/plugins/_browser/extensions", {action: "install_web_store",@@ -549,6 +550,7 @@ const model = {this.extensionActionMessage = `Installed ${response.name || response.id}.`;await this.refreshAfterSettingsClose();} catch (error) {+ this.extensionActionMessage = "";this.extensionActionError = error instanceof Error ? error.message : String(error);} finally {this.extensionActionLoading = false;diff --git a/tests/test_browser_agent_regressions.py b/tests/test_browser_agent_regressions.pyindex 79519e0d8..c0e4c50b5 100644--- a/tests/test_browser_agent_regressions.py+++ b/tests/test_browser_agent_regressions.py@@ -4,6 +4,7 @@ import jsonimport reimport sysimport threading+import zipfilefrom pathlib import Pathfrom types import ModuleType, SimpleNamespace@@ -545,6 +546,108 @@ def test_browser_extension_manager_extracts_crx3_zip_payload():assert _crx_zip_payload(crx) == payload+def test_browser_extension_manager_skips_same_version_reinstall(monkeypatch, tmp_path):+ extension_id = "a" * 32+ monkeypatch.setattr(+ browser_extension_manager_module.files,+ "get_abs_path",+ lambda *parts: str(tmp_path.joinpath(*parts)),+ )+ target = get_extensions_root() / "chrome-web-store" / extension_id+ target.mkdir(parents=True)+ (target / "manifest.json").write_text(+ json.dumps({"name": "Current", "version": "1.0.0"}),+ encoding="utf-8",+ )+ (target / "keep.txt").write_text("current", encoding="utf-8")++ def download(_extension_id, archive_path):+ with zipfile.ZipFile(archive_path, "w") as archive:+ archive.writestr("manifest.json", json.dumps({"name": "Current", "version": "1.0.0"}))+ archive.writestr("replacement.txt", "should not be extracted")++ monkeypatch.setattr(browser_extension_manager_module, "_download_crx", download)+ monkeypatch.setattr(+ browser_extension_manager_module,+ "get_browser_config",+ lambda: {"extension_paths": [str(target)]},+ )+ monkeypatch.setattr(+ browser_extension_manager_module.plugins,+ "save_plugin_config",+ lambda *_args, **_kwargs: None,+ )+ monkeypatch.setattr(+ browser_extension_manager_module,+ "close_all_runtimes_sync",+ lambda: pytest.fail("same-version reinstall restarted Browser runtimes"),+ )+ monkeypatch.setattr(+ browser_extension_manager_module,+ "_safe_extract_zip",+ lambda *_args: pytest.fail("same-version reinstall extracted the package"),+ )++ result = browser_extension_manager_module.install_chrome_web_store_extension(extension_id)++ assert result["version"] == "1.0.0"+ assert (target / "keep.txt").read_text(encoding="utf-8") == "current"+ assert not (target / "replacement.txt").exists()+++def test_browser_extension_manager_stages_updates_and_restarts_runtime(monkeypatch, tmp_path):+ extension_id = "a" * 32+ monkeypatch.setattr(+ browser_extension_manager_module.files,+ "get_abs_path",+ lambda *parts: str(tmp_path.joinpath(*parts)),+ )+ target = get_extensions_root() / "chrome-web-store" / extension_id+ target.mkdir(parents=True)+ (target / "manifest.json").write_text(+ json.dumps({"name": "Old", "version": "1.0.0"}),+ encoding="utf-8",+ )+ (target / "old.txt").write_text("old", encoding="utf-8")++ def download(_extension_id, archive_path):+ with zipfile.ZipFile(archive_path, "w") as archive:+ archive.writestr("manifest.json", json.dumps({"name": "Updated", "version": "2.0.0"}))+ archive.writestr("new.txt", "new")++ saved_configs = []+ restarts = []+ monkeypatch.setattr(browser_extension_manager_module, "_download_crx", download)+ monkeypatch.setattr(+ browser_extension_manager_module,+ "get_browser_config",+ lambda: {"extension_paths": [str(target)]},+ )+ monkeypatch.setattr(+ browser_extension_manager_module.plugins,+ "save_plugin_config",+ lambda _plugin, _project, _agent, config: saved_configs.append(config.copy()),+ )+ def restart():+ listed_paths = [+ extension["path"]+ for extension in browser_extension_manager_module.list_browser_extensions()+ ]+ restarts.append(((target / "old.txt").exists(), listed_paths))++ monkeypatch.setattr(browser_extension_manager_module, "close_all_runtimes_sync", restart)++ result = browser_extension_manager_module.install_chrome_web_store_extension(extension_id)++ assert result["name"] == "Updated"+ assert result["version"] == "2.0.0"+ assert restarts == [(True, [str(target)])]+ assert saved_configs[-1]["extension_paths"] == [str(target)]+ assert (target / "new.txt").read_text(encoding="utf-8") == "new"+ assert not (target / "old.txt").exists()+ assert list(target.parent.iterdir()) == [target]++def test_browser_extension_manager_uses_modern_chrome_prodversion(monkeypatch):extension_id = "a" * 32@@ -589,6 +692,11 @@ def test_browser_extension_menu_exposes_agent_and_url_paths():assert "<span>Open</span>" in htmlassert "hasExtensionInstallUrl()" in htmlassert "malicious or buggy extensions" in html+ assert "'Installing…' : 'Install URL'" in html+ assert ':aria-busy="$store.browserPage.extensionActionLoading.toString()"' in html+ assert "Large packages may take a few minutes." in (+ PROJECT_ROOT / "plugins" / "_browser" / "webui" / "browser-store.js"+ ).read_text(encoding="utf-8")assert skill.exists()