Skip to content

fix: handle non-numeric manifest icon keys in get_extension_icon to prevent ValueError crash #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Copilot wants to merge 1 commit into from
Closed

fix: handle non-numeric manifest icon keys in get_extension_icon to prevent ValueError crash #133

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions src/extension_shield/api/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4035,19 +4035,22 @@ def _persisted_icon_response() -> Optional[Response]:
# Check icons object in manifest
manifest_icons = manifest.get("icons", {})
if manifest_icons:
# Get the largest icon
largest_size = max(manifest_icons.keys(), key=lambda x: int(x))
icon_rel_path = manifest_icons[largest_size]
manifest_icon_path = os.path.join(extracted_path, icon_rel_path)

# Security check
abs_icon_path = os.path.abspath(manifest_icon_path)
abs_extracted_path = os.path.abspath(extracted_path)

if abs_icon_path.startswith(abs_extracted_path):
if os.path.exists(manifest_icon_path):
logger.debug(f"Found icon from manifest at: {manifest_icon_path}")
return _extension_icon_file_response(manifest_icon_path)
# Get the largest icon - only consider numeric size keys (e.g. "128", "64")
# Some extensions use non-numeric keys like "48x48" which cause int() to raise ValueError
numeric_keys = [k for k in manifest_icons if k.isdigit()]
if numeric_keys:
largest_size = max(numeric_keys, key=int)
icon_rel_path = manifest_icons[largest_size]
manifest_icon_path = os.path.join(extracted_path, icon_rel_path)

# Security check
abs_icon_path = os.path.abspath(manifest_icon_path)
abs_extracted_path = os.path.abspath(extracted_path)

if abs_icon_path.startswith(abs_extracted_path):
if os.path.exists(manifest_icon_path):
logger.debug(f"Found icon from manifest at: {manifest_icon_path}")
return _extension_icon_file_response(manifest_icon_path)
except Exception as e:
logger.warning(f"Failed to read manifest for icons: {e}")

Expand Down