Consider root_dir and cwd in ssh_sftpd, if both are provided #1335
Conversation
This file contains 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
HansN
added
fix
team:PS
HansN
reviewed
Feb 10, 2017
| end, | ||
| case is_within_root(Root, AbsFile) of | ||
| true -> AbsFile; | ||
| false -> Root | ||
| end. | ||
|
|
There was a problem hiding this comment.
The three case statements above has a bit unusual indentation for being Erlang. Please follow the usual conventions to make it easier to read ('e' in 'end' on same column as 'c' in the corresponding 'case' etc).
There was a problem hiding this comment.
I fixed the code indentation, rebased on new maint and squashed the commits.
The SFTPD server should use root_dir and cwd when resolving file paths, if both are provided. The root directory should be used for resolving absolute file names, and cwd should be used for resolving relative paths.
kape1395
force-pushed
the
ssh_sftpd_cwd_with_root
branch
from
8baf0b7
to
859ac82
Compare
HansN
added
testing
|
Thanks for the updates, I've added the branch to our nightly tests. |
|
Merged! Thanks for the PR. |
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.
The SFTPD server should use root_dir and cwd when resolving
file paths, if both are provided. The root directory should
be used for resolving absolute file names, and cwd should
be used for resolving relative paths.