Skip to content

Fix permissions when openrsync is used #2708

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix permissions when openrsync is used #2708

Show file tree
Hide file tree
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
34 changes: 33 additions & 1 deletion apple/internal/templates/apple_device.template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,12 +300,22 @@ def extracted_app(
# fail with `Unhandled error domain NSPOSIXErrorDomain, code 13`.
dst_dir = os.path.join(tempfile.gettempdir(), "bazel_temp_" + app_name)
os.makedirs(dst_dir, exist_ok=True)
file_mode = "u+w"
# Mitigate any previous runs of openrsync that synced the application
# into dst_dir without applying the correct permissions.
dst_dir_application = os.path.join(
dst_dir, os.path.basename(application_output_path)
)
if (os.path.exists(dst_dir_application)
and not os.access(dst_dir_application, os.W_OK)):
fix_permissions(dst_dir, file_mode)
rsync_command = [
"/usr/bin/rsync",
"--archive",
"--delete",
"--checksum",
"--chmod=u+w",
"--perms",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding --perms since the man page says it is required when passing --chmod.
Does not have any observable effect at the moment.

f"--chmod={file_mode}",
"--verbose",
# The output path might itself be a symlink; resolve to the
# real path so rsync doesn't just copy the symlink.
Expand All @@ -325,6 +335,7 @@ def extracted_app(
text=True,
)
logger.debug("rsync output: %s", result.stdout)
fix_permissions(dst_dir, file_mode)
yield os.path.join(dst_dir, app_name + ".app")
else:
# Create a new temporary directory for each run, deleting it
Expand Down Expand Up @@ -417,6 +428,27 @@ def run_app(
subprocess.run(args, env=devicectl_launch_environ(), check=False)


def fix_permissions(
directory: str,
mode: str
):
# Fix permissions on macOS 15.4+ until openrsync correctly applies the file permissions
# passed via --chmod.
version = platform.platform(terse=True).removeprefix("macOS-")
version_components = version.split(".")
major = int(version_components[0])
minor = int(version_components[1])
if major < 15:
return
if minor < 4:
return
logger.debug("Fix permissions")
result = subprocess.run(
["/usr/bin/find", directory, "-exec", "chmod", mode, "{}", ";"],
check=True,
)


def main(
*,
app_name: str,
Expand Down
34 changes: 33 additions & 1 deletion apple/internal/templates/apple_simulator.template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,12 +537,22 @@ def extracted_app(
# fail with `Unhandled error domain NSPOSIXErrorDomain, code 13`.
dst_dir = os.path.join(tempfile.gettempdir(), "bazel_temp_" + app_name)
os.makedirs(dst_dir, exist_ok=True)
file_mode = "u+w"
# Mitigate any previous runs of openrsync that synced the application
# into dst_dir without applying the correct permissions.
dst_dir_application = os.path.join(
dst_dir, os.path.basename(application_output_path)
)
if (os.path.exists(dst_dir_application)
and not os.access(dst_dir_application, os.W_OK)):
fix_permissions(dst_dir, file_mode)
rsync_command = [
"/usr/bin/rsync",
"--archive",
"--delete",
"--checksum",
"--chmod=u+w",
"--perms",
f"--chmod={file_mode}",
"--verbose",
# The output path might itself be a symlink; resolve to the
# real path so rsync doesn't just copy the symlink.
Expand All @@ -562,6 +572,7 @@ def extracted_app(
text=True,
)
logger.debug("rsync output: %s", result.stdout)
fix_permissions(dst_dir, file_mode)
yield os.path.join(dst_dir, app_name + ".app")
else:
# Create a new temporary directory for each run, deleting it
Expand Down Expand Up @@ -689,6 +700,27 @@ def run_app_in_simulator(
subprocess.run(args, env=simctl_launch_environ(), check=False)


def fix_permissions(
directory: str,
mode: str
):
# Fix permissions on macOS 15.4+ until openrsync correctly applies the file permissions
# passed via --chmod.
version = platform.platform(terse=True).removeprefix("macOS-")
version_components = version.split(".")
major = int(version_components[0])
minor = int(version_components[1])
if major < 15:
return
if minor < 4:
return
logger.debug("Fix permissions")
result = subprocess.run(
["/usr/bin/find", directory, "-exec", "chmod", mode, "{}", ";"],
check=True,
)


def main(
*,
app_name: str,
Expand Down