Sync Development Changes

.github/workflows/lint.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v1
         with:
-          python-version: 3.12.12
+          python-version: 3.13.13
 
       - name: Install Python dependencies
         run: pip install black flake8

README.md

@@ -384,6 +384,9 @@ For the replacement of `racadm racreset`, the optional argument `--racreset` was
 ```bash
 badfish -H mgmt-your-server.example.com --racreset
 ```
+* You can also specify `--racreset --wait` and Badfish will poll the iDrac for it to complete and keep you updated on progress. 
+
+
 > [!NOTE]
 > Dell specific command, for Supermicro servers there is an equivalent of `--bmc-reset`
 

src/badfish/config.py

@@ -1 +1 @@
-RETRIES = 15
+RETRIES = 30

src/badfish/helpers/http_client.py

@@ -1,5 +1,6 @@
 import asyncio
 import json
+import ssl
 from typing import Any, Dict, Optional
 
 import aiohttp
@@ -10,19 +11,39 @@
 
 class HTTPClient:
 
-    def __init__(self, host: str, username: str, password: str, logger, retries: int = 15):
+    def __init__(self, host: str, username: str, password: str, logger, retries: int = 15, insecure: bool = False):
         self.host = host
         self.username = username
         self.password = password
         self.logger = logger
         self.retries = retries
+        self.insecure = insecure
         self.host_uri = f"https://{host}"
         self.redfish_uri = "/redfish/v1"
         self.root_uri = f"{self.host_uri}{self.redfish_uri}"
         self.semaphore = asyncio.Semaphore(50)
         self.token = None
         self.session_id = None
 
+    def _handle_ssl_error(self, ex: Exception) -> None:
+        """Handle SSL certificate verification errors by logging and raising exception.
+
+        Args:
+            ex: The SSL exception that was raised
+
+        Raises:
+            BadfishException: Always raises with detailed SSL error information
+        """
+        self.logger.debug(f"SSL certificate verification failed: {ex}")
+        raise BadfishException(
+            f"SSL certificate verification failed for {self.host}. "
+            "This is likely due to a self-signed or untrusted certificate. "
+            "To fix this:\n"
+            "  1. Use a valid, trusted certificate on your BMC/iDRAC, OR\n"
+            "  2. Add the certificate to your system's trust store, OR\n"
+            "  3. For testing only, use the --insecure flag to skip verification (not recommended for production)"
+        )
+
     async def error_handler(self, response: aiohttp.ClientResponse, message: Optional[str] = None) -> None:
         try:
             raw = await response.text("utf-8", "ignore")
@@ -71,18 +92,22 @@ async def get_raw(self, uri: str, _continue: bool = False, _get_token: bool = Fa
                         async with session.get(
                             uri,
                             headers={"X-Auth-Token": self.token} if self.token else {},
-                            ssl=False,
+                            ssl=False if self.insecure else True,
                             timeout=60,
                         ) as _response:
                             await _response.read()
                     else:
                         async with session.get(
                             uri,
                             auth=aiohttp.BasicAuth(self.username, self.password),
-                            ssl=False,
+                            ssl=False if self.insecure else True,
                             timeout=60,
                         ) as _response:
                             await _response.read()
+        except (ssl.SSLError, aiohttp.ClientConnectorCertificateError, aiohttp.ClientSSLError) as ex:
+            if _continue:
+                return
+            self._handle_ssl_error(ex)
         except (Exception, TimeoutError) as ex:
             if _continue:
                 return
@@ -109,12 +134,14 @@ async def post_request(
                         uri,
                         data=json.dumps(payload),
                         headers=headers,
-                        ssl=False,
+                        ssl=False if self.insecure else True,
                     ) as _response:
                         if _response.status != 204:
                             await _response.read()
                         else:
                             return _response
+        except (ssl.SSLError, aiohttp.ClientConnectorCertificateError, aiohttp.ClientSSLError) as ex:
+            self._handle_ssl_error(ex)
         except (Exception, TimeoutError):
             raise BadfishException("Failed to communicate with server.")
         return _response
@@ -129,11 +156,15 @@ async def patch_request(self, uri: str, payload: Dict[str, Any], headers: Dict[s
                         uri,
                         data=json.dumps(payload),
                         headers=headers,
-                        ssl=False,
+                        ssl=False if self.insecure else True,
                     ) as _response:
                         raw_data = await _response.read()
                         self.logger.debug(raw_data)
                         return _response
+        except (ssl.SSLError, aiohttp.ClientConnectorCertificateError, aiohttp.ClientSSLError) as ex:
+            if _continue:
+                return None
+            self._handle_ssl_error(ex)
         except Exception as ex:
             if _continue:
                 return None
@@ -150,11 +181,13 @@ async def delete_request(self, uri: str, headers: Dict[str, str]):
                     async with session.delete(
                         uri,
                         headers=headers,
-                        ssl=False,
+                        ssl=False if self.insecure else True,
                     ) as _response:
                         raw_data = await _response.read()
                         self.logger.debug(raw_data)
                         return _response
+        except (ssl.SSLError, aiohttp.ClientConnectorCertificateError, aiohttp.ClientSSLError) as ex:
+            self._handle_ssl_error(ex)
         except (Exception, TimeoutError):
             raise BadfishException("Failed to communicate with server.")
 

src/badfish/helpers/parser.py

@@ -1,5 +1,6 @@
 import argparse
 
+from badfish import __version__
 from badfish.config import RETRIES
 
 
@@ -9,6 +10,7 @@ def create_parser():
         description="Tool for managing server hardware via the Redfish API.",
         allow_abbrev=False,
     )
+    parser.add_argument("--version", action="version", version=f"%(prog)s {__version__}")
     parser.add_argument("-H", "--host", help="iDRAC host address")
     parser.add_argument("-u", help="iDRAC username")
     parser.add_argument("-p", help="iDRAC password")
@@ -70,6 +72,7 @@ def create_parser():
         action="store_true",
     )
     parser.add_argument("--racreset", help="Flag for iDRAC reset", action="store_true")
+    parser.add_argument("--wait", help="Wait for iDRAC to be responsive after reset", action="store_true")
     parser.add_argument("--bmc-reset", help="Flag for BMC reset", action="store_true")
     parser.add_argument(
         "--factory-reset",
@@ -237,6 +240,11 @@ def create_parser():
         help="Number of retries for executing actions.",
         default=RETRIES,
     )
+    parser.add_argument(
+        "--insecure",
+        help="Disable SSL/TLS certificate verification (insecure, use only for testing)",
+        action="store_true",
+    )
     parser.add_argument(
         "--get-scp-targets",
         help="Get allowable target values to export or import with iDRAC SCP. Choices=['Export', 'Import']",