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

Jump to bottom

[match] prevent directory download from s3 #20975

Merged
merged 7 commits into from
Aug 30, 2023
Merged

[match] prevent directory download from s3 #20975

Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
25a1755
fix: prevent directory download from s3
markhomoki Jan 6, 2023
a70dc41
Merge remote-tracking branch 'upstream/master' into fix/prevent-dir-d…
markhomoki Apr 11, 2023
1ba7bb4
Merge tag 'fastlane/2.213.0' into fix/prevent-dir-download-from-s3
markhomoki Jul 5, 2023
e93ef7b
Merge branch 'master' into fix/prevent-dir-download-from-s3
markhomoki Aug 14, 2023
4137ba4
chore: add test to verify file-like s3 downloads
markhomoki Aug 14, 2023
c38f658
Merge branch 'master' into fix/prevent-dir-download-from-s3
markhomoki Aug 23, 2023
01cc219
Update match/lib/match/storage/s3_storage.rb
markhomoki Aug 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions match/lib/match/storage/s3_storage.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,10 @@ def download
self.working_directory = Dir.mktmpdir

s3_client.find_bucket!(s3_bucket).objects(prefix: s3_object_prefix).each do |object|

# prevent download if file_path is a dir
next if object.key.end_with?("/")
markhomoki marked this conversation as resolved.
Show resolved Hide resolved

file_path = strip_s3_object_prefix(object.key) # :s3_object_prefix:team_id/path/to/file

# strip s3_prefix from file_path
Expand Down