Merge pull request #7411 from dependabot/deivid-rodriguez/bundler-sym…

…links Fix fetching files in symlinked folders
dependabot · Aug 4, 2023 · c21e69e · c21e69e
2 parents 5a45f2f + 6770cc3
commit c21e69e
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 8 deletions.
diff --git a/bin/dry-run.rb b/bin/dry-run.rb
@@ -277,7 +277,7 @@ def show_diff(original_file, updated_file)
   removed_lines = diff.count { |line| line.start_with?("-") }
 
   puts
-  puts "    ± #{original_file.name}"
+  puts "    ± #{original_file.realpath}"
   puts "    ~~~"
   puts diff.map { |line| "    " + line }.join
   puts "    ~~~"

diff --git a/common/lib/dependabot/dependency_file.rb b/common/lib/dependabot/dependency_file.rb
@@ -44,7 +44,7 @@ def initialize(name:, content:, directory: "/", type: "file",
       @type = type
 
       begin
-        @mode = File.stat((symlink_target || path).sub(%r{^/}, "")).mode.to_s(8)
+        @mode = File.stat(realpath).mode.to_s(8)
       rescue StandardError
         @mode = mode
       end
@@ -76,6 +76,10 @@ def path
       Pathname.new(File.join(directory, name)).cleanpath.to_path
     end
 
+    def realpath
+      (symlink_target || path).sub(%r{^/}, "")
+    end
+
     def ==(other)
       return false unless other.instance_of?(self.class)
 

diff --git a/common/lib/dependabot/file_fetchers/base.rb b/common/lib/dependabot/file_fetchers/base.rb
@@ -159,19 +159,34 @@ def fetch_file_from_host(filename, type: "file", fetch_submodules: false)
 
         path = Pathname.new(File.join(directory, filename)).cleanpath.to_path
         content = _fetch_file_content(path, fetch_submodules: fetch_submodules)
-        type = "symlink" if @linked_paths.key?(path.gsub(%r{^/}, ""))
+        clean_path = path.gsub(%r{^/}, "")
+
+        linked_path = symlinked_subpath(clean_path)
+        type = "symlink" if linked_path
+        symlink_target = clean_path.sub(linked_path, @linked_paths.dig(linked_path, :path)) if type == "symlink"
 
         DependencyFile.new(
           name: Pathname.new(filename).cleanpath.to_path,
           directory: directory,
           type: type,
           content: content,
-          symlink_target: @linked_paths.dig(path.gsub(%r{^/}, ""), :path)
+          symlink_target: symlink_target
         )
       rescue *CLIENT_NOT_FOUND_ERRORS
         raise Dependabot::DependencyFileNotFound, path
       end
 
+      # Finds the first subpath in path that is a symlink
+      def symlinked_subpath(path)
+        subpaths(path).find { |subpath| @linked_paths.key?(subpath) }
+      end
+
+      # Given a "foo/bar/baz" path, returns ["foo", "foo/bar", "foo/bar/baz"]
+      def subpaths(path)
+        components = path.split("/")
+        components.map { |component| components[0..components.index(component)].join("/") }
+      end
+
       def repo_contents(dir: ".", ignore_base_directory: false,
                         raise_errors: true, fetch_submodules: false)
         dir = File.join(directory, dir) unless ignore_base_directory

diff --git a/common/lib/dependabot/pull_request_creator/github.rb b/common/lib/dependabot/pull_request_creator/github.rb
@@ -193,8 +193,7 @@ def create_tree
                       end
 
             {
-              path: (file.symlink_target ||
-                     file.path).sub(%r{^/}, ""),
+              path: file.realpath,
               mode: (file.mode || "100644"),
               type: "blob"
             }.merge(content)

diff --git a/common/lib/dependabot/pull_request_updater/github.rb b/common/lib/dependabot/pull_request_updater/github.rb
@@ -144,8 +144,7 @@ def create_tree
                       end
 
             {
-              path: (file.symlink_target ||
-                     file.path).sub(%r{^/}, ""),
+              path: file.realpath,
               mode: "100644",
               type: "blob"
             }.merge(content)