fastlane 2.238.0 → 2.241.0

data/fastlane_core/lib/fastlane_core/helper.rb

@@ -57,6 +57,21 @@ module FastlaneCore
       !self.bundler? && !self.contained_fastlane? && !self.homebrew? && !self.mac_app?
     end
 
+    # How this fastlane was installed, as reported to analytics and printed at startup
+    def self.install_method
+      if self.bundler?
+        'bundler'
+      elsif self.contained_fastlane?
+        'standalone'
+      elsif self.homebrew?
+        'homebrew'
+      elsif self.mac_app?
+        'mac_app'
+      else
+        'gem'
+      end
+    end
+
     # environment
     #
 
@@ -332,18 +347,18 @@ module FastlaneCore
     # Zips directory
     def self.zip_directory(path, output_path, contents_only: false, overwrite: false, print: true)
       if overwrite
-        overwrite_command = " && rm -f '#{output_path}'"
+        overwrite_command = " && rm -f #{output_path.shellescape}"
       else
         overwrite_command = ""
       end
 
       if contents_only
-        command = "cd '#{path}'#{overwrite_command} && zip -r '#{output_path}' *"
+        command = "cd #{path.shellescape}#{overwrite_command} && zip -r #{output_path.shellescape} *"
       else
         containing_path = File.expand_path("..", path)
         contents_path = File.basename(path)
 
-        command = "cd '#{containing_path}'#{overwrite_command} && zip -r '#{output_path}' '#{contents_path}'"
+        command = "cd #{containing_path.shellescape}#{overwrite_command} && zip -r #{output_path.shellescape} #{contents_path.shellescape}"
       end
 
       UI.command(command) unless print
@@ -381,6 +396,8 @@ module FastlaneCore
         # we set the default here, instead of at the parameters
         # as we don't want to `UI.message` a rocket that's just there for the loading indicator
         text ||= "🚀"
+        # A spinner left running by a show without a hide could never be stopped once replaced
+        @require_fastlane_spinner.stop if @require_fastlane_spinner && !@require_fastlane_spinner.done?
         @require_fastlane_spinner = TTY::Spinner.new("[:spinner] #{text} ", format: :dots)
         @require_fastlane_spinner.auto_spin
       else
@@ -388,12 +405,24 @@ module FastlaneCore
       end
     end
 
-    def self.hide_loading_indicator
+    def self.hide_loading_indicator(success: true)
       if self.should_show_loading_indicator? && @require_fastlane_spinner
-        @require_fastlane_spinner.success
+        success ? @require_fastlane_spinner.success : @require_fastlane_spinner.error
       end
     end
 
+    # Shows the loading indicator while the block runs, and hides it even when the block raises
+    def self.with_loading_indicator(text = nil)
+      failed = false
+      show_loading_indicator(text)
+      yield
+    rescue Exception # rubocop:disable Lint/RescueException
+      failed = true
+      raise
+    ensure
+      hide_loading_indicator(success: !failed)
+    end
+
     # files
     #
 

data/fastlane_core/lib/fastlane_core/ipa_file_analyser.rb

@@ -55,7 +55,7 @@ module FastlaneCore
     end
 
     def self.fetch_info_plist_with_rubyzip(path)
-      Zip::File.open(path, "rb") do |zipfile|
+      Zip::File.open(path) do |zipfile|
         file = zipfile.glob('**/Payload/*.app/Info.plist').first
         return nil unless file
         zipfile.read(file)

data/fastlane_core/lib/fastlane_core/itunes_transporter.rb

@@ -9,14 +9,6 @@ require_relative 'helper'
 require_relative 'fastlane_pty'
 
 module FastlaneCore
-  # The TransporterInputError occurs when you passed wrong inputs to the {Deliver::ItunesTransporter}
-  class TransporterInputError < StandardError
-  end
-  # The TransporterTransferError occurs when some error happens
-  # while uploading or downloading something from/to iTC
-  class TransporterTransferError < StandardError
-  end
-
   # Used internally
   class TransporterRequiresApplicationSpecificPasswordError < StandardError
   end
@@ -35,7 +27,7 @@ module FastlaneCore
 
     private_constant :ERROR_REGEX, :WARNING_REGEX, :OUTPUT_REGEX, :RETURN_VALUE_REGEX, :SKIP_ERRORS
 
-    def build_download_command(username, password, apple_id, destination = "/tmp", provider_short_name = "", jwt = nil)
+    def build_download_command(username, password, apple_id, destination = Dir.tmpdir, provider_short_name = "", jwt = nil)
       not_implemented(__method__)
     end
 
@@ -43,11 +35,11 @@ module FastlaneCore
       not_implemented(__method__)
     end
 
-    def build_upload_command(username, password, source = "/tmp", options = {})
+    def build_upload_command(username, password, source = Dir.tmpdir, options = {})
       not_implemented(__method__)
     end
 
-    def build_verify_command(username, password, source = "/tmp", provider_short_name = "", **kwargs)
+    def build_verify_command(username, password, source = Dir.tmpdir, provider_short_name = "", **kwargs)
       not_implemented(__method__)
     end
 
@@ -291,6 +283,7 @@ module FastlaneCore
 
       @errors << "The call to the altool completed with a non-zero exit status: #{exit_status}. This indicates a failure." unless exit_status.zero?
       @errors << "-1 indicates altool exited abnormally; try retrying (see https://github.com/fastlane/fastlane/issues/21535)" if exit_status == -1
+      @errors.clear if @all_lines.any? { |line| line.include?("UPLOAD SUCCEEDED with no errors") }
 
       unless @errors.empty? || @all_lines.empty?
         @all_lines.each do |line|
@@ -319,7 +312,7 @@ module FastlaneCore
       end
     end
 
-    def build_upload_command(username, password, source = "/tmp", options = {})
+    def build_upload_command(username, password, source = Dir.tmpdir, options = {})
       provider_short_name = options.fetch(:provider_short_name, "")
       provider_public_id = options.fetch(:provider_public_id, "")
       jwt = options[:jwt]
@@ -351,11 +344,11 @@ module FastlaneCore
       ].compact.join(' ')
     end
 
-    def build_download_command(username, password, apple_id, destination = "/tmp", provider_short_name = "", jwt = nil)
+    def build_download_command(username, password, apple_id, destination = Dir.tmpdir, provider_short_name = "", jwt = nil)
       raise "This feature has not been implemented yet with altool for Xcode 14"
     end
 
-    def build_verify_command(username, password, source = "/tmp", options = {})
+    def build_verify_command(username, password, source = Dir.tmpdir, options = {})
       provider_short_name = options.fetch(:provider_short_name, "")
       provider_public_id = options.fetch(:provider_public_id, "")
       api_key = options[:api_key]
@@ -442,7 +435,7 @@ module FastlaneCore
       end
     end
 
-    def build_upload_command(username, password, source = "/tmp", options = {})
+    def build_upload_command(username, password, source = Dir.tmpdir, options = {})
       provider_short_name = options.fetch(:provider_short_name, "")
       jwt = options[:jwt]
       api_key = options[:api_key]
@@ -458,7 +451,7 @@ module FastlaneCore
       ].compact.join(' ')
     end
 
-    def build_download_command(username, password, apple_id, destination = "/tmp", provider_short_name = "", jwt = nil)
+    def build_download_command(username, password, apple_id, destination = Dir.tmpdir, provider_short_name = "", jwt = nil)
       [
         '"' + Helper.transporter_path + '"',
         "-m lookupMetadata",
@@ -477,7 +470,7 @@ module FastlaneCore
       ].compact.join(' ')
     end
 
-    def build_verify_command(username, password, source = "/tmp", options = {})
+    def build_verify_command(username, password, source = Dir.tmpdir, options = {})
       provider_short_name = options.fetch(:provider_short_name, "")
       jwt = options[:jwt]
       [
@@ -568,7 +561,7 @@ module FastlaneCore
       end
     end
 
-    def build_upload_command(username, password, source = "/tmp", options = {})
+    def build_upload_command(username, password, source = Dir.tmpdir, options = {})
       provider_short_name = options.fetch(:provider_short_name, "")
       jwt = options[:jwt]
       api_key = options[:api_key]
@@ -607,7 +600,7 @@ module FastlaneCore
       end
     end
 
-    def build_verify_command(username, password, source = "/tmp", options = {})
+    def build_verify_command(username, password, source = Dir.tmpdir, options = {})
       provider_short_name = options.fetch(:provider_short_name, "")
       jwt = options[:jwt]
       credential_params = build_credential_params(username, password, jwt, nil, is_default_itms_on_xcode_11?)
@@ -641,7 +634,7 @@ module FastlaneCore
       end
     end
 
-    def build_download_command(username, password, apple_id, destination = "/tmp", provider_short_name = "", jwt = nil)
+    def build_download_command(username, password, apple_id, destination = Dir.tmpdir, provider_short_name = "", jwt = nil)
       credential_params = build_credential_params(username, password, jwt, nil, is_default_itms_on_xcode_11?)
       if is_default_itms_on_xcode_11?
         [
@@ -790,10 +783,10 @@ module FastlaneCore
     # @param app_id [Integer] The unique App ID
     # @param dir [String] the path in which the package file should be stored
     # @return (Bool) True if everything worked fine
-    # @raise [Deliver::TransporterTransferError] when something went wrong
-    #   when transferring
     def download(app_id, dir = nil)
-      dir ||= "/tmp"
+      # Dir.tmpdir, not a literal "/tmp": the transporter chdirs into this
+      # directory, and "/tmp" is not one on Windows. See fastlane#30184.
+      dir ||= Dir.tmpdir
 
       password_placeholder = @jwt.nil? ? 'YourPassword' : nil
       jwt_placeholder = @jwt.nil? ? nil : 'YourJWT'
@@ -829,8 +822,6 @@ module FastlaneCore
     # @param package_path [String] the path to the package file (used instead of app_id and dir)
     # @param asset_path [String] the path to the ipa/dmg/pkg file (used instead of package_path if running on macOS)
     # @return (Bool) True if everything worked fine
-    # @raise [Deliver::TransporterTransferError] when something went wrong
-    #   when transferring
     def upload(app_id = nil, dir = nil, package_path: nil, asset_path: nil, platform: nil)
       raise "app_id and dir are required or package_path or asset_path is required" if (app_id.nil? || dir.nil?) && package_path.nil? && asset_path.nil?
 
@@ -898,8 +889,6 @@ module FastlaneCore
     # @param dir [String] the path in which the package file is located
     # @param package_path [String] the path to the package file (used instead of app_id and dir)
     # @return (Bool) True if everything worked fine
-    # @raise [Deliver::TransporterTransferError] when something went wrong
-    #   when transferring
     def verify(app_id = nil, dir = nil, package_path: nil, asset_path: nil, platform: nil)
       raise "app_id and dir are required or package_path or asset_path is required" if (app_id.nil? || dir.nil?) && package_path.nil? && asset_path.nil?
 

data/fastlane_core/lib/fastlane_core/keychain_importer.rb

@@ -54,37 +54,34 @@ module FastlaneCore
         command << " 1> /dev/null" # always disable stdout. This can be very verbose, and leak potentially sensitive info
 
         # Showing loading indicator as this can take some time if a lot of keys installed
-        Helper.show_loading_indicator("Setting key partition list... (this can take a minute if there are a lot of keys installed)")
-
-        # Strip keychain password from command output
-        sensitive_command = command.gsub(password_part, " -k ********")
-        UI.command(sensitive_command) if output
-        Open3.popen3(command) do |stdin, stdout, stderr, thrd|
-          unless thrd.value.success?
-            err = stderr.read.to_s.strip
-
-            # Inform user when no/wrong password was used as its needed to prevent UI permission popup from Xcode when signing
-            if err.include?("SecKeychainItemSetAccessWithPassword")
-              keychain_name = File.basename(keychain_path, ".*")
-              Security::InternetPassword.delete(server: server_name(keychain_name))
-
-              UI.important("")
-              UI.important("Could not configure imported keychain item (certificate) to prevent UI permission popup when code signing\n" \
-                       "Check if you supplied the correct `keychain_password` for keychain: `#{keychain_path}`\n" \
-                       "#{err}")
-              UI.important("")
-              UI.important("Please look at the following docs to see how to set a keychain password:")
-              UI.important(" - https://docs.fastlane.tools/actions/sync_code_signing")
-              UI.important(" - https://docs.fastlane.tools/actions/get_certificates")
-            else
-              UI.error(err)
+        Helper.with_loading_indicator("Setting key partition list... (this can take a minute if there are a lot of keys installed)") do
+          # Strip keychain password from command output
+          sensitive_command = command.gsub(password_part, " -k ********")
+          UI.command(sensitive_command) if output
+          Open3.popen3(command) do |stdin, stdout, stderr, thrd|
+            unless thrd.value.success?
+              err = stderr.read.to_s.strip
+
+              # Inform user when no/wrong password was used as its needed to prevent UI permission popup from Xcode when signing
+              if err.include?("SecKeychainItemSetAccessWithPassword")
+                keychain_name = File.basename(keychain_path, ".*")
+                Security::InternetPassword.delete(server: server_name(keychain_name))
+
+                UI.important("")
+                UI.important("Could not configure imported keychain item (certificate) to prevent UI permission popup when code signing\n" \
+                         "Check if you supplied the correct `keychain_password` for keychain: `#{keychain_path}`\n" \
+                         "#{err}")
+                UI.important("")
+                UI.important("Please look at the following docs to see how to set a keychain password:")
+                UI.important(" - https://docs.fastlane.tools/actions/sync_code_signing")
+                UI.important(" - https://docs.fastlane.tools/actions/get_certificates")
+              else
+                UI.error(err)
+              end
             end
           end
         end
 
-        # Hiding after Open3 finishes
-        Helper.hide_loading_indicator
-
       end
     end
 
@@ -98,7 +95,13 @@ module FastlaneCore
       server = server_name(keychain_name)
 
       # Attempt to find password in keychain for keychain
-      item = Security::InternetPassword.find(server: server)
+      begin
+        item = Security::InternetPassword.find(server: server)
+      rescue Security::Error => ex
+        UI.important("Could not read the keychain item #{server}: #{ex.message}")
+        item = nil
+      end
+
       if item
         keychain_password = item.password
         UI.important("Using keychain password from keychain item #{server} in #{keychain_path}")

data/fastlane_core/lib/fastlane_core/languages.rb

@@ -8,7 +8,6 @@ module FastlaneCore
     # The new format used from September 2015 on
     # This was generated from `Spaceship::Tunes.client.available_languages.sort`
     # Updates should also be made to:
-    # - produce/lib/produce/available_default_languages.rb
     # - spaceship/lib/assets/languageMapping.json
     # See pull request for example: https://github.com/fastlane/fastlane/pull/14110
     ALL_LANGUAGES = %w[ar-SA bn-BD ca cs da de-DE el en-AU en-CA en-GB en-US es-ES es-MX fi fr-CA fr-FR gu-IN he hi hr hu id it ja kn-IN ko ml-IN mr-IN ms nl-NL no or-IN pa-IN pl pt-BR pt-PT ro ru sk sl-SI sv ta-IN te-IN th tr uk ur-PK vi zh-Hans zh-Hant]

data/fastlane_core/lib/fastlane_core/print_table.rb

@@ -1,5 +1,6 @@
 require_relative 'configuration/configuration'
 require_relative 'helper'
+require_relative 'secrets'
 
 module FastlaneCore
   class PrintTable
@@ -87,6 +88,8 @@ module FastlaneCore
       end
 
       def transform_output(rows, transform: :newline)
+        # Masked before wrapping, which would split a secret across lines
+        rows = rows.map { |row| row.map { |column| column.kind_of?(String) ? Secrets.mask(column) : column } }
         return rows unless should_transform?
 
         require 'fastlane_core/string_filters'
@@ -110,7 +113,7 @@ module FastlaneCore
         return return_array
       end
 
-      def collect_rows(options: nil, hide_keys: [], mask_keys: [], prefix: '', mask: '********')
+      def collect_rows(options: nil, hide_keys: [], mask_keys: [], prefix: '', mask: nil)
         rows = []
 
         options.each do |key, value|
@@ -118,7 +121,7 @@ module FastlaneCore
           next if value.nil?
           next if value.to_s == ""
           next if hide_keys.include?(prefixed_key)
-          value = mask if mask_keys.include?(prefixed_key)
+          value = mask || Secrets.label(key) if mask_keys.include?(prefixed_key)
 
           if value.respond_to?(:key)
             rows.concat(self.collect_rows(options: value, hide_keys: hide_keys, mask_keys: mask_keys, prefix: "#{prefix}#{key}.", mask: mask))

data/fastlane_core/lib/fastlane_core/project.rb

@@ -412,6 +412,16 @@ module FastlaneCore
     # @param [String] The key of which we want the value for (e.g. "PRODUCT_NAME")
     def build_settings(key: nil, optional: true)
       unless @build_settings
+        if (disallowed_by = xcodebuild_settings_lookup_disallowed_by)
+          message = "Could not read the '#{key}' build setting: fetching build settings by running" \
+            " `xcodebuild -showBuildSettings` is disallowed by #{disallowed_by}."
+          trigger = caller.find { |frame| !frame.start_with?(__FILE__) }
+          message += "\nThe build setting lookup was triggered by: #{trigger}" if trigger
+          message += "\nTo fix this, manually specify the option whose automatic detection required the '#{key}' build setting," \
+            " or disable #{disallowed_by} to allow fastlane to fetch it automatically."
+          UI.user_error!(message)
+        end
+
         if is_workspace
           if schemes.count == 0
             UI.user_error!("Could not find any schemes for Xcode workspace at path '#{self.path}'. Please make sure that the schemes you want to use are marked as `Shared` from Xcode.")
@@ -563,5 +573,14 @@ module FastlaneCore
     def automated_scheme_selection?
       FastlaneCore::Env.truthy?("AUTOMATED_SCHEME_SELECTION")
     end
+
+    # Returns a description of what disallowed fetching build settings via the
+    # (potentially slow on large projects) `xcodebuild -showBuildSettings` command,
+    # or nil if the lookup is allowed
+    def xcodebuild_settings_lookup_disallowed_by
+      return "the FASTLANE_DISALLOW_XCODEBUILD_SETTINGS_LOOKUP environment variable" if FastlaneCore::Env.truthy?("FASTLANE_DISALLOW_XCODEBUILD_SETTINGS_LOOKUP")
+      return "the `disallow_xcodebuild_settings_lookup` option" if options[:disallow_xcodebuild_settings_lookup]
+      nil
+    end
   end
 end

data/fastlane_core/lib/fastlane_core/provisioning_profile.rb

@@ -106,26 +106,17 @@ module FastlaneCore
 
       private
 
+      # keychain_path is ignored: unlike `security cms -D`, this imports no certificate into a keychain. See #30186.
       def decode(path, keychain_path = nil)
-        require 'tmpdir'
-        Dir.mktmpdir('fastlane') do |dir|
-          err = "#{dir}/cms.err"
-          # we want to prevent the error output to mix up with the standard output because of
-          # /dev/null: https://github.com/fastlane/fastlane/issues/6387
-          if Helper.mac?
-            if keychain_path.nil?
-              decoded = `security cms -D -i "#{path}" 2> #{err}`
-            else
-              decoded = `security cms -D -i "#{path}" -k "#{keychain_path.shellescape}" 2> #{err}`
-            end
-          else
-            # `security` only works on Mac, fallback to `openssl`
-            # via https://stackoverflow.com/a/14379814/252627
-            decoded = `openssl smime -inform der -verify -noverify -in #{path.shellescape} 2> #{err}`
-          end
-          UI.error("Failure to decode #{path}. Exit: #{$?.exitstatus}: #{File.read(err)}") if $?.exitstatus != 0
-          decoded
-        end
+        require 'openssl'
+        profile = OpenSSL::PKCS7.new(File.binread(path))
+        # NOVERIFY skips the certificate chain, which `security cms -D` does not enforce either, but still checks the signature.
+        # A mismatch is decoded anyway, as `security cms -D` did: match/spec/fixtures/test.provisionprofile has one.
+        UI.important("The signature of #{path} does not match its content: it was changed after it was signed") unless profile.verify([], OpenSSL::X509::Store.new, nil, OpenSSL::PKCS7::NOVERIFY)
+        profile.data.to_s
+      rescue ArgumentError, OpenSSL::PKCS7::PKCS7Error, SystemCallError => e
+        UI.error("Failure to decode #{path}: #{e.message}")
+        ""
       end
     end
   end

data/fastlane_core/lib/fastlane_core/secrets.rb

@@ -0,0 +1,77 @@
+require_relative 'core_ext/shellwords'
+require_relative 'env'
+
+module FastlaneCore
+  # Values hidden from everything fastlane prints. Only output is masked: commands still receive the real value.
+  # FASTLANE_DISABLE_SECRET_MASKING turns it off, for debugging.
+  module Secrets
+    MASK = '********'.freeze
+    # Shorter values would mask unrelated text.
+    MIN_LENGTH = 4
+
+    # Masks what is written to an IO, so `puts`, `print`, `abort` and Logger output are covered.
+    module OutputFilter
+      def write(*args)
+        super(*args.map { |arg| Secrets.mask(arg.to_s) })
+      end
+    end
+
+    class << self
+      # Registers a secret, or every String inside a Hash or Array, together with the escaped forms `sh` prints.
+      # A name, such as the option's key, replaces it with `<NAME>_REDACTED` rather than MASK.
+      def register(value, name: nil)
+        case value
+        when Hash then value.each_value { |v| register(v, name: name) }
+        when Array then value.each { |v| register(v, name: name) }
+        when String
+          return if value.length < MIN_LENGTH
+
+          replacement = name ? label(name) : MASK
+          [value, Shellwords.escape(value), value.shellescape].each do |form|
+            labels[form.b] = replacement if [nil, MASK].include?(labels[form.b])
+          end
+          @pattern = nil
+          install_output_filter unless disabled?
+        end
+      end
+
+      def mask(text)
+        return text if labels.empty? || !text.kind_of?(String) || disabled?
+
+        # One pass: a name put in place of a secret is not masked again by a shorter secret it contains
+        text.b.gsub(pattern) { |match| labels[match] }.force_encoding(text.encoding)
+      end
+
+      # What a secret registered under this name is replaced with, e.g. API_TOKEN_REDACTED
+      def label(name)
+        "#{name.to_s.upcase}_REDACTED"
+      end
+
+      def labels
+        @labels ||= {}
+      end
+
+      def clear
+        @labels = {}
+        @pattern = nil
+      end
+
+      def disabled?
+        FastlaneCore::Env.truthy?('FASTLANE_DISABLE_SECRET_MASKING')
+      end
+
+      private
+
+      # Longest first, so a secret wins over a shorter one it contains
+      def pattern
+        @pattern ||= Regexp.union(labels.keys.sort_by { |v| -v.length })
+      end
+
+      def install_output_filter
+        [$stdout, $stderr].each do |io|
+          io.singleton_class.prepend(OutputFilter) unless io.singleton_class.include?(OutputFilter)
+        end
+      end
+    end
+  end
+end

data/fastlane_core/lib/fastlane_core/ui/fastlane_runner.rb

@@ -265,11 +265,11 @@ module Commander
       ui.error("- If you use system Ruby:")
       ui.error("  - Run `brew update && brew install ruby`")
       ui.error("- If you use rbenv with ruby-build:")
-      ui.error("  - Run `brew update && brew upgrade ruby-build && rbenv install 2.3.1`")
-      ui.error("  - Run `rbenv global 2.3.1` to make it the new global default Ruby version")
+      ui.error("  - Run `brew update && brew upgrade ruby-build && rbenv install #{Fastlane::SUGGESTED_MINIMUM_RUBY}`")
+      ui.error("  - Run `rbenv global #{Fastlane::SUGGESTED_MINIMUM_RUBY}` to make it the new global default Ruby version")
       ui.error("- If you use rvm:")
       ui.error("  - First run `rvm osx-ssl-certs update all`")
-      ui.error("  - Then run `rvm reinstall ruby-2.3.1 --with-openssl-dir=/usr/local`")
+      ui.error("  - Then run `rvm reinstall ruby-#{Fastlane::SUGGESTED_MINIMUM_RUBY}`")
       ui.error("")
       ui.error("If that doesn't fix your issue, please google for the following error message:")
       ui.error("  '#{e}'")

data/fastlane_core/lib/fastlane_core/ui/github_issue_inspector_reporter.rb

@@ -20,7 +20,7 @@ module Fastlane
       report.issues[0..(NUMBER_OF_ISSUES_INLINE - 1)].each { |issue| print_issue_full(issue) }
 
       if report.issues.count > NUMBER_OF_ISSUES_INLINE
-        report.url.sub!('\'', '%27')
+        report.url.gsub!('\'', '%27')
         puts("and #{report.total_results - NUMBER_OF_ISSUES_INLINE} more at: #{report.url}")
         puts("")
       end

data/fastlane_core/lib/fastlane_core/ui/implementations/shell.rb

@@ -1,6 +1,7 @@
 require_relative '../../helper'
 require_relative '../../globals'
 require_relative '../../env'
+require_relative '../../secrets'
 
 require_relative '../interface'
 
@@ -23,7 +24,7 @@ module FastlaneCore
       end
 
       @log.formatter = proc do |severity, datetime, progname, msg|
-        "#{format_string(datetime, severity)}#{msg}\n"
+        "#{format_string(datetime, severity)}#{Secrets.mask(msg.to_s)}\n"
       end
 
       @log

data/fastlane_core/lib/fastlane_core.rb

@@ -2,6 +2,7 @@ require_relative 'fastlane_core/globals'
 # Ruby monkey-patches - should be before almost all else
 require_relative 'fastlane_core/core_ext/string'
 require_relative 'fastlane_core/core_ext/shellwords'
+require_relative 'fastlane_core/secrets'
 
 require_relative 'fastlane_core/analytics/action_completion_context'
 require_relative 'fastlane_core/analytics/action_launch_context'

data/frameit/lib/frameit/device.rb

@@ -15,7 +15,7 @@ module Frameit
     attr_reader :priority_config_key
 
     def initialize(id, formatted_name, priority, resolutions, density_ppi, default_color, platform = Platform::IOS, deliver_screen_id = nil, priority_config_key = nil)
-      Raise("Priority mustn't be higher than #{REQUIRED_PRIORITY}") if priority > REQUIRED_PRIORITY
+      raise "Priority mustn't be higher than #{REQUIRED_PRIORITY}" if priority > REQUIRED_PRIORITY
       @id = id
       @deliver_screen_id = deliver_screen_id
       @formatted_name = formatted_name

data/frameit/lib/frameit/frame_downloader.rb

@@ -20,6 +20,8 @@ module Frameit
 
       files = JSON.parse(download_file("files.json"))
       files.each_with_index do |current, index|
+        # files.json is downloaded: only accept plain file names, so nothing is written outside templates_path
+        UI.user_error!("Unexpected frame file name '#{current}'") if current.include?("/") || current.include?("\\") || current.start_with?(".")
         content = download_file(current, txt: "#{index + 1} of #{files.count} files")
         File.binwrite(File.join(templates_path, current), content)
       end

data/frameit/lib/frameit/runner.rb

@@ -38,8 +38,9 @@ module Frameit
             if editor.should_skip?
               UI.message("Skipping framing of screenshot #{screenshot.path}.  No title provided in your Framefile.json or title.strings.")
             else
-              Helper.show_loading_indicator("Framing screenshot '#{full_path}'")
-              editor.frame!
+              Helper.with_loading_indicator("Framing screenshot '#{full_path}'") do
+                editor.frame!
+              end
             end
           rescue => ex
             UI.error(ex.to_s)

data/frameit/lib/frameit/screenshot.rb

@@ -48,7 +48,6 @@ module Frameit
     # Device name for a given screen size. Used to use the correct template
     def device_name
       @device.formatted_name
-      # rubocop:enable Require/MissingRequireStatement
     end
 
     def default_color

data/gym/lib/gym/generators/build_command_generator.rb

@@ -34,11 +34,11 @@ module Gym
 
         options = []
         options += project_path_array
-        options << "-sdk '#{config[:sdk]}'" if config[:sdk]
-        options << "-toolchain '#{config[:toolchain]}'" if config[:toolchain]
-        options << "-destination '#{config[:destination]}'" if config[:destination]
+        options << "-sdk #{config[:sdk].shellescape}" if config[:sdk]
+        options << "-toolchain #{config[:toolchain].shellescape}" if config[:toolchain]
+        options << "-destination #{config[:destination].shellescape}" if config[:destination]
         options << "-archivePath #{archive_path.shellescape}" unless config[:skip_archive]
-        options << "-resultBundlePath '#{result_bundle_path}'" if config[:result_bundle]
+        options << "-resultBundlePath #{result_bundle_path.shellescape}" if config[:result_bundle]
         options << "-showBuildTimingSummary" if config[:build_timing_summary]
         if config[:use_system_scm] && !options.include?("-scmProvider system")
           options << "-scmProvider system"

data/gym/lib/gym/generators/package_command_generator_xcode7.rb

@@ -33,10 +33,10 @@ module Gym
         config = Gym.config
 
         options = []
-        options << "-exportOptionsPlist '#{config_path}'"
+        options << "-exportOptionsPlist #{config_path.shellescape}"
         options << "-archivePath #{BuildCommandGenerator.archive_path.shellescape}"
-        options << "-exportPath '#{temporary_output_path}'"
-        options << "-toolchain '#{config[:toolchain]}'" if config[:toolchain]
+        options << "-exportPath #{temporary_output_path.shellescape}"
+        options << "-toolchain #{config[:toolchain].shellescape}" if config[:toolchain]
         options << config[:export_xcargs] if config[:export_xcargs]
         options << config[:xcargs] if config[:xcargs]