Thanks to visit codestin.com
Credit goes to github.com

Skip to content

GH-73991: Disallow copying directory into itself via pathlib.Path.copy() #122924

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
merged 9 commits into from
Aug 23, 2024
Merged

GH-73991: Disallow copying directory into itself via pathlib.Path.copy() #122924

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e2b4c6d
GH-73991: Disallow copying directory into itself via `pathlib.Path.co…
barneygale Aug 12, 2024
d646ad2
Tweak import
barneygale Aug 12, 2024
c5a79d0
Expand tests
barneygale Aug 12, 2024
f58c07a
Add comment to _ensure_distinct_path()
barneygale Aug 13, 2024
b119e3d
Improve wording
barneygale Aug 13, 2024
32530b7
Add tests for symlink-to-other-symlink copies.
barneygale Aug 18, 2024
a15f248
Fix windows tests
barneygale Aug 18, 2024
d371b89
More Windows goodness
barneygale Aug 18, 2024
7f5b1ab
Address review feedback
barneygale Aug 23, 2024
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
Next Next commit
Add tests for symlink-to-other-symlink copies.
  • Loading branch information
@barneygale
barneygale committed Aug 18, 2024
commit 32530b704f6b795ccc1dca958fd921e08d7417ed
65 changes: 59 additions & 6 deletions Lib/test/test_pathlib/test_pathlib_abc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1501,19 +1501,20 @@ def iterdir(self):
raise FileNotFoundError(errno.ENOENT, "File not found", path)

def mkdir(self, mode=0o777, parents=False, exist_ok=False):
path = str(self.resolve())
if path in self._directories:
path = str(self.parent.resolve() / self.name)
parent = str(self.parent.resolve())
if path in self._directories or path in self._symlinks:
if exist_ok:
return
else:
raise FileExistsError(errno.EEXIST, "File exists", path)
try:
if self.name:
self._directories[str(self.parent)].add(self.name)
self._directories[parent].add(self.name)
self._directories[path] = set()
except KeyError:
if not parents:
raise FileNotFoundError(errno.ENOENT, "File not found", str(self.parent)) from None
raise FileNotFoundError(errno.ENOENT, "File not found", parent) from None
self.parent.mkdir(parents=True, exist_ok=True)
self.mkdir(mode, parents=False, exist_ok=exist_ok)

Expand Down Expand Up @@ -1764,6 +1765,30 @@ def test_copy_symlink_to_itself(self):
source = base / 'linkA'
self.assertRaises(OSError, source.copy, source)

@needs_symlinks
def test_copy_symlink_to_existing_symlink(self):
base = self.cls(self.base)
source = base / 'copySource'
target = base / 'copyTarget'
source.symlink_to(base / 'fileA')
target.symlink_to(base / 'dirC')
with self.assertRaises(IsADirectoryError):
source.copy(target)
with self.assertRaises(FileExistsError):
source.copy(target, follow_symlinks=False)

@needs_symlinks
def test_copy_symlink_to_existing_directory_symlink(self):
base = self.cls(self.base)
source = base / 'copySource'
target = base / 'copyTarget'
source.symlink_to(base / 'fileA')
target.symlink_to(base / 'dirC')
with self.assertRaises(IsADirectoryError):
source.copy(target)
with self.assertRaises(FileExistsError):
source.copy(target, follow_symlinks=False)

@needs_symlinks
def test_copy_directory_symlink_follow_symlinks_false(self):
base = self.cls(self.base)
Expand All @@ -1789,6 +1814,30 @@ def test_copy_directory_symlink_into_itself(self):
self.assertRaises(OSError, source.copy, target)
self.assertFalse(target.exists())

@needs_symlinks
def test_copy_directory_symlink_to_existing_symlink(self):
base = self.cls(self.base)
source = base / 'copySource'
target = base / 'copyTarget'
source.symlink_to(base / 'dirC')
target.symlink_to(base / 'fileA')
with self.assertRaises(FileExistsError):
source.copy(target)
with self.assertRaises(FileExistsError):
source.copy(target, follow_symlinks=False)

@needs_symlinks
def test_copy_directory_symlink_to_existing_directory_symlink(self):
base = self.cls(self.base)
source = base / 'copySource'
target = base / 'copyTarget'
source.symlink_to(base / 'dirC' / 'dirD')
target.symlink_to(base / 'dirC')
with self.assertRaises(FileExistsError):
source.copy(target)
with self.assertRaises(FileExistsError):
source.copy(target, follow_symlinks=False)

def test_copy_file_to_existing_file(self):
base = self.cls(self.base)
source = base / 'fileA'
Expand Down Expand Up @@ -2922,8 +2971,12 @@ def readlink(self):
raise FileNotFoundError(errno.ENOENT, "File not found", path)

def symlink_to(self, target, target_is_directory=False):
self._directories[str(self.parent)].add(self.name)
self._symlinks[str(self)] = str(target)
path = str(self.parent.resolve() / self.name)
parent = str(self.parent.resolve())
if path in self._symlinks:
raise FileExistsError(errno.EEXIST, "File exists", path)
self._directories[parent].add(self.name)
self._symlinks[path] = str(target)


class DummyPathWithSymlinksTest(DummyPathTest):
Expand Down
Loading