Fix pex extraction perms.

pex/archiver.py

@@ -6,7 +6,7 @@
 import tarfile
 import zipfile
 
-from .common import safe_mkdtemp
+from .common import PermPreservingZipFile, safe_mkdtemp
 
 
 class Archiver(object):
@@ -19,7 +19,7 @@ class InvalidArchive(Error): pass
     '.tar.gz': (tarfile.TarFile.open, tarfile.ReadError),
     '.tar.bz2': (tarfile.TarFile.open, tarfile.ReadError),
     '.tgz': (tarfile.TarFile.open, tarfile.ReadError),
-    '.zip': (zipfile.ZipFile, zipfile.BadZipfile)
+    '.zip': (PermPreservingZipFile, zipfile.BadZipfile)
   }
 
   @classmethod

pex/common.py

@@ -78,10 +78,27 @@ def teardown(self):
 _MKDTEMP_SINGLETON = MktempTeardownRegistry()
 
 
+class PermPreservingZipFile(zipfile.ZipFile):
+  """A ZipFile that works around https://bugs.python.org/issue15795"""
+
+  def _extract_member(self, member, targetpath, pwd):
+    result = super(PermPreservingZipFile, self)._extract_member(member, targetpath, pwd)
+    info = member if isinstance(member, zipfile.ZipInfo) else self.getinfo(member)
+    self._chmod(info, result)
+    return result
+
+  def _chmod(self, info, path):
+    # This magic works to extract perm bits from the 32 bit external file attributes field for
+    # unix-created zip files, for the layout, see:
+    #   https://www.forensicswiki.org/wiki/ZIP#External_file_attributes
+    attr = info.external_attr >> 16
+    os.chmod(path, attr)
+
+
 @contextlib.contextmanager
 def open_zip(path, *args, **kwargs):
   """A contextmanager for zip files.  Passes through positional and kwargs to zipfile.ZipFile."""
-  with contextlib.closing(zipfile.ZipFile(path, *args, **kwargs)) as zip:
+  with contextlib.closing(PermPreservingZipFile(path, *args, **kwargs)) as zip:
     yield zip
 
 

tests/test_common.py

@@ -1,13 +1,14 @@
 # Copyright 2016 Pants project contributors (see CONTRIBUTORS.md).
 # Licensed under the Apache License, Version 2.0 (see LICENSE).
-
+import contextlib
 import errno
 import os
 from contextlib import contextmanager
 
 import pytest
 
-from pex.common import rename_if_empty
+from pex.common import PermPreservingZipFile, chmod_plus_x, rename_if_empty, touch
+from pex.testing import temporary_dir
 
 try:
   from unittest import mock
@@ -42,3 +43,46 @@ def test_rename_if_empty_enotempty():
 
 def test_rename_if_empty_eperm():
   rename_if_empty_test(errno.EPERM, expect_raises=OSError)
+
+
+def extract_perms(path):
+  return oct(os.stat(path).st_mode)
+
+
+@contextlib.contextmanager
+def zip_fixture():
+  with temporary_dir() as target_dir:
+    one = os.path.join(target_dir, 'one')
+    touch(one)
+
+    two = os.path.join(target_dir, 'two')
+    touch(two)
+    chmod_plus_x(two)
+
+    assert extract_perms(one) != extract_perms(two)
+
+    zip_file = os.path.join(target_dir, 'test.zip')
+    with contextlib.closing(PermPreservingZipFile(zip_file, 'w')) as zf:
+      zf.write(one, 'one')
+      zf.write(two, 'two')
+
+    yield zip_file, os.path.join(target_dir, 'extract'), one, two
+
+
+def test_perm_preserving_zipfile_extractall():
+  with zip_fixture() as (zip_file, extract_dir, one, two):
+    with contextlib.closing(PermPreservingZipFile(zip_file)) as zf:
+      zf.extractall(extract_dir)
+
+      assert extract_perms(one) == extract_perms(os.path.join(extract_dir, 'one'))
+      assert extract_perms(two) == extract_perms(os.path.join(extract_dir, 'two'))
+
+
+def test_perm_preserving_zipfile_extract():
+  with zip_fixture() as (zip_file, extract_dir, one, two):
+    with contextlib.closing(PermPreservingZipFile(zip_file)) as zf:
+      zf.extract('one', path=extract_dir)
+      zf.extract('two', path=extract_dir)
+
+      assert extract_perms(one) == extract_perms(os.path.join(extract_dir, 'one'))
+      assert extract_perms(two) == extract_perms(os.path.join(extract_dir, 'two'))