url: reject control codes in credentials set via CURLOPT - #22236
Closed
alhudz wants to merge 2 commits into
Closed
Conversation
bagder
approved these changes
Jul 1, 2026
There was a problem hiding this comment.
Pull request overview
This PR closes a credential-injection gap by rejecting ASCII control bytes (notably CR/LF) in usernames/passwords provided via CURLOPT_* options for protocols that do not allow such bytes, aligning behavior with URL-decoded and .netrc credential handling.
Changes:
- Add
PROTOPT_USERPWDCTRL-gatedstr_has_ctrl()screening forCREDS_OPTIONcredentials inurl_set_data_creds(). - Refactor
str_has_ctrl()visibility so it can be reused outside the.netrc-guarded code. - Add regression test
test2114and register it in the tests makefile.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| tests/data/test2114 | New FTP regression test for rejecting CRLF in credentials provided via config/option path. |
| tests/data/Makefile.am | Adds test2114 to the test data distribution/list. |
| lib/url.c | Applies control-code rejection to option-provided credentials for protocols without PROTOPT_USERPWDCTRL. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
as it seems correct Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Member
|
Thanks! |
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.
REJECT_CTRLand.netrccredentials are screened withstr_has_ctrl(), so a control byte in the user or password is refused for protocols withoutPROTOPT_USERPWDCTRL(FTP,IMAP,POP3,SMTP).CURLOPT_USERNAME/CURLOPT_PASSWORD(CREDS_OPTION) skipped that screening, so aCRorLFin the value reached theUSER/PASS/LOGIN/AUTHcommand line verbatim.Applied the same
PROTOPT_USERPWDCTRL-gatedstr_has_ctrl()check to theCURLOPTpath so all three credential sources behave the same.Repro:
CURLOPT_USERNAME=anonymous\r\nSTOR /x, URLftp://host/Expected: refused before connecting
Actual (before):
USER anonymous\r\nSTOR /x\r\nPASS ...written to the control channel, smuggling an extraFTPcommandFix: rejected with
CURLE_BAD_FUNCTION_ARGUMENT, nothing senttest2114reproduces it overFTP.