Repository navigation
fix(parser): support directory paths with spaces in LIST command (#530) - #578
Merged
hannesdejager merged 1 commit intoOct 25, 2026
Merged
Conversation
…udinvoke#530) Fix LIST command path parsing when listing directories containing spaces in their names. Previously, split(' ') followed by .next() truncated any path after the first space. Now leading hyphen-prefixed option flags and the '--' option delimiter are stripped while preserving the remainder path string intact. Fixes Cloudinvoke#530.
| .map(|s| String::from_utf8_lossy(s).to_string()) | ||
| .next(); | ||
| let line_str = String::from_utf8_lossy(&line); | ||
| let mut remaining = line_str.trim_start(); |
Member
There was a problem hiding this comment.
Thanks for fixing this and adding the integration test! This resolves the reported issue with spaces in directory names.
I noticed one edge case: trim_start() also removes tabs and Unicode whitespace that can legitimately be part of a pathname. Leading ASCII spaces can matter too, so once option parsing ends, we should preserve the remaining pathname unchanged. I checked vsftpd’s implementation, which likewise preserves that remainder without trimming.
I’ll merge this as-is and handle that adjustment and the additional regression tests in a follow-up. No further changes needed from your side—thanks for the contribution!
hannesdejager
added a commit
that referenced
this pull request
Oct 25, 2026
The fix for paths containing spaces in #578 also trimmed leading whitespace. Tabs, Unicode spaces, and additional ASCII spaces can be part of a pathname, so trimming can select a different directory. Consume only the separating space after each leading option and keep the pathname intact, including after the end-of-options delimiter. Cover whitespace and encoded carriage returns in parser tests, and exercise supported filenames over real control and data connections.
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.
Summary
Fixes #530.
When parsing the FTP
LISTcommand with an argument containing spaces (such asLIST path with spaces), the parser previously performed a.split(|&b| b == b' ')and took.next(), causing the path to be truncated after the first space (resulting inpath: Some("path")).Changes
src/server/controlchan/line_parser/parser.rs:LISTparameter parsing to iteratively strip leading hyphen-prefixed option flags (e.g.-la,-x) and support the--option delimiter.src/server/controlchan/line_parser/tests.rs:LISTcovering paths with spaces, multiple option flags, wildcard patterns, leading dashes with--, and whitespace-only input.tests/list.rs:test_list_dir_spaces/sub folder/nested_target) and verifying thatLIST test_list_dir_spaces/sub foldersuccessfully returns the nested entries over the data channel.Cargo.toml:unftp-sbe-fsdev-dependency.Verification
cargo test).tests/list.rs.cargo clippy --all-targets --all-featuresandcargo fmt --check.