mirror of
https://github.com/nim-lang/Nim.git
synced 2026-08-29 18:11:44 +00:00
std: ossymlinks.expandSymlink via reparse-point parsing (#25701)
This PR implements `expandSymlink` on Windows with POSIX readlink semantics: it expands exactly one hop and returns the stored link target without resolving the full chain. The main design question was whether Windows symlink expansion should be built on path-finalization APIs such as `GetFinalPathNameByHandleW`, or on direct reparse-point inspection. Current `expandSymlink` is a single-hop "what target is stored in this link object?" operation and most of other ways to resolve symlinks on Windows actually try to answer the "final true file location" question in various slightly-incompatible ways. The full final-path resolution on Windows is substantially more complex than readlink and is planned as a follow-up. ## Implementation choice Implements Windows `expandSymlink` by: - opening the path with `FILE_FLAG_OPEN_REPARSE_POINT` - calling `DeviceIoControl(FSCTL_GET_REPARSE_POINT)` - parsing the reparse payload for `IO_REPARSE_TAG_SYMLINK` and `IO_REPARSE_TAG_MOUNT_POINT` - decoding the UTF-16 slice referenced by the payload - returning the stored target This is the right primitive for the API: - does not depend on whole-path finalization - works for both symlinks and junctions - matches the existing Linux behaviour `widestrs` changes allow using WideCString views without temporary allocations. Windows prohibits symlink creation without admin rights, so, unfortunately, the tests are conditionally skipped by default. Manually running `testament` in an admin console is required. ## Behaviour: - One hop only - Relative symlink targets are returned unchanged - Absolute Windows targets are converted from stored NT-style prefixes to usable Win32 forms when applicable - Non-links, malformed payloads, and unsupported reparse tags raise `OSError` ## Future work Path canonicalization, i.e. "final true file location". Which is, BTW, different from `absolutePath`, which works on paths only and doesn't hit the underlying FS. So this needs to be an API extension. I'd like to follow-up with this when I sort through the docs, for now you can resolve symlinks in a loop. --------- Co-authored-by: Andreas Rumpf <rumpf_a@web.de>
This commit is contained in:
Zoom
@@ -179,7 +179,7 @@ block fileOperations:
|
||||
# Symlink handling in `copyFile`, `copyFileWithPermissions`, `copyFileToDir`,
|
||||
# `copyDir`, `copyDirWithPermissions`, `moveFile`, and `moveDir`.
|
||||
block:
|
||||
const symlinksAreHandled = not defined(windows)
|
||||
const symlinkCopiesAreHandled = not defined(windows)
|
||||
const dname = buildDir/"D20210116T140629"
|
||||
const subDir = dname/"sub"
|
||||
const subDir2 = dname/"sub2"
|
||||
@@ -189,98 +189,131 @@ block fileOperations:
|
||||
const brokenSymlinkCopy = brokenSymlink & "_COPY"
|
||||
const brokenSymlinkInSubDir = subDir/brokenSymlinkName
|
||||
const brokenSymlinkInSubDir2 = subDir2/brokenSymlinkName
|
||||
const symlinkProbeTarget = dname/"symlink_probe_target"
|
||||
const symlinkProbeLink = dname/"symlink_probe_link"
|
||||
|
||||
createDir(subDir)
|
||||
createSymlink(brokenSymlinkSrc, brokenSymlink)
|
||||
proc removePathIfExists(path: string) =
|
||||
if fileExists(path):
|
||||
removeFile(path)
|
||||
elif dirExists(path):
|
||||
removeDir(path)
|
||||
|
||||
# Test copyFile
|
||||
when symlinksAreHandled:
|
||||
proc canCreateSymlinks(): bool =
|
||||
# We need this check for Windows if we want to permit the block to run
|
||||
# when we have admin privileges
|
||||
try:
|
||||
removePathIfExists(dname)
|
||||
createDir(dname)
|
||||
writeFile(symlinkProbeTarget, "")
|
||||
createSymlink(symlinkProbeTarget, symlinkProbeLink)
|
||||
result = true
|
||||
except OSError:
|
||||
result = false
|
||||
finally:
|
||||
removePathIfExists(symlinkProbeLink)
|
||||
removePathIfExists(symlinkProbeTarget)
|
||||
removePathIfExists(dname)
|
||||
|
||||
proc doAssertExpandedSymlink(path, expected: string) =
|
||||
let actual = expandSymlink(path)
|
||||
doAssert actual == expected,
|
||||
"expandSymlink(" & path & ") returned " & actual &
|
||||
" instead of " & expected
|
||||
|
||||
removePathIfExists(dname)
|
||||
let symlinksAreAvailable = not defined(windows) or canCreateSymlinks()
|
||||
if symlinksAreAvailable:
|
||||
defer:
|
||||
removePathIfExists(dname)
|
||||
|
||||
createDir(subDir)
|
||||
createSymlink(brokenSymlinkSrc, brokenSymlink)
|
||||
doAssertExpandedSymlink(brokenSymlink, brokenSymlinkSrc)
|
||||
doAssertRaises(OSError):
|
||||
copyFile(brokenSymlink, brokenSymlinkCopy)
|
||||
doAssertRaises(OSError):
|
||||
copyFile(brokenSymlink, brokenSymlinkCopy, {cfSymlinkFollow})
|
||||
copyFile(brokenSymlink, brokenSymlinkCopy, {cfSymlinkIgnore})
|
||||
doAssert not fileExists(brokenSymlinkCopy)
|
||||
copyFile(brokenSymlink, brokenSymlinkCopy, {cfSymlinkAsIs})
|
||||
when symlinksAreHandled:
|
||||
doAssert expandSymlink(brokenSymlinkCopy) == brokenSymlinkSrc
|
||||
removeFile(brokenSymlinkCopy)
|
||||
else:
|
||||
discard expandSymlink(dname)
|
||||
|
||||
# Test copyFile
|
||||
when symlinkCopiesAreHandled:
|
||||
doAssertRaises(OSError):
|
||||
copyFile(brokenSymlink, brokenSymlinkCopy)
|
||||
doAssertRaises(OSError):
|
||||
copyFile(brokenSymlink, brokenSymlinkCopy, {cfSymlinkFollow})
|
||||
copyFile(brokenSymlink, brokenSymlinkCopy, {cfSymlinkIgnore})
|
||||
doAssert not fileExists(brokenSymlinkCopy)
|
||||
doAssertRaises(AssertionDefect):
|
||||
copyFile(brokenSymlink, brokenSymlinkCopy,
|
||||
{cfSymlinkAsIs, cfSymlinkFollow})
|
||||
copyFile(brokenSymlink, brokenSymlinkCopy, {cfSymlinkAsIs})
|
||||
when symlinkCopiesAreHandled:
|
||||
doAssertExpandedSymlink(brokenSymlinkCopy, brokenSymlinkSrc)
|
||||
removeFile(brokenSymlinkCopy)
|
||||
else:
|
||||
doAssert not fileExists(brokenSymlinkCopy)
|
||||
doAssertRaises(AssertionDefect):
|
||||
copyFile(brokenSymlink, brokenSymlinkCopy,
|
||||
{cfSymlinkAsIs, cfSymlinkFollow})
|
||||
|
||||
# Test copyFileWithPermissions
|
||||
when symlinksAreHandled:
|
||||
doAssertRaises(OSError):
|
||||
copyFileWithPermissions(brokenSymlink, brokenSymlinkCopy)
|
||||
doAssertRaises(OSError):
|
||||
copyFileWithPermissions(brokenSymlink, brokenSymlinkCopy,
|
||||
options = {cfSymlinkFollow})
|
||||
copyFileWithPermissions(brokenSymlink, brokenSymlinkCopy,
|
||||
options = {cfSymlinkIgnore})
|
||||
doAssert not fileExists(brokenSymlinkCopy)
|
||||
copyFileWithPermissions(brokenSymlink, brokenSymlinkCopy,
|
||||
options = {cfSymlinkAsIs})
|
||||
when symlinksAreHandled:
|
||||
doAssert expandSymlink(brokenSymlinkCopy) == brokenSymlinkSrc
|
||||
removeFile(brokenSymlinkCopy)
|
||||
else:
|
||||
doAssert not fileExists(brokenSymlinkCopy)
|
||||
doAssertRaises(AssertionDefect):
|
||||
# Test copyFileWithPermissions
|
||||
when symlinkCopiesAreHandled:
|
||||
doAssertRaises(OSError):
|
||||
copyFileWithPermissions(brokenSymlink, brokenSymlinkCopy)
|
||||
doAssertRaises(OSError):
|
||||
copyFileWithPermissions(brokenSymlink, brokenSymlinkCopy,
|
||||
options = {cfSymlinkFollow})
|
||||
copyFileWithPermissions(brokenSymlink, brokenSymlinkCopy,
|
||||
options = {cfSymlinkAsIs, cfSymlinkFollow})
|
||||
options = {cfSymlinkIgnore})
|
||||
doAssert not fileExists(brokenSymlinkCopy)
|
||||
copyFileWithPermissions(brokenSymlink, brokenSymlinkCopy,
|
||||
options = {cfSymlinkAsIs})
|
||||
when symlinkCopiesAreHandled:
|
||||
doAssertExpandedSymlink(brokenSymlinkCopy, brokenSymlinkSrc)
|
||||
removeFile(brokenSymlinkCopy)
|
||||
else:
|
||||
doAssert not fileExists(brokenSymlinkCopy)
|
||||
doAssertRaises(AssertionDefect):
|
||||
copyFileWithPermissions(brokenSymlink, brokenSymlinkCopy,
|
||||
options = {cfSymlinkAsIs, cfSymlinkFollow})
|
||||
|
||||
# Test copyFileToDir
|
||||
when symlinksAreHandled:
|
||||
doAssertRaises(OSError):
|
||||
copyFileToDir(brokenSymlink, subDir)
|
||||
doAssertRaises(OSError):
|
||||
copyFileToDir(brokenSymlink, subDir, {cfSymlinkFollow})
|
||||
copyFileToDir(brokenSymlink, subDir, {cfSymlinkIgnore})
|
||||
doAssert not fileExists(brokenSymlinkInSubDir)
|
||||
copyFileToDir(brokenSymlink, subDir, {cfSymlinkAsIs})
|
||||
when symlinksAreHandled:
|
||||
doAssert expandSymlink(brokenSymlinkInSubDir) == brokenSymlinkSrc
|
||||
removeFile(brokenSymlinkInSubDir)
|
||||
else:
|
||||
# Test copyFileToDir
|
||||
when symlinkCopiesAreHandled:
|
||||
doAssertRaises(OSError):
|
||||
copyFileToDir(brokenSymlink, subDir)
|
||||
doAssertRaises(OSError):
|
||||
copyFileToDir(brokenSymlink, subDir, {cfSymlinkFollow})
|
||||
copyFileToDir(brokenSymlink, subDir, {cfSymlinkIgnore})
|
||||
doAssert not fileExists(brokenSymlinkInSubDir)
|
||||
copyFileToDir(brokenSymlink, subDir, {cfSymlinkAsIs})
|
||||
when symlinkCopiesAreHandled:
|
||||
doAssertExpandedSymlink(brokenSymlinkInSubDir, brokenSymlinkSrc)
|
||||
removeFile(brokenSymlinkInSubDir)
|
||||
else:
|
||||
doAssert not fileExists(brokenSymlinkInSubDir)
|
||||
|
||||
createSymlink(brokenSymlinkSrc, brokenSymlinkInSubDir)
|
||||
createSymlink(brokenSymlinkSrc, brokenSymlinkInSubDir)
|
||||
|
||||
# Test copyDir
|
||||
copyDir(subDir, subDir2)
|
||||
when symlinksAreHandled:
|
||||
doAssert expandSymlink(brokenSymlinkInSubDir2) == brokenSymlinkSrc
|
||||
# Test copyDir
|
||||
copyDir(subDir, subDir2)
|
||||
when symlinkCopiesAreHandled:
|
||||
doAssertExpandedSymlink(brokenSymlinkInSubDir2, brokenSymlinkSrc)
|
||||
else:
|
||||
doAssert not fileExists(brokenSymlinkInSubDir2)
|
||||
removeDir(subDir2)
|
||||
|
||||
# Test copyDirWithPermissions
|
||||
copyDirWithPermissions(subDir, subDir2)
|
||||
when symlinkCopiesAreHandled:
|
||||
doAssertExpandedSymlink(brokenSymlinkInSubDir2, brokenSymlinkSrc)
|
||||
else:
|
||||
doAssert not fileExists(brokenSymlinkInSubDir2)
|
||||
removeDir(subDir2)
|
||||
|
||||
# Test moveFile
|
||||
moveFile(brokenSymlink, brokenSymlinkCopy)
|
||||
doAssertExpandedSymlink(brokenSymlinkCopy, brokenSymlinkSrc)
|
||||
removeFile(brokenSymlinkCopy)
|
||||
|
||||
# Test moveDir
|
||||
moveDir(subDir, subDir2)
|
||||
doAssertExpandedSymlink(brokenSymlinkInSubDir2, brokenSymlinkSrc)
|
||||
else:
|
||||
doAssert not fileExists(brokenSymlinkInSubDir2)
|
||||
removeDir(subDir2)
|
||||
|
||||
# Test copyDirWithPermissions
|
||||
copyDirWithPermissions(subDir, subDir2)
|
||||
when symlinksAreHandled:
|
||||
doAssert expandSymlink(brokenSymlinkInSubDir2) == brokenSymlinkSrc
|
||||
else:
|
||||
doAssert not fileExists(brokenSymlinkInSubDir2)
|
||||
removeDir(subDir2)
|
||||
|
||||
# Test moveFile
|
||||
moveFile(brokenSymlink, brokenSymlinkCopy)
|
||||
when not defined(windows):
|
||||
doAssert expandSymlink(brokenSymlinkCopy) == brokenSymlinkSrc
|
||||
else:
|
||||
doAssert symlinkExists(brokenSymlinkCopy)
|
||||
removeFile(brokenSymlinkCopy)
|
||||
|
||||
# Test moveDir
|
||||
moveDir(subDir, subDir2)
|
||||
when not defined(windows):
|
||||
doAssert expandSymlink(brokenSymlinkInSubDir2) == brokenSymlinkSrc
|
||||
else:
|
||||
doAssert symlinkExists(brokenSymlinkInSubDir2)
|
||||
|
||||
removeDir(dname)
|
||||
discard "Skipping symlink tests: symlink creation is not permitted in this environment"
|
||||
|
||||
block: # moveFile
|
||||
let tempDir = getTempDir() / "D20210609T151608"
|
||||
|
||||
Reference in New Issue
Block a user