Skip to content
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.

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

Workaround for isabs() on Windows + Python 3.13 (#652) #652

Merged
merged 3 commits into from
Oct 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.11"]
python-version: ["3.13"]
os: [ubuntu-latest, windows-latest, macos-latest]

steps:
Expand Down
4 changes: 4 additions & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ Version: 2.1.0 - (IN DEVELOPMENT)
for local development. They can also be installed via ``pip install .[test]``
and ``pip install .[dev]``.

**Bug fixes**

* #650: file operations on Windows with Python 3.13 give "Permission denied".

Version: 2.0.0 - 2024-09-04
===========================

Expand Down
16 changes: 13 additions & 3 deletions pyftpdlib/filesystems.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,16 @@ def cwd(self, path):

# --- Pathname / conversion utilities

@staticmethod
def _isabs(path, _windows=os.name == "nt"):
# Windows + Python 3.13: isabs() changed so that a path
# starting with "/" is no longer considered absolute.
# https://github.com/python/cpython/issues/44626
# https://github.com/python/cpython/pull/113829/
if _windows and path.startswith("/"):
return True
return os.path.isabs(path)

def ftpnorm(self, ftppath):
"""Normalize a "virtual" ftp pathname (typically the raw string
coming from client) depending on the current working directory.
Expand All @@ -132,7 +142,7 @@ def ftpnorm(self, ftppath):
Note: directory separators are system independent ("/").
Pathname returned is always absolutized.
"""
if os.path.isabs(ftppath):
if self._isabs(ftppath):
p = os.path.normpath(ftppath)
else:
p = os.path.normpath(os.path.join(self.cwd, ftppath))
Expand All @@ -148,7 +158,7 @@ def ftpnorm(self, ftppath):
# Anti path traversal: don't trust user input, in the event
# that self.cwd is not absolute, return "/" as a safety measure.
# This is for extra protection, maybe not really necessary.
if not os.path.isabs(p):
if not self._isabs(p):
p = "/"
return p

Expand Down Expand Up @@ -185,7 +195,7 @@ def fs2ftp(self, fspath):
On invalid pathnames escaping from user's root directory
(e.g. "/home" when root is "/home/user") always return "/".
"""
if os.path.isabs(fspath):
if self._isabs(fspath):
p = os.path.normpath(fspath)
else:
p = os.path.normpath(os.path.join(self.root, fspath))
Expand Down
Loading