feat(repodb): Implement RepoDB for image specific information using boltdb/dynamodb (#979)

* feat(repodb): implement a DB for image specific information using boltdb (cherry picked from commit e3cb60b856) Some other fixes/improvements on top (Andrei) Global search: The last updated attribute on repo level is now computed correctly. Global search: Fix and enhance tests: validate more fields, and fix CVE verification logic RepoListWithNewestImage: The vendors and platforms at repo level are no longer containing duplicate entries CVE: scan OCIUncompressedLayer instead of skiping them (used in tests) bug(repodb): do no try to increment download counters for signatures Signed-off-by: Andrei Aaron <andaaron@cisco.com> Add filtering to global search API (Laurentiu) (cherry picked from commit a87976d635ea876fe8ced532e8adb7c3bb24098f) Original work by Laurentiu Niculae <niculae.laurentiu1@gmail.com> Fix pagination bug - when limit was bigger than the repo count result contained empty results - now correctly returns only maximum available number of repo results Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com> Add history to the fields returned from RepoDB Consolidate fields used in packages - pkg/extensions/search/common/common_test - pkg/extensions/search/common/common Refactor duplicate code in GlobalSearch verification Add vulnerability scan results to image:tag reply Signed-off-by: Andrei Aaron <andaaron@cisco.com> Refactor ExpandedRepoInfo to using RepoDB Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com> (cherry picked from commit fd7dc85c3a9d028fd8860d3791cad4df769ed005) Init RepoDB at startup - sync with storage - ignore images without a tag Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com> (cherry picked from commit 359898facd6541b2aa99ee95080f7aabf28c2650) Update request to get image:tag to use repodb Signed-off-by: Andrei Aaron <andaaron@cisco.com> Sync RepoDB logging - added logging for errors Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com> (cherry picked from commit 2e128f4d01712b34c70b5468285100b0657001bb) sync-repodb minor error checking fix Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com> Improve tests for syncing RepoDB with storage Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com> (cherry picked from commit b18408c6d64e01312849fc18b929e3a2a7931e9e) Update scoring rule for repos - now prioritize matches to the end of the repo name Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com> (cherry picked from commit 6961346ccf02223132b3b12a2132c80bd1b6b33c) Upgrade search filters to permit multiple values - multiple values for os and arch Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com> (cherry picked from commit 3ffb72c6fc0587ff827a03fe4f76a13b27b876a0) feature(repodb): add pagination for RepoListWithNewestImage Signed-off-by: Alex Stan <alexandrustan96@yahoo.ro> (cherry picked from commit 32c917f2dc65363b0856345289353559a8027aee) test(fix): fix tests failing since repodb is used for listing all repos 1. One of the tests was verifying disk/oci related erros and is not applicable 2. Another test was actually broken in an older PR, the default store and the substore were using the same repo names (the substore ones were unprefixed), which should not be the case, this was causing a single entry to show in the RepoDB instead of two separate entries for each test image Root cause in: https://github.com/project-zot/zot/commit/b61aff62cd5088314cee39fae42cec0ad855bd7c#diff-b86e11fa5a3102b336caebec3b30a9d35e26af554dd8658f124dba2404b7d24aR88 Signed-off-by: Andrei Aaron <andaaron@cisco.com> chore: move code reponsible for transforming objects to gql_generated types to separate package Signed-off-by: Andrei Aaron <andaaron@cisco.com> Process input for global search - Clean input: query, filter strings - Add validation for global search input Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com> (cherry picked from commit f1ca8670fbe4a4a327ea25cf459237dbf23bb78a) fix: only call cve scanning for data shown to the user Signed-off-by: Andrei Aaron <andaaron@cisco.com> GQL omit scanning for CVE if field is not required Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com> (cherry picked from commit 5479ce45d6cb2abcf5fbccadeaf6f3393c3f6bf1) Fix filtering logic in RepoDB - filter parameter was set to false instead of being calculator from the later image Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com> (cherry picked from commit a82d2327e34e5da617af0b7ca78a2dba90999f0a) bug(repodb): Checking signature returns error if signed image is not found - we considere a signature image orfan when the image it signs is not found - we need this to ignore such signatures in certain cases Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com> (cherry picked from commit d0418505f76467accd8e1ee34fcc2b2a165efae5) feat(repodb): CVE logic to use repoDB Also update some method signatures to remove usage of: github.com/google/go-containerregistry/pkg/v1 Signed-off-by: Andrei Aaron <andaaron@cisco.com> * feat(repodb): refactor repodb update logic Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com> * fix(repodb): minor fixes Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com> * feat(repodb): move repodb logic inside meta directory under pkg Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com> * feat(repodb): change factory class for repodb initialization with factory metrod Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com> * feat(repodb): simplify repodb configuration - repodb now shares config parameters with the cache - config taken directly from storage config Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com> * fix(authors): fix authors information to work properly with repodb Ideally this commit would be squshed in the repodb commit but as-is it is easier to cherry-pick on other branches Signed-off-by: Andrei Aaron <andaaron@cisco.com> * feat(repodb): dynamodb support for repodb - clean-up repodb code + coverage improvements Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com> * feat(dynamo): tables used by dynamo are created automatically if they don't exists - if the table exists nothing happens Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com> * test(repodb): coverage tests - minor fix for CVEListForImage to fix the tests Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com> * feat(repodb): add descriptor with media type - to represent images and multi-arch images Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com> * feat(repodb): support signatures on repo level - added to follow the behavior of signing and signature verification tools that work on a manifest level for each repo - all images with different tags but the same manifest will be signed at once Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com> * feat(repodb): old repodb version migration support Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com> * feat(repodb): tests for coverage Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com> * feat(repodb): WIP fixing tests Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com> * feat(repodb): work on patchRepoDB tests Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com> * fix(repodb): create dynamo tables only for linux amd Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com> * fix(ci): fix a typo in ci-cd.yml Signed-off-by: Andrei Aaron <aaaron@luxoft.com> Signed-off-by: Andrei Aaron <andaaron@cisco.com> Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com> Signed-off-by: Andrei Aaron <aaaron@luxoft.com> Co-authored-by: Andrei Aaron <andaaron@cisco.com> Co-authored-by: Andrei Aaron <aaaron@luxoft.com>
2026-06-16 04:17:55 +08:00 · 2023-01-09 22:37:44 +02:00
parent f69b104838
commit f408df0dac
61 changed files with 13863 additions and 2488 deletions
@@ -1,6 +1,7 @@
 package test

 import (
+	"bytes"
 	"context"
 	"crypto/rand"
 	"encoding/json"
@@ -12,16 +13,22 @@ import (
 	"net/http"
 	"net/url"
 	"os"
+	"os/exec"
 	"path"
 	"strings"
 	"time"

 	godigest "github.com/opencontainers/go-digest"
 	"github.com/opencontainers/image-spec/specs-go"
-	imagespec "github.com/opencontainers/image-spec/specs-go/v1"
+	ispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/opencontainers/umoci"
 	"github.com/phayes/freeport"
+	"github.com/sigstore/cosign/cmd/cosign/cli/generate"
+	"github.com/sigstore/cosign/cmd/cosign/cli/options"
+	"github.com/sigstore/cosign/cmd/cosign/cli/sign"
 	"gopkg.in/resty.v1"
+
+	"zotregistry.io/zot/pkg/storage"
 )

 const (
@@ -59,8 +66,8 @@ var (
 )

 type Image struct {
-	Manifest imagespec.Manifest
-	Config   imagespec.Image
+	Manifest ispec.Manifest
+	Config   ispec.Image
 	Layers   [][]byte
 	Tag      string
 }
@@ -219,6 +226,50 @@ func NewControllerManager(controller Controller) ControllerManager {
 	return cm
 }

+func WriteImageToFileSystem(image Image, repoName string, storeController storage.StoreController) error {
+	store := storeController.GetImageStore(repoName)
+
+	err := store.InitRepo(repoName)
+	if err != nil {
+		return err
+	}
+
+	for _, layerBlob := range image.Layers {
+		layerReader := bytes.NewReader(layerBlob)
+		layerDigest := godigest.FromBytes(layerBlob)
+
+		_, _, err = store.FullBlobUpload(repoName, layerReader, layerDigest)
+		if err != nil {
+			return err
+		}
+	}
+
+	configBlob, err := json.Marshal(image.Config)
+	if err != nil {
+		return err
+	}
+
+	configReader := bytes.NewReader(configBlob)
+	configDigest := godigest.FromBytes(configBlob)
+
+	_, _, err = store.FullBlobUpload(repoName, configReader, configDigest)
+	if err != nil {
+		return err
+	}
+
+	manifestBlob, err := json.Marshal(image.Manifest)
+	if err != nil {
+		return err
+	}
+
+	_, err = store.PutImageManifest(repoName, image.Tag, ispec.MediaTypeImageManifest, manifestBlob)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func WaitTillServerReady(url string) {
 	for {
 		_, err := resty.R().Get(url)
@@ -241,7 +292,7 @@ func WaitTillTrivyDBDownloadStarted(rootDir string) {
 }

 // Adapted from https://gist.github.com/dopey/c69559607800d2f2f90b1b1ed4e550fb
-func randomString(n int) string {
+func RandomString(n int) string {
 	const letters = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-"

 	ret := make([]byte, n)
@@ -261,14 +312,14 @@ func randomString(n int) string {
 func GetRandomImageConfig() ([]byte, godigest.Digest) {
 	const maxLen = 16

-	randomAuthor := randomString(maxLen)
+	randomAuthor := RandomString(maxLen)

-	config := imagespec.Image{
-		Platform: imagespec.Platform{
+	config := ispec.Image{
+		Platform: ispec.Platform{
 			Architecture: "amd64",
 			OS:           "linux",
 		},
-		RootFS: imagespec.RootFS{
+		RootFS: ispec.RootFS{
 			Type:    "layers",
 			DiffIDs: []godigest.Digest{},
 		},
@@ -286,7 +337,7 @@ func GetRandomImageConfig() ([]byte, godigest.Digest) {
 }

 func GetEmptyImageConfig() ([]byte, godigest.Digest) {
-	config := imagespec.Image{}
+	config := ispec.Image{}

 	configBlobContent, err := json.MarshalIndent(&config, "", "\t")
 	if err != nil {
@@ -299,12 +350,12 @@ func GetEmptyImageConfig() ([]byte, godigest.Digest) {
 }

 func GetImageConfig() ([]byte, godigest.Digest) {
-	config := imagespec.Image{
-		Platform: imagespec.Platform{
+	config := ispec.Image{
+		Platform: ispec.Platform{
 			Architecture: "amd64",
 			OS:           "linux",
 		},
-		RootFS: imagespec.RootFS{
+		RootFS: ispec.RootFS{
 			Type:    "layers",
 			DiffIDs: []godigest.Digest{},
 		},
@@ -355,7 +406,7 @@ func GetOciLayoutDigests(imagePath string) (godigest.Digest, godigest.Digest, go
 			panic(err)
 		}

-		var manifest imagespec.Manifest
+		var manifest ispec.Manifest

 		err = json.Unmarshal(manifestBuf, &manifest)
 		if err != nil {
@@ -372,13 +423,13 @@ func GetOciLayoutDigests(imagePath string) (godigest.Digest, godigest.Digest, go
 	return manifestDigest, configDigest, layerDigest
 }

-func GetImageComponents(layerSize int) (imagespec.Image, [][]byte, imagespec.Manifest, error) {
-	config := imagespec.Image{
-		Platform: imagespec.Platform{
+func GetImageComponents(layerSize int) (ispec.Image, [][]byte, ispec.Manifest, error) {
+	config := ispec.Image{
+		Platform: ispec.Platform{
 			Architecture: "amd64",
 			OS:           "linux",
 		},
-		RootFS: imagespec.RootFS{
+		RootFS: ispec.RootFS{
 			Type:    "layers",
 			DiffIDs: []godigest.Digest{},
 		},
@@ -387,7 +438,7 @@ func GetImageComponents(layerSize int) (imagespec.Image, [][]byte, imagespec.Man

 	configBlob, err := json.Marshal(config)
 	if err = Error(err); err != nil {
-		return imagespec.Image{}, [][]byte{}, imagespec.Manifest{}, err
+		return ispec.Image{}, [][]byte{}, ispec.Manifest{}, err
 	}

 	configDigest := godigest.FromBytes(configBlob)
@@ -398,16 +449,16 @@ func GetImageComponents(layerSize int) (imagespec.Image, [][]byte, imagespec.Man

 	schemaVersion := 2

-	manifest := imagespec.Manifest{
+	manifest := ispec.Manifest{
 		Versioned: specs.Versioned{
 			SchemaVersion: schemaVersion,
 		},
-		Config: imagespec.Descriptor{
+		Config: ispec.Descriptor{
 			MediaType: "application/vnd.oci.image.config.v1+json",
 			Digest:    configDigest,
 			Size:      int64(len(configBlob)),
 		},
-		Layers: []imagespec.Descriptor{
+		Layers: []ispec.Descriptor{
 			{
 				MediaType: "application/vnd.oci.image.layer.v1.tar",
 				Digest:    godigest.FromBytes(layers[0]),
@@ -419,6 +470,118 @@ func GetImageComponents(layerSize int) (imagespec.Image, [][]byte, imagespec.Man
 	return config, layers, manifest, nil
 }

+func GetRandomImageComponents(layerSize int) (ispec.Image, [][]byte, ispec.Manifest, error) {
+	config := ispec.Image{
+		Platform: ispec.Platform{
+			Architecture: "amd64",
+			OS:           "linux",
+		},
+		RootFS: ispec.RootFS{
+			Type:    "layers",
+			DiffIDs: []godigest.Digest{},
+		},
+		Author: "ZotUser",
+	}
+
+	configBlob, err := json.Marshal(config)
+	if err = Error(err); err != nil {
+		return ispec.Image{}, [][]byte{}, ispec.Manifest{}, err
+	}
+
+	configDigest := godigest.FromBytes(configBlob)
+
+	layer := make([]byte, layerSize)
+
+	_, err = rand.Read(layer)
+	if err != nil {
+		return ispec.Image{}, [][]byte{}, ispec.Manifest{}, err
+	}
+
+	layers := [][]byte{
+		layer,
+	}
+
+	schemaVersion := 2
+
+	manifest := ispec.Manifest{
+		Versioned: specs.Versioned{
+			SchemaVersion: schemaVersion,
+		},
+		Config: ispec.Descriptor{
+			MediaType: "application/vnd.oci.image.config.v1+json",
+			Digest:    configDigest,
+			Size:      int64(len(configBlob)),
+		},
+		Layers: []ispec.Descriptor{
+			{
+				MediaType: "application/vnd.oci.image.layer.v1.tar",
+				Digest:    godigest.FromBytes(layers[0]),
+				Size:      int64(len(layers[0])),
+			},
+		},
+	}
+
+	return config, layers, manifest, nil
+}
+
+func GetImageWithConfig(conf ispec.Image) (ispec.Image, [][]byte, ispec.Manifest, error) {
+	configBlob, err := json.Marshal(conf)
+	if err = Error(err); err != nil {
+		return ispec.Image{}, [][]byte{}, ispec.Manifest{}, err
+	}
+
+	configDigest := godigest.FromBytes(configBlob)
+
+	layerSize := 100
+	layer := make([]byte, layerSize)
+
+	_, err = rand.Read(layer)
+	if err != nil {
+		return ispec.Image{}, [][]byte{}, ispec.Manifest{}, err
+	}
+
+	layers := [][]byte{
+		layer,
+	}
+
+	schemaVersion := 2
+
+	manifest := ispec.Manifest{
+		Versioned: specs.Versioned{
+			SchemaVersion: schemaVersion,
+		},
+		Config: ispec.Descriptor{
+			MediaType: "application/vnd.oci.image.config.v1+json",
+			Digest:    configDigest,
+			Size:      int64(len(configBlob)),
+		},
+		Layers: []ispec.Descriptor{
+			{
+				MediaType: "application/vnd.oci.image.layer.v1.tar",
+				Digest:    godigest.FromBytes(layers[0]),
+				Size:      int64(len(layers[0])),
+			},
+		},
+	}
+
+	return conf, layers, manifest, nil
+}
+
+func GetCosignSignatureTagForManifest(manifest ispec.Manifest) (string, error) {
+	manifestBlob, err := json.Marshal(manifest)
+	if err != nil {
+		return "", err
+	}
+
+	manifestDigest := godigest.FromBytes(manifestBlob)
+
+	return GetCosignSignatureTagForDigest(manifestDigest), nil
+}
+
+func GetCosignSignatureTagForDigest(manifestDigest godigest.Digest) string {
+	return manifestDigest.Algorithm().String() + "-" + manifestDigest.Encoded() + ".sig"
+}
+
 func UploadImage(img Image, baseURL, repo string) error {
 	for _, blob := range img.Layers {
 		resp, err := resty.R().Post(baseURL + "/v2/" + repo + "/blobs/uploads/")
@@ -463,7 +626,7 @@ func UploadImage(img Image, baseURL, repo string) error {
 		return err
 	}

-	if ErrStatusCode(resp.StatusCode()) != http.StatusAccepted && ErrStatusCode(resp.StatusCode()) == -1 {
+	if ErrStatusCode(resp.StatusCode()) != http.StatusAccepted || ErrStatusCode(resp.StatusCode()) == -1 {
 		return ErrPostBlob
 	}

@@ -480,7 +643,7 @@ func UploadImage(img Image, baseURL, repo string) error {
 		return err
 	}

-	if ErrStatusCode(resp.StatusCode()) != http.StatusCreated && ErrStatusCode(resp.StatusCode()) == -1 {
+	if ErrStatusCode(resp.StatusCode()) != http.StatusCreated || ErrStatusCode(resp.StatusCode()) == -1 {
 		return ErrPostBlob
 	}

@@ -498,7 +661,7 @@ func UploadImage(img Image, baseURL, repo string) error {
 	return err
 }

-func UploadArtifact(baseURL, repo string, artifactManifest *imagespec.Artifact) error {
+func UploadArtifact(baseURL, repo string, artifactManifest *ispec.Artifact) error {
 	// put manifest
 	artifactManifestBlob, err := json.Marshal(artifactManifest)
 	if err != nil {
@@ -508,7 +671,7 @@ func UploadArtifact(baseURL, repo string, artifactManifest *imagespec.Artifact)
 	artifactManifestDigest := godigest.FromBytes(artifactManifestBlob)

 	_, err = resty.R().
-		SetHeader("Content-type", imagespec.MediaTypeArtifactManifest).
+		SetHeader("Content-type", ispec.MediaTypeArtifactManifest).
 		SetBody(artifactManifestBlob).
 		Put(baseURL + "/v2/" + repo + "/manifests/" + artifactManifestDigest.String())

@@ -567,3 +730,164 @@ func ReadLogFileAndSearchString(logPath string, stringToMatch string, timeout ti
 		}
 	}
 }
+
+func UploadImageWithBasicAuth(img Image, baseURL, repo, user, password string) error {
+	for _, blob := range img.Layers {
+		resp, err := resty.R().
+			SetBasicAuth(user, password).
+			Post(baseURL + "/v2/" + repo + "/blobs/uploads/")
+		if err != nil {
+			return err
+		}
+
+		if resp.StatusCode() != http.StatusAccepted {
+			return ErrPostBlob
+		}
+
+		loc := resp.Header().Get("Location")
+
+		digest := godigest.FromBytes(blob).String()
+
+		resp, err = resty.R().
+			SetBasicAuth(user, password).
+			SetHeader("Content-Length", fmt.Sprintf("%d", len(blob))).
+			SetHeader("Content-Type", "application/octet-stream").
+			SetQueryParam("digest", digest).
+			SetBody(blob).
+			Put(baseURL + loc)
+
+		if err != nil {
+			return err
+		}
+
+		if resp.StatusCode() != http.StatusCreated {
+			return ErrPutBlob
+		}
+	}
+	// upload config
+	cblob, err := json.Marshal(img.Config)
+	if err = Error(err); err != nil {
+		return err
+	}
+
+	cdigest := godigest.FromBytes(cblob)
+
+	resp, err := resty.R().
+		SetBasicAuth(user, password).
+		Post(baseURL + "/v2/" + repo + "/blobs/uploads/")
+	if err = Error(err); err != nil {
+		return err
+	}
+
+	if ErrStatusCode(resp.StatusCode()) != http.StatusAccepted || ErrStatusCode(resp.StatusCode()) == -1 {
+		return ErrPostBlob
+	}
+
+	loc := Location(baseURL, resp)
+
+	// uploading blob should get 201
+	resp, err = resty.R().
+		SetBasicAuth(user, password).
+		SetHeader("Content-Length", fmt.Sprintf("%d", len(cblob))).
+		SetHeader("Content-Type", "application/octet-stream").
+		SetQueryParam("digest", cdigest.String()).
+		SetBody(cblob).
+		Put(loc)
+	if err = Error(err); err != nil {
+		return err
+	}
+
+	if ErrStatusCode(resp.StatusCode()) != http.StatusCreated || ErrStatusCode(resp.StatusCode()) == -1 {
+		return ErrPostBlob
+	}
+
+	// put manifest
+	manifestBlob, err := json.Marshal(img.Manifest)
+	if err = Error(err); err != nil {
+		return err
+	}
+
+	_, err = resty.R().
+		SetBasicAuth(user, password).
+		SetHeader("Content-type", "application/vnd.oci.image.manifest.v1+json").
+		SetBody(manifestBlob).
+		Put(baseURL + "/v2/" + repo + "/manifests/" + img.Tag)
+
+	return err
+}
+
+func SignImageUsingCosign(repoTag, port string) error {
+	cwd, err := os.Getwd()
+	if err != nil {
+		return err
+	}
+
+	defer func() { _ = os.Chdir(cwd) }()
+
+	tdir, err := os.MkdirTemp("", "cosign")
+	if err != nil {
+		return err
+	}
+
+	defer os.RemoveAll(tdir)
+
+	_ = os.Chdir(tdir)
+
+	// generate a keypair
+	os.Setenv("COSIGN_PASSWORD", "")
+
+	err = generate.GenerateKeyPairCmd(context.TODO(), "", nil)
+	if err != nil {
+		return err
+	}
+
+	imageURL := fmt.Sprintf("localhost:%s/%s", port, repoTag)
+
+	// sign the image
+	return sign.SignCmd(&options.RootOptions{Verbose: true, Timeout: 1 * time.Minute},
+		options.KeyOpts{KeyRef: path.Join(tdir, "cosign.key"), PassFunc: generate.GetPass},
+		options.RegistryOptions{AllowInsecure: true},
+		map[string]interface{}{"tag": "1.0"},
+		[]string{imageURL},
+		"", "", true, "", "", "", false, false, "", true)
+}
+
+func SignImageUsingNotary(repoTag, port string) error {
+	cwd, err := os.Getwd()
+	if err != nil {
+		return err
+	}
+
+	defer func() { _ = os.Chdir(cwd) }()
+
+	tdir, err := os.MkdirTemp("", "notation")
+	if err != nil {
+		return err
+	}
+
+	defer os.RemoveAll(tdir)
+
+	_ = os.Chdir(tdir)
+
+	_, err = exec.LookPath("notation")
+	if err != nil {
+		return err
+	}
+
+	os.Setenv("XDG_CONFIG_HOME", tdir)
+
+	// generate a keypair
+	cmd := exec.Command("notation", "cert", "generate-test", "--trust", "notation-sign-test")
+
+	err = cmd.Run()
+	if err != nil {
+		return err
+	}
+
+	// sign the image
+	image := fmt.Sprintf("localhost:%s/%s", port, repoTag)
+
+	cmd = exec.Command("notation", "sign", "--key", "notation-sign-test", "--plain-http", image)
+
+	return cmd.Run()
+}
@@ -6,6 +6,7 @@ package test_test
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"os"
 	"path"
 	"testing"
@@ -14,6 +15,7 @@ import (
 	godigest "github.com/opencontainers/go-digest"
 	ispec "github.com/opencontainers/image-spec/specs-go/v1"
 	. "github.com/smartystreets/goconvey/convey"
+	"golang.org/x/crypto/bcrypt"

 	"zotregistry.io/zot/pkg/api"
 	"zotregistry.io/zot/pkg/api/config"
@@ -387,6 +389,78 @@ func TestUploadImage(t *testing.T) {
 		So(err, ShouldBeNil)
 	})

+	Convey("Upload image with authentification", t, func() {
+		tempDir := t.TempDir()
+		conf := config.New()
+		port := test.GetFreePort()
+		baseURL := test.GetBaseURL(port)
+
+		user1 := "test"
+		password1 := "test"
+		testString1 := getCredString(user1, password1)
+		htpasswdPath := test.MakeHtpasswdFileFromString(testString1)
+		defer os.Remove(htpasswdPath)
+		conf.HTTP.Auth = &config.AuthConfig{
+			HTPasswd: config.AuthHTPasswd{
+				Path: htpasswdPath,
+			},
+		}
+
+		conf.HTTP.Port = port
+
+		conf.AccessControl = &config.AccessControlConfig{
+			Repositories: config.Repositories{
+				"repo": config.PolicyGroup{
+					Policies: []config.Policy{
+						{
+							Users:   []string{user1},
+							Actions: []string{"read", "create"},
+						},
+					},
+					DefaultPolicy: []string{},
+				},
+				"inaccessibleRepo": config.PolicyGroup{
+					Policies: []config.Policy{
+						{
+							Users:   []string{user1},
+							Actions: []string{"create"},
+						},
+					},
+					DefaultPolicy: []string{},
+				},
+			},
+			AdminPolicy: config.Policy{
+				Users:   []string{},
+				Actions: []string{},
+			},
+		}
+
+		ctlr := api.NewController(conf)
+
+		ctlr.Config.Storage.RootDirectory = tempDir
+
+		go startServer(ctlr)
+		defer stopServer(ctlr)
+		test.WaitTillServerReady(baseURL)
+
+		Convey("Request fail while pushing layer", func() {
+			err := test.UploadImageWithBasicAuth(test.Image{Layers: [][]byte{{1, 2, 3}}}, "badURL", "", "", "")
+			So(err, ShouldNotBeNil)
+		})
+		Convey("Request status is not StatusOk while pushing layer", func() {
+			err := test.UploadImageWithBasicAuth(test.Image{Layers: [][]byte{{1, 2, 3}}}, baseURL, "repo", "", "")
+			So(err, ShouldNotBeNil)
+		})
+		Convey("Request fail while pushing config", func() {
+			err := test.UploadImageWithBasicAuth(test.Image{}, "badURL", "", "", "")
+			So(err, ShouldNotBeNil)
+		})
+		Convey("Request status is not StatusOk while pushing config", func() {
+			err := test.UploadImageWithBasicAuth(test.Image{}, baseURL, "repo", "", "")
+			So(err, ShouldNotBeNil)
+		})
+	})
+
 	Convey("Blob upload wrong response status code", t, func() {
 		port := test.GetFreePort()
 		baseURL := test.GetBaseURL(port)
@@ -481,6 +555,17 @@ func TestUploadImage(t *testing.T) {
 	})
 }

+func getCredString(username, password string) string {
+	hash, err := bcrypt.GenerateFromPassword([]byte(password), 10)
+	if err != nil {
+		panic(err)
+	}
+
+	usernameAndHash := fmt.Sprintf("%s:%s", username, string(hash))
+
+	return usernameAndHash
+}
+
 func TestInjectUploadImage(t *testing.T) {
 	Convey("Inject failures for unreachable lines", t, func() {
 		port := test.GetFreePort()
@@ -566,6 +651,81 @@ func TestReadLogFileAndSearchString(t *testing.T) {
 	})
 }

+func TestInjectUploadImageWithBasicAuth(t *testing.T) {
+	Convey("Inject failures for unreachable lines", t, func() {
+		port := test.GetFreePort()
+		baseURL := test.GetBaseURL(port)
+
+		tempDir := t.TempDir()
+		conf := config.New()
+		conf.HTTP.Port = port
+		conf.Storage.RootDirectory = tempDir
+
+		user := "user"
+		password := "password"
+		testString := getCredString(user, password)
+		htpasswdPath := test.MakeHtpasswdFileFromString(testString)
+		defer os.Remove(htpasswdPath)
+		conf.HTTP.Auth = &config.AuthConfig{
+			HTPasswd: config.AuthHTPasswd{
+				Path: htpasswdPath,
+			},
+		}
+
+		ctlr := api.NewController(conf)
+		go startServer(ctlr)
+		defer stopServer(ctlr)
+
+		test.WaitTillServerReady(baseURL)
+
+		layerBlob := []byte("test")
+		layerPath := path.Join(tempDir, "test", ".uploads")
+
+		if _, err := os.Stat(layerPath); os.IsNotExist(err) {
+			err = os.MkdirAll(layerPath, 0o700)
+			if err != nil {
+				t.Fatal(err)
+			}
+		}
+
+		img := test.Image{
+			Layers: [][]byte{
+				layerBlob,
+			}, // invalid format that will result in an error
+			Config: ispec.Image{},
+		}
+
+		Convey("first marshal", func() {
+			injected := test.InjectFailure(0)
+			if injected {
+				err := test.UploadImageWithBasicAuth(img, baseURL, "test", "user", "password")
+				So(err, ShouldNotBeNil)
+			}
+		})
+		Convey("CreateBlobUpload POST call", func() {
+			injected := test.InjectFailure(1)
+			if injected {
+				err := test.UploadImageWithBasicAuth(img, baseURL, "test", "user", "password")
+				So(err, ShouldNotBeNil)
+			}
+		})
+		Convey("UpdateBlobUpload PUT call", func() {
+			injected := test.InjectFailure(3)
+			if injected {
+				err := test.UploadImageWithBasicAuth(img, baseURL, "test", "user", "password")
+				So(err, ShouldNotBeNil)
+			}
+		})
+		Convey("second marshal", func() {
+			injected := test.InjectFailure(5)
+			if injected {
+				err := test.UploadImageWithBasicAuth(img, baseURL, "test", "user", "password")
+				So(err, ShouldNotBeNil)
+			}
+		})
+	})
+}
+
 func startServer(c *api.Controller) {
 	// this blocks
 	ctx := context.Background()
@@ -14,7 +14,6 @@ type OciLayoutUtilsMock struct {
 	GetImageInfoFn              func(repo string, digest godigest.Digest) (ispec.Image, error)
 	GetImageTagsWithTimestampFn func(repo string) ([]common.TagInfo, error)
 	GetImagePlatformFn          func(imageInfo ispec.Image) (string, string)
-	GetImageVendorFn            func(imageInfo ispec.Image) string
 	GetImageManifestSizeFn      func(repo string, manifestDigest godigest.Digest) int64
 	GetImageConfigSizeFn        func(repo string, manifestDigest godigest.Digest) int64
 	GetRepoLastUpdatedFn        func(repo string) (common.TagInfo, error)
@@ -81,14 +80,6 @@ func (olum OciLayoutUtilsMock) GetImagePlatform(imageInfo ispec.Image) (string,
 	return "", ""
 }

-func (olum OciLayoutUtilsMock) GetImageVendor(imageInfo ispec.Image) string {
-	if olum.GetImageVendorFn != nil {
-		return olum.GetImageVendorFn(imageInfo)
-	}
-
-	return ""
-}
-
 func (olum OciLayoutUtilsMock) GetImageManifestSize(repo string, manifestDigest godigest.Digest) int64 {
 	if olum.GetImageManifestSizeFn != nil {
 		return olum.GetImageManifestSizeFn(repo, manifestDigest)
@@ -0,0 +1,263 @@
+package mocks
+
+import (
+	"context"
+
+	godigest "github.com/opencontainers/go-digest"
+
+	"zotregistry.io/zot/pkg/meta/repodb"
+)
+
+type RepoDBMock struct {
+	SetRepoDescriptionFn func(repo, description string) error
+
+	IncrementRepoStarsFn func(repo string) error
+
+	DecrementRepoStarsFn func(repo string) error
+
+	GetRepoStarsFn func(repo string) (int, error)
+
+	SetRepoLogoFn func(repo string, logoPath string) error
+
+	SetRepoTagFn func(repo string, tag string, manifestDigest godigest.Digest, mediaType string) error
+
+	DeleteRepoTagFn func(repo string, tag string) error
+
+	GetRepoMetaFn func(repo string) (repodb.RepoMetadata, error)
+
+	GetMultipleRepoMetaFn func(ctx context.Context, filter func(repoMeta repodb.RepoMetadata) bool,
+		requestedPage repodb.PageInput) ([]repodb.RepoMetadata, error)
+
+	GetManifestDataFn func(manifestDigest godigest.Digest) (repodb.ManifestData, error)
+
+	SetManifestDataFn func(manifestDigest godigest.Digest, mm repodb.ManifestData) error
+
+	GetManifestMetaFn func(repo string, manifestDigest godigest.Digest) (repodb.ManifestMetadata, error)
+
+	SetManifestMetaFn func(repo string, manifestDigest godigest.Digest, mm repodb.ManifestMetadata) error
+
+	IncrementImageDownloadsFn func(repo string, reference string) error
+
+	AddManifestSignatureFn func(repo string, signedManifestDigest godigest.Digest, sm repodb.SignatureMetadata) error
+
+	DeleteSignatureFn func(repo string, signedManifestDigest godigest.Digest, sm repodb.SignatureMetadata) error
+
+	SearchReposFn func(ctx context.Context, searchText string, filter repodb.Filter, requestedPage repodb.PageInput) (
+		[]repodb.RepoMetadata, map[string]repodb.ManifestMetadata, error)
+
+	SearchTagsFn func(ctx context.Context, searchText string, filter repodb.Filter, requestedPage repodb.PageInput) (
+		[]repodb.RepoMetadata, map[string]repodb.ManifestMetadata, error)
+
+	SearchDigestsFn func(ctx context.Context, searchText string, requestedPage repodb.PageInput) (
+		[]repodb.RepoMetadata, map[string]repodb.ManifestMetadata, error)
+
+	SearchLayersFn func(ctx context.Context, searchText string, requestedPage repodb.PageInput) (
+		[]repodb.RepoMetadata, map[string]repodb.ManifestMetadata, error)
+
+	SearchForAscendantImagesFn func(ctx context.Context, searchText string, requestedPage repodb.PageInput) (
+		[]repodb.RepoMetadata, map[string]repodb.ManifestMetadata, error)
+
+	SearchForDescendantImagesFn func(ctx context.Context, searchText string, requestedPage repodb.PageInput) (
+		[]repodb.RepoMetadata, map[string]repodb.ManifestMetadata, error)
+
+	PatchDBFn func() error
+}
+
+func (sdm RepoDBMock) SetRepoDescription(repo, description string) error {
+	if sdm.SetRepoDescriptionFn != nil {
+		return sdm.SetRepoDescriptionFn(repo, description)
+	}
+
+	return nil
+}
+
+func (sdm RepoDBMock) IncrementRepoStars(repo string) error {
+	if sdm.IncrementRepoStarsFn != nil {
+		return sdm.IncrementRepoStarsFn(repo)
+	}
+
+	return nil
+}
+
+func (sdm RepoDBMock) DecrementRepoStars(repo string) error {
+	if sdm.DecrementRepoStarsFn != nil {
+		return sdm.DecrementRepoStarsFn(repo)
+	}
+
+	return nil
+}
+
+func (sdm RepoDBMock) GetRepoStars(repo string) (int, error) {
+	if sdm.GetRepoStarsFn != nil {
+		return sdm.GetRepoStarsFn(repo)
+	}
+
+	return 0, nil
+}
+
+func (sdm RepoDBMock) SetRepoLogo(repo string, logoPath string) error {
+	if sdm.SetRepoLogoFn != nil {
+		return sdm.SetRepoLogoFn(repo, logoPath)
+	}
+
+	return nil
+}
+
+func (sdm RepoDBMock) SetRepoTag(repo string, tag string, manifestDigest godigest.Digest, mediaType string) error {
+	if sdm.SetRepoTagFn != nil {
+		return sdm.SetRepoTagFn(repo, tag, manifestDigest, mediaType)
+	}
+
+	return nil
+}
+
+func (sdm RepoDBMock) DeleteRepoTag(repo string, tag string) error {
+	if sdm.DeleteRepoTagFn != nil {
+		return sdm.DeleteRepoTagFn(repo, tag)
+	}
+
+	return nil
+}
+
+func (sdm RepoDBMock) GetRepoMeta(repo string) (repodb.RepoMetadata, error) {
+	if sdm.GetRepoMetaFn != nil {
+		return sdm.GetRepoMetaFn(repo)
+	}
+
+	return repodb.RepoMetadata{}, nil
+}
+
+func (sdm RepoDBMock) GetMultipleRepoMeta(ctx context.Context, filter func(repoMeta repodb.RepoMetadata) bool,
+	requestedPage repodb.PageInput,
+) ([]repodb.RepoMetadata, error) {
+	if sdm.GetMultipleRepoMetaFn != nil {
+		return sdm.GetMultipleRepoMetaFn(ctx, filter, requestedPage)
+	}
+
+	return []repodb.RepoMetadata{}, nil
+}
+
+func (sdm RepoDBMock) GetManifestData(manifestDigest godigest.Digest) (repodb.ManifestData, error) {
+	if sdm.GetManifestDataFn != nil {
+		return sdm.GetManifestData(manifestDigest)
+	}
+
+	return repodb.ManifestData{}, nil
+}
+
+func (sdm RepoDBMock) SetManifestData(manifestDigest godigest.Digest, md repodb.ManifestData) error {
+	if sdm.SetManifestDataFn != nil {
+		return sdm.SetManifestData(manifestDigest, md)
+	}
+
+	return nil
+}
+
+func (sdm RepoDBMock) GetManifestMeta(repo string, manifestDigest godigest.Digest) (repodb.ManifestMetadata, error) {
+	if sdm.GetManifestMetaFn != nil {
+		return sdm.GetManifestMetaFn(repo, manifestDigest)
+	}
+
+	return repodb.ManifestMetadata{}, nil
+}
+
+func (sdm RepoDBMock) SetManifestMeta(repo string, manifestDigest godigest.Digest, mm repodb.ManifestMetadata) error {
+	if sdm.SetManifestMetaFn != nil {
+		return sdm.SetManifestMetaFn(repo, manifestDigest, mm)
+	}
+
+	return nil
+}
+
+func (sdm RepoDBMock) IncrementImageDownloads(repo string, reference string) error {
+	if sdm.IncrementImageDownloadsFn != nil {
+		return sdm.IncrementImageDownloadsFn(repo, reference)
+	}
+
+	return nil
+}
+
+func (sdm RepoDBMock) AddManifestSignature(repo string, signedManifestDigest godigest.Digest,
+	sm repodb.SignatureMetadata,
+) error {
+	if sdm.AddManifestSignatureFn != nil {
+		return sdm.AddManifestSignatureFn(repo, signedManifestDigest, sm)
+	}
+
+	return nil
+}
+
+func (sdm RepoDBMock) DeleteSignature(repo string, signedManifestDigest godigest.Digest,
+	sm repodb.SignatureMetadata,
+) error {
+	if sdm.DeleteSignatureFn != nil {
+		return sdm.DeleteSignatureFn(repo, signedManifestDigest, sm)
+	}
+
+	return nil
+}
+
+func (sdm RepoDBMock) SearchRepos(ctx context.Context, searchText string, filter repodb.Filter,
+	requestedPage repodb.PageInput,
+) ([]repodb.RepoMetadata, map[string]repodb.ManifestMetadata, error) {
+	if sdm.SearchReposFn != nil {
+		return sdm.SearchReposFn(ctx, searchText, filter, requestedPage)
+	}
+
+	return []repodb.RepoMetadata{}, map[string]repodb.ManifestMetadata{}, nil
+}
+
+func (sdm RepoDBMock) SearchTags(ctx context.Context, searchText string, filter repodb.Filter,
+	requestedPage repodb.PageInput,
+) ([]repodb.RepoMetadata, map[string]repodb.ManifestMetadata, error) {
+	if sdm.SearchTagsFn != nil {
+		return sdm.SearchTagsFn(ctx, searchText, filter, requestedPage)
+	}
+
+	return []repodb.RepoMetadata{}, map[string]repodb.ManifestMetadata{}, nil
+}
+
+func (sdm RepoDBMock) SearchDigests(ctx context.Context, searchText string, requestedPage repodb.PageInput,
+) ([]repodb.RepoMetadata, map[string]repodb.ManifestMetadata, error) {
+	if sdm.SearchDigestsFn != nil {
+		return sdm.SearchDigestsFn(ctx, searchText, requestedPage)
+	}
+
+	return []repodb.RepoMetadata{}, map[string]repodb.ManifestMetadata{}, nil
+}
+
+func (sdm RepoDBMock) SearchLayers(ctx context.Context, searchText string, requestedPage repodb.PageInput,
+) ([]repodb.RepoMetadata, map[string]repodb.ManifestMetadata, error) {
+	if sdm.SearchLayersFn != nil {
+		return sdm.SearchLayersFn(ctx, searchText, requestedPage)
+	}
+
+	return []repodb.RepoMetadata{}, map[string]repodb.ManifestMetadata{}, nil
+}
+
+func (sdm RepoDBMock) SearchForAscendantImages(ctx context.Context, searchText string, requestedPage repodb.PageInput,
+) ([]repodb.RepoMetadata, map[string]repodb.ManifestMetadata, error) {
+	if sdm.SearchForAscendantImagesFn != nil {
+		return sdm.SearchForAscendantImagesFn(ctx, searchText, requestedPage)
+	}
+
+	return []repodb.RepoMetadata{}, map[string]repodb.ManifestMetadata{}, nil
+}
+
+func (sdm RepoDBMock) SearchForDescendantImages(ctx context.Context, searchText string,
+	requestedPage repodb.PageInput,
+) ([]repodb.RepoMetadata, map[string]repodb.ManifestMetadata, error) {
+	if sdm.SearchForDescendantImagesFn != nil {
+		return sdm.SearchForDescendantImagesFn(ctx, searchText, requestedPage)
+	}
+
+	return []repodb.RepoMetadata{}, map[string]repodb.ManifestMetadata{}, nil
+}
+
+func (sdm RepoDBMock) PatchDB() error {
+	if sdm.PatchDBFn != nil {
+		return sdm.PatchDBFn()
+	}
+
+	return nil
+}