-
Notifications
You must be signed in to change notification settings - Fork 0
π‘οΈ Sentinel: [CRITICAL] Fix TOCTOU and unbounded memory consumption DoS in JSON adapters #69
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 |
|---|---|---|
|
|
@@ -105,13 +105,19 @@ def record_attempts(self, attempts: list[Attempt]) -> None: | |
| def _load_storage(self) -> dict[str, object]: | ||
| if not self._file_path.exists(): | ||
| return {"items": [], "attempts": []} | ||
| if self._file_path.stat().st_size > 10 * 1024 * 1024: | ||
| if not self._file_path.is_file(): | ||
| raise ValueError( | ||
| f"Practice repository file {self._file_path} exceeds 10MB size limit" | ||
| f"Practice repository path {self._file_path} is not a regular file" | ||
| ) | ||
|
|
||
| try: | ||
| content = self._file_path.read_text(encoding="utf-8") | ||
| with open(self._file_path, encoding="utf-8") as f: | ||
| content = f.read(10 * 1024 * 1024 + 1) | ||
| if len(content) > 10 * 1024 * 1024: | ||
|
Comment on lines
+115
to
+116
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 _MAX_FILE_SIZE_BYTES = 10 * 1024 * 1024 # 10MBThen you can use this constant here. This makes the intent clearer and simplifies future changes to the limit. |
||
| 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 |
|---|---|---|
|
|
@@ -42,13 +42,19 @@ def _load_storage(self) -> dict[str, LessonProgress]: | |
| """Load all persisted progress payloads.""" | ||
| if not self._file_path.exists(): | ||
| return {} | ||
| if self._file_path.stat().st_size > 10 * 1024 * 1024: | ||
| if not self._file_path.is_file(): | ||
| raise ValueError( | ||
| f"Progress repository file {self._file_path} exceeds 10MB size limit" | ||
| f"Progress repository path {self._file_path} is not a regular file" | ||
| ) | ||
|
|
||
| try: | ||
| content = self._file_path.read_text(encoding="utf-8") | ||
| with open(self._file_path, encoding="utf-8") as f: | ||
| content = f.read(10 * 1024 * 1024 + 1) | ||
| if len(content) > 10 * 1024 * 1024: | ||
|
Comment on lines
+52
to
+53
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 _MAX_FILE_SIZE_BYTES = 10 * 1024 * 1024 # 10MBThen you can use this constant here. This makes the intent clearer and simplifies future changes to the limit. |
||
| 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 |
|---|---|---|
|
|
@@ -36,12 +36,19 @@ def save(self, snapshot: ProgressSnapshot) -> None: | |
| def _load_payload(self) -> dict[str, object]: | ||
| if not self._file_path.exists(): | ||
| return {} | ||
| if self._file_path.stat().st_size > 10 * 1024 * 1024: | ||
| if not self._file_path.is_file(): | ||
| raise ValueError( | ||
| f"Progress snapshot file {self._file_path} exceeds 10MB size limit" | ||
| f"Progress snapshot path {self._file_path} is not a regular file" | ||
| ) | ||
| try: | ||
| parsed = json.loads(self._file_path.read_text(encoding="utf-8")) | ||
| with open(self._file_path, encoding="utf-8") as f: | ||
| content = f.read(10 * 1024 * 1024 + 1) | ||
| if len(content) > 10 * 1024 * 1024: | ||
|
Comment on lines
+45
to
+46
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 _MAX_FILE_SIZE_BYTES = 10 * 1024 * 1024 # 10MBThen you can use this constant here. This makes the intent clearer and simplifies future changes to the limit. |
||
| 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 a 'magic number'. To improve readability and maintainability, consider defining it as a module-level constant, for example:Then you can use this constant here. This makes the intent clearer and simplifies future changes to the limit.