octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-12-22 02:48:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(fs): fix directory junction handling (fixes #9775) (#9786)

Browse Source 
### Purpose

This fixes #9775. I also improved the comments as they were lacking.

My apologies for introducing this bug. In summary, the bug was
```
mode = mode ^ (ModeSymlink | ModeIrregular)
```
didn't correctly reset those bits. This correctly resets them:
```
mode = mode &^ ModeSymlink &^ ModeIrregular
```
Tested and working in Windows 11 version 10.0.22631.4317. I didn't test
in other versions, but I'm sure this is the only issue.
This commit is contained in:
Ross Smith II 2024-10-27 08:08:38 -07:00 committed by GitHub
parent 4afc898c2f
commit 377200591e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/fs/basicfs_lstat_windows.go
View File

@ -67,7 +67,7 @@ type dirJunctFileInfo struct {
func (fi *dirJunctFileInfo) Mode() os.FileMode { func (fi *dirJunctFileInfo) Mode() os.FileMode {
// Simulate a directory and not a symlink; also set the execute // Simulate a directory and not a symlink; also set the execute
// bits so the directory can be traversed Unix-side. // bits so the directory can be traversed Unix-side.
return fi.FileInfo.Mode() ^ junctionPointModeMask | os.ModeDir | 0111 return fi.FileInfo.Mode()&^junctionPointModeMask | os.ModeDir | 0111
} }
func (fi *dirJunctFileInfo) IsDir() bool { func (fi *dirJunctFileInfo) IsDir() bool {
@ -77,10 +77,13 @@ func (fi *dirJunctFileInfo) IsDir() bool {
var junctionPointModeMask os.FileMode var junctionPointModeMask os.FileMode
func init() { func init() {
// Per https://tip.golang.org/doc/go1.23#minor_library_changes
// In go1.22 (and go1.23 when GODEBUG=winsymlink=0) Windows' directory
// junctions (aka "mount points") always have ModeSymlink set.
junctionPointModeMask = os.ModeSymlink junctionPointModeMask = os.ModeSymlink
if version.Compare(runtime.Version(), "go1.23") >= 0 { if version.Compare(runtime.Version(), "go1.23") >= 0 {
// if GODEBUG=winsymlink=0, then we are in g1.22 mode so let's check for // In go1.23 Windows' directory junctions always have ModeIrregular set
// os.ModeSymlink as well, as it can't hurt. // (unless GODEBUG=winsymlink=0).
junctionPointModeMask |= os.ModeIrregular junctionPointModeMask |= os.ModeIrregular
} }
} }