working commit
This commit is contained in:
+70
-89
@@ -90,8 +90,7 @@ type PutManifestResult struct {
|
||||
Location string
|
||||
}
|
||||
|
||||
// TODO: control size 413 Payload Too Large
|
||||
|
||||
// TODO: lock for the name-reference or simular?
|
||||
func (oper *Operator) PutManifest(ctx context.Context, params *PutManifestParams) (*PutManifestResult, int, error) {
|
||||
var err error
|
||||
res := &PutManifestResult{}
|
||||
@@ -128,6 +127,7 @@ func (oper *Operator) PutManifest(ctx context.Context, params *PutManifestParams
|
||||
if err != nil {
|
||||
return res, http.StatusInternalServerError, err
|
||||
}
|
||||
|
||||
incomingManifestBytes := buffer.Bytes()
|
||||
if int64(len(incomingManifestBytes)) != contentLength {
|
||||
err = fmt.Errorf("Mismatch Content-Length and received manifest size: %d vs %d",
|
||||
@@ -136,7 +136,12 @@ func (oper *Operator) PutManifest(ctx context.Context, params *PutManifestParams
|
||||
return res, code, err
|
||||
}
|
||||
|
||||
oper.logg.Debugf("Manifest data: [%s]", string(incomingManifestBytes))
|
||||
if len(incomingManifestBytes) > (4 * 1024 * 1024) {
|
||||
err = fmt.Errorf("Payload more 4M: %d bytes", len(incomingManifestBytes))
|
||||
code := http.StatusRequestEntityTooLarge
|
||||
return res, code, err
|
||||
}
|
||||
//oper.logg.Debugf("Manifest data: [%s]", string(incomingManifestBytes))
|
||||
|
||||
incomingManifest, err := auxoci.ParseOCIManifest(incomingManifestBytes)
|
||||
if err != nil {
|
||||
@@ -147,100 +152,76 @@ func (oper *Operator) PutManifest(ctx context.Context, params *PutManifestParams
|
||||
incomingManifest.MediaType = params.ContentType
|
||||
}
|
||||
|
||||
manifestExists, _, err := oper.mdb.GetManifestByReference(ctx, params.Name, params.Reference)
|
||||
manifestExists, existengManifestDescr, err := oper.mdb.GetManifestByReference(ctx, params.Name, params.Reference)
|
||||
if err != nil {
|
||||
return res, http.StatusInternalServerError, err
|
||||
}
|
||||
if !manifestExists {
|
||||
name := params.Name
|
||||
reference := params.Reference
|
||||
manifestDescr, layerDescrs, err := descrsFromManifest(name, reference, incomingManifest, incomingManifestBytes)
|
||||
// Check layers
|
||||
var blobError error
|
||||
for _, layer := range layerDescrs {
|
||||
layerExists, _, err := oper.store.BlobFileExists(layer.Digest)
|
||||
if err != nil {
|
||||
return res, http.StatusInternalServerError, err
|
||||
}
|
||||
if !layerExists {
|
||||
err := fmt.Errorf("Layer %s not found", layer.Digest)
|
||||
blobError = errors.Join(blobError, err)
|
||||
}
|
||||
}
|
||||
if blobError != nil {
|
||||
return res, http.StatusInternalServerError, blobError
|
||||
}
|
||||
// Store manifest and layesrs data
|
||||
err = oper.mdb.InsertManifestWithLayers(ctx, &manifestDescr, layerDescrs)
|
||||
|
||||
name := params.Name
|
||||
reference := params.Reference
|
||||
|
||||
incomingManifestDescr, incomingLayerDescrs, err := descrsFromManifest(name, reference, incomingManifest, incomingManifestBytes)
|
||||
// Always check layer files for availability
|
||||
var blobError error
|
||||
for _, layer := range incomingLayerDescrs {
|
||||
layerExists, _, err := oper.store.BlobExists(layer.Digest)
|
||||
if err != nil {
|
||||
return res, http.StatusInternalServerError, err
|
||||
}
|
||||
if !layerExists {
|
||||
err := fmt.Errorf("Layer %s not found.", layer.Digest)
|
||||
blobError = errors.Join(blobError, err)
|
||||
}
|
||||
}
|
||||
if blobError != nil {
|
||||
return res, http.StatusInternalServerError, blobError
|
||||
}
|
||||
if !manifestExists {
|
||||
// Store manifest and layesrs data
|
||||
err = oper.mdb.InsertManifestWithLayers(ctx, &incomingManifestDescr, incomingLayerDescrs)
|
||||
if err != nil {
|
||||
return res, http.StatusInternalServerError, err
|
||||
}
|
||||
} else {
|
||||
/* TODO: only update descr
|
||||
if bytes.Equal(existingManifestBytes, incomingManifestBytes) {
|
||||
return res, http.StatusCreated, err
|
||||
}
|
||||
*/
|
||||
|
||||
/*
|
||||
exists, existingManifestDescr, err := lg.mdb.GetManifestByReference(params.Name, params.Reference)
|
||||
if err != nil {
|
||||
return res, http.StatusInternalServerError, err
|
||||
}
|
||||
|
||||
if exists {
|
||||
existingManifestBytes := []byte(existingManifestDescr.Payload)
|
||||
// Exist if incoming and existing manyfest is equal
|
||||
if bytes.Equal(existingManifestBytes, incomingManifestBytes) {
|
||||
return res, http.StatusCreated, err
|
||||
}
|
||||
name := params.Name
|
||||
reference := params.Reference
|
||||
manifestDescr, newBlobDescrs, delBlobDescrs, err := blobsDiff(name, reference, existingManifestBytes, incomingManifestBytes)
|
||||
if err != nil {
|
||||
return res, http.StatusInternalServerError, err
|
||||
}
|
||||
err = lg.maindb.UpdateManifest(ctx, &manifestDescr, newBlobDescrs, delBlobDescrs)
|
||||
if err != nil {
|
||||
return res, http.StatusInternalServerError, err
|
||||
}
|
||||
// Clean blobs
|
||||
for _, blob := range delBlobDescrs {
|
||||
exists, _, err = lg.st.BlobFileExists(blob.Digest)
|
||||
if err != nil {
|
||||
return res, http.StatusInternalServerError, err
|
||||
}
|
||||
blobUsage, err := lg.maindb.GetBlobUsage(blob.Digest)
|
||||
if err != nil {
|
||||
return res, http.StatusInternalServerError, err
|
||||
}
|
||||
if exists && blobUsage == 0 {
|
||||
lg.log.Debugf("Delete file %s:%s blob %s", params.Name, params.Reference, blob.Digest)
|
||||
err = lg.st.DeleteBlobFile(blob.Digest)
|
||||
if err != nil {
|
||||
return res, http.StatusInternalServerError, err
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
name := params.Name
|
||||
reference := params.Reference
|
||||
manifestDescr, configDescr, layerDescrs, err := descrsFromManifestBytes(name, reference, incomingManifestBytes)
|
||||
// Check layer blobs
|
||||
var blobError error
|
||||
for _, layer := range layerDescrs {
|
||||
exists, _, err = lg.st.BlobFileExists(layer.Digest)
|
||||
if !exists {
|
||||
err := fmt.Errorf("Blob %s not exists", layer.Digest)
|
||||
blobError = errors.Join(blobError, err)
|
||||
}
|
||||
}
|
||||
if blobError != nil {
|
||||
return res, http.StatusInternalServerError, blobError
|
||||
}
|
||||
// Store manifest and blobs data
|
||||
err = lg.maindb.InsertManifest(ctx, &manifestDescr, &configDescr, layerDescrs)
|
||||
if err != nil {
|
||||
return res, http.StatusInternalServerError, err
|
||||
}
|
||||
}
|
||||
|
||||
*/
|
||||
existingManifestBytes := []byte(existengManifestDescr.Payload)
|
||||
existingManifest, err := auxoci.ParseOCIManifest(existingManifestBytes)
|
||||
if err != nil {
|
||||
return res, http.StatusInternalServerError, err
|
||||
}
|
||||
addedBlobDescrs, uselessBlobDescrs, err := layersDiff(name, reference,
|
||||
existingManifest, incomingManifest, incomingManifestBytes)
|
||||
if err != nil {
|
||||
return res, http.StatusInternalServerError, err
|
||||
}
|
||||
// Starting manifest and blobs transaction
|
||||
err = oper.mdb.UpdateManifestWithBlobs(ctx, &incomingManifestDescr, addedBlobDescrs, uselessBlobDescrs)
|
||||
if err != nil {
|
||||
return res, http.StatusInternalServerError, err
|
||||
}
|
||||
for _, blob := range uselessBlobDescrs {
|
||||
exists, _, err := oper.store.BlobExists(blob.Digest)
|
||||
if err != nil {
|
||||
return res, http.StatusInternalServerError, err
|
||||
}
|
||||
blobUsage, err := oper.mdb.GetBlobUsage(ctx, blob.Digest)
|
||||
if err != nil {
|
||||
return res, http.StatusInternalServerError, err
|
||||
}
|
||||
if exists && blobUsage == 0 {
|
||||
oper.logg.Debugf("Delete file %s:%s blob %s", name, reference, blob.Digest)
|
||||
err = oper.store.DeleteBlob(blob.Digest)
|
||||
if err != nil {
|
||||
return res, http.StatusInternalServerError, err
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
res.Location = fmt.Sprintf(`/v2/%s/manifests/%s`, params.Name, params.Reference)
|
||||
return res, http.StatusCreated, err
|
||||
|
||||
Reference in New Issue
Block a user