Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions test_testping1.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,16 @@ def test_is_reachable_ip_too_long(self, mock_call):
self.assertIn("IP address string too long", log.output[0])
mock_call.assert_not_called()

@patch('testping1.subprocess.call')
def test_is_reachable_type_error(self, mock_call):
"""Test is_reachable gracefully handles inputs that raise TypeError."""
invalid_ips = [None, [], {}, ()]
for invalid_ip in invalid_ips:
with self.assertLogs(level='ERROR') as log:
self.assertFalse(is_reachable(invalid_ip))
self.assertIn(f"Invalid IP address format: {repr(invalid_ip)}", log.output[0])
mock_call.assert_not_called()

@patch('testping1.subprocess.call')
def test_is_reachable_argument_injection(self, mock_call):
"""Test is_reachable prevents argument injection by rejecting invalid IPs."""
Expand Down
5 changes: 4 additions & 1 deletion testping1.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,12 @@ def is_reachable(ip, timeout=1):
return False

# πŸ›‘οΈ Sentinel: Validate IP address to prevent argument injection
# Catch TypeError alongside ValueError as ipaddress.ip_address()
# raises TypeError when passed None or non-string/int objects,
# which can crash the worker thread pool (DoS) if unhandled.
try:
ip_obj = ipaddress.ip_address(ip)
except ValueError:
except (ValueError, TypeError):
# πŸ›‘οΈ Sentinel: Sanitize log input to prevent CRLF/Log Injection
logging.error(f"Invalid IP address format: {repr(ip)}")
return False
Expand Down
Loading