Skip to content

utils.py: Fix _ensure_real_directory() #2200

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

Open
juergbi wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −2
Open

utils.py: Fix _ensure_real_directory() #2200

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions src/buildstream/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import threading
import itertools
from contextlib import contextmanager
from pathlib import Path
from pathlib import Path, PurePath
from typing import Callable, IO, Iterable, Iterator, Optional, Tuple, Union, Pattern
from google.protobuf import timestamp_pb2

Expand Down Expand Up @@ -1064,7 +1064,12 @@ def _copy_directories(srcdir, destdir, target):
#
def _ensure_real_directory(root, path):
destpath = root
for name in os.path.split(path):
purepath = PurePath(path)
if purepath.is_absolute():
raise UtilError(f"Expected relative path, got absolute path: {path}")
for name in purepath.parts:
if name == "..":
raise UtilError(f"`..` not allowed in relative path: {path}")
destpath = os.path.join(destpath, name)
try:
deststat = os.lstat(destpath)
Expand Down
Loading