fixed more bugs

Author: ADScanPro

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "bloodhound-cli"  # The package name as installed via pip (pip install bloodhound-cli)
-version = "1.1.1"          # Bump: add CE skeleton, --edition, --verbose, rich optional
+version = "1.1.2"          # Bump: add CE skeleton, --edition, --verbose, rich optional
 description = "CLI for querying BloodHound data (Legacy Neo4j + CE skeleton)."
 readme = "README.md"
 authors = [

src/bloodhound_cli/__init__.py

@@ -1,2 +1,2 @@
 # src/bloodhound_cli/__init__.py
-__version__ = "1.1.1"
+__version__ = "1.1.2"

src/bloodhound_cli/core/ce.py

@@ -694,6 +694,88 @@ def upload_data_and_wait(self, file_path: str, poll_interval: int = 5, timeout_s
             print(f"Error in upload and wait: {e}")
             return False
 
+    def verify_token(self) -> bool:
+        """Verify if the current token is valid by making a test request"""
+        try:
+            # Try to make a simple API call to verify the token
+            response = self.session.get(
+                f"{self.base_url}/api/v2/file-upload",
+                headers=self._get_headers()
+            )
+            return response.status_code == 200
+        except Exception:
+            return False
+    
+    def auto_renew_token(self) -> bool:
+        """Automatically renew the token using stored credentials"""
+        try:
+            # Load config to get stored credentials
+            config = configparser.ConfigParser()
+            config.read(os.path.expanduser("~/.bloodhound_config"))
+            
+            if 'CE' not in config:
+                return False
+            
+            username = config['CE'].get('username', 'admin')
+            password = config['CE'].get('password')
+            base_url = config['CE'].get('base_url', 'http://localhost:8080')
+            
+            if not password:
+                return False
+            
+            # Create a new session for authentication (without the expired token)
+            import requests
+            temp_session = requests.Session()
+            temp_session.verify = self.session.verify
+            
+            # Authenticate with stored credentials using the temp session
+            login_url = f"{base_url}/api/v2/login"
+            payload = {"login_method": "secret", "username": username, "secret": password}
+            
+            response = temp_session.post(login_url, json=payload, timeout=60)
+            if response.status_code >= 400:
+                return False
+                
+            data = response.json()
+            token = None
+            if isinstance(data, dict):
+                data_field = data.get("data")
+                if isinstance(data_field, dict):
+                    token = data_field.get("session_token")
+            if not token:
+                token = data.get("token") or data.get("access_token") or data.get("jwt")
+            
+            if not token:
+                return False
+            
+            # Update the stored token and our session
+            config['CE']['api_token'] = token
+            with open(os.path.expanduser("~/.bloodhound_config"), 'w') as f:
+                config.write(f)
+            
+            # Update our session with the new token
+            self.api_token = token
+            self.session.headers.update({"Authorization": f"Bearer {token}"})
+            
+            return True
+            
+        except Exception as e:
+            print(f"Error auto-renewing token: {e}")
+            return False
+    
+    def ensure_valid_token(self) -> bool:
+        """Ensure we have a valid token, auto-renew if necessary"""
+        if not self.api_token:
+            return self.auto_renew_token()
+        
+        # Check if current token is valid
+        if self.verify_token():
+            return True
+        
+        # Token is invalid, try to renew
+        print("Token expired, attempting to renew...")
+        return self.auto_renew_token()
+    
     def close(self):
         """Close the HTTP session"""
         try:

src/bloodhound_cli/main.py

@@ -48,10 +48,10 @@ def output_results(results, output_file=None, verbose=False, result_type="result
             # Fallback to console output
             for result in results:
                 print(result)
-        else:
-            # Console output
-            for result in results:
-                print(result)
+    else:
+        # Console output
+        for result in results:
+            print(result)
 
 
 def get_client(edition: str, **kwargs):
@@ -84,8 +84,9 @@ def get_client(edition: str, **kwargs):
             verify=kwargs.get('verify', True)
         )
 
-        # Only authenticate if no token is available (either from config or parameters)
-        if not client.api_token:
+        # Ensure we have a valid token
+        if not client.ensure_valid_token():
+            # If auto-renewal failed, try manual authentication
             username = kwargs.get('username', 'admin')
             password = kwargs.get('ce_password', kwargs.get('password', 'Bloodhound123!'))
             client.authenticate(username, password)
@@ -165,7 +166,7 @@ def cmd_users(args):
             print(f"Found {len(users)} {user_type} in domain {args.domain}")
 
         # Output results to console or file
-        output_results(users, args.output, args.verbose, user_type)
+        output_results(users, args.output, False, user_type)
 
     finally:
         client.close()
@@ -197,7 +198,7 @@ def cmd_computers(args):
             print(f"Found {len(computers)} computers in domain {args.domain}")
 
         # Output results to console or file
-        output_results(computers, args.output, args.verbose, "computers")
+        output_results(computers, args.output, False, "computers")
 
     finally:
         client.close()
@@ -418,6 +419,8 @@ def cmd_auth(args):
 
         config['CE']['base_url'] = args.url
         config['CE']['api_token'] = token
+        config['CE']['username'] = args.username
+        config['CE']['password'] = password  # Store password for auto-renewal
 
         # Update GENERAL section
         if 'GENERAL' not in config: