dependabot-common 0.124.1 → 0.124.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd5f760de88f18b1b02d000700ee31816399598f649fb1c0dc517d9e4ee64f53
-  data.tar.gz: 66afb451c31cbcf860a06b605ccfc7303aea932ec52092f0c11206ae5f3d68e8
+  metadata.gz: 3f86ed72ece634a04866d2ae1cf7e47c63c533e25c1576e3ff0e743718ab2546
+  data.tar.gz: 936d63e8162c673bdc66b3de36a51e702148f08b2ec70e0b6233785f04d9477e
 SHA512:
-  metadata.gz: 9d83ee81a113febfbc73a802696a0cc2dbe0e09a3f55f86f7e601fe1f8e7692ff8c0bf21ddfa9c4e9d54b65327364a5cda53b3e1ee0c35483aaefa7239fc8f2c
-  data.tar.gz: 4dccba4c87d90ac14a87d8a2ef659da8c00746730c258b36b68b55bf76f15dce8914e61bce5a30c7b2de286093908c7b2e91bb59013b7cf86caa424921b78a9e
+  metadata.gz: 6bfa982e97636618bc524b954fc394ae8bc57a84b68fd71202be55c92617e1caf2368fbdd10fc7198364a9cc61d9efea4707b06b32976787b1c638caf6b23367
+  data.tar.gz: 9f146bf076f55248d48fae6fbb910a0294fb5477a3d5899e869a014865b8bce8b16fc5ecb02e2f8ea80b422294de9d87dc73ea440a9e036a538c07a2b8302faa

data/lib/dependabot/file_updaters/vendor_updater.rb

@@ -18,7 +18,10 @@ module Dependabot
         return [] unless repo_contents_path && vendor_dir
 
         Dir.chdir(repo_contents_path) do
-          relative_dir = vendor_dir.sub("#{repo_contents_path}/", "")
+          relative_dir = Pathname.new(vendor_dir).relative_path_from(
+            repo_contents_path
+          )
+
           status = SharedHelpers.run_shell_command(
             "git status --untracked-files=all --porcelain=v1 #{relative_dir}"
           )
@@ -31,8 +34,14 @@ module Dependabot
               encoding = Dependabot::DependencyFile::ContentEncoding::BASE64
               encoded_content = Base64.encode64(encoded_content) unless deleted
             end
+
+            project_root =
+              Pathname.new(File.expand_path(File.join(Dir.pwd, base_directory)))
+            file_path =
+              Pathname.new(path).expand_path.relative_path_from(project_root)
+
             Dependabot::DependencyFile.new(
-              name: path,
+              name: file_path.to_s,
               content: encoded_content,
               directory: base_directory,
               deleted: deleted,

data/lib/dependabot/security_advisory.rb

@@ -43,6 +43,51 @@ module Dependabot
       safe_versions.any?
     end
 
+    # Check if the advisory is fixed by the updated dependency
+    #
+    # @param dependency [Dependabot::Dependency] Updated dependency
+    # @return [Boolean]
+    def fixed_by?(dependency)
+      # Handle case mismatch between the security advisory and parsed name
+      return false unless dependency_name.downcase == dependency.name.downcase
+      return false unless package_manager == dependency.package_manager
+      # TODO: Support no previous version to the same level as dependency graph
+      # and security alerts. We currently ignore dependency updates without a
+      # previous version because we don't know if the dependency was vulerable.
+      return false unless dependency.previous_version
+      return false unless version_class.correct?(dependency.previous_version)
+
+      # Ignore deps that weren't previously vulnerable
+      return false unless affects_version?(dependency.previous_version)
+
+      # Select deps that are now fixed
+      !affects_version?(dependency.version)
+    end
+
+    # Check if the version is affected by the advisory
+    #
+    # @param version [Dependabot::<Package Manager>::Version] version class
+    # @return [Boolean]
+    def affects_version?(version)
+      return false unless version_class.correct?(version)
+      return false unless [*safe_versions, *vulnerable_versions].any?
+
+      version = version_class.new(version)
+
+      # If version is known safe for this advisory, it's not vulnerable
+      return false if safe_versions.any? { |r| r.satisfied_by?(version) }
+
+      # If in the vulnerable range and not known safe, it's vulnerable
+      return true if vulnerable_versions.any? { |r| r.satisfied_by?(version) }
+
+      # If a vulnerable range present but not met, it's not vulnerable
+      return false if vulnerable_versions.any?
+
+      # Finally, if no vulnerable range provided, but a safe range provided,
+      # and this versions isn't included (checked earler), it's vulnerable
+      safe_versions.any?
+    end
+
     private
 
     def convert_string_version_requirements

data/lib/dependabot/shared_helpers.rb

@@ -42,6 +42,9 @@ module Dependabot
         path = Pathname.new(File.join(repo_contents_path, directory)).
                expand_path
         reset_git_repo(repo_contents_path)
+        # Handle missing directories by creating an empty one and relying on the
+        # file fetcher to raise a DependencyFileNotFound error
+        FileUtils.mkdir_p(path) unless Dir.exist?(path)
         Dir.chdir(path) { yield(path) }
       else
         in_a_temporary_directory(directory, &block)
@@ -58,13 +61,14 @@ module Dependabot
     end
 
     class HelperSubprocessFailed < StandardError
-      attr_reader :error_class, :error_context
+      attr_reader :error_class, :error_context, :trace
 
-      def initialize(message:, error_context:, error_class: nil)
+      def initialize(message:, error_context:, error_class: nil, trace: nil)
         super(message)
         @error_class = error_class || ""
         @error_context = error_context
         @command = error_context[:command]
+        @trace = trace
       end
 
       def raven_context
@@ -113,7 +117,8 @@ module Dependabot
       raise HelperSubprocessFailed.new(
         message: response["error"],
         error_class: response["error_class"],
-        error_context: error_context
+        error_context: error_context,
+        trace: response["trace"]
       )
     rescue JSON::ParserError
       raise HelperSubprocessFailed.new(

data/lib/dependabot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dependabot
-  VERSION = "0.124.1"
+  VERSION = "0.124.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.124.1
+  version: 0.124.6
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-22 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-codecommit
@@ -438,7 +438,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.7.3
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Shared code used between Dependabot package managers