Repository navigation
Escape directory-listing output to prevent XSS - #9
Merged
Merged
Conversation
Server::showDirectoryListing() echoed the request URI and file names into HTML unescaped, allowing reflected XSS via the request URI (and stored XSS via a crafted directory entry) when the opt-in directory-listing option is on. - Extract a pure, testable Server::directoryListingHtml() that HTML-escapes the URI and file names (htmlspecialchars, ENT_QUOTES) before interpolation. - Harden glob() to default to [] so a failed glob no longer feeds false into usort()/array_map() (also removes two phpstan-baseline entries). - Add ServerTest coverage asserting URIs and file names are escaped. Full suite: 316 tests, phpstan green, php-cs-fixer clean.
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
1 participant
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.
Phase-1 finding F-1.2.
Server::showDirectoryListing()echoed the request URI and file names into HTML unescaped. With the opt-indirectory-listingoption on, a request URI like/"><script>…</script>is reflected verbatim → reflected XSS (and a crafted directory entry → stored XSS).Server::directoryListingHtml()that HTML-escapes the URI and file names (htmlspecialchars,ENT_QUOTES).glob()to?: []so a failed glob no longer passesfalseintousort()/array_map()(also clears two phpstan-baseline entries).ServerTestcoverage for escaping + normal links.Full suite: 316 tests, phpstan green, php-cs-fixer clean.