From: Joe Tsai Date: Fri, 23 Feb 2018 23:08:11 +0000 (-0800) Subject: [release-branch.go1.10] archive/zip: fix handling of Info-ZIP Unix extended timestamps X-Git-Tag: go1.10.1~21 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=176900a7b74ad59a9307cc5232e708c6dfd7a9e3;p=gostls13.git [release-branch.go1.10] archive/zip: fix handling of Info-ZIP Unix extended timestamps The Info-ZIP Unix1 extra field is specified as such: >>> Value Size Description ----- ---- ----------- 0x5855 Short tag for this extra block type ("UX") TSize Short total data size for this block AcTime Long time of last access (GMT/UTC) ModTime Long time of last modification (GMT/UTC) <<< The previous handling was incorrect in that it read the AcTime field instead of the ModTime field. The test-osx.zip test unfortunately locked in the wrong behavior. Manually parsing that ZIP file shows that the encoded MS-DOS date and time are 0x4b5f and 0xa97d, which corresponds with a date of 2017-10-31 21:11:58, which matches the correct mod time (off by 1 second due to MS-DOS timestamp resolution). Fixes #23901 Change-Id: I567824c66e8316b9acd103dbecde366874a4b7ef Reviewed-on: https://go-review.googlesource.com/96895 Run-TryBot: Joe Tsai Reviewed-by: Ian Lance Taylor Reviewed-on: https://go-review.googlesource.com/102782 Run-TryBot: Andrew Bonventre Reviewed-by: Joe Tsai TryBot-Result: Gobot Gobot --- diff --git a/src/archive/zip/reader.go b/src/archive/zip/reader.go index 1563e74dfc..2444106ba6 100644 --- a/src/archive/zip/reader.go +++ b/src/archive/zip/reader.go @@ -366,7 +366,7 @@ parseExtras: epoch := time.Date(1601, time.January, 1, 0, 0, 0, 0, time.UTC) modified = time.Unix(epoch.Unix()+secs, nsecs) } - case unixExtraID: + case unixExtraID, infoZipUnixExtraID: if len(fieldBuf) < 8 { continue parseExtras } @@ -379,12 +379,6 @@ parseExtras: } ts := int64(fieldBuf.uint32()) // ModTime since Unix epoch modified = time.Unix(ts, 0) - case infoZipUnixExtraID: - if len(fieldBuf) < 4 { - continue parseExtras - } - ts := int64(fieldBuf.uint32()) // ModTime since Unix epoch - modified = time.Unix(ts, 0) } } diff --git a/src/archive/zip/reader_test.go b/src/archive/zip/reader_test.go index 0d9040f767..1e58b26b6e 100644 --- a/src/archive/zip/reader_test.go +++ b/src/archive/zip/reader_test.go @@ -414,7 +414,7 @@ var tests = []ZipTest{ Name: "test.txt", Content: []byte{}, Size: 1<<32 - 1, - Modified: time.Date(2017, 10, 31, 21, 17, 27, 0, timeZone(-7*time.Hour)), + Modified: time.Date(2017, 10, 31, 21, 11, 57, 0, timeZone(-7*time.Hour)), Mode: 0644, }, },