fastlane 2.240.1 → 2.241.1

data/match/lib/match/options.rb

@@ -160,14 +160,14 @@ module Match
         FastlaneCore::ConfigItem.new(key: :git_basic_authorization,
                                      env_name: "MATCH_GIT_BASIC_AUTHORIZATION",
                                      sensitive: true,
-                                     description: "Use a basic authorization header to access the git repo (e.g.: access via HTTPS, GitHub Actions, etc), usually a string in Base64",
+                                     description: "Use a basic authorization header to access the git repo (e.g.: access via HTTPS, GitHub Actions, etc), usually a string in Base64. Needs git 2.31 or later",
                                      conflicting_options: [:git_bearer_authorization, :git_private_key],
                                      optional: true,
                                      default_value: nil),
         FastlaneCore::ConfigItem.new(key: :git_bearer_authorization,
                                      env_name: "MATCH_GIT_BEARER_AUTHORIZATION",
                                      sensitive: true,
-                                     description: "Use a bearer authorization header to access the git repo (e.g.: access to an Azure DevOps repository), usually a string in Base64",
+                                     description: "Use a bearer authorization header to access the git repo (e.g.: access to an Azure DevOps repository), usually a string in Base64. Needs git 2.31 or later",
                                      conflicting_options: [:git_basic_authorization, :git_private_key],
                                      optional: true,
                                      default_value: nil),
@@ -209,7 +209,8 @@ module Match
         FastlaneCore::ConfigItem.new(key: :s3_access_key,
                                      env_name: "MATCH_S3_ACCESS_KEY",
                                      description: "S3 access key",
-                                     optional: true),
+                                     optional: true,
+                                     sensitive: true),
         FastlaneCore::ConfigItem.new(key: :s3_secret_access_key,
                                      env_name: "MATCH_S3_SECRET_ACCESS_KEY",
                                      description: "S3 secret access key",
@@ -247,11 +248,13 @@ module Match
         FastlaneCore::ConfigItem.new(key: :job_token,
                                       env_name: "CI_JOB_TOKEN",
                                       description: "GitLab CI_JOB_TOKEN",
-                                      optional: true),
+                                      optional: true,
+                                      sensitive: true),
         FastlaneCore::ConfigItem.new(key: :private_token,
                                       env_name: "PRIVATE_TOKEN",
                                       description: "GitLab Access Token",
-                                      optional: true),
+                                      optional: true,
+                                      sensitive: true),
 
         # Keychain
         FastlaneCore::ConfigItem.new(key: :keychain_name,
@@ -374,6 +377,11 @@ module Match
                                      description: "Force encryption to use legacy cbc algorithm for backwards compatibility with older match versions",
                                      type: Boolean,
                                      default_value: false),
+        FastlaneCore::ConfigItem.new(key: :offline_profile,
+                                     env_name: "MATCH_OFFLINE_PROFILE",
+                                     description: "Enable profile with 'Offline Support' (7 day validity). Requires Apple ID login, not supported with App Store Connect API key authentication",
+                                     type: Boolean,
+                                     default_value: false),
 
         # other
         FastlaneCore::ConfigItem.new(key: :verbose,

data/match/lib/match/storage/git_storage.rb

@@ -1,4 +1,5 @@
 require 'fastlane_core/command_executor'
+require 'open3'
 
 require_relative '../module'
 require_relative './interface'
@@ -7,6 +8,9 @@ module Match
   module Storage
     # Store the code signing identities in a git repo
     class GitStorage < Interface
+      DEFAULT_BRANCH = "main"
+      PRIVATE_KEY_ENV = "MATCH_SSH_ADD_PRIVATE_KEY"
+
       # User provided values
       attr_accessor :git_url
       attr_accessor :shallow_clone
@@ -85,11 +89,6 @@ module Match
         self.working_directory = Dir.mktmpdir
 
         command = "git clone #{self.git_url.shellescape} #{self.working_directory.shellescape}"
-        # HTTP headers are supposed to be case-insensitive but
-        # Bitbucket requires `Authorization: Basic` and `Authorization Bearer` to work
-        # https://github.com/fastlane/fastlane/pull/15928
-        command << " -c http.extraheader='Authorization: Basic #{self.git_basic_authorization}'" unless self.git_basic_authorization.nil?
-        command << " -c http.extraheader='Authorization: Bearer #{self.git_bearer_authorization}'" unless self.git_bearer_authorization.nil?
 
         if self.shallow_clone
           command << " --depth 1"
@@ -165,8 +164,10 @@ module Match
       def generate_matchfile_content
         UI.important("Please create a new, private git repository to store the certificates and profiles there")
         url = UI.input("URL of the Git Repo: ")
+        branch = UI.input("Branch of the Git Repo (leave blank to use '#{DEFAULT_BRANCH}'): ").to_s.strip
+        branch = DEFAULT_BRANCH if branch.empty?
 
-        return "git_url(\"#{url}\")"
+        return "git_url(\"#{url}\")\ngit_branch(\"#{branch}\")"
       end
 
       def list_files(file_name: "", file_ext: "")
@@ -178,7 +179,8 @@ module Match
           ssh_add = File.expand_path(self.git_private_key).shellescape.to_s
         else
           UI.message("Private key file does not exist, will continue by using it as a raw key.")
-          ssh_add = "- <<< \"#{self.git_private_key}\""
+          # From the environment (git_env_values), so the key is not on bash's command line
+          ssh_add = "- <<< \"$#{PRIVATE_KEY_ENV}\""
         end
         return "ssh-agent bash -c 'ssh-add #{ssh_add}; #{command}'"
       end
@@ -264,9 +266,43 @@ module Match
       def git_env_values
         env_values = { 'GIT_TERMINAL_PROMPT' => '0' }
         env_values['GIT_SSH_COMMAND'] = non_interactive_git_ssh_command
+        env_values[PRIVATE_KEY_ENV] = self.git_private_key unless self.git_private_key.nil?
+        env_values.merge(authorization_env_values)
+      end
+
+      # Through git's environment (git 2.31+), so the header is neither on the command line nor stored in .git/config
+      def authorization_env_values
+        headers = []
+        # HTTP headers are supposed to be case-insensitive but
+        # Bitbucket requires `Authorization: Basic` and `Authorization Bearer` to work
+        # https://github.com/fastlane/fastlane/pull/15928
+        headers << "Authorization: Basic #{self.git_basic_authorization}" unless self.git_basic_authorization.nil?
+        headers << "Authorization: Bearer #{self.git_bearer_authorization}" unless self.git_bearer_authorization.nil?
+        return {} if headers.empty?
+
+        version = git_version
+        UI.user_error!("git_basic_authorization and git_bearer_authorization need git 2.31 or later, found git #{version}") if version && Gem::Version.new(version) < Gem::Version.new('2.31')
+
+        # Keep pairs the user already passes this way
+        first = ENV['GIT_CONFIG_COUNT'].to_i
+        env_values = { 'GIT_CONFIG_COUNT' => (first + headers.count).to_s }
+        headers.each_with_index do |header, i|
+          env_values["GIT_CONFIG_KEY_#{first + i}"] = 'http.extraheader'
+          env_values["GIT_CONFIG_VALUE_#{first + i}"] = header
+        end
         env_values
       end
 
+      # nil when git cannot be run: cloning reports that
+      def git_version
+        @git_version ||= begin
+          output, status = Open3.capture2('git', '--version')
+          output[/\d+\.\d+(\.\d+)?/] if status.success?
+        rescue Errno::ENOENT
+          nil
+        end
+      end
+
       def non_interactive_git_ssh_command
         ssh_command = ENV['GIT_SSH_COMMAND']
 

data/match/lib/match/storage/gitlab/secure_file.rb

@@ -1,4 +1,5 @@
 require 'open-uri'
+require 'ostruct'
 
 require_relative '../../module'
 
@@ -39,7 +40,7 @@ module Match
 
             create_subfolders(working_directory)
             File.open(destination_file, "wb") do |saved_file|
-              URI.open(url, "rb", { @client.authentication_key => @client.authentication_value }) do |data|
+              url.open("rb", { @client.authentication_key => @client.authentication_value }) do |data|
                 saved_file.write(data.read)
               end
 

data/pem/lib/pem/module.rb

@@ -6,10 +6,6 @@ module PEM
     attr_accessor :config
   end
 
-  tmp_dir = Dir.tmpdir
-  TMP_FOLDER = "#{tmp_dir}/fastlane/PEM/"
-  FileUtils.mkdir_p(TMP_FOLDER)
-
   ENV['FASTLANE_TEAM_ID'] ||= ENV["PEM_TEAM_ID"]
   ENV['DELIVER_USER'] ||= ENV["PEM_USERNAME"]
 

data/precheck/lib/precheck/rule_processor.rb

@@ -1,3 +1,4 @@
+require 'ostruct'
 require 'spaceship/tunes/language_item'
 require 'spaceship/tunes/iap_list'
 require 'fastlane/markdown_table_formatter'

data/produce/lib/produce/itunes_connect.rb

@@ -38,7 +38,7 @@ module Produce
         end
 
         # Produce.config[:itc_users]
-        application = Spaceship::ConnectAPI::App.create(
+        Spaceship::ConnectAPI::App.create(
           name: Produce.config[:app_name],
           version_string: Produce.config[:app_version] || "1.0",
           sku: Produce.config[:sku].to_s,

data/produce/lib/produce/service.rb

@@ -88,7 +88,6 @@ module Produce
     end
 
     # rubocop:disable Metrics/PerceivedComplexity
-    # rubocop:disable Require/MissingRequireStatement
     def update(on, options)
       updated = valid_services_for(options).count
 

data/produce/lib/produce.rb

@@ -2,5 +2,4 @@ require_relative 'produce/manager'
 require_relative 'produce/options'
 require_relative 'produce/developer_center'
 require_relative 'produce/itunes_connect'
-require_relative 'produce/available_default_languages'
 require_relative 'produce/module'

data/scan/lib/scan/options.rb

@@ -207,6 +207,13 @@ module Scan
                                      conflict_block: proc do |value|
                                        UI.user_error!("You can't use 'thread_sanitizer' and 'address_sanitizer' options in one run")
                                      end),
+        FastlaneCore::ConfigItem.new(key: :collect_test_diagnostics,
+                                     env_name: "SCAN_COLLECT_TEST_DIAGNOSTICS",
+                                     description: "Whether verbose and long-running diagnostics (like sysdiagnoses or log archives) are collected when testing. Valid values are: on-failure or never. If not specified, the value in the test plan is used. Equivalent to -collect-test-diagnostics (Xcode 14 and up)",
+                                     optional: true,
+                                     verify_block: proc do |value|
+                                       UI.user_error!("Invalid collect_test_diagnostics #{value}") unless ['on-failure', 'never'].include?(value)
+                                     end),
 
         # output
         FastlaneCore::ConfigItem.new(key: :open_report,

data/scan/lib/scan/runner.rb

@@ -327,7 +327,7 @@ module Scan
 
     def open_report
       if !Helper.ci? && Scan.cache[:open_html_report_path]
-        `open --hide '#{Scan.cache[:open_html_report_path]}'`
+        system("open", "--hide", Scan.cache[:open_html_report_path])
       end
     end
 

data/scan/lib/scan/test_command_generator.rb

@@ -44,9 +44,9 @@ module Scan
 
       options = []
       options += project_path_array unless config[:xctestrun]
-      options << "-sdk '#{config[:sdk]}'" if config[:sdk]
+      options << "-sdk #{config[:sdk].shellescape}" if config[:sdk]
       options << destination if destination # generated in `detect_values`
-      options << "-toolchain '#{config[:toolchain]}'" if config[:toolchain]
+      options << "-toolchain #{config[:toolchain].to_s.shellescape}" if config[:toolchain]
       if config[:derived_data_path] && !options.include?("-derivedDataPath #{config[:derived_data_path].shellescape}")
         options << "-derivedDataPath #{config[:derived_data_path].shellescape}"
       end
@@ -68,6 +68,9 @@ module Scan
       options << "-enableCodeCoverage #{config[:code_coverage] ? 'YES' : 'NO'}" unless config[:code_coverage].nil?
       options << "-enableAddressSanitizer #{config[:address_sanitizer] ? 'YES' : 'NO'}" unless config[:address_sanitizer].nil?
       options << "-enableThreadSanitizer #{config[:thread_sanitizer] ? 'YES' : 'NO'}" unless config[:thread_sanitizer].nil?
+      if config[:collect_test_diagnostics] && FastlaneCore::Helper.xcode_at_least?(14)
+        options << "-collect-test-diagnostics #{config[:collect_test_diagnostics]}"
+      end
       if FastlaneCore::Helper.xcode_at_least?(11)
         if config[:cloned_source_packages_path] && !options.include?("-clonedSourcePackagesDirPath #{config[:cloned_source_packages_path].shellescape}")
           options << "-clonedSourcePackagesDirPath #{config[:cloned_source_packages_path].shellescape}"
@@ -77,14 +80,14 @@ module Scan
           options << "-packageCachePath #{config[:package_cache_path].shellescape}"
         end
 
-        options << "-testPlan '#{config[:testplan]}'" if config[:testplan]
+        options << "-testPlan #{config[:testplan].shellescape}" if config[:testplan]
 
         # detect_values will ensure that these values are present as Arrays if
         # they are present at all
-        options += config[:only_test_configurations].map { |name| "-only-test-configuration '#{name}'" } if config[:only_test_configurations]
-        options += config[:skip_test_configurations].map { |name| "-skip-test-configuration '#{name}'" } if config[:skip_test_configurations]
+        options += config[:only_test_configurations].map { |name| "-only-test-configuration #{name.shellescape}" } if config[:only_test_configurations]
+        options += config[:skip_test_configurations].map { |name| "-skip-test-configuration #{name.shellescape}" } if config[:skip_test_configurations]
       end
-      options << "-xctestrun '#{config[:xctestrun]}'" if config[:xctestrun]
+      options << "-xctestrun #{config[:xctestrun].shellescape}" if config[:xctestrun]
       options << config[:xcargs] if config[:xcargs]
 
       # Number of retries does not equal xcodebuild's -test-iterations number
@@ -127,7 +130,7 @@ module Scan
     end
 
     def pipe
-      pipe = ["| tee '#{xcodebuild_log_path}'"]
+      pipe = ["| tee #{xcodebuild_log_path.shellescape}"]
 
       # disable_xcpretty is now deprecated and directs to use output_style of raw
       if Scan.config[:disable_xcpretty] || Scan.config[:output_style] == 'raw'
@@ -182,7 +185,7 @@ module Scan
       formatter = []
       if (custom_formatter = Scan.config[:xcpretty_formatter] || Scan.config[:formatter])
         if custom_formatter.end_with?(".rb")
-          formatter << "-f '#{custom_formatter}'"
+          formatter << "-f #{custom_formatter.shellescape}"
         else
           formatter << "-f `#{custom_formatter}`"
         end
@@ -234,7 +237,7 @@ module Scan
     # Generate destination parameters
     def destination
       unless Scan.cache[:destination]
-        Scan.cache[:destination] = [*Scan.config[:destination]].map { |dst| "-destination '#{dst}'" }.join(' ')
+        Scan.cache[:destination] = [*Scan.config[:destination]].map { |dst| "-destination #{dst.shellescape}" }.join(' ')
       end
       Scan.cache[:destination]
     end

data/scan/lib/scan/test_result_parser.rb

@@ -3,6 +3,7 @@ require_relative 'module'
 module Scan
   class TestResultParser
     def parse_result(output)
+      UI.deprecated("Scan::TestResultParser is deprecated and will be removed in a future version of fastlane; scan no longer uses it. Read the test counts from the result bundle with Trainer::TestParser, or from the <testsuites> attributes of the JUnit report.")
       unless output
         return {
             tests: 0,

data/scan/lib/scan/xcpretty_reporter_options_generator.rb

@@ -49,7 +49,7 @@ module Scan
         type = raw_type.strip
         output_path = File.join(File.expand_path(@output_directory), determine_output_file_name(type))
         reporter << "--report #{type}"
-        reporter << "--output '#{output_path}'"
+        reporter << "--output #{output_path.shellescape}"
 
         if type == "html" && @open_report
           Scan.cache[:open_html_report_path] = output_path
@@ -62,7 +62,7 @@ module Scan
       @temp_junit_report = Tempfile.new("junit_report")
       Scan.cache[:temp_junit_report] = @temp_junit_report.path
       reporter << "--report junit"
-      reporter << "--output '#{Scan.cache[:temp_junit_report]}'"
+      reporter << "--output #{Scan.cache[:temp_junit_report].shellescape}"
       return reporter
     end
 

data/screengrab/lib/screengrab/page.html.erb

@@ -65,18 +65,18 @@
     </style>
   </head>
   <body><% image_counter = 0 %><% @data.each do |language, content| %>
-    <h1 id="<%= language %>" class="language"><%= language %></h1>
+    <h1 id="<%= ERB::Util.h(language) %>" class="language"><%= ERB::Util.h(language) %></h1>
     <hr>
     <table><% content.each do |device_name, screens| %>
       <tr>
         <th colspan="<%= screens.count %>">
-          <a id="<%= language %>-<%= device_name %>" class="deviceName" href="#<%= language %>-<%= device_name %>"><%= device_name %></a>
+          <a id="<%= ERB::Util.h(language) %>-<%= ERB::Util.h(device_name) %>" class="deviceName" href="#<%= ERB::Util.h(language) %>-<%= ERB::Util.h(device_name) %>"><%= ERB::Util.h(device_name) %></a>
         </th>
       </tr>
       <tr><% screens.each do |screen_path| %><% next if screen_path.include?"_framed.png" %>
         <td><% image_counter += 1 %>
-          <a href="<%= screen_path %>" target="_blank" class="screenshotLink">
-            <img class="screenshot" src="<%= screen_path %>" style="width: 100%;" alt="<%= language %> <%= device_name %>" data-counter="<%= image_counter %>">
+          <a href="<%= ERB::Util.h(screen_path) %>" target="_blank" class="screenshotLink">
+            <img class="screenshot" src="<%= ERB::Util.h(screen_path) %>" style="width: 100%;" alt="<%= ERB::Util.h(language) %> <%= ERB::Util.h(device_name) %>" data-counter="<%= image_counter %>">
           </a>
         </td><% end %>
       </tr><% end %>
@@ -128,9 +128,14 @@
           imageDisplay.alt             = img.alt;
           imageDisplay.dataset.counter = img.dataset.counter;
 
-          imageInfo.innerHTML          = '<h3>'+img.alt+'</h3>';
-          imageInfo.innerHTML         += decodeURI(img.src.split("/").pop());
-          imageInfo.innerHTML         += '<br />'+tmpImg.height+'&times;'+tmpImg.width+'px';
+          // textContent, not innerHTML: file names must not be interpreted as HTML
+          var imageTitle               = document.createElement('h3');
+          imageTitle.textContent       = img.alt;
+          imageInfo.textContent        = '';
+          imageInfo.appendChild(imageTitle);
+          imageInfo.appendChild(document.createTextNode(decodeURI(img.src.split("/").pop())));
+          imageInfo.appendChild(document.createElement('br'));
+          imageInfo.appendChild(document.createTextNode(tmpImg.height+'\u00d7'+tmpImg.width+'px'));
 
           overlay.style.display        = "block";
         });

data/screengrab/lib/screengrab/reports_generator.rb

@@ -30,7 +30,7 @@ module Screengrab
 
       export_path = File.expand_path(export_path)
       UI.success("Successfully created HTML file with an overview of all the screenshots: '#{export_path}'")
-      system("open '#{export_path}'") unless Screengrab.config[:skip_open_summary]
+      system("open", export_path) unless Screengrab.config[:skip_open_summary]
     end
   end
 end

data/sigh/lib/assets/resign.sh

@@ -321,6 +321,23 @@ else
     error "Error: Only can resign .app files and .ipa files."
 fi
 
+# Stop if a symbolic link resolves outside the temporary directory: later steps write through such links.
+# Resolved with the cd -P and pwd -P builtins, as realpath and readlink -f are missing on older macOS.
+TEMP_DIR_PHYSICAL="$(cd -P "$TEMP_DIR" && pwd -P)"
+checkStatus
+while IFS= read -d '' -r link; do
+    target="$(readlink "$link")"
+    [[ "$target" == /* ]] || target="$(dirname "$link")/$target"
+    if [ -d "$target" ]; then
+        resolved="$(cd -P "$target" 2>/dev/null && pwd -P)"
+    else
+        resolved="$(cd -P "$(dirname "$target")" 2>/dev/null && pwd -P)/$(basename "$target")"
+    fi
+    if [[ "$resolved" != "$TEMP_DIR_PHYSICAL" && "$resolved" != "$TEMP_DIR_PHYSICAL"/* ]]; then
+        error "Error: '${link#"$TEMP_DIR"/}' is a symbolic link to '$(readlink "$link")', outside of '$ORIGINAL_FILE'. Remove it before resigning."
+    fi
+done < <(find "$TEMP_DIR" -type l -print0)
+
 # check the keychain
 if [ "${KEYCHAIN}" != "" ]; then
     security list-keychains -s "$KEYCHAIN"

data/sigh/lib/sigh/local_manage.rb

@@ -134,7 +134,7 @@ module Sigh
 
       profiles = []
       profile_paths.each do |profile_path|
-        profile = Plist.parse_xml(`security cms -D -i '#{profile_path}' 2> /dev/null`) # /dev/null: https://github.com/fastlane/fastlane/issues/6387
+        profile = FastlaneCore::ProvisioningProfile.parse(profile_path)
         profile['Path'] = profile_path
         profiles << profile
       end

data/sigh/lib/sigh/options.rb

@@ -63,6 +63,11 @@ module Sigh
                                      code_gen_sensitive: true,
                                      default_value: CredentialsManager::AppfileConfig.try_fetch_value(:app_identifier),
                                      default_value_dynamic: true),
+        FastlaneCore::ConfigItem.new(key: :offline_profile,
+                                     env_name: "SIGH_OFFLINE_PROFILE",
+                                     description: "Enable profile with 'Offline Support' (7 day validity). Requires Apple ID login, not supported with App Store Connect API key authentication",
+                                     is_string: false,
+                                     default_value: false),
 
         # App Store Connect API
         FastlaneCore::ConfigItem.new(key: :api_key_path,

data/sigh/lib/sigh/resign.rb

@@ -45,10 +45,10 @@ module Sigh
       entitlements = "-e #{entitlements.shellescape}" if entitlements
 
       provisioning_options = create_provisioning_options(provisioning_profiles)
-      version = "-n #{version}" if version
+      version = "-n #{version.shellescape}" if version
       display_name = "-d #{display_name.shellescape}" if display_name
-      short_version = "--short-version #{short_version}" if short_version
-      bundle_version = "--bundle-version #{bundle_version}" if bundle_version
+      short_version = "--short-version #{short_version.shellescape}" if short_version
+      bundle_version = "--bundle-version #{bundle_version.shellescape}" if bundle_version
       verbose = "-v" if FastlaneCore::Globals.verbose?
       bundle_id = "-b '#{new_bundle_id}'" if new_bundle_id
       use_app_entitlements_flag = "--use-app-entitlements" if use_app_entitlements

data/sigh/lib/sigh/runner.rb

@@ -34,6 +34,10 @@ module Sigh
         UI.message("Successfully logged in")
       end
 
+      if Sigh.config[:offline_profile] && !Spaceship::ConnectAPI.token.nil?
+        UI.user_error!("The 'offline_profile' option requires logging in with an Apple ID. Apple's App Store Connect API (API key authentication) does not support the 'Offline Support' profile setting")
+      end
+
       profiles = [] if Sigh.config[:skip_fetch_profiles]
       profiles ||= fetch_profiles # download the profile if it's there
 
@@ -185,7 +189,8 @@ module Sigh
         profile_type: profile_type,
         bundle_id_id: bundle_id.id,
         certificate_ids: certificates_to_use.map(&:id),
-        device_ids: devices_to_use.map(&:id)
+        device_ids: devices_to_use.map(&:id),
+        is_offline_profile: Sigh.config[:offline_profile]
       )
 
       profile

data/snapshot/lib/snapshot/page.html.erb

@@ -96,38 +96,38 @@
       <button class="tabLink" onclick="openTab(event, 'byScreen')">By Screen</button>
     </div>
     <div id="byLanguage" class="tabContent"><h1 class="tabTitle">By Language:</h1><% image_counter = 0 %><% @data_by_language.each do |language, content| %>
-      <h2 id="<%= language %>"><%= language %></h2>
+      <h2 id="<%= ERB::Util.h(language) %>"><%= ERB::Util.h(language) %></h2>
       <hr>
       <table><% content.each do |device_name, screens| %>
         <tr>
           <th colspan="<%= screens.count %>">
-            <a id="<%= language %>-<%= device_name %>" class="deviceName" href="#<%= language %>-<%= device_name %>"><%= device_name %></a>
+            <a id="<%= ERB::Util.h(language) %>-<%= ERB::Util.h(device_name) %>" class="deviceName" href="#<%= ERB::Util.h(language) %>-<%= ERB::Util.h(device_name) %>"><%= ERB::Util.h(device_name) %></a>
           </th>
         </tr>
         <tr><% screens.each do |screen_path| %><% next if screen_path.include?"_framed.png" %>
           <td><% image_counter += 1 %>
-            <a href="<%= screen_path %>" target="_blank" class="screenshotLink">
-              <img class="screenshot" src="<%= screen_path %>" style="width: 100%;" alt="<%= language %> <%= device_name %>" data-tab="1" data-counter="<%= image_counter %>">
+            <a href="<%= ERB::Util.h(screen_path) %>" target="_blank" class="screenshotLink">
+              <img class="screenshot" src="<%= ERB::Util.h(screen_path) %>" style="width: 100%;" alt="<%= ERB::Util.h(language) %> <%= ERB::Util.h(device_name) %>" data-tab="1" data-counter="<%= image_counter %>">
             </a>
           </td><% end %>
         </tr><% end %>
       </table><% end %>
     </div>
     <div id="byScreen" class="tabContent"><h1 class="tabTitle">By Screen:</h1><% image_counter = 0 %><% @data_by_screen.each do |screen, content| %>
-      <h2 id="<%= screen %>" class="screen"><%= screen %></h2>
+      <h2 id="<%= ERB::Util.h(screen) %>" class="screen"><%= ERB::Util.h(screen) %></h2>
       <hr>
       <table><% content.each do |device_name, screens| %>
         <tr>
           <th colspan="<%= screens.count %>">
-            <a id="<%= screen %>-<%= device_name %>" class="deviceName" href="#<%= screen %>-<%= device_name %>"><%= device_name %></a>
+            <a id="<%= ERB::Util.h(screen) %>-<%= ERB::Util.h(device_name) %>" class="deviceName" href="#<%= ERB::Util.h(screen) %>-<%= ERB::Util.h(device_name) %>"><%= ERB::Util.h(device_name) %></a>
           </th>
         </tr>
         <tr><% screens.each do |language, screen_path| %><% next if screen_path.include?"_framed.png" %>
           <td><% image_counter += 1 %>
-            <a href="<%= screen_path %>" target="_blank" class="screenshotLink">
-              <img class="screenshot" src="<%= screen_path %>" style="width: 100%;" alt="<%= language %> <%= device_name %>" data-tab="2" data-counter="<%= image_counter %>">
+            <a href="<%= ERB::Util.h(screen_path) %>" target="_blank" class="screenshotLink">
+              <img class="screenshot" src="<%= ERB::Util.h(screen_path) %>" style="width: 100%;" alt="<%= ERB::Util.h(language) %> <%= ERB::Util.h(device_name) %>" data-tab="2" data-counter="<%= image_counter %>">
             </a>
-            <div class="caption"><%= language %></div>
+            <div class="caption"><%= ERB::Util.h(language) %></div>
           </td><% end %>
         </tr><% end %>
       </table><% end %>
@@ -222,9 +222,14 @@
           imageDisplay.alt             = img.alt;
           imageDisplay.dataset.counter = img.dataset.counter;
 
-          imageInfo.innerHTML          = '<h3>'+img.alt+'</h3>';
-          imageInfo.innerHTML         += decodeURI(img.src.split("/").pop());
-          imageInfo.innerHTML         += '<br />'+tmpImg.height+'&times;'+tmpImg.width+'px';
+          // textContent, not innerHTML: file names must not be interpreted as HTML
+          var imageTitle               = document.createElement('h3');
+          imageTitle.textContent       = img.alt;
+          imageInfo.textContent        = '';
+          imageInfo.appendChild(imageTitle);
+          imageInfo.appendChild(document.createTextNode(decodeURI(img.src.split("/").pop())));
+          imageInfo.appendChild(document.createElement('br'));
+          imageInfo.appendChild(document.createTextNode(tmpImg.height+'\u00d7'+tmpImg.width+'px'));
 
           overlay.style.display        = "block";
         });

data/snapshot/lib/snapshot/reports_generator.rb

@@ -51,7 +51,7 @@ module Snapshot
 
       export_path = File.expand_path(export_path)
       UI.success("Successfully created HTML file with an overview of all the screenshots: '#{export_path}'")
-      system("open '#{export_path}'") unless Snapshot.config[:skip_open_summary]
+      system("open", export_path) unless Snapshot.config[:skip_open_summary]
     end
 
     def xcode_8_and_below_device_name_mappings
@@ -84,6 +84,8 @@ module Snapshot
       {
         # snapshot in Xcode 9 saves screenshots with the SIMULATOR_DEVICE_NAME
         # which includes spaces
+        'iPhone 18 Pro Max' => "iPhone 18 Pro Max",
+        'iPhone 18 Pro' => "iPhone 18 Pro",
         'iPhone 17 Pro Max' => "iPhone 17 Pro Max",
         'iPhone 17 Pro' => "iPhone 17 Pro",
         'iPhone 17' => "iPhone 17",

data/snapshot/lib/snapshot/simulator_launchers/simulator_launcher_base.rb

@@ -82,7 +82,7 @@ module Snapshot
       unless launcher_config.headless
         simulator_path = File.join(Helper.xcode_path, 'Applications', 'Simulator.app')
         device_udid = TestCommandGenerator.device_udid(device_types.first)
-        command = "open -a #{simulator_path} -g"
+        command = "open -a #{simulator_path.shellescape} -g"
         command += " --args -CurrentDeviceUDID #{device_udid}" if device_udid
         Helper.backticks(command, print: FastlaneCore::Globals.verbose?)
       end

data/snapshot/lib/snapshot.rb

@@ -1,8 +1,6 @@
 require_relative 'snapshot/runner'
 require_relative 'snapshot/reports_generator'
 require_relative 'snapshot/detect_values'
-require_relative 'snapshot/screenshot_flatten'
-require_relative 'snapshot/screenshot_rotate'
 require_relative 'snapshot/dependency_checker'
 require_relative 'snapshot/latest_os_version'
 require_relative 'snapshot/test_command_generator'

data/spaceship/README.md

@@ -27,8 +27,7 @@ Get in contact with the creators on Twitter: [@FastlaneTools](https://twitter.co
     <a href="#whats-spaceship">Why?</a> &bull;
     <a href="#usage">Usage</a> &bull;
     <a href="#installation">Installation</a> &bull;
-    <a href="#technical-details">Technical Details</a> &bull;
-    <a href="#need-help">Need help?</a>
+    <a href="#technical-details">Technical Details</a>
 </p>
 
 -------
@@ -165,7 +164,7 @@ _spaceship_ does a lot of magic to get everything working so neatly:
 - **Multiple Spaceship**: You can launch multiple _spaceships_ with different Apple accounts to do things like syncing the registered devices.
 
 # Code of Conduct
-Help us keep _fastlane_ open and inclusive. Please read and follow our [Code of Conduct](https://github.com/fastlane/fastlane/blob/master/CODE_OF_CONDUCT.md).
+Help us keep _fastlane_ open and inclusive. Please read and follow our [Code of Conduct](https://github.com/fastlane/fastlane/blob/master/docs/CODE_OF_CONDUCT.md).
 
 # License
 This project is licensed under the terms of the MIT license. See the LICENSE file.

data/spaceship/lib/spaceship/base.rb

@@ -224,7 +224,9 @@ module Spaceship
     # The initialize method accepts a parsed response from Apple and sets all
     # attributes that are defined by `attr_mapping`
     #
-    # Do not override `initialize` in your own models.
+    # Do not override `initialize` in your own models, use `setup` instead. An
+    # override that has to take a value Apple's response does not carry must call
+    # `super`, or `attr_mapping`, `raw_data`, `client` and `setup` are all skipped.
     def initialize(attrs = {}, existing_client = nil)
       attrs.each do |key, val|
         self.send("#{key}=", val) if respond_to?("#{key}=")