ida-hcli 0.13.3.dev2__tar.gz → 0.13.3.dev4__tar.gz

{ida_hcli-0.13.3.dev2 → ida_hcli-0.13.3.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ida-hcli
-Version: 0.13.3.dev2
+Version: 0.13.3.dev4
 Summary: HCLI - Hex-Rays CLI Utility
 Author-email: Hex-Rays SA <support@hex-rays.com>
 License-Expression: MIT

{ida_hcli-0.13.3.dev2 → ida_hcli-0.13.3.dev4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ida-hcli"
-version = "0.13.3-dev.2"
+version = "0.13.3-dev.4"
 description = "HCLI - Hex-Rays CLI Utility"
 requires-python = ">=3.10"
 license = "MIT"

ida_hcli-0.13.3.dev4/src/hcli/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.13.3-dev.4"

{ida_hcli-0.13.3.dev2 → ida_hcli-0.13.3.dev4}/src/hcli/commands/plugin/lint.py

@@ -14,12 +14,12 @@ from pydantic import ValidationError
 from hcli.lib.console import console
 from hcli.lib.ida.plugin import (
     IDAMetadataDescriptor,
-    get_metadatas_with_paths_from_plugin_archive,
     parse_plugin_version,
     validate_metadata_in_plugin_archive,
 )
 from hcli.lib.ida.plugin.install import validate_metadata_in_plugin_directory
 from hcli.lib.ida.plugin.repo import fetch_plugin_archive
+from hcli.lib.util.logging import m
 
 logger = logging.getLogger(__name__)
 
@@ -232,15 +232,36 @@ def _lint_plugin_archive(zip_data: bytes, source_name: str) -> int:
     """
     recommendation_count = 0
 
-    try:
-        plugins_found = list(get_metadatas_with_paths_from_plugin_archive(zip_data))
-    except Exception as e:
-        console.print(f"[red]Error[/red]: Failed to read plugins from archive {source_name}: {e}")
-        recommendation_count += 1
-        return recommendation_count
-    else:
-        for path, meta in plugins_found:
-            logger.debug("found plugin %s at %s", meta.plugin.name, path)
+    plugins_found = []
+    with zipfile.ZipFile(io.BytesIO(zip_data), "r") as zip_file:
+        for file_path in zip_file.namelist():
+            if not file_path.endswith("ida-plugin.json"):
+                continue
+
+            logger.debug(m("found metadata path: %s", file_path))
+            with zip_file.open(file_path) as f:
+                try:
+                    metadata = IDAMetadataDescriptor.model_validate_json(f.read().decode("utf-8"))
+                except ValidationError as e:
+                    logger.debug(m("failed to validate metadata: %s", file_path, path=file_path, error=str(e)))
+                    console.print(f"[red]Error[/red] ({source_name}): {file_path}: ida-plugin.json validation failed")
+                    for error in e.errors():
+                        field_path = ".".join(str(loc) for loc in error["loc"])
+                        error_msg = error["msg"]
+                        error_type = error["type"]
+
+                        if error_type == "missing":
+                            console.print(f"  [red]Missing required field[/red]: {field_path}")
+                        else:
+                            console.print(f"  [red]Invalid value[/red] for {field_path}: {error_msg}")
+                        recommendation_count += 1
+                    continue
+                else:
+                    logger.debug(m("found valid metadata: %s", file_path))
+                    plugins_found.append((Path(file_path), metadata))
+
+    for path, meta in plugins_found:
+        logger.debug("found plugin %s at %s", meta.plugin.name, path)
 
     if not plugins_found:
         console.print(f"[red]Error[/red]: No valid plugins found in archive {source_name}")

{ida_hcli-0.13.3.dev2 → ida_hcli-0.13.3.dev4}/src/hcli/lib/ida/__init__.py

@@ -176,6 +176,8 @@ def get_default_ida_install_directory(ver: IdaProduct) -> Path:
         # typically idat isn't widely used; however, HCLI does use it to discover the path to IDA's Python interpreter,
         # as well as the installed arch (ARM or Intel on macOS). The latter could probably be discovered by inspecting
         # the installed files; however, figuring out the Python configuration is messy, and much easier to leave to idat.
+        #
+        # see also the warnings in commands/ida/install.py.
         if ver.major == 9 and ver.minor == 2 and " " in app_directory_name:
             # "IDA Professional 9.2" -> "IDA-Professional-9.2"
             sanitized_name = app_directory_name.replace(" ", "-")
@@ -624,6 +626,11 @@ def run_py_in_current_idapython(src: str) -> str:
     if not idat_path.exists():
         raise ValueError(f"can't find idat: {idat_path}")
 
+    if get_os() == "linux" and "9.2" in str(idat_path.absolute()):
+        logger.warning(
+            "invoking idat on IDA 9.2/Linux with a space in the full path, you might encounter HCLI GitHub issue #99"
+        )
+
     with tempfile.TemporaryDirectory() as temp_dir:
         temp_path = Path(temp_dir)
 
@@ -661,7 +668,7 @@ def run_py_in_current_idapython(src: str) -> str:
             logger.debug(f"idat stderr: {result.stderr}")
 
         if not log_path.exists():
-            raise RuntimeError(f"Log file was not created: {log_path}")
+            raise RuntimeError(f"failed to invoke idat: log file was not created: {log_path}")
 
         for line in log_path.read_text().splitlines():
             if not line.startswith("__hcli__:"):
@@ -669,7 +676,7 @@ def run_py_in_current_idapython(src: str) -> str:
 
             return json.loads(line[len("__hcli__:") :])
 
-        raise RuntimeError("Could not find __hcli__: prefix in log output")
+        raise RuntimeError("failed to invoke idat: could not find expected lines in log output")
 
 
 def get_current_ida_platform_cache_path() -> Path:
@@ -745,7 +752,10 @@ def find_current_ida_platform() -> str:
             return get_current_ida_platform_cache(ida_dir)
         except KeyError:
             pass
-        platform = run_py_in_current_idapython(FIND_PLATFORM_PY)
+        try:
+            platform = run_py_in_current_idapython(FIND_PLATFORM_PY)
+        except RuntimeError as e:
+            raise RuntimeError("failed to determine current IDA platform") from e
         set_current_ida_platform_cache(ida_dir, platform)
         return platform
     else:
@@ -802,7 +812,10 @@ def find_current_ida_version() -> str:
         return get_current_ida_version_cache(ida_dir)
     except KeyError:
         pass
-    version = run_py_in_current_idapython(FIND_VERSION_PY)
+    try:
+        version = run_py_in_current_idapython(FIND_VERSION_PY)
+    except RuntimeError as e:
+        raise RuntimeError("failed to determine current IDA version") from e
     set_current_ida_version_cache(ida_dir, version)
     return version
 

{ida_hcli-0.13.3.dev2 → ida_hcli-0.13.3.dev4}/src/hcli/lib/ida/plugin/repo/github.py

@@ -634,8 +634,14 @@ class GithubPluginRepo(BasePluginRepo):
             md = get_releases_metadata(self.client, owner, repo)
             seen_zipball_urls = set()
             for release in md.releases:
+                context = {
+                    "owner": owner,
+                    "repo": repo,
+                    "release": release.tag_name,
+                    "date": release.published_at,
+                }
                 logger.debug(
-                    m("considering release: %s", release.tag_name, owner=owner, repo=repo, release=release.tag_name)
+                    m("considering release: %s", release.tag_name, **context)
                 )
 
                 if release.published_at < "2025-09-01":
@@ -643,20 +649,18 @@ class GithubPluginRepo(BasePluginRepo):
                         m(
                             "skipping old release: %s < 2025-09-01",
                             release.published_at,
-                            owner=owner,
-                            repo=repo,
-                            release=release.tag_name,
+                            **context,
                         )
                     )
                     continue
 
-                logger.debug(m("found release: %s", release.tag_name, owner=owner, repo=repo, release=release.tag_name))
+                logger.debug(m("found release: %s", release.tag_name, **context))
 
                 # source archives
-                source_archives.append((owner, repo, release.commit_hash, release.zipball_url))
+                source_archives.append((owner, repo, release.commit_hash, release.zipball_url, release.published_at))
                 seen_zipball_urls.add(release.zipball_url)
                 logger.debug(
-                    m("found zipball URL: %s", release.zipball_url, owner=owner, repo=repo, release=release.tag_name)
+                    m("found zipball URL: %s", release.zipball_url, **context)
                 )
 
                 # assets (distribution/binary archives)
@@ -664,23 +668,27 @@ class GithubPluginRepo(BasePluginRepo):
                     if asset.content_type != "application/zip":
                         continue
 
-                    assets.append((owner, repo, release.tag_name, asset))
+                    assets.append((owner, repo, release.tag_name, asset, release.published_at))
                     logger.debug(
                         m(
                             "found zip asset: %s",
                             asset.download_url,
-                            owner=owner,
-                            repo=repo,
-                            release=release.tag_name,
-                            asset=asset.name,
+                            **dict(context, asset=asset.name),
                         )
                     )
 
             for tag in md.tags:
-                logger.debug(m("considering tag: %s", tag.tag_name, owner=owner, repo=repo, tag=tag.tag_name))
+                context = {
+                    "owner": owner,
+                    "repo": repo,
+                    "tag": tag.tag_name,
+                    "date": tag.committed_date,
+                }
+
+                logger.debug(m("considering tag: %s", tag.tag_name, **context))
 
                 if not tag.tag_name.startswith("v"):
-                    logger.debug(m("skipping non-v* tag: %s", tag.tag_name, owner=owner, repo=repo, tag=tag.tag_name))
+                    logger.debug(m("skipping non-v* tag: %s", tag.tag_name, **context))
                     continue
 
                 if tag.committed_date < "2025-09-01":
@@ -688,27 +696,25 @@ class GithubPluginRepo(BasePluginRepo):
                         m(
                             "skipping old tag: %s < 2025-09-01",
                             tag.committed_date,
-                            owner=owner,
-                            repo=repo,
-                            tag=tag.tag_name,
+                            **context,
                         )
                     )
                     continue
 
-                logger.debug(m("found tag: %s", tag.tag_name, owner=owner, repo=repo, tag=tag.tag_name))
+                logger.debug(m("found tag: %s", tag.tag_name, **context))
 
                 if tag.zipball_url in seen_zipball_urls:
                     logger.debug(
-                        m("already found URL for tag: %s", tag.zipball_url, owner=owner, repo=repo, tag=tag.tag_name)
+                        m("already found URL for tag: %s", tag.zipball_url, **context)
                     )
                 else:
-                    source_archives.append((owner, repo, tag.commit_hash, tag.zipball_url))
+                    source_archives.append((owner, repo, tag.commit_hash, tag.zipball_url, tag.committed_date))
                     seen_zipball_urls.add(tag.zipball_url)
-                    logger.debug(m("found zipball URL: %s", tag.zipball_url, owner=owner, repo=repo, tag=tag.tag_name))
+                    logger.debug(m("found zipball URL: %s", tag.zipball_url, **context))
 
         index = PluginArchiveIndex()
 
-        for owner, repo, tag_name, asset in rich.progress.track(
+        for owner, repo, tag_name, asset, date in rich.progress.track(
             assets, description="Fetching plugin assests", transient=True, console=stderr_console
         ):
             logger.debug(m("fetching release asset: %s", asset.download_url, owner=owner, repo=repo, tag=tag_name))
@@ -722,10 +728,10 @@ class GithubPluginRepo(BasePluginRepo):
                 buf,
                 asset.download_url,
                 expected_host=host_url,
-                context=dict(owner=owner, repo=repo, type="release asset", tag=tag_name, url=asset.download_url),
+                context=dict(owner=owner, repo=repo, type="release asset", tag=tag_name, url=asset.download_url, date=date),
             )
 
-        for owner, repo, commit_hash, url in rich.progress.track(
+        for owner, repo, commit_hash, url, date in rich.progress.track(
             source_archives, description="Fetching plugin source archives", transient=True, console=stderr_console
         ):
             logger.debug(m("fetching source archive: %s", url, owner=owner, repo=repo, commit=commit_hash))
@@ -739,7 +745,7 @@ class GithubPluginRepo(BasePluginRepo):
                 buf,
                 url,
                 expected_host=host_url,
-                context=dict(owner=owner, repo=repo, type="source archive", commit=commit_hash, url=url),
+                context=dict(owner=owner, repo=repo, type="source archive", commit=commit_hash, url=url, date=date),
             )
 
         return index.get_plugins()

{ida_hcli-0.13.3.dev2 → ida_hcli-0.13.3.dev4}/src/hcli/lib/ida/python.py

@@ -32,7 +32,11 @@ def find_current_python_executable() -> Path:
     if ENV.HCLI_CURRENT_IDA_PYTHON_EXE is not None:
         return Path(ENV.HCLI_CURRENT_IDA_PYTHON_EXE)
 
-    exe = run_py_in_current_idapython(FIND_PYTHON_PY)
+    try:
+        exe = run_py_in_current_idapython(FIND_PYTHON_PY)
+    except RuntimeError as e:
+        raise RuntimeError("failed to determine current IDA python interpreter") from e
+
     logger.debug("found python path: %s", exe)
     return Path(exe)
 

{ida_hcli-0.13.3.dev2 → ida_hcli-0.13.3.dev4}/src/ida_hcli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ida-hcli
-Version: 0.13.3.dev2
+Version: 0.13.3.dev4
 Summary: HCLI - Hex-Rays CLI Utility
 Author-email: Hex-Rays SA <support@hex-rays.com>
 License-Expression: MIT

ida_hcli-0.13.3.dev2/src/hcli/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.13.3-dev.2"