Skip to content

Commit

Permalink
pythongh-96005: Handle WASI ENOTCAPABLE in getpath (pythonGH-96006)
Browse files Browse the repository at this point in the history
- On WASI `ENOTCAPABLE` is now mapped to `PermissionError`.
- The `errno` modules exposes the new error number.
- `getpath.py` now ignores `PermissionError` when it cannot open landmark
  files `pybuilddir.txt` and `pyenv.cfg`.
(cherry picked from commit 48174fa)

Co-authored-by: Christian Heimes <christian@python.org>
  • Loading branch information
tiran authored and miss-islington committed Aug 16, 2022
1 parent 2bb363c commit d4ff6ff
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 4 deletions.
9 changes: 9 additions & 0 deletions Doc/library/errno.rst
Expand Up @@ -657,3 +657,12 @@ defined by the module. The specific list of defined symbols is available as
Interface output queue is full

.. versionadded:: 3.11

.. data:: ENOTCAPABLE

Capabilities insufficient. This error is mapped to the exception
:exc:`PermissionError`.

.. availability:: WASI

.. versionadded:: 3.11.1
7 changes: 6 additions & 1 deletion Doc/library/exceptions.rst
Expand Up @@ -746,7 +746,12 @@ depending on the system error code.

Raised when trying to run an operation without the adequate access
rights - for example filesystem permissions.
Corresponds to :c:data:`errno` :py:data:`~errno.EACCES` and :py:data:`~errno.EPERM`.
Corresponds to :c:data:`errno` :py:data:`~errno.EACCES`,
:py:data:`~errno.EPERM`, and :py:data:`~errno.ENOTCAPABLE`.

.. versionchanged:: 3.11.1
WASI's :py:data:`~errno.ENOTCAPABLE` is now mapped to
:exc:`PermissionError`.

.. exception:: ProcessLookupError

Expand Down
@@ -0,0 +1,4 @@
On WASI :data:`~errno.ENOTCAPABLE` is now mapped to :exc:`PermissionError`.
The :mod:`errno` modules exposes the new error number. ``getpath.py`` now
ignores :exc:`PermissionError` when it cannot open landmark files
``pybuilddir.txt`` and ``pyenv.cfg``.
4 changes: 4 additions & 0 deletions Modules/errnomodule.c
Expand Up @@ -927,6 +927,10 @@ errno_exec(PyObject *module)
#ifdef EQFULL
add_errcode("EQFULL", EQFULL, "Interface output queue is full");
#endif
#ifdef ENOTCAPABLE
// WASI extension
add_errcode("ENOTCAPABLE", ENOTCAPABLE, "Capabilities insufficient");
#endif

Py_DECREF(error_dict);
return 0;
Expand Down
6 changes: 3 additions & 3 deletions Modules/getpath.py
Expand Up @@ -351,11 +351,11 @@ def search_up(prefix, *landmarks, test=isfile):
try:
# Read pyvenv.cfg from one level above executable
pyvenvcfg = readlines(joinpath(venv_prefix, VENV_LANDMARK))
except FileNotFoundError:
except (FileNotFoundError, PermissionError):
# Try the same directory as executable
pyvenvcfg = readlines(joinpath(venv_prefix2, VENV_LANDMARK))
venv_prefix = venv_prefix2
except FileNotFoundError:
except (FileNotFoundError, PermissionError):
venv_prefix = None
pyvenvcfg = []

Expand Down Expand Up @@ -475,7 +475,7 @@ def search_up(prefix, *landmarks, test=isfile):
# File exists but is empty
platstdlib_dir = real_executable_dir
build_prefix = joinpath(real_executable_dir, VPATH)
except FileNotFoundError:
except (FileNotFoundError, PermissionError):
if isfile(joinpath(real_executable_dir, BUILD_LANDMARK)):
build_prefix = joinpath(real_executable_dir, VPATH)
if os_name == 'nt':
Expand Down
5 changes: 5 additions & 0 deletions Objects/exceptions.c
Expand Up @@ -3644,6 +3644,11 @@ _PyExc_InitState(PyInterpreterState *interp)
ADD_ERRNO(InterruptedError, EINTR);
ADD_ERRNO(PermissionError, EACCES);
ADD_ERRNO(PermissionError, EPERM);
#ifdef ENOTCAPABLE
// Extension for WASI capability-based security. Process lacks
// capability to access a resource.
ADD_ERRNO(PermissionError, ENOTCAPABLE);
#endif
ADD_ERRNO(ProcessLookupError, ESRCH);
ADD_ERRNO(TimeoutError, ETIMEDOUT);

Expand Down

0 comments on commit d4ff6ff

Please sign in to comment.