Repository navigation
Confine CID image embedding to the base path - #15
Merged
Merged
Conversation
When a base path is given, a relative src was joined to it and read without any check, so ../ segments or an absolute-looking path could attach files from outside the base directory. The file must now resolve (symlinks and .. included) inside the base path, be a regular readable file under 5 MB, and have an image MIME type. URLs, stream wrappers and protocol-relative addresses are never treated as local paths.
This file contains hidden or 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
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.
Hardens
CidImageEmbedder::embed()when a$basePathis passed (MailBuilder::embedCidImages($html, $basePath)).Before: a relative
srcwas joined to the base path and read if it existed, so../segments or symlinks could attach files from outside the base directory, whatever their type.Now a local file is embedded only if it:
..included) inside the base path,image/*MIME type.URLs, stream wrappers (
php://,file://), protocol-relative addresses and NUL bytes are never treated as local paths. Calls without a base path behave as before (data URIs only).Tests: inside-base embed, parent and deep traversal, stream wrapper, file scheme, protocol-relative, a symlink leaving the base, and a non-image file. The new tests fail on the old code. Pint, PHPStan and the full suite (152 tests) pass locally.
Not merged or tagged; waiting for the go-ahead.