Skip to content

Commit

Permalink
path/filepath: allow EvalSymlinks to work on UNC share roots on Windows
Browse files Browse the repository at this point in the history
Fixes #42079

Previously, EvalSymlinks returned an error when called with the root of
a UNC share (e.g. \\server\share). This was due to Windows's
FindFirstFile function not supporting a share root path.

To resolve this, now return early from toNorm in the case where the path
after the volume name is empty. Skipping the later path component
resolution shouldn't have any negative impact in this case, as if the
path is empty, there aren't any path components to resolve anyways.

The test case uses the localhost admin share (c$), as it should be
present in most situations. This allows testing without setting up an
external file share. However, this fix applies to all UNC share root
paths.

Change-Id: I05035bd86be93662d7bea34fab4b75fc8e918206
GitHub-Last-Rev: bd3db2c
GitHub-Pull-Request: #42096
Reviewed-on: https://go-review.googlesource.com/c/go/+/263917
Trust: Alex Brainman <alex.brainman@gmail.com>
Trust: Giovanni Bajo <rasky@develer.com>
Run-TryBot: Alex Brainman <alex.brainman@gmail.com>
Reviewed-by: Alex Brainman <alex.brainman@gmail.com>
  • Loading branch information
kevpar authored and rasky committed Oct 25, 2020
1 parent 7930d39 commit 9488741
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions src/path/filepath/path_windows_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,9 @@ func TestToNorm(t *testing.T) {
{`{{tmp}}\test`, `.\foo\bar`, `foo\bar`},
{`{{tmp}}\test`, `foo\..\foo\bar`, `foo\bar`},
{`{{tmp}}\test`, `FOO\BAR`, `foo\bar`},

// test UNC paths
{".", `\\localhost\c$`, `\\localhost\c$`},
}

tmp, err := ioutil.TempDir("", "testToNorm")
Expand Down
2 changes: 1 addition & 1 deletion src/path/filepath/symlink_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ func toNorm(path string, normBase func(string) (string, error)) (string, error)
path = path[len(volume):]

// skip special cases
if path == "." || path == `\` {
if path == "" || path == "." || path == `\` {
return volume + path, nil
}

Expand Down

0 comments on commit 9488741

Please sign in to comment.