Add RC1 Support

go.mod

@@ -27,7 +27,7 @@ require (
 	github.com/ncw/swift v1.0.47
 	github.com/opencontainers/go-digest v1.0.0
 	github.com/opencontainers/image-spec v1.0.1
-	github.com/oras-project/artifacts-spec v1.0.0-draft.1
+	github.com/oras-project/artifacts-spec v1.0.0-rc.1
 	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/cobra v1.0.0
 	github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43 // indirect

go.sum

@@ -138,6 +138,8 @@ github.com/opencontainers/image-spec v1.0.1 h1:JMemWkRwHx4Zj+fVxWoMCFm/8sYGGrUVo
 github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
 github.com/oras-project/artifacts-spec v1.0.0-draft.1 h1:AyD++MU8sif5eyyvPbT5qskkJA9VZynYVoroVFTXPLM=
 github.com/oras-project/artifacts-spec v1.0.0-draft.1/go.mod h1:Xch2aLzSwtkhbFFN6LUzTfLtukYvMMdXJ4oZ8O7BOdc=
+github.com/oras-project/artifacts-spec v1.0.0-rc.1 h1:bCHf9mPbrgiNwQFyVzBX79BYZVAl0OUrmvICZOCOwts=
+github.com/oras-project/artifacts-spec v1.0.0-rc.1/go.mod h1:Xch2aLzSwtkhbFFN6LUzTfLtukYvMMdXJ4oZ8O7BOdc=
 github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

registry/api/v2/errors.go

@@ -154,4 +154,14 @@ var (
 		to return) is not an integer, or "n" is negative.`,
 		HTTPStatusCode: http.StatusBadRequest,
 	})
+
+	// ErrorCodeMalformedNextToken is returned when uploading a blob if the
+	// provided digest does not match the blob contents.
+	ErrorCodeMalformedNextToken = errcode.Register(errGroup, errcode.ErrorDescriptor{
+		Value:   "MALFORMED_NEXTTOKEN",
+		Message: "provided nextToken is invalid",
+		Description: `Returned if a client provides a non-empty nextToken value that
+		cannot be properly parsed`,
+		HTTPStatusCode: http.StatusBadRequest,
+	})
 )

registry/api/v2/extensions.go

@@ -18,10 +18,10 @@ func ExtendRoute(ns, ext, component string, template RouteDescriptor, nameRequir
 	path := routeDescriptorsMap[RouteNameBase].Path
 	if nameRequired {
 		name = RouteNameExtensionsRepository
-		path += "{name:" + reference.NameRegexp.String() + "}"
+		path += "{name:" + reference.NameRegexp.String() + "}/"
 	}
 	name = fmt.Sprintf("%s-%s-%s-%s", name, ns, ext, component)
-	path = fmt.Sprintf("%s/_%s/%s/%s", path, ns, ext, component)
+	path = fmt.Sprintf("%s_%s/%s/%s", path, ns, ext, component)
 
 	desc := template
 	desc.Name = name

registry/extension/extension.go

@@ -1,7 +1,6 @@
 package extension
 
 import (
-	"context"
 	c "context"
 	"fmt"
 	"net/http"
@@ -72,27 +71,31 @@ type EnumerateExtension struct {
 var extensions map[string]InitExtensionNamespace
 var extensionsNamespaces map[string]Namespace
 
-func EnumerateRegistered(ctx context.Context) (enumeratedExtensions []EnumerateExtension) {
+func EnumerateRegistered(ctx Context) (enumeratedExtensions []EnumerateExtension) {
 	for _, namespace := range extensionsNamespaces {
 		enumerateExtension := EnumerateExtension{
 			Name:        namespace.GetNamespaceName(),
 			Url:         namespace.GetNamespaceUrl(),
 			Description: namespace.GetNamespaceDescription(),
+			Endpoints:   []string{},
 		}
 
-		registryScoped := namespace.GetRegistryRoutes()
-		for _, regScoped := range registryScoped {
-			path := fmt.Sprintf("_%s/%s/%s", regScoped.Namespace, regScoped.Extension, regScoped.Component)
-			enumerateExtension.Endpoints = append(enumerateExtension.Endpoints, path)
+		scopedRoutes := namespace.GetRepositoryRoutes()
+
+		// if the repository is not set in the context, scope is registry wide
+		if ctx.Repository == nil {
+			scopedRoutes = namespace.GetRegistryRoutes()
 		}
 
-		repositoryScoped := namespace.GetRepositoryRoutes()
-		for _, repScoped := range repositoryScoped {
-			path := fmt.Sprintf("_%s/%s/%s", repScoped.Namespace, repScoped.Extension, repScoped.Component)
+		for _, route := range scopedRoutes {
+			path := fmt.Sprintf("_%s/%s/%s", route.Namespace, route.Extension, route.Component)
 			enumerateExtension.Endpoints = append(enumerateExtension.Endpoints, path)
 		}
 
-		enumeratedExtensions = append(enumeratedExtensions, enumerateExtension)
+		// add extension to list if endpoints exist
+		if len(enumerateExtension.Endpoints) > 0 {
+			enumeratedExtensions = append(enumeratedExtensions, enumerateExtension)
+		}
 	}
 
 	return enumeratedExtensions

registry/extension/oci/discover.go

@@ -10,7 +10,6 @@ import (
 )
 
 type discoverGetAPIResponse struct {
-	Name       string                         `json:"name"`
 	Extensions []extension.EnumerateExtension `json:"extensions"`
 }
 
@@ -20,13 +19,13 @@ type extensionHandler struct {
 	storageDriver driver.StorageDriver
 }
 
-func (th *extensionHandler) getExtensions(w http.ResponseWriter, r *http.Request) {
+func (eh *extensionHandler) getExtensions(w http.ResponseWriter, r *http.Request) {
 	defer r.Body.Close()
 
 	w.Header().Set("Content-Type", "application/json")
 
 	// get list of extension information seperated at the namespace level
-	enumeratedExtensions := extension.EnumerateRegistered(r.Context())
+	enumeratedExtensions := extension.EnumerateRegistered(*eh.Context)
 
 	// remove the oci extension so it's not returned by discover
 	for i, e := range enumeratedExtensions {
@@ -37,10 +36,9 @@ func (th *extensionHandler) getExtensions(w http.ResponseWriter, r *http.Request
 
 	enc := json.NewEncoder(w)
 	if err := enc.Encode(discoverGetAPIResponse{
-		Name:       th.Repository.Named().Name(),
 		Extensions: enumeratedExtensions,
 	}); err != nil {
-		th.Errors = append(th.Errors, errcode.ErrorCodeUnknown.WithDetail(err))
+		eh.Errors = append(eh.Errors, errcode.ErrorCodeUnknown.WithDetail(err))
 		return
 	}
 }

registry/extension/oci/oci.go

@@ -70,10 +70,10 @@ func (o *ociNamespace) GetManifestHandlers(repo distribution.Repository, blobSto
 }
 
 // GetRepositoryRoutes returns a list of extension routes scoped at a repository level
-func (d *ociNamespace) GetRepositoryRoutes() []extension.Route {
+func (o *ociNamespace) GetRepositoryRoutes() []extension.Route {
 	var routes []extension.Route
 
-	if d.discoverEnabled {
+	if o.discoverEnabled {
 		routes = append(routes, extension.Route{
 			Namespace: namespaceName,
 			Extension: extensionName,
@@ -87,38 +87,57 @@ func (d *ociNamespace) GetRepositoryRoutes() []extension.Route {
 					},
 				},
 			},
-			Dispatcher: d.discoverDispatcher,
+			Dispatcher: o.discoverDispatcher,
 		})
 	}
 
 	return routes
 }
 
 // GetRegistryRoutes returns a list of extension routes scoped at a registry level
-// There are no registry scoped routes exposed by this namespace
-func (d *ociNamespace) GetRegistryRoutes() []extension.Route {
-	return nil
+func (o *ociNamespace) GetRegistryRoutes() []extension.Route {
+	var routes []extension.Route
+
+	if o.discoverEnabled {
+		routes = append(routes, extension.Route{
+			Namespace: namespaceName,
+			Extension: extensionName,
+			Component: discoverComponentName,
+			Descriptor: v2.RouteDescriptor{
+				Entity: "Extension",
+				Methods: []v2.MethodDescriptor{
+					{
+						Method:      "GET",
+						Description: "Get all extensions enabled for a registry.",
+					},
+				},
+			},
+			Dispatcher: o.discoverDispatcher,
+		})
+	}
+
+	return routes
 }
 
 // GetNamespaceName returns the name associated with the namespace
-func (d *ociNamespace) GetNamespaceName() string {
+func (o *ociNamespace) GetNamespaceName() string {
 	return namespaceName
 }
 
 // GetNamespaceUrl returns the url link to the documentation where the namespace's extension and endpoints are defined
-func (d *ociNamespace) GetNamespaceUrl() string {
+func (o *ociNamespace) GetNamespaceUrl() string {
 	return namespaceUrl
 }
 
 // GetNamespaceDescription returns the description associated with the namespace
-func (d *ociNamespace) GetNamespaceDescription() string {
+func (o *ociNamespace) GetNamespaceDescription() string {
 	return namespaceDescription
 }
 
-func (d *ociNamespace) discoverDispatcher(ctx *extension.Context, r *http.Request) http.Handler {
+func (o *ociNamespace) discoverDispatcher(ctx *extension.Context, r *http.Request) http.Handler {
 	extensionHandler := &extensionHandler{
 		Context:       ctx,
-		storageDriver: d.storageDriver,
+		storageDriver: o.storageDriver,
 	}
 
 	return handlers.MethodHandler{

registry/extension/oras/artifactmanifest.go

@@ -37,6 +37,16 @@ func (a Manifest) ArtifactType() string {
 	return a.inner.ArtifactType
 }
 
+// Annotations returns the annotations of this ORAS artifact.
+func (a Manifest) Annotations() map[string]string {
+	return a.inner.Annotations
+}
+
+// MediaType returns the media type of this ORAS artifact.
+func (a Manifest) MediaType() string {
+	return a.inner.MediaType
+}
+
 // References returns the distribution descriptors for the referenced blobs.
 func (a Manifest) References() []distribution.Descriptor {
 	blobs := make([]distribution.Descriptor, len(a.inner.Blobs))
@@ -79,6 +89,10 @@ func (d *DeserializedManifest) UnmarshalJSON(b []byte) error {
 	if man.ArtifactType == "" {
 		return errors.New("artifactType cannot be empty")
 	}
+	if man.MediaType != v1.MediaTypeArtifactManifest {
+		return errors.New("mediaType is invalid")
+	}
+
 	d.inner = man
 
 	return nil

registry/extension/oras/artifactmanifesthandler.go

@@ -5,11 +5,19 @@ import (
 	"encoding/json"
 	"errors"
 	"path"
+	"time"
 
 	"github.com/distribution/distribution/v3"
 	dcontext "github.com/distribution/distribution/v3/context"
 	"github.com/distribution/distribution/v3/registry/storage/driver"
 	"github.com/opencontainers/go-digest"
+	v1 "github.com/oras-project/artifacts-spec/specs-go/v1"
+)
+
+var (
+	errInvalidArtifactType      = errors.New("artifactType invalid")
+	errInvalidMediaType         = errors.New("mediaType invalid")
+	errInvalidCreatedAnnotation = errors.New("failed to parse created time")
 )
 
 // artifactManifestHandler is a ManifestHandler that covers ORAS Artifacts.
@@ -75,7 +83,18 @@ func (amh *artifactManifestHandler) verifyManifest(ctx context.Context, dm Deser
 	var errs distribution.ErrManifestVerification
 
 	if dm.ArtifactType() == "" {
-		errs = append(errs, distribution.ErrManifestVerification{errors.New("artifactType invalid")})
+		errs = append(errs, errInvalidArtifactType)
+	}
+
+	if dm.MediaType() != v1.MediaTypeArtifactManifest {
+		errs = append(errs, errInvalidMediaType)
+	}
+
+	if createdAt, ok := dm.Annotations()[createAnnotationName]; ok {
+		_, err := time.Parse(time.RFC3339, createdAt)
+		if err != nil {
+			errs = append(errs, errInvalidCreatedAnnotation)
+		}
 	}
 
 	if !skipDependencyVerification {