lib/versioner: expand tildes in version directory (fixes #9241) #9327
Conversation
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
calmh
approved these changes
Jan 7, 2024
calmh
reviewed
Jan 7, 2024
lib/versioner/simple_test.go
Outdated
Comment on lines
104
to
105
| t.Setenv("USERPROFILE", home) | ||
| os.Mkdir(filepath.Join(home, "folder"), 0755) |
Member
There was a problem hiding this comment.
This fails on the Windows runner, probably because our legacy HOMEDRIVE/HOMEPATH check takes precedence over USERPROFILE.
Contributor
Author
There was a problem hiding this comment.
Hmm, not fixed.
\\?\C:\C:\Users\RUNNER~1\AppData\Local\Temp\TestPathTildes1447117282\001\folder\test: The filename, directory name, or volume label syntax is incorrect.
Not sure where the extra C:\ is coming from. Will take another look later today.
calmh
reviewed
Jan 7, 2024
Member
calmh
left a comment
There was a problem hiding this comment.
Thanks, and welcome, and thanks for Go and all :)
When creating the versioner file system, first try to expand any leading tildes to the user's home directory before handling relative paths. This makes a version path "~/p" expand to "$HOME/p" instead of "/folder/~/p".
calmh
added a commit
to calmh/syncthing
that referenced
this pull request
Jan 14, 2024
* main: (24 commits) lib/ignore: Refactor out result type (syncthing#9343) build: Testing infra images for infra-* branches lib/versioner: Expand tildes in version directory (fixes syncthing#9241) (syncthing#9327) lib/scanner: Prevent sync-conflict for receive-only local modifications (syncthing#9323) gui, man, authors: Update docs, translations, and contributors Fix website security link in README.md (syncthing#9325) cmd/syncthing: Add CLI completion functionality (fixes syncthing#8616) (syncthing#9226) lib/api: Save session & CSRF tokens to database, add option to stay logged in (fixes syncthing#9151) (syncthing#9284) Update dependencies (syncthing#9321) gui: Always inform about loading data in Restore Versions modal (syncthing#9317) lib/build: Allow semver build in version regex (fixes syncthing#9267) (syncthing#9316) gui: Keep short deviceID length consistent + xrefs (fixes syncthing#9313) (syncthing#9314) build(deps): bump actions/download-artifact from 3 to 4 (syncthing#9294) build(deps): bump actions/upload-artifact from 3 to 4 (syncthing#9293) gui, man, authors: Update docs, translations, and contributors gui, lib/scanner: Improve scan progress indication (ref syncthing#8331) (syncthing#9308) lib/protocol: handle empty names in unixOwnershipEqual (fixes syncthing#9039) (syncthing#9306) gui, man, authors: Update docs, translations, and contributors etc/linux-desktop: use double dash for long options (syncthing#9301) lib/connections: Skip allocation in check for missing port (syncthing#9297) ...
Contributor
Author
|
Thanks for the fix! ❤️ |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
Purpose
Fix #9241 by expanding tildes in version paths.
When creating the versioner file system, first try to expand any leading tildes to the user's home directory before handling relative paths. This makes a version path
"~/p"expand to"$HOME/p"instead of"/folder/~/p".Testing
Added a test to lib/versioner that exercises this code path. Also manually tested with local syncthing instances.