From dc80267b594e41cf7e223821dc1446683f0cae36 Mon Sep 17 00:00:00 2001
From: Valentin Rothberg <rothberg@redhat.com>
Date: Wed, 13 May 2020 13:44:29 +0200
Subject: compat handlers: add X-Registry-Auth header support

 * Support the `X-Registry-Auth` http-request header.

 * The content of the header is a base64 encoded JSON payload which can
   either be a single auth config or a map of auth configs (user+pw or
   token) with the corresponding registries being the keys.  Vanilla
   Docker, projectatomic Docker and the bindings are transparantly
   supported.

 * Add a hidden `--registries-conf` flag.  Buildah exposes the same
   flag, mostly for testing purposes.

 * Do all credential parsing in the client (i.e., `cmd/podman`) pass
   the username and password in the backend instead of unparsed
   credentials.

 * Add a `pkg/auth` which handles most of the heavy lifting.

 * Go through the authentication-handling code of most commands, bindings
   and endpoints.  Migrate them to the new code and fix issues as seen.
   A final evaluation and more tests is still required *after* this
   change.

 * The manifest-push endpoint is missing certain parameters and should
   use the ABI function instead.  Adding auth-support isn't really
   possible without these parts working.

 * The container commands and endpoints (i.e., create and run) have not
   been changed yet.  The APIs don't yet account for the authfile.

 * Add authentication tests to `pkg/bindings`.

Fixes: #6384
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
---
 libpod/image/docker_registry_options.go |  2 ++
 libpod/options.go                       | 18 ++++++++++++++++++
 libpod/runtime.go                       |  5 +++--
 3 files changed, 23 insertions(+), 2 deletions(-)

(limited to 'libpod')

diff --git a/libpod/image/docker_registry_options.go b/libpod/image/docker_registry_options.go
index 01b5558af..081e7ef4f 100644
--- a/libpod/image/docker_registry_options.go
+++ b/libpod/image/docker_registry_options.go
@@ -30,6 +30,8 @@ type DockerRegistryOptions struct {
 	OSChoice string
 	// If not "", overrides the use of platform.GOARCH when choosing an image or verifying architecture match.
 	ArchitectureChoice string
+	// RegistriesConfPath can be used to override the default path of registries.conf.
+	RegistriesConfPath string
 }
 
 // GetSystemContext constructs a new system context from a parent context. the values in the DockerRegistryOptions, and other parameters.
diff --git a/libpod/options.go b/libpod/options.go
index ff5e29335..8e0d3df86 100644
--- a/libpod/options.go
+++ b/libpod/options.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/containers/common/pkg/config"
 	"github.com/containers/image/v5/manifest"
+	"github.com/containers/image/v5/types"
 	"github.com/containers/libpod/libpod/define"
 	"github.com/containers/libpod/libpod/events"
 	"github.com/containers/libpod/pkg/namespaces"
@@ -17,6 +18,7 @@ import (
 	"github.com/containers/storage/pkg/idtools"
 	"github.com/cri-o/ocicni/pkg/ocicni"
 	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
 )
 
 // Runtime Creation Options
@@ -244,6 +246,22 @@ func WithStaticDir(dir string) RuntimeOption {
 	}
 }
 
+// WithRegistriesConf configures the runtime to always use specified
+// registries.conf for image processing.
+func WithRegistriesConf(path string) RuntimeOption {
+	logrus.Debugf("Setting custom registries.conf: %q", path)
+	return func(rt *Runtime) error {
+		if _, err := os.Stat(path); err != nil {
+			return errors.Wrap(err, "error locating specified registries.conf")
+		}
+		if rt.imageContext == nil {
+			rt.imageContext = &types.SystemContext{}
+		}
+		rt.imageContext.SystemRegistriesConfPath = path
+		return nil
+	}
+}
+
 // WithHooksDir sets the directories to look for OCI runtime hook configuration.
 func WithHooksDir(hooksDirs ...string) RuntimeOption {
 	return func(rt *Runtime) error {
diff --git a/libpod/runtime.go b/libpod/runtime.go
index c1864683f..4744de1a2 100644
--- a/libpod/runtime.go
+++ b/libpod/runtime.go
@@ -339,9 +339,10 @@ func makeRuntime(ctx context.Context, runtime *Runtime) (err error) {
 	}
 
 	// Set up containers/image
-	runtime.imageContext = &types.SystemContext{
-		SignaturePolicyPath: runtime.config.Engine.SignaturePolicyPath,
+	if runtime.imageContext == nil {
+		runtime.imageContext = &types.SystemContext{}
 	}
+	runtime.imageContext.SignaturePolicyPath = runtime.config.Engine.SignaturePolicyPath
 
 	// Create the tmpDir
 	if err := os.MkdirAll(runtime.config.Engine.TmpDir, 0751); err != nil {
-- 
cgit v1.2.3-54-g00ecf