Skip to content
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.

Sign up for GitHub

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

Fix recursion error during file attachment parsing of deep nested paths #173

Merged
merged 15 commits into from
May 9, 2023
+117 −41
Merged

Fix recursion error during file attachment parsing of deep nested paths #173

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9952110
Ensure mp Pool is not reused to avoid broken pipes from shutdown
ionite34 Mar 12, 2023
3ea786f
Reduce file parse timeout from 8 to 5 seconds
ionite34 Mar 12, 2023
2abd6cd
Handle recursion error cases from glob
ionite34 Mar 12, 2023
46dd830
Add `timeout` to `MemFS.files` and `MemFS.files_list` for more cooper…
ionite34 Mar 12, 2023
99d6b96
Provide files_timeout to `MemFS.files_list` call
ionite34 Mar 12, 2023
6601b36
Add unit test for deeply nested path file parsing
ionite34 Mar 12, 2023
7ca3917
Add SIGALRM based time limit
ionite34 Mar 13, 2023
0ef2552
Remove unused timed function
ionite34 Mar 13, 2023
fb01ba2
Update snekbox/utils/timed.py
ionite34 Mar 15, 2023
6b0dba5
Use log.exception for catch all
ionite34 Mar 16, 2023
e924217
Rename `count` variable
ionite34 Mar 16, 2023
6441719
Include TimeoutError in raises docstring field
ionite34 Mar 16, 2023
1af5bf0
Add unit tests for time_limit
ionite34 Mar 16, 2023
de1327d
Update type hint for `files_timeout` to be `int` to be compatible wit…
ionite34 Mar 16, 2023
90910bd
Merge branch 'main' into file-scan-recursion-fix
ChrisLovering May 9, 2023
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
2 changes: 1 addition & 1 deletion snekbox/nsjail.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ def python3(
args, None, "TimeoutError: Exceeded time limit while parsing attachments"
)
except Exception as e:
log.error(f"Unexpected {type(e).__name__} while parse attachments: {e}")
log.exception(f"Unexpected {type(e).__name__} while parse attachments", exc_info=e)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

exc_info is redundant when log.exception is used within an except block.

return EvalResult(
args, None, "FileParsingError: Unknown error while parsing attachments"
)
Expand Down