From d0112cf9306834b17eb5476363cb6b3b9bfb650c Mon Sep 17 00:00:00 2001
From: Anton Samarchyan <anton.samarchyan@savoirfairelinux.com>
Date: Thu, 1 Dec 2016 11:05:08 -0500
Subject: [PATCH] Fixed #26494 -- Made Archive.extract() preserve file
 permissions.

---
 django/utils/archive.py                   |   5 +++++
 tests/utils_tests/archives/foobar.tar     | Bin 10240 -> 5632 bytes
 tests/utils_tests/archives/foobar.tar.bz2 | Bin 238 -> 265 bytes
 tests/utils_tests/archives/foobar.tar.gz  | Bin 249 -> 253 bytes
 tests/utils_tests/archives/foobar.zip     | Bin 1130 -> 810 bytes
 tests/utils_tests/test_archive.py         |  10 ++++++++++
 6 files changed, 15 insertions(+)

diff --git a/django/utils/archive.py b/django/utils/archive.py
index 13f8afa32f..f8c1a0f83b 100644
--- a/django/utils/archive.py
+++ b/django/utils/archive.py
@@ -164,6 +164,7 @@ class TarArchive(BaseArchive):
                         os.makedirs(dirname)
                     with open(filename, 'wb') as outfile:
                         shutil.copyfileobj(extracted, outfile)
+                        os.chmod(filename, member.mode)
                 finally:
                     if extracted:
                         extracted.close()
@@ -185,6 +186,7 @@ class ZipArchive(BaseArchive):
         leading = self.has_leading_dir(namelist)
         for name in namelist:
             data = self._archive.read(name)
+            info = self._archive.getinfo(name)
             if leading:
                 name = self.split_leading_dir(name)[1]
             filename = os.path.join(to_path, name)
@@ -198,6 +200,9 @@ class ZipArchive(BaseArchive):
             else:
                 with open(filename, 'wb') as outfile:
                     outfile.write(data)
+                # convert ZipInfo.external_attr to mode
+                mode = info.external_attr >> 16
+                os.chmod(filename, mode)
 
     def close(self):
         self._archive.close()
diff --git a/tests/utils_tests/archives/foobar.tar b/tests/utils_tests/archives/foobar.tar
index 5418405070f1c410f2751215f73e1e6f778e8526..44886fb33becb174c984ed45a783ded067394931 100644
GIT binary patch
literal 5632
zcmeH~L5{*O3`KpE+yFbVlk)^rGz(^s3P^B!oWh{)m@FKPgtKWRtBLbp`|a$H$IZ6R
z8!#M*SVRIKQW07|HS!pN5=KPkj4>cdqzpj}b9ya(Ii2gQsnt{cuJi8eR)1cx_2gar
zc@ABvjj(?8KhNWU<W!H$yypJ<9V}WcdJ%DqMaipnNU3myfCF-a59dz<H16TgB`^F%
zoc{ncuz&i$r4RJ+=jQ(jlk*?R-_i%V_~%FcFU9$f;%~i=^6%{bm__Tq_kY%8VDW!T
z?{6pQ`v0Z*KTGoZZx3I0X!YOH`}_Gf|5yIr{}16mU8mjUT(^hGZoB6H<*)aDNv;1Y
SiM{^Y5%HB>0aw5k0JsB+RO)#E

literal 10240
zcmeH~F%H5o3`KL4o}i6G9G`~@!C0xl{jn((Ooa@N5d16|tjf`Qv7Poqa9>fEFbCa8
zIKJ){vK5GON)ihvi%Z#+(6Rf;G{N<J+0R`UPKWEbmG51A>)S7m^#i$|&IFg7U%jvQ
zz(TfG|CB|{zYvEmx}QuF{JsC=PT2&1>Yw#4nEy!d?=D6Y^uuwQoM(Xf|FHj4X6+Lc
zbr_)kxAX5i18V9&bGrK%)PD>8kNWqW0d@YD`j?FU-{Jx+{eRrgjx(UD|BL=75RuhC
z-v9nL;OXCQ22|C5vHnlV{{Qg)Z|UD}22}Z9>ObWj{QKKS1`q%N5C8!X009sH0T2KI
W5C8!X009sH0T2KI5CDN+C2#{-E1fU^

diff --git a/tests/utils_tests/archives/foobar.tar.bz2 b/tests/utils_tests/archives/foobar.tar.bz2
index 693529dcefa2a6be78daa22bc82ae352a64c20f8..5a3d8a402eda8ef240e1e6724e9200df416e0412 100644
GIT binary patch
literal 265
zcmV+k0rvhvT4**gL0KkKS=D$hzW@Q^dyvq8AOJuB|9}C^`$wK&1V8`?FaasC1c^+_
zH6fEGjDr!QOd^#JNwS&%9-*P20I5+1fHD98G|BWJ<EAu-h>Uo&+SCX5Jpl<^**;HR
z%g`Xf3sq>N0vbdv5VU6GSx#i2ifTf_m_$Sc%QZ%jqa-#V2yi!*D_Ynkb1W%_dAfxW
zL4gg63Su}etqgFnyiE%XK_u_bJGY}zVNjzdnr0joBFe>uLUOMF#@T|YRhWY06yao`
zaHvi*6y;Wt1W9R)LJqw|9fS~rn*9)aBB)tCbVJ3ra4(^18Zr>_pOTQ5qhv0HS}#L<
PPvY)KrwS4puLalOW3p<f

literal 238
zcmV<K01^K}T4*^jL0KkKS?YbL5&!_M`-Q-O06;(i|9}HCb%34#004pj00=Mv3t56l
zO%q6H2dDr9Nm1$nkOR~J2%?imr~m+HdsM;<uampGzP!d^n2<jS4P+#hENs(A&8{JA
z(2<h1)uvjT5V9IXF+wWR5eY*iB?_Q0`_5)&W*8jfq(aIO0Ea`Fa`)|uj&TU^g8-op
zEN;x4r45jkhCvBYu?`@z#@k#)N&xIWP$rUXC@TVRftKXbst9{0SBQ+n#lVU~%Mc-p
oY#@;fq2Zwot;8U4LnJ$m$M8B3q$om=vaj)XBvXY64yW3IAT7gR+W-In

diff --git a/tests/utils_tests/archives/foobar.tar.gz b/tests/utils_tests/archives/foobar.tar.gz
index 5b596bd58efd5d4146f91a1b6d69f9cd8a888db5..8582a871396ba9ed006bf4e044bef761faaae4a7 100644
GIT binary patch
literal 253
zcmV<Z00RFXiwFR~NkCWt1MQaE3c@f9hW99a1Jg8Vo~O#h3lA_A^zCgu;f0{RNI=YY
zlfee*_OU-%?sl_znP!6`03ghv)+iib>yr=@AOKMY3=kP(9s+9~>cMe;C{sO3*_Tb3
z7OQjFzJ2b~{rh`7>yLm2J?i(!L?8S|LX>L0UPDYmI0P^_+rRsd20eQGljN&^X7_Kw
z@}B>iInd{yTK*?U?%#rkf6W}|@}F<>U&Q@e(EMxn=->Z{7=8b<p!wI{0lWTxZuw7~
zeEyrz{A=%keg5(0-}iqL#?!bs9?E<@>h);(FW=@rr#Am3k^6TX$I;{h?;E-<02TlM
DKc$5%

literal 249
zcmV<V00#dbiwFSf;!I2c1MSya3WG2Z1<))dD=?Y7W<5%2KLuO&-#jSxt2TuR6z=&6
zYQVsCW^gh}oXt4KvJyx8zP>1;;5;Srf%1J$-YXsDkEYaqf6SZK>UP<ePy5cE|EbB4
z_&Z9#DTLGf9a{>_C4Z)<v=u*@LjJ~yzoRGrXl>2k67nBmGS_t#o&n$X|62bse<x(~
z1^WL8Eq~b=(AEE=tNAnPe~6a9><sA3ztukn<Uc~of0;MI8PL`LIqxH)Qvc}x@{auF
zW<Xc{r_%q)`Goo(;mBWZ2K4>^)%thABYyw@0000000000fL}cUd&-Ya04M+emV$r2

diff --git a/tests/utils_tests/archives/foobar.zip b/tests/utils_tests/archives/foobar.zip
index dc3e2fc0675de899be591ed479cff00c30e626f0..b02bb3e95a8ca95a5f3f08f53c180426dc48cf08 100644
GIT binary patch
literal 810
zcmWIWW@h1HW&ncrSwCz*Gz>5T8HNFH=?*N?MhNN1h(=GCP7uun#Hkgj$)zQUNja$?
zbs}I}T+!6A0M(`C=j$U(sz$Sj6{-TsEj2ilfZc=L9uBA}Nr^>Bb~U0I#EGN|$-Xu`
z%7At<GTAfZ4nv@kK%mgDq!B~|O+_fj7N#IY5asef8pU*MVGLFcH2rU*9gv9};vj3V
zhXp9iAwZzvtz#OH35fxO!?48xL<h(p9Z(%8e!&(e2ra9jTA=>H?k-RqK>)~I=YUL*
xyC5-!a2vKbgXjXe?F*7F6!&3^LxeVIU}}e126Q7U8%T;12rmI8oIqKD0RWKTZH)i`

literal 1130
zcmWIWW@h1H0D+EKKWxAZD8a}e!(bR1!pXpF-|X!Z0mP*h+zgB?FPIq^z(fFEtwvz2
z4urJUpxMd-v^6b1UmvVn2dG;gpT*T^x>=#RA@0@!Y6W4O?nbv9rXAvTknJFhQ+qp_
z?Ho|slM;&{?zaW%wrjy-LL-_9oJb}>{9pt$0)&Zn1hNqje}G&8!Wc#{GRZOHihBuo
zQdrUmVgg;m3P}lM8)FSL2IwN7F`!g|#~AczVPSx|Mu6e1V;RsGND2X(gf)H;{=!Tj
zFq0S<mNagGngsD1)|7%U3f)nxa7TfR`V2J+;y(he!b~?XSAqOz#0c>pBozVuNFeSo
z(-6!wki$xlOoR9nYidIH6Wwu~DE{1zWE{k=SY5};1`H1d4j_zTVqo|M)WpC50PL2w
A8vp<R

diff --git a/tests/utils_tests/test_archive.py b/tests/utils_tests/test_archive.py
index d1dc5f2841..42f445ce9c 100644
--- a/tests/utils_tests/test_archive.py
+++ b/tests/utils_tests/test_archive.py
@@ -1,5 +1,7 @@
 import os
 import shutil
+import stat
+import sys
 import tempfile
 import unittest
 
@@ -42,6 +44,14 @@ class ArchiveTester(object):
         extract(self.archive_path, self.tmpdir)
         self.check_files(self.tmpdir)
 
+    @unittest.skipIf(sys.platform == 'win32', 'Python on Windows has a limited os.chmod().')
+    def test_extract_file_permissions(self):
+        """Archive.extract() preserves file permissions."""
+        extract(self.archive_path, self.tmpdir)
+        filepath = os.path.join(self.tmpdir, 'executable')
+        # The file has executable permission.
+        self.assertTrue(os.stat(filepath).st_mode & stat.S_IXOTH)
+
     def test_extract_function_with_leadpath(self):
         extract(self.archive_lead_path, self.tmpdir)
         self.check_files(self.tmpdir)