@@ -24,10 +24,7 @@

 # the case. Therefore, you don't have to disable it anymore.

 #

-FROM golang:1.10.4 AS base

-# FIXME(vdemeester) this is kept for other script depending on it to not fail right away

-# Remove this once the other scripts uses something else to detect the version

-ENV GO_VERSION 1.10.4

+FROM golang:1.11.0 AS base

 # allow replacing httpredir or deb mirror

 ARG APT_MIRROR=deb.debian.org

 RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list

@@ -1,5 +1,5 @@

 ## Step 1: Build tests

-FROM golang:1.10.4-alpine3.7 as builder

+FROM golang:1.11.0-alpine3.7 as builder

 RUN apk add --update \

     bash \

@@ -5,7 +5,7 @@

 # This represents the bare minimum required to build and test Docker.

-FROM debian:stretch

+FROM golang:1.11.0-stretch

 # allow replacing httpredir or deb mirror

 ARG APT_MIRROR=deb.debian.org

@@ -37,18 +37,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \

 		vim-common \

 	&& rm -rf /var/lib/apt/lists/*

-# Install Go

-# IMPORTANT: If the version of Go is updated, the Windows to Linux CI machines

-#            will need updating, to avoid errors. Ping #docker-maintainers on IRC

-#            with a heads-up.

-# IMPORTANT: When updating this please note that stdlib archive/tar pkg is vendored

-ENV GO_VERSION 1.10.4

-RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" \

-	| tar -xzC /usr/local

-ENV PATH /go/bin:/usr/local/go/bin:$PATH

-ENV GOPATH /go

-ENV CGO_LDFLAGS -L/lib

-

 # Install runc, containerd, tini and docker-proxy

 # Please edit hack/dockerfile/install/<name>.installer to update them.

 COPY hack/dockerfile/install hack/dockerfile/install

@@ -161,7 +161,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref

 # Environment variable notes:

 #  - GO_VERSION must be consistent with 'Dockerfile' used by Linux.

 #  - FROM_DOCKERFILE is used for detection of building within a container.

-ENV GO_VERSION=1.10.4 `

+ENV GO_VERSION=1.11 `

     GIT_VERSION=2.11.1 `

     GOPATH=C:\go `

     FROM_DOCKERFILE=1

@@ -29,8 +29,8 @@ func TestStrSliceMarshalJSON(t *testing.T) {

 func TestStrSliceUnmarshalJSON(t *testing.T) {

 	parts := map[string][]string{

-		"":   {"default", "values"},

-		"[]": {},

+		"":                        {"default", "values"},

+		"[]":                      {},

 		`["/bin/sh","-c","echo"]`: {"/bin/sh", "-c", "echo"},

 	}

 	for json, expectedParts := range parts {

@@ -788,7 +788,7 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S

 	for operatingSystem, gd := range d.graphDrivers {

 		layerStores[operatingSystem], err = layer.NewStoreFromOptions(layer.StoreOptions{

-			Root: config.Root,

+			Root:                      config.Root,

 			MetadataStorePathTemplate: filepath.Join(config.Root, "image", "%s", "layerdb"),

 			GraphDriver:               gd,

 			GraphDriverOptions:        config.GraphOptions,

@@ -156,7 +156,7 @@ func TestNewGELFTCPWriter(t *testing.T) {

 			"gelf-address":             url,

 			"gelf-tcp-max-reconnect":   "0",

 			"gelf-tcp-reconnect-delay": "0",

-			"tag": "{{.ID}}",

+			"tag":                      "{{.ID}}",

 		},

 		ContainerID: "12345678901234567890",

 	}

@@ -30,10 +30,10 @@ func TestValidateLogOpt(t *testing.T) {

 		splunkVerifyConnectionKey:     "true",

 		splunkGzipCompressionKey:      "true",

 		splunkGzipCompressionLevelKey: "1",

-		envKey:      "a",

-		envRegexKey: "^foo",

-		labelsKey:   "b",

-		tagKey:      "c",

+		envKey:                        "a",

+		envRegexKey:                   "^foo",

+		labelsKey:                     "b",

+		tagKey:                        "c",

 	})

 	if err != nil {

 		t.Fatal(err)

@@ -251,9 +251,9 @@ func TestInlineFormatWithNonDefaultOptions(t *testing.T) {

 			splunkIndexKey:           "myindex",

 			splunkFormatKey:          splunkFormatInline,

 			splunkGzipCompressionKey: "true",

-			tagKey:      "{{.ImageName}}/{{.Name}}",

-			labelsKey:   "a",

-			envRegexKey: "^foo",

+			tagKey:                   "{{.ImageName}}/{{.Name}}",

+			labelsKey:                "a",

+			envRegexKey:              "^foo",

 		},

 		ContainerID:        "containeriid",

 		ContainerName:      "/container_name",

@@ -1,6 +1,6 @@

 #!/bin/sh

-VNDR_COMMIT=a6e196d8b4b0cbbdc29aebdb20c59ac6926bb384

+VNDR_COMMIT=81cb8916aad3c8d06193f008dba3e16f82851f52

 install_vndr() {

 	echo "Install vndr version $VNDR_COMMIT"

@@ -130,7 +130,7 @@ Function Check-InContainer() {

 # outside of a container where it may be out of date with master.

 Function Verify-GoVersion() {

     Try {

-        $goVersionDockerfile=(Select-String -Path ".\Dockerfile" -Pattern "^FROM golang:").ToString().Split(" ")[1].SubString(7)

+        $goVersionDockerfile=(Select-String -Path ".\Dockerfile" -Pattern "^FROM golang:").ToString().Split(" ")[1].SubString(7) -replace '\.0$',''

         $goVersionInstalled=(go version).ToString().Split(" ")[2].SubString(2)

     }

     Catch [Exception] {

@@ -9,11 +9,7 @@ validate_vendor_diff(){

 	unset IFS

 	if [ ${#files[@]} -gt 0 ]; then

-		# Remove vendor/ first so  that anything not included in vendor.conf will

-		# cause the validation to fail. archive/tar is a special case, see vendor.conf

-		# for details.

-		ls -d vendor/* | grep -v vendor/archive | xargs rm -rf

-		# run vndr to recreate vendor/

+		# recreate vendor/

 		vndr

 		# check if any files have changed

 		diffs="$(git status --porcelain -- vendor 2>/dev/null)"

@@ -656,7 +656,7 @@ func (s *DockerSuite) TestBuildCopyWildcard(c *check.C) {

 			"file2.txt":                     "test2",

 			"dir/nested_file":               "nested file",

 			"dir/nested_dir/nest_nest_file": "2 times nested",

-			"dirt": "dirty",

+			"dirt":                          "dirty",

 		}))

 	defer ctx.Close()

@@ -37,8 +37,8 @@ func TestBuildWithRemoveAndForceRemove(t *testing.T) {

 			RUN exit 0

 			RUN exit 0`,

 			numberOfIntermediateContainers: 2,

-			rm:      false,

-			forceRm: false,

+			rm:                             false,

+			forceRm:                        false,

 		},

 		{

 			name: "successful build with remove",

@@ -46,8 +46,8 @@ func TestBuildWithRemoveAndForceRemove(t *testing.T) {

 			RUN exit 0

 			RUN exit 0`,

 			numberOfIntermediateContainers: 0,

-			rm:      true,

-			forceRm: false,

+			rm:                             true,

+			forceRm:                        false,

 		},

 		{

 			name: "successful build with remove and force remove",

@@ -55,8 +55,8 @@ func TestBuildWithRemoveAndForceRemove(t *testing.T) {

 			RUN exit 0

 			RUN exit 0`,

 			numberOfIntermediateContainers: 0,

-			rm:      true,

-			forceRm: true,

+			rm:                             true,

+			forceRm:                        true,

 		},

 		{

 			name: "failed build with no removal",

@@ -64,8 +64,8 @@ func TestBuildWithRemoveAndForceRemove(t *testing.T) {

 			RUN exit 0

 			RUN exit 1`,

 			numberOfIntermediateContainers: 2,

-			rm:      false,

-			forceRm: false,

+			rm:                             false,

+			forceRm:                        false,

 		},

 		{

 			name: "failed build with remove",

@@ -73,8 +73,8 @@ func TestBuildWithRemoveAndForceRemove(t *testing.T) {

 			RUN exit 0

 			RUN exit 1`,

 			numberOfIntermediateContainers: 1,

-			rm:      true,

-			forceRm: false,

+			rm:                             true,

+			forceRm:                        false,

 		},

 		{

 			name: "failed build with remove and force remove",

@@ -82,8 +82,8 @@ func TestBuildWithRemoveAndForceRemove(t *testing.T) {

 			RUN exit 0

 			RUN exit 1`,

 			numberOfIntermediateContainers: 0,

-			rm:      true,

-			forceRm: true,

+			rm:                             true,

+			forceRm:                        true,

 		},

 	}

@@ -168,9 +168,9 @@ func (c *client) Create(_ context.Context, id string, spec *specs.Spec, runtimeO

 func (c *client) createWindows(id string, spec *specs.Spec, runtimeOptions interface{}) error {

 	logger := c.logger.WithField("container", id)

 	configuration := &hcsshim.ContainerConfig{

-		SystemType: "Container",

-		Name:       id,

-		Owner:      defaultOwner,

+		SystemType:              "Container",

+		Name:                    id,

+		Owner:                   defaultOwner,

 		IgnoreFlushesDuringBoot: spec.Windows.IgnoreFlushesDuringBoot,

 		HostName:                spec.Hostname,

 		HvPartition:             false,

@@ -377,11 +377,11 @@ func (c *client) createLinux(id string, spec *specs.Spec, runtimeOptions interfa

 	}

 	configuration := &hcsshim.ContainerConfig{

-		HvPartition:   true,

-		Name:          id,

-		SystemType:    "container",

-		ContainerType: "linux",

-		Owner:         defaultOwner,

+		HvPartition:                 true,

+		Name:                        id,

+		SystemType:                  "container",

+		ContainerType:               "linux",

+		Owner:                       defaultOwner,

 		TerminateOnLastHandleClosed: true,

 	}

@@ -40,9 +40,9 @@ func TestMigrateRefs(t *testing.T) {

 	}

 	expected := map[string]string{

-		"docker.io/library/busybox:latest":                                                                  "sha256:fcde2b2edba56bf408601fb721fe9b5c338d10ee429ea04fae5511b68fbf8fb9",

+		"docker.io/library/busybox:latest": "sha256:fcde2b2edba56bf408601fb721fe9b5c338d10ee429ea04fae5511b68fbf8fb9",

 		"docker.io/library/busybox@sha256:16a2a52884c2a9481ed267c2d46483eac7693b813a63132368ab098a71303f8a": "sha256:fcde2b2edba56bf408601fb721fe9b5c338d10ee429ea04fae5511b68fbf8fb9",

-		"docker.io/library/registry:2":                                                                      "sha256:2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae",

+		"docker.io/library/registry:2": "sha256:2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae",

 	}

 	if !reflect.DeepEqual(expected, ta.refs) {

@@ -69,18 +69,18 @@ func TestParseDockerDaemonHost(t *testing.T) {

 		"[::1]:5555/path":             "tcp://[::1]:5555/path",

 		"[0:0:0:0:0:0:0:1]:":          "tcp://[0:0:0:0:0:0:0:1]:2375",

 		"[0:0:0:0:0:0:0:1]:5555/path": "tcp://[0:0:0:0:0:0:0:1]:5555/path",

-		":6666":                   fmt.Sprintf("tcp://%s:6666", DefaultHTTPHost),

-		":6666/path":              fmt.Sprintf("tcp://%s:6666/path", DefaultHTTPHost),

-		"tcp://":                  DefaultTCPHost,

-		"tcp://:7777":             fmt.Sprintf("tcp://%s:7777", DefaultHTTPHost),

-		"tcp://:7777/path":        fmt.Sprintf("tcp://%s:7777/path", DefaultHTTPHost),

-		"unix:///run/docker.sock": "unix:///run/docker.sock",

-		"unix://":                 "unix://" + DefaultUnixSocket,

-		"fd://":                   "fd://",

-		"fd://something":          "fd://something",

-		"localhost:":              "tcp://localhost:2375",

-		"localhost:5555":          "tcp://localhost:5555",

-		"localhost:5555/path":     "tcp://localhost:5555/path",

+		":6666":                       fmt.Sprintf("tcp://%s:6666", DefaultHTTPHost),

+		":6666/path":                  fmt.Sprintf("tcp://%s:6666/path", DefaultHTTPHost),

+		"tcp://":                      DefaultTCPHost,

+		"tcp://:7777":                 fmt.Sprintf("tcp://%s:7777", DefaultHTTPHost),

+		"tcp://:7777/path":            fmt.Sprintf("tcp://%s:7777/path", DefaultHTTPHost),

+		"unix:///run/docker.sock":     "unix:///run/docker.sock",

+		"unix://":                     "unix://" + DefaultUnixSocket,

+		"fd://":                       "fd://",

+		"fd://something":              "fd://something",

+		"localhost:":                  "tcp://localhost:2375",

+		"localhost:5555":              "tcp://localhost:5555",

+		"localhost:5555/path":         "tcp://localhost:5555/path",

 	}

 	for invalidAddr, expectedError := range invalids {

 		if addr, err := parseDaemonHost(invalidAddr); err == nil || err.Error() != expectedError {

@@ -17,7 +17,7 @@ import (

 func TestPeerCertificateMarshalJSON(t *testing.T) {

 	template := &x509.Certificate{

-		IsCA: true,

+		IsCA:                  true,

 		BasicConstraintsValid: true,

 		SubjectKeyId:          []byte{1, 2, 3},

 		SerialNumber:          big.NewInt(1234),

@@ -144,7 +144,7 @@ func TestDrainBody(t *testing.T) {

 		length             int // length is the message length send to drainBody

 		expectedBodyLength int // expectedBodyLength is the expected body length after drainBody is called

 	}{

-		{10, 10}, // Small message size

+		{10, 10},                           // Small message size

 		{maxBodySize - 1, maxBodySize - 1}, // Max message size

 		{maxBodySize * 2, 0},               // Large message size (skip copying body)

@@ -16,11 +16,11 @@ import (

 var (

 	saveLoadTestCases = map[string]digest.Digest{

-		"registry:5000/foobar:HEAD":                                                        "sha256:470022b8af682154f57a2163d030eb369549549cba00edc69e1b99b46bb924d6",

-		"registry:5000/foobar:alternate":                                                   "sha256:ae300ebc4a4f00693702cfb0a5e0b7bc527b353828dc86ad09fb95c8a681b793",

-		"registry:5000/foobar:latest":                                                      "sha256:6153498b9ac00968d71b66cca4eac37e990b5f9eb50c26877eb8799c8847451b",

-		"registry:5000/foobar:master":                                                      "sha256:6c9917af4c4e05001b346421959d7ea81b6dc9d25718466a37a6add865dfd7fc",

-		"jess/hollywood:latest":                                                            "sha256:ae7a5519a0a55a2d4ef20ddcbd5d0ca0888a1f7ab806acc8e2a27baf46f529fe",

+		"registry:5000/foobar:HEAD":      "sha256:470022b8af682154f57a2163d030eb369549549cba00edc69e1b99b46bb924d6",

+		"registry:5000/foobar:alternate": "sha256:ae300ebc4a4f00693702cfb0a5e0b7bc527b353828dc86ad09fb95c8a681b793",

+		"registry:5000/foobar:latest":    "sha256:6153498b9ac00968d71b66cca4eac37e990b5f9eb50c26877eb8799c8847451b",

+		"registry:5000/foobar:master":    "sha256:6c9917af4c4e05001b346421959d7ea81b6dc9d25718466a37a6add865dfd7fc",

+		"jess/hollywood:latest":          "sha256:ae7a5519a0a55a2d4ef20ddcbd5d0ca0888a1f7ab806acc8e2a27baf46f529fe",

 		"registry@sha256:367eb40fd0330a7e464777121e39d2f5b3e8e23a1e159342e53ab05c9e4d94e6": "sha256:24126a56805beb9711be5f4590cc2eb55ab8d4a85ebd618eed72bb19fc50631c",

 		"busybox:latest": "sha256:91e54dfb11794fad694460162bf0cb0a4fa710cfa3f60979c177d920813e267c",

 	}

@@ -57,7 +57,7 @@ func (s *DefaultService) lookupV2Endpoints(hostname string) (endpoints []APIEndp

 				Scheme: "https",

 				Host:   hostname,

 			},

-			Version: APIVersion2,

+			Version:                        APIVersion2,

 			AllowNondistributableArtifacts: ana,

 			TrimHostname:                   true,

 			TLSConfig:                      tlsConfig,

@@ -70,7 +70,7 @@ func (s *DefaultService) lookupV2Endpoints(hostname string) (endpoints []APIEndp

 				Scheme: "http",

 				Host:   hostname,

 			},

-			Version: APIVersion2,

+			Version:                        APIVersion2,

 			AllowNondistributableArtifacts: ana,

 			TrimHostname:                   true,

 			// used to check if supposed to be secure via InsecureSkipVerify

@@ -22,20 +22,20 @@ func TestNetworkModeTest(t *testing.T) {

 		"something:weird":          {true, false, false, false, false, false},

 		"bridge":                   {true, true, false, false, false, false},

 		DefaultDaemonNetworkMode(): {true, true, false, false, false, false},

-		"host":           {false, false, true, false, false, false},

-		"container:name": {false, false, false, true, false, false},

-		"none":           {true, false, false, false, true, false},

-		"default":        {true, false, false, false, false, true},

+		"host":                     {false, false, true, false, false, false},

+		"container:name":           {false, false, false, true, false, false},

+		"none":                     {true, false, false, false, true, false},

+		"default":                  {true, false, false, false, false, true},

 	}

 	networkModeNames := map[container.NetworkMode]string{

 		"":                         "",

 		"something:weird":          "something:weird",

 		"bridge":                   "bridge",

 		DefaultDaemonNetworkMode(): "bridge",

-		"host":           "host",

-		"container:name": "container",

-		"none":           "none",

-		"default":        "default",

+		"host":                     "host",

+		"container:name":           "container",

+		"none":                     "none",

+		"default":                  "default",

 	}

 	for networkMode, state := range networkModes {

 		if networkMode.IsPrivate() != state[0] {

@@ -57,7 +57,8 @@ github.com/samuel/go-zookeeper d0e0d8e11f318e000a8cc434616d69e329edc374

 github.com/deckarep/golang-set ef32fa3046d9f249d399f98ebaf9be944430fd1d

 github.com/coreos/etcd v3.2.1

 github.com/coreos/go-semver v0.2.0

-github.com/ugorji/go f1f1a805ed361a0e078bb537e4ea78cd37dcf065

+# fix for go vet (https://github.com/kolyshkin/ugorji-go/commit/1cf431c13dec46596)

+github.com/ugorji/go go111 https://github.com/kolyshkin/ugorji-go

 github.com/hashicorp/consul v0.5.2

 github.com/boltdb/bolt fff57c100f4dea1905678da7e90d92429dff2904

 github.com/miekg/dns v1.0.7

@@ -116,7 +117,7 @@ google.golang.org/genproto 694d95ba50e67b2e363f3483057db5d4910c18f9

 # containerd

 github.com/containerd/containerd v1.2.0-beta.2

 github.com/containerd/fifo 3d5202aec260678c48179c56f40e6f38a095738c

-github.com/containerd/continuity d3c23511c1bf5851696cba83143d9cbcd666869b

+github.com/containerd/continuity c7c5070e6f6e090ab93b0a61eb921f2196fc3383

 github.com/containerd/cgroups 5e610833b72089b37d0e615de9a92dfc043757c2

 github.com/containerd/console c12b1e7919c14469339a5d38f2f8ed9b64a9de23

 github.com/containerd/go-runc edcf3de1f4971445c42d61f20d506b30612aa031

@@ -156,9 +157,3 @@ github.com/Nvveen/Gotty a8b993ba6abdb0e0c12b0125c603323a71c7790c https://github.

 github.com/docker/go-metrics d466d4f6fd960e01820085bd7e1a24426ee7ef18

 github.com/opencontainers/selinux b29023b86e4a69d1b46b7e7b4e2b6fda03f0b9cd

-

-

-# archive/tar (for Go 1.10, see https://github.com/golang/go/issues/24787)

-# mkdir -p ./vendor/archive

-# git clone -b go-1.10 --depth=1 git@github.com:kolyshkin/go-tar.git ./vendor/archive/tar

-# vndr # to clean up test files

deleted file mode 100644

@@ -1,27 +0,0 @@

-Copyright (c) 2009 The Go Authors. All rights reserved.

-

-Redistribution and use in source and binary forms, with or without

-modification, are permitted provided that the following conditions are

-met:

-

-   * Redistributions of source code must retain the above copyright

-notice, this list of conditions and the following disclaimer.

-   * Redistributions in binary form must reproduce the above

-copyright notice, this list of conditions and the following disclaimer

-in the documentation and/or other materials provided with the

-distribution.

-   * Neither the name of Google Inc. nor the names of its

-contributors may be used to endorse or promote products derived from

-this software without specific prior written permission.

-

-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

deleted file mode 100644

@@ -1,27 +0,0 @@

-This is a fork of Go 1.10 `archive/tar` package from the official

-[repo](https://github.com/golang/go/tree/release-branch.go1.10/src/archive/tar),

-with a partial [revert](https://github.com/kolyshkin/go-tar/commit/d651d6e45972363e9bb62b8e9d876df440b31628)

-of upstream [commit 0564e304a6ea](https://github.com/golang/go/commit/0564e304a6ea394a42929060c588469dbd6f32af).

-It is suggested as a replacement to the original package included with Go 1.10

-in case you want to build a static Linux/glibc binary that works, and

-can't afford to use `CGO_ENABLED=0`.

-

-## Details

-

-Using Go 1.10 [archive/tar](https://golang.org/pkg/archive/tar/) from a static binary

-compiled with glibc on Linux can result in a panic upon calling

-[`tar.FileInfoHeader()`](https://golang.org/pkg/archive/tar/#FileInfoHeader).

-This is a major regression in Go 1.10, filed as

-[Go issue #24787](https://github.com/golang/go/issues/24787).

-

-The above issue is caused by an unfortunate combination of:

-1. glibc way of dynamic loading of nss libraries even for a static build;

-2. Go `os/user` package hard-coded reliance on libc to resolve user/group IDs to names (unless CGO is disabled).

-

-While glibc can probably not be fixed and is not considered a bug per se,

-the `os/user` issue is documented (see [Go issue #23265](https://github.com/golang/go/issues/23265))

-and already fixed by [Go commit 62f0127d81](https://github.com/golang/go/commit/62f0127d8104d8266d9a3fb5a87e2f09ec8b6f5b).

-The fix is expected to make its way to Go 1.11, and requires `osusergo` build tag

-to be used for a static build.

-

-This repository serves as a temporary workaround until the above fix is available.

deleted file mode 100644

@@ -1,720 +0,0 @@

-// Copyright 2009 The Go Authors. All rights reserved.

-// Use of this source code is governed by a BSD-style

-// license that can be found in the LICENSE file.

-

-// Package tar implements access to tar archives.

-//

-// Tape archives (tar) are a file format for storing a sequence of files that

-// can be read and written in a streaming manner.

-// This package aims to cover most variations of the format,

-// including those produced by GNU and BSD tar tools.

-package tar

-

-import (

-	"errors"

-	"fmt"

-	"math"

-	"os"

-	"path"

-	"reflect"

-	"strconv"

-	"strings"

-	"time"

-)

-

-// BUG: Use of the Uid and Gid fields in Header could overflow on 32-bit

-// architectures. If a large value is encountered when decoding, the result

-// stored in Header will be the truncated version.

-

-var (

-	ErrHeader          = errors.New("archive/tar: invalid tar header")

-	ErrWriteTooLong    = errors.New("archive/tar: write too long")

-	ErrFieldTooLong    = errors.New("archive/tar: header field too long")

-	ErrWriteAfterClose = errors.New("archive/tar: write after close")

-	errMissData        = errors.New("archive/tar: sparse file references non-existent data")

-	errUnrefData       = errors.New("archive/tar: sparse file contains unreferenced data")

-	errWriteHole       = errors.New("archive/tar: write non-NUL byte in sparse hole")

-)

-

-type headerError []string

-

-func (he headerError) Error() string {

-	const prefix = "archive/tar: cannot encode header"

-	var ss []string

-	for _, s := range he {

-		if s != "" {

-			ss = append(ss, s)

-		}

-	}

-	if len(ss) == 0 {

-		return prefix

-	}

-	return fmt.Sprintf("%s: %v", prefix, strings.Join(ss, "; and "))

-}

-

-// Type flags for Header.Typeflag.

-const (

-	// Type '0' indicates a regular file.

-	TypeReg  = '0'

-	TypeRegA = '\x00' // For legacy support; use TypeReg instead

-

-	// Type '1' to '6' are header-only flags and may not have a data body.

-	TypeLink    = '1' // Hard link

-	TypeSymlink = '2' // Symbolic link

-	TypeChar    = '3' // Character device node

-	TypeBlock   = '4' // Block device node

-	TypeDir     = '5' // Directory

-	TypeFifo    = '6' // FIFO node

-

-	// Type '7' is reserved.

-	TypeCont = '7'

-

-	// Type 'x' is used by the PAX format to store key-value records that

-	// are only relevant to the next file.

-	// This package transparently handles these types.

-	TypeXHeader = 'x'

-

-	// Type 'g' is used by the PAX format to store key-value records that

-	// are relevant to all subsequent files.

-	// This package only supports parsing and composing such headers,

-	// but does not currently support persisting the global state across files.

-	TypeXGlobalHeader = 'g'

-

-	// Type 'S' indicates a sparse file in the GNU format.

-	TypeGNUSparse = 'S'

-

-	// Types 'L' and 'K' are used by the GNU format for a meta file

-	// used to store the path or link name for the next file.

-	// This package transparently handles these types.

-	TypeGNULongName = 'L'

-	TypeGNULongLink = 'K'

-)

-

-// Keywords for PAX extended header records.

-const (

-	paxNone     = "" // Indicates that no PAX key is suitable

-	paxPath     = "path"

-	paxLinkpath = "linkpath"

-	paxSize     = "size"

-	paxUid      = "uid"

-	paxGid      = "gid"

-	paxUname    = "uname"

-	paxGname    = "gname"

-	paxMtime    = "mtime"

-	paxAtime    = "atime"

-	paxCtime    = "ctime"   // Removed from later revision of PAX spec, but was valid

-	paxCharset  = "charset" // Currently unused

-	paxComment  = "comment" // Currently unused

-

-	paxSchilyXattr = "SCHILY.xattr."

-

-	// Keywords for GNU sparse files in a PAX extended header.

-	paxGNUSparse          = "GNU.sparse."

-	paxGNUSparseNumBlocks = "GNU.sparse.numblocks"

-	paxGNUSparseOffset    = "GNU.sparse.offset"

-	paxGNUSparseNumBytes  = "GNU.sparse.numbytes"

-	paxGNUSparseMap       = "GNU.sparse.map"

-	paxGNUSparseName      = "GNU.sparse.name"

-	paxGNUSparseMajor     = "GNU.sparse.major"

-	paxGNUSparseMinor     = "GNU.sparse.minor"

-	paxGNUSparseSize      = "GNU.sparse.size"

-	paxGNUSparseRealSize  = "GNU.sparse.realsize"

-)

-

-// basicKeys is a set of the PAX keys for which we have built-in support.

-// This does not contain "charset" or "comment", which are both PAX-specific,

-// so adding them as first-class features of Header is unlikely.

-// Users can use the PAXRecords field to set it themselves.

-var basicKeys = map[string]bool{

-	paxPath: true, paxLinkpath: true, paxSize: true, paxUid: true, paxGid: true,

-	paxUname: true, paxGname: true, paxMtime: true, paxAtime: true, paxCtime: true,

-}

-

-// A Header represents a single header in a tar archive.

-// Some fields may not be populated.

-//

-// For forward compatibility, users that retrieve a Header from Reader.Next,

-// mutate it in some ways, and then pass it back to Writer.WriteHeader

-// should do so by creating a new Header and copying the fields

-// that they are interested in preserving.

-type Header struct {

-	Typeflag byte // Type of header entry (should be TypeReg for most files)

-

-	Name     string // Name of file entry

-	Linkname string // Target name of link (valid for TypeLink or TypeSymlink)

-

-	Size  int64  // Logical file size in bytes

-	Mode  int64  // Permission and mode bits

-	Uid   int    // User ID of owner

-	Gid   int    // Group ID of owner

-	Uname string // User name of owner

-	Gname string // Group name of owner

-

-	// If the Format is unspecified, then Writer.WriteHeader rounds ModTime

-	// to the nearest second and ignores the AccessTime and ChangeTime fields.

-	//

-	// To use AccessTime or ChangeTime, specify the Format as PAX or GNU.

-	// To use sub-second resolution, specify the Format as PAX.

-	ModTime    time.Time // Modification time

-	AccessTime time.Time // Access time (requires either PAX or GNU support)

-	ChangeTime time.Time // Change time (requires either PAX or GNU support)

-

-	Devmajor int64 // Major device number (valid for TypeChar or TypeBlock)

-	Devminor int64 // Minor device number (valid for TypeChar or TypeBlock)

-

-	// Xattrs stores extended attributes as PAX records under the

-	// "SCHILY.xattr." namespace.

-	//

-	// The following are semantically equivalent:

-	//  h.Xattrs[key] = value

-	//  h.PAXRecords["SCHILY.xattr."+key] = value

-	//

-	// When Writer.WriteHeader is called, the contents of Xattrs will take

-	// precedence over those in PAXRecords.

-	//

-	// Deprecated: Use PAXRecords instead.

-	Xattrs map[string]string

-

-	// PAXRecords is a map of PAX extended header records.

-	//

-	// User-defined records should have keys of the following form:

-	//	VENDOR.keyword

-	// Where VENDOR is some namespace in all uppercase, and keyword may

-	// not contain the '=' character (e.g., "GOLANG.pkg.version").

-	// The key and value should be non-empty UTF-8 strings.

-	//

-	// When Writer.WriteHeader is called, PAX records derived from the

-	// the other fields in Header take precedence over PAXRecords.

-	PAXRecords map[string]string

-

-	// Format specifies the format of the tar header.

-	//

-	// This is set by Reader.Next as a best-effort guess at the format.

-	// Since the Reader liberally reads some non-compliant files,

-	// it is possible for this to be FormatUnknown.

-	//

-	// If the format is unspecified when Writer.WriteHeader is called,

-	// then it uses the first format (in the order of USTAR, PAX, GNU)

-	// capable of encoding this Header (see Format).

-	Format Format

-}

-

-// sparseEntry represents a Length-sized fragment at Offset in the file.

-type sparseEntry struct{ Offset, Length int64 }

-

-func (s sparseEntry) endOffset() int64 { return s.Offset + s.Length }

-

-// A sparse file can be represented as either a sparseDatas or a sparseHoles.

-// As long as the total size is known, they are equivalent and one can be

-// converted to the other form and back. The various tar formats with sparse

-// file support represent sparse files in the sparseDatas form. That is, they

-// specify the fragments in the file that has data, and treat everything else as

-// having zero bytes. As such, the encoding and decoding logic in this package

-// deals with sparseDatas.

-//

-// However, the external API uses sparseHoles instead of sparseDatas because the

-// zero value of sparseHoles logically represents a normal file (i.e., there are

-// no holes in it). On the other hand, the zero value of sparseDatas implies

-// that the file has no data in it, which is rather odd.

-//

-// As an example, if the underlying raw file contains the 10-byte data:

-//	var compactFile = "abcdefgh"

-//

-// And the sparse map has the following entries:

-//	var spd sparseDatas = []sparseEntry{

-//		{Offset: 2,  Length: 5},  // Data fragment for 2..6

-//		{Offset: 18, Length: 3},  // Data fragment for 18..20

-//	}

-//	var sph sparseHoles = []sparseEntry{

-//		{Offset: 0,  Length: 2},  // Hole fragment for 0..1

-//		{Offset: 7,  Length: 11}, // Hole fragment for 7..17

-//		{Offset: 21, Length: 4},  // Hole fragment for 21..24

-//	}

-//

-// Then the content of the resulting sparse file with a Header.Size of 25 is:

-//	var sparseFile = "\x00"*2 + "abcde" + "\x00"*11 + "fgh" + "\x00"*4

-type (

-	sparseDatas []sparseEntry

-	sparseHoles []sparseEntry

-)

-

-// validateSparseEntries reports whether sp is a valid sparse map.

-// It does not matter whether sp represents data fragments or hole fragments.

-func validateSparseEntries(sp []sparseEntry, size int64) bool {

-	// Validate all sparse entries. These are the same checks as performed by

-	// the BSD tar utility.

-	if size < 0 {

-		return false

-	}

-	var pre sparseEntry

-	for _, cur := range sp {

-		switch {

-		case cur.Offset < 0 || cur.Length < 0:

-			return false // Negative values are never okay

-		case cur.Offset > math.MaxInt64-cur.Length:

-			return false // Integer overflow with large length

-		case cur.endOffset() > size:

-			return false // Region extends beyond the actual size

-		case pre.endOffset() > cur.Offset:

-			return false // Regions cannot overlap and must be in order

-		}

-		pre = cur

-	}

-	return true

-}

-

-// alignSparseEntries mutates src and returns dst where each fragment's

-// starting offset is aligned up to the nearest block edge, and each

-// ending offset is aligned down to the nearest block edge.

-//

-// Even though the Go tar Reader and the BSD tar utility can handle entries

-// with arbitrary offsets and lengths, the GNU tar utility can only handle

-// offsets and lengths that are multiples of blockSize.

-func alignSparseEntries(src []sparseEntry, size int64) []sparseEntry {

-	dst := src[:0]

-	for _, s := range src {

-		pos, end := s.Offset, s.endOffset()

-		pos += blockPadding(+pos) // Round-up to nearest blockSize

-		if end != size {

-			end -= blockPadding(-end) // Round-down to nearest blockSize

-		}

-		if pos < end {

-			dst = append(dst, sparseEntry{Offset: pos, Length: end - pos})

-		}

-	}

-	return dst

-}

-

-// invertSparseEntries converts a sparse map from one form to the other.

-// If the input is sparseHoles, then it will output sparseDatas and vice-versa.

-// The input must have been already validated.

-//

-// This function mutates src and returns a normalized map where:

-//	* adjacent fragments are coalesced together

-//	* only the last fragment may be empty

-//	* the endOffset of the last fragment is the total size

-func invertSparseEntries(src []sparseEntry, size int64) []sparseEntry {

-	dst := src[:0]

-	var pre sparseEntry

-	for _, cur := range src {

-		if cur.Length == 0 {

-			continue // Skip empty fragments

-		}

-		pre.Length = cur.Offset - pre.Offset

-		if pre.Length > 0 {

-			dst = append(dst, pre) // Only add non-empty fragments

-		}

-		pre.Offset = cur.endOffset()

-	}

-	pre.Length = size - pre.Offset // Possibly the only empty fragment

-	return append(dst, pre)

-}

-

-// fileState tracks the number of logical (includes sparse holes) and physical

-// (actual in tar archive) bytes remaining for the current file.

-//

-// Invariant: LogicalRemaining >= PhysicalRemaining

-type fileState interface {

-	LogicalRemaining() int64

-	PhysicalRemaining() int64

-}

-

-// allowedFormats determines which formats can be used.

-// The value returned is the logical OR of multiple possible formats.

-// If the value is FormatUnknown, then the input Header cannot be encoded

-// and an error is returned explaining why.

-//

-// As a by-product of checking the fields, this function returns paxHdrs, which

-// contain all fields that could not be directly encoded.

-// A value receiver ensures that this method does not mutate the source Header.

-func (h Header) allowedFormats() (format Format, paxHdrs map[string]string, err error) {

-	format = FormatUSTAR | FormatPAX | FormatGNU

-	paxHdrs = make(map[string]string)

-

-	var whyNoUSTAR, whyNoPAX, whyNoGNU string

-	var preferPAX bool // Prefer PAX over USTAR

-	verifyString := func(s string, size int, name, paxKey string) {

-		// NUL-terminator is optional for path and linkpath.

-		// Technically, it is required for uname and gname,

-		// but neither GNU nor BSD tar checks for it.

-		tooLong := len(s) > size

-		allowLongGNU := paxKey == paxPath || paxKey == paxLinkpath

-		if hasNUL(s) || (tooLong && !allowLongGNU) {

-			whyNoGNU = fmt.Sprintf("GNU cannot encode %s=%q", name, s)

-			format.mustNotBe(FormatGNU)

-		}

-		if !isASCII(s) || tooLong {

-			canSplitUSTAR := paxKey == paxPath

-			if _, _, ok := splitUSTARPath(s); !canSplitUSTAR || !ok {

-				whyNoUSTAR = fmt.Sprintf("USTAR cannot encode %s=%q", name, s)

-				format.mustNotBe(FormatUSTAR)

-			}

-			if paxKey == paxNone {

-				whyNoPAX = fmt.Sprintf("PAX cannot encode %s=%q", name, s)

-				format.mustNotBe(FormatPAX)

-			} else {

-				paxHdrs[paxKey] = s

-			}

-		}

-		if v, ok := h.PAXRecords[paxKey]; ok && v == s {

-			paxHdrs[paxKey] = v

-		}

-	}

-	verifyNumeric := func(n int64, size int, name, paxKey string) {

-		if !fitsInBase256(size, n) {

-			whyNoGNU = fmt.Sprintf("GNU cannot encode %s=%d", name, n)

-			format.mustNotBe(FormatGNU)