Skip to content

bpo-9949: Enable symlink traversal for ntpath.realpath #15287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zooba merged 12 commits into from
Aug 21, 2019
Merged

bpo-9949: Enable symlink traversal for ntpath.realpath #15287

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b65f06f
[WIP] bpo-9949: Enable symlink traversal for ntpath.realpath
zooba Aug 14, 2019
df54868
Fixes link resolution and test file creation
zooba Aug 14, 2019
f82129b
Fix x-plat handling in test_ntpath and additional error code
zooba Aug 14, 2019
8ee4046
Fix use of os.path in ntpath tests
zooba Aug 14, 2019
b93c9e8
Fix additional uses of os.path
zooba Aug 14, 2019
5f9816f
Validate that the path prefix is unnecessary before removing
zooba Aug 14, 2019
d1d0726
Don't need second call to _getfinalpathname
zooba Aug 14, 2019
9bc4192
Fix test discovery mocks
zooba Aug 14, 2019
9dc0608
Avoid traversing a symlink cycle
zooba Aug 15, 2019
28c9bb4
Simplify and document cycle handling in os.path.realpath
zooba Aug 16, 2019
ab485a5
Update whatsnew
zooba Aug 16, 2019
5d560b8
Add fast resolution path and minor doc update
zooba Aug 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Add fast resolution path and minor doc update
  • Loading branch information
@zooba
zooba committed Aug 21, 2019
commit 5d560b8a5dc0c2ce661e4f3ee42d59fe4d5cd498
3 changes: 2 additions & 1 deletion Doc/library/os.path.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,8 @@ the :mod:`glob` module.)
Accepts a :term:`path-like object`.

.. versionchanged:: 3.8
Symbolic links are now resolved on Windows.
Symbolic links and junctions are now resolved on Windows.


.. function:: relpath(path, start=os.curdir)

Expand Down
7 changes: 7 additions & 0 deletions Lib/ntpath.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,13 @@ def _readlink_deep(path, seen=None):
return path

def _getfinalpathname_nonstrict(path):
# Fast path to get the final path name. If this succeeds, there
# is no need to go any further.
try:
return _getfinalpathname(path)
except OSError:
pass

# Allow file (2) or directory (3) not found, invalid syntax (123),
# and symlinks that cannot be followed (1921)
allowed_winerror = 2, 3, 123, 1921
Expand Down