Skip to content

Do not upload files outside task sandbox#1777

Merged
ssalinas merged 1 commit into
masterfrom
s3-guardrails
Apr 12, 2018
Merged

Do not upload files outside task sandbox#1777
ssalinas merged 1 commit into
masterfrom
s3-guardrails

Conversation

@pschoenfelder
Copy link
Copy Markdown
Contributor

No description provided.

@pschoenfelder pschoenfelder requested a review from ssalinas April 4, 2018 20:30
for (SingularityS3UploaderFile additionalFile : taskDefinition.getExecutorData().getS3UploaderAdditionalFiles()) {
Path directory = additionalFile.getDirectory().isPresent() ? taskDefinition.getTaskDirectoryPath().resolve(additionalFile.getDirectory().get()) : taskDefinition.getTaskDirectoryPath();

if (!directory.toAbsolutePath().startsWith(taskDefinition.getTaskDirectoryPath())) {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Do we want to && this with isCheckSubdirectories(). The main thing we're trying to protect against is the uploader going crazy checking all subdirectories of / or something like that. Debating if we should allow a way for folks to use this for things outside of the sandbox, within reason. @baconmania thoughts?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

As far as I can tell the startsWith method of checking this should not start recursively checking directories so I don't think we have to worry about going crazy checking all subdirs of /.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

It's not the startsWith, that's just a string check, I'm worried about. It's the isCheckSubdirectories() value of the additionalFile. If it isn't checking subdirectories/not recursive, the most files the uploader will eventually scan is whatever is in the specified folder. If it is recursive, that's the problem we are trying to prevent. (e.g. isCheckSubdirectories() -> true with a folder of / essentially causes it to check every folder on the host

That said I could go either way on limiting this. It's basically a question of whether or not we expect a task to write to and want to upload something outside it's sandbox, and if it does we certainly need to impose a limit that the folder isn't checked recursively

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I could see potentially only doing this limitation based on isCheckSubdirectories() == true, but my vote here right now would be to default to limiting everything to the sandbox unless we see an ask where people want to be able to upload things outside the sandbox.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

👍 fair enough, let's leave the check as-is for now then

@ssalinas ssalinas added this to the 0.20.0 milestone Apr 11, 2018
@ssalinas
Copy link
Copy Markdown
Contributor

🚢

@ssalinas ssalinas merged commit 38548b8 into master Apr 12, 2018
@ssalinas ssalinas deleted the s3-guardrails branch April 12, 2018 14:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants