Fix issue with codesign not supporting bundles that have spaces (#2732)

Author: adincebic

apple/internal/codesigning_support.bzl

@@ -694,13 +694,13 @@ def _post_process_and_sign_archive_action(
         output = process_and_sign_expanded_template,
         is_executable = True,
         substitutions = {
-            "%ipa_post_processor%": ipa_post_processor_path or "",
-            "%output_path%": output_archive.path,
+            "%ipa_post_processor%": shell.quote(ipa_post_processor_path) or "",
+            "%output_path%": shell.quote(output_archive.path),
             "%should_compress%": "1" if should_compress else "",
             "%should_verify%": "1",  # always verify the crc
             "%signing_command_lines%": signing_command_lines,
-            "%unprocessed_archive_path%": input_archive.path,
-            "%work_dir%": output_archive_root_path,
+            "%unprocessed_archive_path%": shell.quote(input_archive.path),
+            "%work_dir%": shell.quote(output_archive_root_path),
         },
     )
 

test/starlark_tests/ios_application_tests.bzl

@@ -1035,6 +1035,60 @@ Found "com.bazel.app.example" which does not match previously defined "com.altba
         tags = [name],
     )
 
+    archive_contents_test(
+        name = "{}_with_spaces_contents_test".format(name),
+        build_type = "simulator",
+        target_under_test = "//test/starlark_tests/targets_under_test/ios:app minimal has several spaces",
+        contains = [
+            "$BUNDLE_ROOT/Info.plist",
+            "$BUNDLE_ROOT/PkgInfo",
+            "$BUNDLE_ROOT/app minimal has several spaces",
+        ],
+        tags = [name],
+    )
+
+    archive_contents_test(
+        name = "{}_tree_artifact_with_spaces_contents_test".format(name),
+        build_type = "simulator",
+        target_under_test = "//test/starlark_tests/targets_under_test/ios:app minimal has several spaces",
+        build_settings = {
+            build_settings_labels.use_tree_artifacts_outputs: "True",
+        },
+        contains = [
+            "$BUNDLE_ROOT/Info.plist",
+            "$BUNDLE_ROOT/PkgInfo",
+            "$BUNDLE_ROOT/app minimal has several spaces",
+        ],
+        tags = [name],
+    )
+
+    archive_contents_test(
+        name = "{}_bundle_name_with_spaces_contents_test".format(name),
+        build_type = "simulator",
+        target_under_test = "//test/starlark_tests/targets_under_test/ios:app_minimal_bundle_name_with_spaces",
+        contains = [
+            "$BUNDLE_ROOT/Info.plist",
+            "$BUNDLE_ROOT/PkgInfo",
+            "$BUNDLE_ROOT/app minimal bundle name has several spaces",
+        ],
+        tags = [name],
+    )
+
+    archive_contents_test(
+        name = "{}_tree_artifact_bundle_name_with_spaces_contents_test".format(name),
+        build_type = "simulator",
+        target_under_test = "//test/starlark_tests/targets_under_test/ios:app_minimal_bundle_name_with_spaces",
+        build_settings = {
+            build_settings_labels.use_tree_artifacts_outputs: "True",
+        },
+        contains = [
+            "$BUNDLE_ROOT/Info.plist",
+            "$BUNDLE_ROOT/PkgInfo",
+            "$BUNDLE_ROOT/app minimal bundle name has several spaces",
+        ],
+        tags = [name],
+    )
+
     native.test_suite(
         name = name,
         tags = [name],

test/starlark_tests/targets_under_test/ios/BUILD

@@ -72,6 +72,37 @@ package(
 # notap to avoid them being built/tested when testing the //test/...
 # package.
 
+ios_application(
+    name = "app minimal has several spaces",
+    bundle_id = "com.google.example",
+    families = ["iphone"],
+    infoplists = [
+        "//test/starlark_tests/resources:Info.plist",
+    ],
+    minimum_os_version = common.min_os_ios.baseline,
+    provisioning_profile = "//test/testdata/provisioning:integration_testing_ios.mobileprovision",
+    tags = common.fixture_tags,
+    deps = [
+        "//test/starlark_tests/resources:objc_main_lib",
+    ],
+)
+
+ios_application(
+    name = "app_minimal_bundle_name_with_spaces",
+    bundle_id = "com.google.example",
+    bundle_name = "app minimal bundle name has several spaces",
+    families = ["iphone"],
+    infoplists = [
+        "//test/starlark_tests/resources:Info.plist",
+    ],
+    minimum_os_version = common.min_os_ios.baseline,
+    provisioning_profile = "//test/testdata/provisioning:integration_testing_ios.mobileprovision",
+    tags = common.fixture_tags,
+    deps = [
+        "//test/starlark_tests/resources:objc_main_lib",
+    ],
+)
+
 ios_application(
     name = "app_minimal",
     bundle_id = "com.google.example",

tools/bundletool/bundletool_experimental.py

@@ -50,6 +50,7 @@
 import filecmp
 import json
 import os
+import shlex
 import shutil
 import sys
 import zipfile
@@ -300,9 +301,11 @@ def _sign_bundle(self, bundle_root, command_lines):
     Args:
       bundle_root: The path to the bundle.
       command_lines: A newline-separated list of command lines that should be
-          executed in the bundle to sign it.
+        executed in the bundle to sign it.
     """
-    exit_code = os.system('WORK_DIR="%s"\n%s' % (bundle_root, command_lines))
+    exit_code = os.system(
+        'WORK_DIR=%s\n%s' % (shlex.quote(bundle_root), command_lines)
+    )
     if exit_code:
       raise CodeSignError(exit_code)