fix: escape regex metacharacters in isURLAllowed pathname allow-list#16997
Open
ciechanowiec wants to merge 1 commit into
Open
fix: escape regex metacharacters in isURLAllowed pathname allow-list#16997ciechanowiec wants to merge 1 commit into
ciechanowiec wants to merge 1 commit into
Conversation
The upload allow-list matcher (isURLAllowed) compiled a pathname pattern into a RegExp without escaping regex metacharacters, so a configured '.' matched any character and the allow-list accepted more URLs than intended. '**' was also rewritten before '*', corrupting '**' into '.[^/]*'. Escape the pattern first (via the existing escapeRegExp utility), then restore the now-escaped wildcards. Applied to both the payload and ui copies. Adds a co-located unit test.
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.
What?
Escapes regex metacharacters in the
pathnamematching ofisURLAllowed(the upload allow-list matcher) before compiling the pattern to aRegExp. Applied to both copies of the function (packages/payloadandpackages/ui) and adds a unit test.Why?
isURLAllowedcompiled an allow-listpathnamepattern into aRegExpwithout escaping regex metacharacters, so a configured.matched any character — e.g. pattern/files/report.jsonalso matched/files/reportXjson. The allow-list therefore accepted more URLs than configured.This matters because
isURLAllowedgates whether an upload-related fetch skips SSRF protection: ingetFileFromURL.ts/getExternalFile.tsan allow-list match (pasteURL.allowList/skipSafeFetch) uses a plainfetchinstead ofsafeFetch. Over-broadpathnamematching widens that boundary. Thehostnamefield is required and matched exactly, so this is not a full cross-host SSRF bypass — it is a defense-in-depth / least-privilege weakening on an already-trusted (often internal) host.Separately,
**was translated to.*before*was translated to[^/]*, so the*inside the freshly inserted.*was rewritten again:/uploads/**compiled to/uploads/.[^/]*and failed to match/uploads/nested/file.png(fail-closed correctness bug).How?
Escape the pattern first via the existing
escapeRegExputility (the same approachwordBoundariesRegex.tsalready uses), then restore the now-escaped\*\*/\*wildcards. Escaping first also resolves the ordering bug, because the resulting.*no longer contains an escaped\*for the next replace to match:Adds
packages/payload/src/utilities/isURLAllowed.spec.tscovering literal metacharacters,*vs**segment semantics, exact hostname matching (incl. theuserinfo@hostcase), and the optional trailing slash.Fixes #16996