show mock and lint

Author: nateinaction

.vscode/launch.json

@@ -7,7 +7,7 @@
             "request": "launch",
             "program": "${workspaceFolder}/.venv/bin/pytest",
             "args": [
-                "tests/unit",
+                "cpython-workspaces/flight-software-unit-tests/src",
                 "--maxfail=1",
                 "--disable-warnings"
             ],

circuitpython-workspaces/flight-software/src/pysquared/hmac_auth.py

@@ -21,14 +21,8 @@
 ```
 """
 
-import circuitpython_hmac as hmac
-
-try:
-    # CircuitPython uses adafruit_hashlib
-    import adafruit_hashlib as hashlib
-except ImportError:
-    # Standard Python uses hashlib
-    import hashlib
+import adafruit_hashlib as hashlib  # interesting, this lib imports cpython stuff if it's available.... hmmm
+from circuitpython_hmac import HMAC
 
 
 class HMACAuthenticator:
@@ -58,26 +52,28 @@ def generate_hmac(self, message: str, counter: int) -> str:
         # Generate HMAC using SHA-256
         # Note: In CircuitPython, this uses the circuitpython_hmac library
         # In testing/CPython, this uses the standard hmac library
-        h = hmac.new(self._secret_key, data, hashlib.sha256)
+        h = HMAC(self._secret_key, data, hashlib.sha256)
         return h.hexdigest()
 
     def compare_digest(expected_hmac: str, received_hmac: str):
         """Compares two byte or str sequences in constant time.
         Returns True if expected_hmac == recieved_hmac, False otherwise.
         """
-        if not isinstance(expected_hmac, (bytes, bytearray, str)) or not isinstance(received_hmac, (bytes, bytearray, str)):
+        if not isinstance(expected_hmac, (bytes, bytearray, str)) or not isinstance(
+            received_hmac, (bytes, bytearray, str)
+        ):
             raise TypeError("compare_digest() expects two bytes or two str objects")
         # Convert strings to bytes if both are str
         if isinstance(expected_hmac, str) and isinstance(received_hmac, str):
-            expected_hmac = expected_hmac.encode('utf-8')
-            received_hmac = received_hmac.encode('utf-8')
+            expected_hmac = expected_hmac.encode("utf-8")
+            received_hmac = received_hmac.encode("utf-8")
         elif isinstance(expected_hmac, str) or isinstance(received_hmac, str):
             raise TypeError("Both inputs must be of the same type")
         # Ensure both are bytes/bytearray at this point
         if len(expected_hmac) != len(received_hmac):
             # Continue processing full length to keep timing consistent
             result = 0
-            maxlen = max(len(expected_hmac), len(b))
+            maxlen = max(len(expected_hmac), len(received_hmac))
             for i in range(maxlen):
                 x = expected_hmac[i] if i < len(expected_hmac) else 0
                 y = received_hmac[i] if i < len(received_hmac) else 0

cpython-workspaces/flight-software-unit-tests/src/unit-tests/test_hmac_integration.py

@@ -5,6 +5,7 @@
 """
 
 import json
+from typing import Generator
 from unittest.mock import MagicMock, patch
 
 import pytest
@@ -63,12 +64,25 @@ def ground_station_authenticator(mock_config):
     return HMACAuthenticator(mock_config.hmac_secret)
 
 
+@pytest.fixture
+def mock_hmac() -> Generator[MagicMock, None, None]:
+    """Mocks the HMAC class.
+
+    Yields:
+        A MagicMock instance of HMAC.
+    """
+    with patch("pysquared.hmac_auth.HMAC") as mock_class:
+        mock_class.return_value = MagicMock()
+        yield mock_class
+
+
 def test_hmac_integration_valid_command(
     flight_software_cdh,
     ground_station_authenticator,
     mock_config,
     mock_packet_manager,
     mock_counter16,
+    mock_hmac,
 ):
     """Tests successful HMAC authentication flow from ground station to flight software.
 
@@ -121,6 +135,7 @@ def test_hmac_integration_invalid_hmac(
     mock_config,
     mock_packet_manager,
     mock_logger,
+    mock_hmac,
 ):
     """Tests that flight software rejects commands with invalid HMAC.
 
@@ -170,6 +185,7 @@ def test_hmac_integration_replay_attack(
     mock_packet_manager,
     mock_counter16,
     mock_logger,
+    mock_hmac,
 ):
     """Tests that flight software prevents replay attacks.
 
@@ -226,6 +242,7 @@ def test_hmac_integration_counter_sequence(
     mock_config,
     mock_packet_manager,
     mock_counter16,
+    mock_hmac,
 ):
     """Tests multiple commands with incrementing counters.
 
@@ -271,6 +288,7 @@ def test_hmac_integration_counter_wraparound(
     mock_config,
     mock_packet_manager,
     mock_counter16,
+    mock_hmac,
 ):
     """Tests counter wraparound handling in integration scenario.
 
@@ -308,7 +326,11 @@ def test_hmac_integration_counter_wraparound(
 
 
 def test_hmac_integration_different_secrets(
-    mock_logger, mock_config, mock_packet_manager, mock_counter16
+    mock_logger,
+    mock_config,
+    mock_packet_manager,
+    mock_counter16,
+    mock_hmac,
 ):
     """Tests that flight software rejects commands with different HMAC secret.
 
@@ -357,6 +379,7 @@ def test_hmac_integration_large_message(
     mock_config,
     mock_packet_manager,
     mock_counter16,
+    mock_hmac,
 ):
     """Tests HMAC authentication with large message requiring packetization.