Fix processing of archives with no parent directory #4061
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The ZIP files created by GitHub Actions don't have any parent directory, and just directly contain wpt_report.json, etc. Previously, we were searching for filenames starting with "/", which obviously doesn't match if there is no parent directory.
gsnedders
force-pushed
the
zip_with_no_parent
branch
from
0df8f5e
to
3fd0c99
Compare
past
approved these changes
Oct 16, 2024
| self.results.append(path) | ||
| if re.match(r'^.*/wpt_screenshot.*\.txt$', f.filename): | ||
| elif fnmatch.fnmatchcase(basename, 'wpt_screenshot*.txt'): | ||
| path = z.extract(f, path=self._temp_dir) |
There was a problem hiding this comment.
Why did you move (and duplicate) the path assignment into the conditional? Do the if/elif conditions have side effects?
There was a problem hiding this comment.
Mostly just avoiding decompressing things unnecessarily, try to mitigate some of the risk of any sort of decompression bomb by only decompressing the files we actually care about.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The ZIP files created by GitHub Actions don't have any parent directory, and just directly contain wpt_report.json, etc.
Previously, we were searching for filenames starting with "/", which obviously doesn't match if there is no parent directory.
I believe this will fix the issue described in #4020 (comment), which will hopefully allow us to close that issue.