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

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

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

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

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

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

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

{ida_hcli-0.7.7.dev2 → ida_hcli-0.7.7.dev4}/src/hcli/commands/auth/key/create.py

@@ -13,7 +13,7 @@ from hcli.lib.console import console
 
 
 @click.command()
-@click.argument("name", required=False)
+@click.option("-n", "--name", help="Name for the new key")
 @require_auth
 @async_command
 async def create(name: str | None) -> None:

ida_hcli-0.7.7.dev4/src/hcli/commands/download.py

@@ -0,0 +1,233 @@
+from __future__ import annotations
+
+import re
+from typing import List, Optional
+
+import questionary
+import rich_click as click
+from questionary import Choice
+
+from hcli.commands.common import safe_ask_async
+from hcli.lib.api.asset import Asset, TreeNode
+from hcli.lib.api.asset import asset as asset_api
+from hcli.lib.api.common import get_api_client
+from hcli.lib.commands import async_command, auth_command
+from hcli.lib.console import console
+from hcli.lib.constants import cli
+
+
+class BackNavigationResult:
+    """Special result class to indicate backspace navigation."""
+
+    pass
+
+
+BACK_NAVIGATION = BackNavigationResult()
+
+
+async def select_asset(nodes: List[TreeNode], current_path: str = "") -> Optional[Asset]:
+    """Alternative traverse using questionary.select with hierarchical navigation."""
+
+    async def _traverse_recursive(current_nodes: List[TreeNode], path_stack: List[str]) -> Optional[Asset]:
+        # Get folders and files at current level
+        folders = [node for node in current_nodes if node.type == "folder" and node.children]
+        files = [node for node in current_nodes if node.type == "file"]
+
+        # Build choices using questionary Choice objects
+        choices = []
+
+        # Add "Go back" option if not at root - create a special TreeNode for this
+        if path_stack:
+            dummy_asset = Asset(filename="", key="")
+            back_node = TreeNode(name="← Go back", type="back", asset=dummy_asset)
+            choices.append(Choice("← Go back", value=back_node))
+
+        # Add folders
+        for folder in folders:
+            choices.append(Choice(f"📁 {folder.name}", value=folder))
+
+        # Add files
+        for file in files:
+            # Get display info from asset metadata if available
+            display_name = file.name
+            if file.asset and file.asset.metadata and "operating_system" in file.asset.metadata:
+                display_name = f"{file.asset.metadata['name']} ({file.asset.key.split('/')[-1]})"
+            choices.append(Choice(f"📄 {display_name}", value=file))
+
+        if not choices:
+            console.print("[red]No items found at this path[/red]")
+            return None
+
+        # Show current path
+        path_display = "/" + "/".join(path_stack) if path_stack else "/"
+        console.print(f"[blue]Current path: {path_display}[/blue]")
+
+        # Get user selection
+        selected_node = await safe_ask_async(
+            questionary.select(
+                "Select an item to navigate or download:",
+                choices=choices,
+                use_jk_keys=False,
+                use_search_filter=True,
+                style=cli.SELECT_STYLE,
+            )
+        )
+
+        if not selected_node:
+            return None
+
+        # Handle selection based on node type
+        if selected_node.type == "back":
+            # Go back one level by removing last item from path stack
+            return await _traverse_recursive(_get_nodes_at_path(nodes, path_stack[:-1]), path_stack[:-1])
+        elif selected_node.type == "folder":
+            # Navigate into folder
+            if selected_node.children:
+                new_path_stack = path_stack + [selected_node.name]
+                return await _traverse_recursive(selected_node.children, new_path_stack)
+            return None
+        elif selected_node.type == "file":
+            # File selected - return the asset key
+            return selected_node.asset if selected_node.asset else None
+
+        return None
+
+    def _get_nodes_at_path(root_nodes: List[TreeNode], path_stack: List[str]) -> List[TreeNode]:
+        """Helper to get nodes at a specific path in the tree."""
+        current_nodes = root_nodes
+        for path_part in path_stack:
+            # Find the folder with matching name
+            folder = next((node for node in current_nodes if node.type == "folder" and node.name == path_part), None)
+            if not folder or not folder.children:
+                return []
+            current_nodes = folder.children
+        return current_nodes
+
+    return await _traverse_recursive(nodes, [])
+
+
+def collect_all_assets(nodes: List[TreeNode]) -> List[Asset]:
+    """Recursively collect all assets from the tree nodes."""
+    assets = []
+    
+    for node in nodes:
+        if node.type == "file" and node.asset:
+            assets.append(node.asset)
+        elif node.type == "folder" and node.children:
+            assets.extend(collect_all_assets(node.children))
+    
+    return assets
+
+
+def filter_assets_by_pattern(assets: List[Asset], pattern: str) -> List[Asset]:
+    """Filter assets by regex pattern matching their keys."""
+    try:
+        compiled_pattern = re.compile(pattern, re.IGNORECASE)
+        return [asset for asset in assets if compiled_pattern.search(asset.key)]
+    except re.error as e:
+        console.print(f"[red]Invalid regex pattern: {e}[/red]")
+        return []
+
+
+def validate_pattern_for_direct_mode(ctx, param, value):
+    mode = ctx.params.get('mode')
+    if mode == 'direct' and not value:
+        raise click.BadParameter('--pattern is required when --mode is "direct"')
+    return value
+
+@auth_command()
+@click.option("-f", "--force", is_flag=True, help="Skip cache")
+@click.option("--mode", "mode", default="interactive", help="One of interactive or direct")
+@click.option("--output-dir", "output_dir", default="./", help="Output path")
+@click.option("--pattern", "pattern", default=None, help="Pattern to search for assets",callback=validate_pattern_for_direct_mode)
+@click.argument("key", required=False)
+@async_command
+async def download(
+        force: bool = False,
+        output_dir: str = "./",
+        mode: str = "interactive",
+        pattern: Optional[str] = None,
+        key: Optional[str] = None,
+) -> None:
+    """Download IDA binaries, SDK, utilities and more.
+
+    KEY: The asset key for direct download eg. release/9.1/ida-pro/ida-pro_91_x64linux.run (optional)
+
+    \b
+    When using direct mode, a pattern is required.
+
+    """
+    try:
+        if pattern:
+            mode = "direct"
+
+        if key:
+            selected_keys = [key]
+        else:
+            console.print("[yellow]Fetching available downloads...[/yellow]")
+
+            if mode == "direct" and pattern:
+                # Get downloads from API
+                assets = await asset_api.get_files("installers")
+
+                filtered_assets = filter_assets_by_pattern(assets.items, pattern)
+
+                if not filtered_assets:
+                    console.print(f"[red]No assets found matching pattern: {pattern}[/red]")
+                    return
+                
+                console.print(f"[green]Found {len(filtered_assets)} assets matching pattern:[/green]")
+                for asset in filtered_assets:
+                    console.print(f"  • {asset.key}")
+                
+                selected_keys = [asset.key for asset in filtered_assets]
+            else:
+                # Get downloads from API
+                assets = await asset_api.get_files_tree("installers")
+
+                # Interactive navigation
+                selected_asset = await select_asset(assets, "")
+
+                if not selected_asset:
+                    console.print("[yellow]Download cancelled[/yellow]")
+                    return
+
+                selected_keys = [selected_asset.key]
+
+        # Download files
+        client = await get_api_client()
+        downloaded_files = []
+        
+        for selected_key in selected_keys:
+            console.print(f"[yellow]Getting download URL for: {selected_key}[/yellow]")
+            try:
+                download_asset: Optional[Asset] = await asset_api.get_file("installers", selected_key)
+                if not download_asset:
+                    console.print(f"[red]Asset '{selected_key}' not found[/red]")
+                    continue
+            except Exception as e:
+                console.print(f"[red]Failed to get download URL for {selected_key}: {e}[/red]")
+                continue
+
+            if not download_asset.url:
+                console.print(f"[red]Error: No download URL available for asset {selected_key}[/red]")
+                continue
+
+            # Download the file
+            console.print(f"[yellow]Starting download of {selected_key}...[/yellow]")
+            try:
+                target_path = await client.download_file(download_asset.url, target_dir=output_dir, force=force, auth=True)
+                downloaded_files.append(target_path)
+                console.print(f"[green]Download complete! File saved to: {target_path}[/green]")
+            except Exception as e:
+                console.print(f"[red]Failed to download {selected_key}: {e}[/red]")
+                continue
+        
+        if downloaded_files:
+            console.print(f"[green]Successfully downloaded {len(downloaded_files)} file(s)[/green]")
+        else:
+            console.print("[red]No files were downloaded[/red]")
+
+    except Exception as e:
+        console.print(f"[red]Download failed: {e}[/red]")
+        raise

{ida_hcli-0.7.7.dev2 → ida_hcli-0.7.7.dev4}/src/hcli/commands/ida/install.py

@@ -46,7 +46,7 @@ async def install(
             enforce_login()
 
         if download_slug:
-            await download.callback(output_dir=tmp_dir, slug=download_slug)
+            await download.callback(output_dir=tmp_dir, key=download_slug)
             # Find the downloaded installer file
             installer_path = Path(tmp_dir) / Path(download_slug).name
             installer = str(installer_path)

{ida_hcli-0.7.7.dev2 → ida_hcli-0.7.7.dev4}/src/hcli/lib/auth/__init__.py

@@ -193,8 +193,47 @@ class AuthService:
         if self._current_source.type == CredentialType.KEY:
             return bool(self._current_source.token)
         elif self._current_source.type == CredentialType.INTERACTIVE:
-            return self.session is not None and self.session.user is not None
+            # For interactive auth, check if session is valid by attempting to get user
+            if self.session is not None and self.session.user is not None:
+                return True
+            # If we have credentials but no valid session, try to refresh
+            if self._current_source.token:
+                try:
+                    user_response = self.supabase.auth.get_user()
+                    if user_response.user:
+                        self.user = user_response.user
+                        self.session = self.supabase.auth.get_session()
+                        return True
+                except Exception:
+                    # Token exists but is expired/invalid
+                    return False
+            return False
+
+        return False
 
+    def has_expired_session(self) -> bool:
+        """Check if user has credentials but session is expired."""
+        # No expired session for environment API key
+        if ENV.HCLI_API_KEY:
+            return False
+            
+        # No expired session if no credentials exist
+        if not self._current_source:
+            return False
+            
+        # Only interactive auth can have expired sessions
+        if self._current_source.type != CredentialType.INTERACTIVE:
+            return False
+            
+        # Has credentials but session is invalid/expired
+        if self._current_source.token and (self.session is None or self.session.user is None):
+            try:
+                # Try to verify if token is actually expired
+                user_response = self.supabase.auth.get_user()
+                return user_response.user is None
+            except Exception:
+                return True
+                
         return False
 
     def get_auth_type(self) -> Dict[str, str]:

{ida_hcli-0.7.7.dev2 → ida_hcli-0.7.7.dev4}/src/hcli/lib/commands/__init__.py

@@ -20,7 +20,12 @@ def require_auth(f: Callable) -> Callable:
 
         # Check if user is logged in
         if not auth_service.is_logged_in():
-            console.print("[red]You are not logged in. Use 'hcli login'.[/red]")
+            if auth_service.has_expired_session():
+                current_source = auth_service.get_current_credentials()
+                email = current_source.email if current_source else "unknown"
+                console.print(f"[red]Your session {email} has expired, use 'hcli login'.[/red]")
+            else:
+                console.print("[red]You are not logged in. Use 'hcli login'.[/red]")
             sys.exit(1)
 
         return f(*args, **kwargs)
@@ -52,7 +57,12 @@ def enforce_login() -> bool:
     auth_service = get_auth_service()
 
     if not auth_service.is_logged_in():
-        console.print("[red]You are not logged in. Use 'hcli login'.[/red]")
+        if auth_service.has_expired_session():
+            current_source = auth_service.get_current_credentials()
+            email = current_source.email if current_source else "unknown"
+            console.print(f"[red]Your session {email} has expired, use 'hcli login'.[/red]")
+        else:
+            console.print("[red]You are not logged in. Use 'hcli login'.[/red]")
         sys.exit(1)
 
     return True
@@ -97,7 +107,12 @@ class AuthCommand(BaseCommand):
 
         # Check if user is logged in
         if not auth_service.is_logged_in():
-            console.print("[red]You are not logged in. Use 'hcli login'.[/red]")
+            if auth_service.has_expired_session():
+                current_source = auth_service.get_current_credentials()
+                email = current_source.email if current_source else "unknown"
+                console.print(f"[red]Your session {email} has expired, use 'hcli login'.[/red]")
+            else:
+                console.print("[red]You are not logged in. Use 'hcli login'.[/red]")
             sys.exit(1)
 
         # Validate forced credentials exists

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

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

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

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

ida_hcli-0.7.7.dev2/src/hcli/commands/download.py

@@ -1,171 +0,0 @@
-from __future__ import annotations
-
-from typing import List, Optional
-
-import questionary
-import rich_click as click
-from questionary import Choice
-
-from hcli.commands.common import safe_ask_async
-from hcli.lib.api.asset import Asset, TreeNode
-from hcli.lib.api.asset import asset as asset_api
-from hcli.lib.api.common import get_api_client
-from hcli.lib.commands import async_command, auth_command
-from hcli.lib.console import console
-from hcli.lib.constants import cli
-
-
-class BackNavigationResult:
-    """Special result class to indicate backspace navigation."""
-
-    pass
-
-
-BACK_NAVIGATION = BackNavigationResult()
-
-
-async def select_asset(nodes: List[TreeNode], current_path: str = "") -> Optional[Asset]:
-    """Alternative traverse using questionary.select with hierarchical navigation."""
-
-    async def _traverse_recursive(current_nodes: List[TreeNode], path_stack: List[str]) -> Optional[Asset]:
-        # Get folders and files at current level
-        folders = [node for node in current_nodes if node.type == "folder" and node.children]
-        files = [node for node in current_nodes if node.type == "file"]
-
-        # Build choices using questionary Choice objects
-        choices = []
-
-        # Add "Go back" option if not at root - create a special TreeNode for this
-        if path_stack:
-            dummy_asset = Asset(filename="", key="")
-            back_node = TreeNode(name="← Go back", type="back", asset=dummy_asset)
-            choices.append(Choice("← Go back", value=back_node))
-
-        # Add folders
-        for folder in folders:
-            choices.append(Choice(f"📁 {folder.name}", value=folder))
-
-        # Add files
-        for file in files:
-            # Get display info from asset metadata if available
-            display_name = file.name
-            if file.asset and file.asset.metadata and "operating_system" in file.asset.metadata:
-                display_name = f"{file.asset.metadata['name']} ({file.asset.metadata['operating_system']})"
-            choices.append(Choice(f"📄 {display_name}", value=file))
-
-        if not choices:
-            console.print("[red]No items found at this path[/red]")
-            return None
-
-        # Show current path
-        path_display = "/" + "/".join(path_stack) if path_stack else "/"
-        console.print(f"[blue]Current path: {path_display}[/blue]")
-
-        # Get user selection
-        selected_node = await safe_ask_async(
-            questionary.select(
-                "Select an item to navigate or download:",
-                choices=choices,
-                use_jk_keys=False,
-                use_search_filter=True,
-                style=cli.SELECT_STYLE,
-            )
-        )
-
-        if not selected_node:
-            return None
-
-        # Handle selection based on node type
-        if selected_node.type == "back":
-            # Go back one level by removing last item from path stack
-            return await _traverse_recursive(_get_nodes_at_path(nodes, path_stack[:-1]), path_stack[:-1])
-        elif selected_node.type == "folder":
-            # Navigate into folder
-            if selected_node.children:
-                new_path_stack = path_stack + [selected_node.name]
-                return await _traverse_recursive(selected_node.children, new_path_stack)
-            return None
-        elif selected_node.type == "file":
-            # File selected - return the asset key
-            return selected_node.asset if selected_node.asset else None
-
-        return None
-
-    def _get_nodes_at_path(root_nodes: List[TreeNode], path_stack: List[str]) -> List[TreeNode]:
-        """Helper to get nodes at a specific path in the tree."""
-        current_nodes = root_nodes
-        for path_part in path_stack:
-            # Find the folder with matching name
-            folder = next((node for node in current_nodes if node.type == "folder" and node.name == path_part), None)
-            if not folder or not folder.children:
-                return []
-            current_nodes = folder.children
-        return current_nodes
-
-    return await _traverse_recursive(nodes, [])
-
-
-@auth_command()
-@click.option("-f", "--force", is_flag=True, help="Skip cache")
-@click.option("--output-dir", "output_dir", default="./", help="Output path")
-@click.argument("slug", required=False)
-@async_command
-async def download(
-    force: bool = False,
-    output_dir: str = "./",
-    version_filter: Optional[str] = None,
-    latest: bool = False,
-    category_filter: Optional[str] = None,
-    slug: Optional[str] = None,
-) -> None:
-    """Download IDA binaries, SDK, utilities and more."""
-    try:
-        selected_key: Optional[str]
-
-        if slug:
-            selected_key = slug
-        else:
-            # Get downloads from API
-            console.print("[yellow]Fetching available downloads...[/yellow]")
-            assets = await asset_api.get_files_tree("installers")
-
-            if not assets:
-                console.print("[red]No downloads available or unable to fetch downloads[/red]")
-                return
-
-            # Interactive navigation
-            selected_asset = await select_asset(assets, "")
-
-            if not selected_asset:
-                console.print("[yellow]Download cancelled[/yellow]")
-                return
-
-            selected_key = selected_asset.key
-
-        # Get download URL
-        console.print(f"[yellow]Getting download URL for: {selected_key}[/yellow]")
-        try:
-            asset = await asset_api.get_file("installers", selected_key)
-        except Exception as e:
-            console.print(f"[red]Failed to get download URL: {e}[/red]")
-            return
-
-        if not asset:
-            console.print(f"[red]Asset '{selected_key}' not found[/red]")
-            return
-
-        # Download the file
-        console.print("[yellow]Starting download...[/yellow]")
-        client = await get_api_client()
-
-        if not asset.url:
-            console.print("[red]Error: No download URL available for asset[/red]")
-            return
-
-        target_path = await client.download_file(asset.url, target_dir=output_dir, force=force, auth=True)
-
-        console.print(f"[green]Download complete! File saved to: {target_path}[/green]")
-
-    except Exception as e:
-        console.print(f"[red]Download failed: {e}[/red]")
-        raise