-
Notifications
You must be signed in to change notification settings - Fork 0
π‘οΈ Sentinel: [HIGH] Fix OOM DoS and TOCTOU in JSON file adapters #72
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weβll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -231,11 +231,13 @@ def _to_int(value: object, default: int) -> int: | |
|
|
||
|
|
||
| def _read_json(path: Path) -> dict[str, object]: | ||
| if not path.exists(): | ||
| if not path.is_file(): | ||
| return {} | ||
| if path.stat().st_size > 10 * 1024 * 1024: | ||
| with path.open("r", encoding="utf-8") as f: | ||
| content = f.read(10 * 1024 * 1024 + 1) | ||
| if len(content) > 10 * 1024 * 1024: | ||
| raise ValueError(f"Checkpoint file {path} exceeds 10MB size limit") | ||
| parsed = json.loads(path.read_text(encoding="utf-8")) | ||
| parsed = json.loads(content) | ||
| return parsed if isinstance(parsed, dict) else {} | ||
|
Comment on lines
+236
to
241
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This |
||
|
|
||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -103,15 +103,17 @@ def record_attempts(self, attempts: list[Attempt]) -> None: | |
| self._save_storage(storage) | ||
|
|
||
| def _load_storage(self) -> dict[str, object]: | ||
| if not self._file_path.exists(): | ||
| if not self._file_path.is_file(): | ||
| return {"items": [], "attempts": []} | ||
| if self._file_path.stat().st_size > 10 * 1024 * 1024: | ||
| raise ValueError( | ||
| f"Practice repository file {self._file_path} exceeds 10MB size limit" | ||
| ) | ||
|
|
||
| try: | ||
| content = self._file_path.read_text(encoding="utf-8") | ||
| with self._file_path.open("r", encoding="utf-8") as f: | ||
| content = f.read(10 * 1024 * 1024 + 1) | ||
| if len(content) > 10 * 1024 * 1024: | ||
|
Comment on lines
+111
to
+112
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The file size limit For example: _MAX_FILE_SIZE_BYTES = 10 * 1024 * 1024 # 10MB
# ... inside _load_storage
with self._file_path.open("r", encoding="utf-8") as f:
content = f.read(_MAX_FILE_SIZE_BYTES + 1)
if len(content) > _MAX_FILE_SIZE_BYTES:
# ... |
||
| raise ValueError( | ||
| f"Practice repository file {self._file_path} " | ||
| "exceeds 10MB size limit" | ||
| ) | ||
| if not content.strip(): | ||
| return {"items": [], "attempts": []} | ||
| parsed = json.loads(content) | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -40,15 +40,17 @@ def reset_progress(self, user_id: str) -> None: | |
|
|
||
| def _load_storage(self) -> dict[str, LessonProgress]: | ||
| """Load all persisted progress payloads.""" | ||
| if not self._file_path.exists(): | ||
| if not self._file_path.is_file(): | ||
| return {} | ||
| if self._file_path.stat().st_size > 10 * 1024 * 1024: | ||
| raise ValueError( | ||
| f"Progress repository file {self._file_path} exceeds 10MB size limit" | ||
| ) | ||
|
|
||
| try: | ||
| content = self._file_path.read_text(encoding="utf-8") | ||
| with self._file_path.open("r", encoding="utf-8") as f: | ||
| content = f.read(10 * 1024 * 1024 + 1) | ||
| if len(content) > 10 * 1024 * 1024: | ||
|
Comment on lines
+48
to
+49
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The magic number For example: _MAX_FILE_SIZE_BYTES = 10 * 1024 * 1024 # 10MB
# ... inside _load_storage
with self._file_path.open("r", encoding="utf-8") as f:
content = f.read(_MAX_FILE_SIZE_BYTES + 1)
if len(content) > _MAX_FILE_SIZE_BYTES:
# ... |
||
| raise ValueError( | ||
| f"Progress repository file {self._file_path} " | ||
| "exceeds 10MB size limit" | ||
| ) | ||
| if not content.strip(): | ||
| return {} | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,14 +34,16 @@ def save(self, snapshot: ProgressSnapshot) -> None: | |
| self._save_payload(progress_snapshot_to_payload(snapshot)) | ||
|
|
||
| def _load_payload(self) -> dict[str, object]: | ||
| if not self._file_path.exists(): | ||
| if not self._file_path.is_file(): | ||
| return {} | ||
| if self._file_path.stat().st_size > 10 * 1024 * 1024: | ||
| raise ValueError( | ||
| f"Progress snapshot file {self._file_path} exceeds 10MB size limit" | ||
| ) | ||
| try: | ||
| parsed = json.loads(self._file_path.read_text(encoding="utf-8")) | ||
| with self._file_path.open("r", encoding="utf-8") as f: | ||
| content = f.read(10 * 1024 * 1024 + 1) | ||
| if len(content) > 10 * 1024 * 1024: | ||
|
Comment on lines
+41
to
+42
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The file size limit Example: _MAX_FILE_SIZE_BYTES = 10 * 1024 * 1024 # 10MB
# ... inside _load_payload
with self._file_path.open("r", encoding="utf-8") as f:
content = f.read(_MAX_FILE_SIZE_BYTES + 1)
if len(content) > _MAX_FILE_SIZE_BYTES:
# ... |
||
| raise ValueError( | ||
| f"Progress snapshot file {self._file_path} exceeds 10MB size limit" | ||
| ) | ||
| parsed = json.loads(content) | ||
| except (OSError, json.JSONDecodeError): | ||
| return {} | ||
| return parsed if isinstance(parsed, dict) else {} | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The file size limit
10 * 1024 * 1024is used twice here. To improve maintainability and avoid magic numbers, consider defining it as a module-level constant. This would make the code cleaner and easier to update if the limit needs to change.For example:
This principle applies to the other file adapters modified in this pull request as well.