autodetect.go:Increase the judgment criteria for the ImageLayout file…

… type

Signed-off-by: zhouhao <[email protected]>

image/autodetect.go

@@ -16,10 +16,12 @@ package image
 
 import (
 	"encoding/json"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"os"
+	"path/filepath"
 
 	"github.com/opencontainers/image-spec/schema"
 	"github.com/pkg/errors"
@@ -34,6 +36,13 @@ const (
 	TypeConfig       = "config"
 )
 
+// Layoutfile realize the image files that are included in the image layout type
+var Layoutfile = []string{
+	"blobs",
+	"oci-layout",
+	"refs",
+}
+
 // Autodetect detects the validation type for the given path
 // or an error if the validation type could not be resolved.
 func Autodetect(path string) (string, error) {
@@ -43,6 +52,25 @@ func Autodetect(path string) (string, error) {
 	}
 
 	if fi.IsDir() {
+		for _, file := range Layoutfile {
+			mpath := filepath.Join(path, file)
+			mfi, erro := os.Stat(mpath)
+			if os.IsNotExist(erro) {
+				return "", fmt.Errorf("%s not exit in ImageLayout", file)
+			}
+
+			if file == Layoutfile[0] || file == Layoutfile[2] {
+				if !(mfi.IsDir()) {
+					return "", fmt.Errorf("%s must be a directory", file)
+				}
+			}
+
+			if file == Layoutfile[1] {
+				if _, err := os.Open(mpath); err != nil {
+					return "", errors.Wrap(err, "oci-layout must be a file")
+				}
+			}
+		}
 		return TypeImageLayout, nil
 	}