Don't follow symlinks when uninstalling files

pip/req/req_uninstall.py

@@ -47,7 +47,7 @@ def _can_uninstall(self):
         return True
 
     def add(self, path):
-        path = normalize_path(path)
+        path = normalize_path(path, resolve_symlinks=False)
         if not os.path.exists(path):
             return
         if self._permitted(path):

pip/utils/__init__.py

@@ -260,12 +260,17 @@ def make_path_relative(path, rel_to):
     return os.path.sep.join(full_parts)
 
 
-def normalize_path(path):
+def normalize_path(path, resolve_symlinks=True):
     """
     Convert a path to its canonical, case-normalized, absolute version.
 
     """
-    return os.path.normcase(os.path.realpath(os.path.expanduser(path)))
+    path = os.path.expanduser(path)
+    if resolve_symlinks:
+        path = os.path.realpath(path)
+    else:
+        path = os.path.abspath(path)
+    return os.path.normcase(path)
 
 
 def splitext(path):

tests/unit/test_req_uninstall.py

@@ -0,0 +1,46 @@
+import os
+import shutil
+import sys
+import tempfile
+
+import pytest
+from mock import Mock
+
+from pip.locations import running_under_virtualenv
+from pip.req.req_uninstall import UninstallPathSet
+
+class TestUninstallPathSet(object):
+    def setup(self):
+        if running_under_virtualenv():
+            # Construct tempdir in sys.prefix, otherwise UninstallPathSet
+            # will reject paths.
+            self.tempdir = tempfile.mkdtemp(prefix=sys.prefix)
+        else:
+            self.tempdir = tempfile.mkdtemp()
+
+    def teardown(self):
+        shutil.rmtree(self.tempdir, ignore_errors=True)
+
+    def test_add(self):
+        file_extant = os.path.join(self.tempdir, 'foo')
+        file_nonexistant = os.path.join(self.tempdir, 'nonexistant')
+        with open(file_extant, 'w'): pass
+
+        ups = UninstallPathSet(dist=Mock())
+        assert ups.paths == set()
+        ups.add(file_extant)
+        assert ups.paths == set([file_extant])
+
+        ups.add(file_nonexistant)
+        assert ups.paths == set([file_extant])
+
+    @pytest.mark.skipif("sys.platform == 'win32'")
+    def test_add_symlink(self):
+        f = os.path.join(self.tempdir, 'foo')
+        with open(f, 'w'): pass
+        l = os.path.join(self.tempdir, 'foo_link')
+        os.symlink(f, l)
+
+        ups = UninstallPathSet(dist=Mock())
+        ups.add(l)
+        assert ups.paths == set([l])

tests/unit/test_utils.py

@@ -13,7 +13,7 @@
 
 from mock import Mock, patch
 from pip.utils import (egg_link_path, Inf, get_installed_distributions,
-                       untar_file, unzip_file, rmtree)
+                       untar_file, unzip_file, rmtree, normalize_path)
 from pip.operations.freeze import freeze_excludes
 
 
@@ -369,3 +369,36 @@ def test_rmtree_retries_for_3sec(tmpdir, monkeypatch):
     monkeypatch.setattr(shutil, 'rmtree', Failer(duration=5).call)
     with pytest.raises(OSError):
         rmtree('foo')
+
+class Test_normalize_path(object):
+    def setup(self):
+        self.tempdir = tempfile.mkdtemp()
+        self.orig_working_dir = os.getcwd()
+        os.chdir(self.tempdir)
+
+    def teardown(self):
+        os.chdir(self.orig_working_dir)
+        shutil.rmtree(self.tempdir, ignore_errors=True)
+
+    # Technically, symlinks are possible on Windows, but you need a special
+    # permission bit to create them, and Python 2 doesn't support it anyway, so
+    # it's easiest just to skip this test on Windows altogether.
+    @pytest.mark.skipif("sys.platform == 'win32'")
+    def test_resolve_symlinks(self):
+        d = os.path.join('foo', 'bar')
+        f = os.path.join(d, 'file1')
+        os.makedirs(d)
+        with open(f, 'w'): pass  # Create the file
+
+        os.symlink(d, 'dir_link')
+        os.symlink(f, 'file_link')
+
+        assert normalize_path('dir_link/file1', resolve_symlinks=True) \
+                == os.path.join(self.tempdir, f)
+        assert normalize_path('dir_link/file1', resolve_symlinks=False) \
+                == os.path.join(self.tempdir, 'dir_link', 'file1')
+
+        assert normalize_path('file_link', resolve_symlinks=True) \
+                == os.path.join(self.tempdir, f)
+        assert normalize_path('file_link', resolve_symlinks=False) \
+                == os.path.join(self.tempdir, 'file_link')