Merge branch 'main' into fix/URLSanitizer

Author: steam-bell-92

math/README.md

@@ -3,18 +3,24 @@
 This folder contains Python mini-projects focused on math concepts, number patterns, calculators, and transformations. Each project is in its own subfolder and can be run directly from the terminal.
 
 ## Projects in `math/`
-
 - AP-GP-AGP-HP-Recognizer
 - Armstrong-Number
+- Binary-Search
+- Bubble-Sort
 - Collatz-Conjecture
+- Complete-Calculus-Engine
 - Coordinate-to-Polar-Transformation
 - Derivative-Calculator
 - Fibonacci-Series
+- Fourier-Series-Visualizer
 - Happy-Number
 - Matrix-Calculator
+- Merge-Sort
 - Pascal-Triangle
 - Prime-Number-Analyzer
 - Projectile-Motion-Game
+- Quadratic-Solver
+- Quick-Sort
 - Scientific-Graphing-Calculator
 
 ## How to Set Up and Run Any Math Project

security/tar_safe.py

@@ -197,7 +197,10 @@ def _extract_file(
                 while bytes_copied < member.size:
                     chunk = src.read(min(chunk_size, member.size - bytes_copied))
                     if not chunk:
-                        break
+                        raise UnsafeTarError(
+                            f"Truncated file: {member.name} - expected {member.size} bytes, "
+                            f"got {bytes_copied}"
+                        )
                     bytes_copied += len(chunk)
                     tmp.write(chunk)
 

security/url_sanitizer.py

@@ -155,6 +155,21 @@ def _validate_port(self, port: Optional[int]) -> None:
         elif port in self.BLOCKED_PORTS:
             raise InvalidURLError(f"Blocked port: {port}")
 
+    def _validate_port(self, port: Optional[int]) -> None:
+        """Validate port number against allowed/blocked lists."""
+        if port is None:
+            return
+        if port < 1 or port > 65535:
+            raise InvalidURLError(f"Invalid port number: {port}")
+        if self.allowed_ports is not None:
+            if port not in self.allowed_ports:
+                raise InvalidURLError(
+                    f"Port {port} is not allowed. "
+                    f"Allowed ports: {', '.join(str(p) for p in self.allowed_ports)}"
+                )
+        elif port in self.BLOCKED_PORTS:
+            raise InvalidURLError(f"Blocked port: {port}")
+
     def _validate_characters(self, url: str) -> None:
         """Check for unsafe or malicious characters."""
         if '\0' in url:

tests/test_security.py

@@ -263,6 +263,27 @@ def test_nested_valid_directories(self, tmp_path):
         assert len(extracted) == 1
         assert (extract_dir / 'dir1' / 'dir2' / 'file.txt').exists()
 
+    def test_truncated_file_detection(self, tmp_path):
+        """Test that truncated files (size metadata > actual data) are detected."""
+        tar_file = tmp_path / "truncated.tar"
+
+        with tarfile.open(tar_file, 'w') as tar:
+            info = tarfile.TarInfo(name='truncated.txt')
+            info.size = 1000
+            info.type = tarfile.REGTYPE
+            content = b'x' * 1000
+            fileobj = io.BytesIO(content)
+            tar.addfile(info, fileobj)
+
+        data = tar_file.read_bytes()
+        tar_file.write_bytes(data[:512 + 500])
+
+        extract_dir = tmp_path / "extracted"
+        extractor = SafeTarExtractor()
+
+        with pytest.raises(UnsafeTarError):
+            extractor.extract(tar_file, extract_dir)
+
     def test_size_limits(self, tmp_path):
         """Test file size limits."""
         tar_file = tmp_path / "large.tar"

utils/validation.py

@@ -13,6 +13,12 @@ def get_int(
             val_str = input(prompt).strip()
             if not val_str:
                 if default is not None:
+                    if min_value is not None and default < min_value:
+                        print(f"❌ Default {default} is below minimum {min_value}.")
+                        continue
+                    if max_value is not None and default > max_value:
+                        print(f"❌ Default {default} is above maximum {max_value}.")
+                        continue
                     return default
                 print(error_empty)
                 continue
@@ -40,6 +46,12 @@ def get_float(
             val_str = input(prompt).strip()
             if not val_str:
                 if default is not None:
+                    if min_value is not None and default < min_value:
+                        print(f"❌ Default {default} is below minimum {min_value}.")
+                        continue
+                    if max_value is not None and default > max_value:
+                        print(f"❌ Default {default} is above maximum {max_value}.")
+                        continue
                     return default
                 print(error_empty)
                 continue
@@ -52,103 +64,4 @@ def get_float(
                 continue
             return val
         except ValueError:
-            print(error_invalid)
-
-def get_non_empty_string(
-    prompt: str,
-    default: Optional[str] = None,
-    error_empty: str = "❌ Error: Input cannot be empty.",
-) -> str:
-    while True:
-        val_str = input(prompt).strip()
-        if not val_str:
-            if default is not None:
-                return default
-            print(error_empty)
-            continue
-        return val_str
-
-def get_choice(
-    prompt: str,
-    choices: List[str],
-    default: Optional[str] = None,
-    error_empty: str = "❌ Error: Input cannot be empty.",
-    error_invalid: Optional[str] = None,
-) -> str:
-    choices_lower = [c.lower() for c in choices]
-    while True:
-        val_str = input(prompt).strip()
-        if not val_str:
-            if default is not None:
-                return default
-            print(error_empty)
-            continue
-        if val_str.lower() in choices_lower:
-            idx = choices_lower.index(val_str.lower())
-            return choices[idx]
-        if error_invalid is not None:
-            print(error_invalid)
-        else:
-            print(f"❌ Invalid selection. Please choose from: {', '.join(choices)}")
-
-def get_yes_no(prompt: str, default: Optional[str] = None) -> bool:
-    while True:
-        val_str = input(prompt).strip().lower()
-        if not val_str:
-            if default is not None:
-                return default.lower() in ['y', 'yes']
-            print("❌ Error: Input cannot be empty. Please enter 'y' or 'n'.")
-            continue
-        if val_str in ['y', 'yes']:
-            return True
-        if val_str in ['n', 'no']:
-            return False
-        print("❌ Invalid choice. Please enter 'y' or 'n'.")
-
-def get_int_list(
-    prompt: str,
-    min_len: Optional[int] = None,
-    max_len: Optional[int] = None,
-    error_empty: str = "❌ Error: Input cannot be empty.",
-    error_invalid: str = "❌ Error: Please enter valid integers only.",
-) -> List[int]:
-    while True:
-        val_str = input(prompt).strip()
-        if not val_str:
-            print(error_empty)
-            continue
-        try:
-            val_list = [int(x) for x in val_str.split()]
-            if min_len is not None and len(val_list) < min_len:
-                print(f"❌ Error: Please enter at least {min_len} numbers.")
-                continue
-            if max_len is not None and len(val_list) > max_len:
-                print(f"❌ Error: Please enter at most {max_len} numbers.")
-                continue
-            return val_list
-        except ValueError:
-            print(error_invalid)
-
-def get_float_list(
-    prompt: str,
-    min_len: Optional[int] = None,
-    max_len: Optional[int] = None,
-    error_empty: str = "❌ Error: Input cannot be empty.",
-    error_invalid: str = "❌ Error: Please enter valid numbers only.",
-) -> List[float]:
-    while True:
-        val_str = input(prompt).strip()
-        if not val_str:
-            print(error_empty)
-            continue
-        try:
-            val_list = [float(x) for x in val_str.split()]
-            if min_len is not None and len(val_list) < min_len:
-                print(f"❌ Error: Please enter at least {min_len} numbers.")
-                continue
-            if max_len is not None and len(val_list) > max_len:
-                print(f"❌ Error: Please enter at most {max_len} numbers.")
-                continue
-            return val_list
-        except ValueError:
-            print(error_invalid)
+            print(error_invalid)