9637cb40cd
Errors thrown by storage drivers don't have the name of the driver, causing user confusion about whether the error is coming from Docker or from a storage driver. This change adds the storage driver name to each error message. This required changing ErrUnsupportedDriver to a type, leading to code changes whenever ErrUnsupportedDriver is used. The tests check whether the driver name appears in the error message. Signed-off-by: Amit Shukla <amit.shukla@docker.com>
198 lines
6.8 KiB
Go
198 lines
6.8 KiB
Go
// Package base provides a base implementation of the storage driver that can
|
|
// be used to implement common checks. The goal is to increase the amount of
|
|
// code sharing.
|
|
//
|
|
// The canonical approach to use this class is to embed in the exported driver
|
|
// struct such that calls are proxied through this implementation. First,
|
|
// declare the internal driver, as follows:
|
|
//
|
|
// type driver struct { ... internal ...}
|
|
//
|
|
// The resulting type should implement StorageDriver such that it can be the
|
|
// target of a Base struct. The exported type can then be declared as follows:
|
|
//
|
|
// type Driver struct {
|
|
// Base
|
|
// }
|
|
//
|
|
// Because Driver embeds Base, it effectively implements Base. If the driver
|
|
// needs to intercept a call, before going to base, Driver should implement
|
|
// that method. Effectively, Driver can intercept calls before coming in and
|
|
// driver implements the actual logic.
|
|
//
|
|
// To further shield the embed from other packages, it is recommended to
|
|
// employ a private embed struct:
|
|
//
|
|
// type baseEmbed struct {
|
|
// base.Base
|
|
// }
|
|
//
|
|
// Then, declare driver to embed baseEmbed, rather than Base directly:
|
|
//
|
|
// type Driver struct {
|
|
// baseEmbed
|
|
// }
|
|
//
|
|
// The type now implements StorageDriver, proxying through Base, without
|
|
// exporting an unnecessary field.
|
|
package base
|
|
|
|
import (
|
|
"io"
|
|
|
|
"github.com/docker/distribution/context"
|
|
storagedriver "github.com/docker/distribution/registry/storage/driver"
|
|
)
|
|
|
|
// Base provides a wrapper around a storagedriver implementation that provides
|
|
// common path and bounds checking.
|
|
type Base struct {
|
|
storagedriver.StorageDriver
|
|
}
|
|
|
|
// Format errors received from the storage driver
|
|
func (base *Base) setDriverName(e error) error {
|
|
if e != nil {
|
|
if actualErr, ok := e.(storagedriver.ErrUnsupportedMethod); ok {
|
|
actualErr.DriverName = base.StorageDriver.Name()
|
|
return actualErr
|
|
}
|
|
if actualErr, ok := e.(storagedriver.PathNotFoundError); ok {
|
|
actualErr.DriverName = base.StorageDriver.Name()
|
|
return actualErr
|
|
}
|
|
if actualErr, ok := e.(storagedriver.InvalidPathError); ok {
|
|
actualErr.DriverName = base.StorageDriver.Name()
|
|
return actualErr
|
|
}
|
|
if actualErr, ok := e.(storagedriver.InvalidOffsetError); ok {
|
|
actualErr.DriverName = base.StorageDriver.Name()
|
|
return actualErr
|
|
}
|
|
}
|
|
return e
|
|
}
|
|
|
|
// GetContent wraps GetContent of underlying storage driver.
|
|
func (base *Base) GetContent(ctx context.Context, path string) ([]byte, error) {
|
|
ctx, done := context.WithTrace(ctx)
|
|
defer done("%s.GetContent(%q)", base.Name(), path)
|
|
|
|
if !storagedriver.PathRegexp.MatchString(path) {
|
|
return nil, storagedriver.InvalidPathError{Path: path, DriverName: base.StorageDriver.Name()}
|
|
}
|
|
|
|
b, e := base.StorageDriver.GetContent(ctx, path)
|
|
return b, base.setDriverName(e)
|
|
}
|
|
|
|
// PutContent wraps PutContent of underlying storage driver.
|
|
func (base *Base) PutContent(ctx context.Context, path string, content []byte) error {
|
|
ctx, done := context.WithTrace(ctx)
|
|
defer done("%s.PutContent(%q)", base.Name(), path)
|
|
|
|
if !storagedriver.PathRegexp.MatchString(path) {
|
|
return storagedriver.InvalidPathError{Path: path, DriverName: base.StorageDriver.Name()}
|
|
}
|
|
|
|
return base.setDriverName(base.StorageDriver.PutContent(ctx, path, content))
|
|
}
|
|
|
|
// ReadStream wraps ReadStream of underlying storage driver.
|
|
func (base *Base) ReadStream(ctx context.Context, path string, offset int64) (io.ReadCloser, error) {
|
|
ctx, done := context.WithTrace(ctx)
|
|
defer done("%s.ReadStream(%q, %d)", base.Name(), path, offset)
|
|
|
|
if offset < 0 {
|
|
return nil, storagedriver.InvalidOffsetError{Path: path, Offset: offset, DriverName: base.StorageDriver.Name()}
|
|
}
|
|
|
|
if !storagedriver.PathRegexp.MatchString(path) {
|
|
return nil, storagedriver.InvalidPathError{Path: path, DriverName: base.StorageDriver.Name()}
|
|
}
|
|
|
|
rc, e := base.StorageDriver.ReadStream(ctx, path, offset)
|
|
return rc, base.setDriverName(e)
|
|
}
|
|
|
|
// WriteStream wraps WriteStream of underlying storage driver.
|
|
func (base *Base) WriteStream(ctx context.Context, path string, offset int64, reader io.Reader) (nn int64, err error) {
|
|
ctx, done := context.WithTrace(ctx)
|
|
defer done("%s.WriteStream(%q, %d)", base.Name(), path, offset)
|
|
|
|
if offset < 0 {
|
|
return 0, storagedriver.InvalidOffsetError{Path: path, Offset: offset, DriverName: base.StorageDriver.Name()}
|
|
}
|
|
|
|
if !storagedriver.PathRegexp.MatchString(path) {
|
|
return 0, storagedriver.InvalidPathError{Path: path, DriverName: base.StorageDriver.Name()}
|
|
}
|
|
|
|
i64, e := base.StorageDriver.WriteStream(ctx, path, offset, reader)
|
|
return i64, base.setDriverName(e)
|
|
}
|
|
|
|
// Stat wraps Stat of underlying storage driver.
|
|
func (base *Base) Stat(ctx context.Context, path string) (storagedriver.FileInfo, error) {
|
|
ctx, done := context.WithTrace(ctx)
|
|
defer done("%s.Stat(%q)", base.Name(), path)
|
|
|
|
if !storagedriver.PathRegexp.MatchString(path) {
|
|
return nil, storagedriver.InvalidPathError{Path: path, DriverName: base.StorageDriver.Name()}
|
|
}
|
|
|
|
fi, e := base.StorageDriver.Stat(ctx, path)
|
|
return fi, base.setDriverName(e)
|
|
}
|
|
|
|
// List wraps List of underlying storage driver.
|
|
func (base *Base) List(ctx context.Context, path string) ([]string, error) {
|
|
ctx, done := context.WithTrace(ctx)
|
|
defer done("%s.List(%q)", base.Name(), path)
|
|
|
|
if !storagedriver.PathRegexp.MatchString(path) && path != "/" {
|
|
return nil, storagedriver.InvalidPathError{Path: path, DriverName: base.StorageDriver.Name()}
|
|
}
|
|
|
|
str, e := base.StorageDriver.List(ctx, path)
|
|
return str, base.setDriverName(e)
|
|
}
|
|
|
|
// Move wraps Move of underlying storage driver.
|
|
func (base *Base) Move(ctx context.Context, sourcePath string, destPath string) error {
|
|
ctx, done := context.WithTrace(ctx)
|
|
defer done("%s.Move(%q, %q", base.Name(), sourcePath, destPath)
|
|
|
|
if !storagedriver.PathRegexp.MatchString(sourcePath) {
|
|
return storagedriver.InvalidPathError{Path: sourcePath, DriverName: base.StorageDriver.Name()}
|
|
} else if !storagedriver.PathRegexp.MatchString(destPath) {
|
|
return storagedriver.InvalidPathError{Path: destPath, DriverName: base.StorageDriver.Name()}
|
|
}
|
|
|
|
return base.setDriverName(base.StorageDriver.Move(ctx, sourcePath, destPath))
|
|
}
|
|
|
|
// Delete wraps Delete of underlying storage driver.
|
|
func (base *Base) Delete(ctx context.Context, path string) error {
|
|
ctx, done := context.WithTrace(ctx)
|
|
defer done("%s.Delete(%q)", base.Name(), path)
|
|
|
|
if !storagedriver.PathRegexp.MatchString(path) {
|
|
return storagedriver.InvalidPathError{Path: path, DriverName: base.StorageDriver.Name()}
|
|
}
|
|
|
|
return base.setDriverName(base.StorageDriver.Delete(ctx, path))
|
|
}
|
|
|
|
// URLFor wraps URLFor of underlying storage driver.
|
|
func (base *Base) URLFor(ctx context.Context, path string, options map[string]interface{}) (string, error) {
|
|
ctx, done := context.WithTrace(ctx)
|
|
defer done("%s.URLFor(%q)", base.Name(), path)
|
|
|
|
if !storagedriver.PathRegexp.MatchString(path) {
|
|
return "", storagedriver.InvalidPathError{Path: path, DriverName: base.StorageDriver.Name()}
|
|
}
|
|
|
|
str, e := base.StorageDriver.URLFor(ctx, path, options)
|
|
return str, base.setDriverName(e)
|
|
}
|