cmd/syncthing, lib/model: Handle rel/abs paths for config/protected paths (Fixes #3183) #3995
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
imsodin
force-pushed
the
protectedIgnore
branch
from
7fae183
to
ddfc26f
Compare
|
The commentary and stuff in main seems off. In general I don't think we can require an absolute config path. For example it would break my workflow:
$ cd test
$ syncthing -home h1
(Unless I misunderstand what this does)
|
|
Your use case still works, this does not require an absolute path, it converts the relative one to an absolute path, by using That comment entered by copy&paste from folderconfig.go, can remove that of course. |
|
Yeah, please do. Now that I read it again it makes sense, but it discusses a performance aspect that is irrelevant when called once in main. It seems to work fine though so my other concern is a non-issue 👍 |
|
@st-review merge it |
|
@calmh: Build status is |
st-review
added
the
pr-merged
st-review
added
the
frozen-due-to-age
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This ensures that the protected paths are relative to the folder root when checking if they are ignored.
While testing I did not get the "overwriting protected files" warning as I set the config directory via
-home=./config. This path is then kept in relative form and therefore isn't considered as a subfolder (model.go:283). This is fixed by callingfilepath.Abson the path given on the command line.