cocoapods-downloader 1.6.0 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c97d257d2ddac34f6116fd99c16d44d77f2db914d87ab4e9a3b60c4460281fc8
-  data.tar.gz: fead38dd215fc932fe50deb288ddc5db9e9a38077b6185017043ac878dd9b992
+  metadata.gz: 552e14f661a129b219df83f3db56753d10be764ad6e6e3b304e8f8249ee13c1b
+  data.tar.gz: 47c19e50a1d7ea407552c99052834f037a7bc72b56ad86d100194a45014731f7
 SHA512:
-  metadata.gz: a4b95d247caec0895f112376d34a9815eea2ed3e3ecddf469074bfd952dd0b18fad8d49d6f2699c03c84cbde525c1e007d2ff5c1233dd20e113018ce6e20d98e
-  data.tar.gz: 35ea901675d445329421332622fd1093e96aa7e0ce8a322ff3cc40ffa936cf899439a5ddc128c55c1e91ca66ae2de7c8aaf64c75fe68d7657f9a8813b4bb9e9f
+  metadata.gz: '09adf719b95b1f6973515377a5b0f96522e03c6d778ae2440a99f0787eedb5dd637163e80a371735bdd40dd2fd8ba237296116581e86ca7243e9c990153d884f'
+  data.tar.gz: e2b21b9bc0c0feb48be075ab70c8e178a66f4fe35851e8df28e079ae7aa7d7887c249a6ce414e4b5ad30bdbe80a3822774ce235b926c321114548e2e00c3da0b

data/lib/cocoapods-downloader/base.rb

@@ -77,6 +77,7 @@ module Pod
       # @return [void]
       #
       def download
+        validate_input
         ui_action("#{name} download") do
           target_path.mkpath
           download!
@@ -121,6 +122,14 @@ module Pod
         raise 'Abstract method'
       end
 
+      # Provides a before-download check for safety of the options in the
+      # concrete downloader.
+      #
+      # @return [void]
+      #
+      def validate_input
+      end
+
       # Returns a User-Agent string that itentifies http network requests as
       # originating from CocoaPods.
       # Contains version numbers from the CocoaPods Gem and the cocoapods-downloader Gem.

data/lib/cocoapods-downloader/gem_version.rb

@@ -3,6 +3,6 @@ module Pod
     # @return [String] Downloader’s version, following
     #         [semver](http://semver.org).
     #
-    VERSION = '1.6.0'.freeze
+    VERSION = '1.6.3'.freeze
   end
 end

data/lib/cocoapods-downloader/git.rb

@@ -21,12 +21,17 @@ module Pod
       end
 
       def self.preprocess_options(options)
-        validate_input options
         return options unless options[:branch]
 
+        input = [options[:git], options[:commit]].map(&:to_s)
+        invalid = input.compact.any? { |value| value.start_with?('--') || value.include?(' --') }
+        raise DownloaderError, "Provided unsafe input for git #{options}." if invalid
+
         command = ['ls-remote',
+                   '--',
                    options[:git],
                    options[:branch]]
+
         output = Git.execute_command('git', command)
         match = commit_from_ls_remote output, options[:branch]
 
@@ -58,13 +63,7 @@ module Pod
         match[1] unless match.nil?
       end
 
-      def self.validate_input(options)
-        input = [options[:git], options[:branch], options[:commit], options[:tag]]
-        invalid = input.compact.any? { |value| value.start_with?('--') || value.include?(' --') }
-        raise DownloaderError, "Provided unsafe input for git #{options}." if invalid
-      end
-
-      private_class_method :commit_from_ls_remote, :validate_input
+      private_class_method :commit_from_ls_remote
 
       private
 
@@ -160,6 +159,12 @@ module Pod
       def target_git(*args)
         git!(['-C', target_path] + args)
       end
+
+      def validate_input
+        input = [url, options[:branch], options[:commit], options[:tag]].map(&:to_s)
+        invalid = input.compact.any? { |value| value.start_with?('--') || value.include?(' --') }
+        raise DownloaderError, "Provided unsafe input for git #{options}." if invalid
+      end
     end
   end
 end

data/lib/cocoapods-downloader/mercurial.rb

@@ -18,19 +18,6 @@ module Pod
         end
       end
 
-      def self.preprocess_options(options)
-        validate_input options
-        options
-      end
-
-      def self.validate_input(options)
-        input = [options[:hg], options[:revision], options[:branch], options[:tag]].map(&:to_s)
-        invalid = input.compact.any? { |value| value.start_with?('--') || value.include?(' --') }
-        raise DownloaderError, "Provided unsafe input for hg #{options}." if invalid
-      end
-
-      private_class_method :validate_input
-
       private
 
       executable :hg
@@ -62,6 +49,12 @@ module Pod
       def download_branch!
         hg! 'clone', url, '--updaterev', options[:branch], @target_path
       end
+
+      def validate_input
+        input = [url, options[:revision], options[:branch], options[:tag]].map(&:to_s)
+        invalid = input.compact.any? { |value| value.start_with?('--') || value.include?(' --') }
+        raise DownloaderError, "Provided unsafe input for hg #{options}." if invalid
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-downloader
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.3
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-22 00:00:00.000000000 Z
+date: 2022-04-01 00:00:00.000000000 Z
 dependencies: []
 description:
 email: