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>

9 files changed, 81 insertions, 36 deletions

diff --git a/pkg/domain/entities/engine.go b/pkg/domain/entities/engine.go
index 265c9f36f..db58befa5 100644
--- a/pkg/domain/entities/engine.go
+++ b/pkg/domain/entities/engine.go
@@ -37,19 +37,20 @@ type PodmanConfig struct {
 	*config.Config
 	*pflag.FlagSet
 
-	CGroupUsage string           // rootless code determines Usage message
-	ConmonPath  string           // --conmon flag will set Engine.ConmonPath
-	CpuProfile  string           // Hidden: Should CPU profile be taken
-	EngineMode  EngineMode       // ABI or Tunneling mode
-	Identities  []string         // ssh identities for connecting to server
-	MaxWorks    int              // maximum number of parallel threads
-	RuntimePath string           // --runtime flag will set Engine.RuntimePath
-	SpanCloser  io.Closer        // Close() for tracing object
-	SpanCtx     context.Context  // context to use when tracing
-	Span        opentracing.Span // tracing object
-	Syslog      bool             // write to StdOut and Syslog, not supported when tunneling
-	Trace       bool             // Hidden: Trace execution
-	Uri         string           // URI to API Service
+	CGroupUsage    string           // rootless code determines Usage message
+	ConmonPath     string           // --conmon flag will set Engine.ConmonPath
+	CpuProfile     string           // Hidden: Should CPU profile be taken
+	EngineMode     EngineMode       // ABI or Tunneling mode
+	Identities     []string         // ssh identities for connecting to server
+	MaxWorks       int              // maximum number of parallel threads
+	RegistriesConf string           // allows for specifying a custom registries.conf
+	RuntimePath    string           // --runtime flag will set Engine.RuntimePath
+	SpanCloser     io.Closer        // Close() for tracing object
+	SpanCtx        context.Context  // context to use when tracing
+	Span           opentracing.Span // tracing object
+	Syslog         bool             // write to StdOut and Syslog, not supported when tunneling
+	Trace          bool             // Hidden: Trace execution
+	Uri            string           // URI to API Service
 
 	Runroot       string
 	StorageDriver string
diff --git a/pkg/domain/entities/images.go b/pkg/domain/entities/images.go
index 968bcff3b..19a2c87f5 100644
--- a/pkg/domain/entities/images.go
+++ b/pkg/domain/entities/images.go
@@ -128,9 +128,10 @@ type ImagePullOptions struct {
 	// CertDir is the path to certificate directories.  Ignored for remote
 	// calls.
 	CertDir string
-	// Credentials for authenticating against the registry in the format
-	// USERNAME:PASSWORD.
-	Credentials string
+	// Username for authenticating against the registry.
+	Username string
+	// Password for authenticating against the registry.
+	Password string
 	// OverrideArch will overwrite the local architecture for image pulls.
 	OverrideArch string
 	// OverrideOS will overwrite the local operating system (OS) for image
@@ -162,9 +163,10 @@ type ImagePushOptions struct {
 	// transport. Default is same compression type as source. Ignored for remote
 	// calls.
 	Compress bool
-	// Credentials for authenticating against the registry in the format
-	// USERNAME:PASSWORD.
-	Credentials string
+	// Username for authenticating against the registry.
+	Username string
+	// Password for authenticating against the registry.
+	Password string
 	// DigestFile, after copying the image, write the digest of the resulting
 	// image to the file.  Ignored for remote calls.
 	DigestFile string
diff --git a/pkg/domain/entities/manifest.go b/pkg/domain/entities/manifest.go
index 273052bb9..853619b19 100644
--- a/pkg/domain/entities/manifest.go
+++ b/pkg/domain/entities/manifest.go
@@ -1,5 +1,9 @@
 package entities
 
+import "github.com/containers/image/v5/types"
+
+// TODO: add comments to *all* types and fields.
+
 type ManifestCreateOptions struct {
 	All bool `schema:"all"`
 }
@@ -26,6 +30,9 @@ type ManifestAnnotateOptions struct {
 }
 
 type ManifestPushOptions struct {
-	Purge, Quiet, All, TlsVerify, RemoveSignatures       bool
-	Authfile, CertDir, Creds, DigestFile, Format, SignBy string
+	Purge, Quiet, All, RemoveSignatures bool
+
+	Authfile, CertDir, Username, Password, DigestFile, Format, SignBy string
+
+	SkipTLSVerify types.OptionalBool
 }
diff --git a/pkg/domain/entities/play.go b/pkg/domain/entities/play.go
index 93864c23b..4f485cbee 100644
--- a/pkg/domain/entities/play.go
+++ b/pkg/domain/entities/play.go
@@ -8,9 +8,10 @@ type PlayKubeOptions struct {
 	Authfile string
 	// CertDir - to a directory containing TLS certifications and keys.
 	CertDir string
-	// Credentials - `username:password` for authentication against a
-	// container registry.
-	Credentials string
+	// Username for authenticating against the registry.
+	Username string
+	// Password for authenticating against the registry.
+	Password string
 	// Network - name of the CNI network to connect to.
 	Network string
 	// Quiet - suppress output when pulling images.
diff --git a/pkg/domain/entities/system.go b/pkg/domain/entities/system.go
index 5e4760d12..79a90be48 100644
--- a/pkg/domain/entities/system.go
+++ b/pkg/domain/entities/system.go
@@ -97,3 +97,9 @@ type SystemVersionReport struct {
 type ComponentVersion struct {
 	types.Version
 }
+
+// ListRegistriesReport is the report when querying for a sorted list of
+// registries which may be contacted during certain operations.
+type ListRegistriesReport struct {
+	Registries []string
+}
diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go
index 6e774df8e..d8af4d339 100644
--- a/pkg/domain/infra/abi/images.go
+++ b/pkg/domain/infra/abi/images.go
@@ -121,12 +121,11 @@ func (ir *ImageEngine) Pull(ctx context.Context, rawImage string, options entiti
 	}
 
 	var registryCreds *types.DockerAuthConfig
-	if options.Credentials != "" {
-		creds, err := util.ParseRegistryCreds(options.Credentials)
-		if err != nil {
-			return nil, err
+	if len(options.Username) > 0 && len(options.Password) > 0 {
+		registryCreds = &types.DockerAuthConfig{
+			Username: options.Username,
+			Password: options.Password,
 		}
-		registryCreds = creds
 	}
 	dockerRegistryOptions := image.DockerRegistryOptions{
 		DockerRegistryCreds:         registryCreds,
@@ -226,12 +225,11 @@ func (ir *ImageEngine) Push(ctx context.Context, source string, destination stri
 	}
 
 	var registryCreds *types.DockerAuthConfig
-	if options.Credentials != "" {
-		creds, err := util.ParseRegistryCreds(options.Credentials)
-		if err != nil {
-			return err
+	if len(options.Username) > 0 && len(options.Password) > 0 {
+		registryCreds = &types.DockerAuthConfig{
+			Username: options.Username,
+			Password: options.Password,
 		}
-		registryCreds = creds
 	}
 	dockerRegistryOptions := image.DockerRegistryOptions{
 		DockerRegistryCreds:         registryCreds,
diff --git a/pkg/domain/infra/abi/manifest.go b/pkg/domain/infra/abi/manifest.go
index fca34dda2..6e311dec7 100644
--- a/pkg/domain/infra/abi/manifest.go
+++ b/pkg/domain/infra/abi/manifest.go
@@ -16,6 +16,7 @@ import (
 	"github.com/containers/image/v5/docker"
 	"github.com/containers/image/v5/manifest"
 	"github.com/containers/image/v5/transports/alltransports"
+	"github.com/containers/image/v5/types"
 	libpodImage "github.com/containers/libpod/libpod/image"
 	"github.com/containers/libpod/pkg/domain/entities"
 	"github.com/containers/libpod/pkg/util"
@@ -179,12 +180,28 @@ func (ir *ImageEngine) ManifestPush(ctx context.Context, names []string, opts en
 		case "v2s2", "docker":
 			manifestType = manifest.DockerV2Schema2MediaType
 		default:
-			return errors.Errorf("unknown format %q. Choose on of the supported formats: 'oci' or 'v2s2'", opts.Format)
+			return errors.Errorf("unknown format %q. Choose one of the supported formats: 'oci' or 'v2s2'", opts.Format)
 		}
 	}
+
+	// Set the system context.
+	sys := ir.Libpod.SystemContext()
+	if sys != nil {
+		sys = &types.SystemContext{}
+	}
+	sys.AuthFilePath = opts.Authfile
+	sys.DockerInsecureSkipTLSVerify = opts.SkipTLSVerify
+
+	if opts.Username != "" && opts.Password != "" {
+		sys.DockerAuthConfig = &types.DockerAuthConfig{
+			Username: opts.Username,
+			Password: opts.Password,
+		}
+	}
+
 	options := manifests.PushOptions{
 		Store:              ir.Libpod.GetStore(),
-		SystemContext:      ir.Libpod.SystemContext(),
+		SystemContext:      sys,
 		ImageListSelection: cp.CopySpecificImages,
 		Instances:          nil,
 		RemoveSignatures:   opts.RemoveSignatures,
diff --git a/pkg/domain/infra/abi/play.go b/pkg/domain/infra/abi/play.go
index cd7eec7e6..6d0919d2b 100644
--- a/pkg/domain/infra/abi/play.go
+++ b/pkg/domain/infra/abi/play.go
@@ -56,6 +56,9 @@ func (ic *ContainerEngine) PlayKube(ctx context.Context, path string, options en
 		return nil, errors.Wrapf(err, "unable to read %q as YAML", path)
 	}
 
+	// NOTE: pkg/bindings/play is also parsing the file.
+	// A pkg/kube would be nice to refactor and abstract
+	// parts of the K8s-related code.
 	if podYAML.Kind != "Pod" {
 		return nil, errors.Errorf("invalid YAML kind: %q. Pod is the only supported Kubernetes YAML kind", podYAML.Kind)
 	}
@@ -147,6 +150,13 @@ func (ic *ContainerEngine) PlayKube(ctx context.Context, path string, options en
 		writer = os.Stderr
 	}
 
+	if len(options.Username) > 0 && len(options.Password) > 0 {
+		registryCreds = &types.DockerAuthConfig{
+			Username: options.Username,
+			Password: options.Password,
+		}
+	}
+
 	dockerRegistryOptions := image.DockerRegistryOptions{
 		DockerRegistryCreds:         registryCreds,
 		DockerCertPath:              options.CertDir,
diff --git a/pkg/domain/infra/runtime_libpod.go b/pkg/domain/infra/runtime_libpod.go
index 7c9180d43..a57eadc63 100644
--- a/pkg/domain/infra/runtime_libpod.go
+++ b/pkg/domain/infra/runtime_libpod.go
@@ -213,6 +213,9 @@ func getRuntime(ctx context.Context, fs *flag.FlagSet, opts *engineOpts) (*libpo
 	if fs.Changed("hooks-dir") {
 		options = append(options, libpod.WithHooksDir(cfg.Engine.HooksDir...))
 	}
+	if fs.Changed("registries-conf") {
+		options = append(options, libpod.WithRegistriesConf(cfg.RegistriesConf))
+	}
 
 	// TODO flag to set CNI plugins dir?