Upstream
/
harbor
mirror of https://github.com/goharbor/harbor.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[Cherry-pick] fix retention/immutable API issue (#18158) (#18190) 

fix retention/immutable API issue (#18158)

Signed-off-by: Shengwen Yu <yshengwen@vmware.com>
This commit is contained in:
Shengwen YU 2023-02-08 15:38:56 +08:00 committed by GitHub
parent 7cdf8f696c
commit 3208b74279
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/server/v2.0/handler/immutable.go
View File

@ -77,6 +77,9 @@ func (ia *immutableAPI) DeleteImmuRule(ctx context.Context, params operation.Del
}
func (ia *immutableAPI) UpdateImmuRule(ctx context.Context, params operation.UpdateImmuRuleParams) middleware.Responder {
if params.ImmutableRuleID != params.ImmutableRule.ID {
return ia.SendError(ctx, errors.BadRequestError(fmt.Errorf("the immutable_rule_id doesn't match the id in the payload body of ImmutableRule")))
}
projectNameOrID := parseProjectNameOrID(params.ProjectNameOrID, params.XIsResourceName)
if err := ia.RequireProjectAccess(ctx, projectNameOrID, rbac.ActionUpdate, rbac.ResourceImmutableTag); err != nil {
return ia.SendError(ctx, err)

19
src/server/v2.0/handler/project.go
View File

@ -160,7 +160,7 @@ func (a *projectAPI) CreateProject(ctx context.Context, params operation.CreateP
req.Metadata.EnableContentTrust = nil
}
// validate the RegistryID and StorageLimit in the body of the request
// validate the RetentionID, RegistryID and StorageLimit in the body of the request
if err := a.validateProjectReq(ctx, req); err != nil {
return a.SendError(ctx, err)
}
@ -204,6 +204,7 @@ func (a *projectAPI) CreateProject(ctx context.Context, params operation.CreateP
RegistryID: lib.Int64Value(req.RegistryID),
}
lib.JSONCopy(&p.Metadata, req.Metadata)
delete(p.Metadata, "retention_id")
projectID, err := a.projectCtl.Create(ctx, p)
if err != nil {
@ -551,6 +552,18 @@ func (a *projectAPI) UpdateProject(ctx context.Context, params operation.UpdateP
}
lib.JSONCopy(&p.Metadata, params.Project.Metadata)
// validate retention_id
if ridParam, ok := p.Metadata["retention_id"]; ok {
md, err := a.metadataMgr.Get(ctx, p.ProjectID)
if err != nil {
return a.SendError(ctx, err)
}
if rid, ok := md["retention_id"]; !ok || rid != ridParam {
errMsg := "the retention_id in the request's payload when updating a project should be omitted, alternatively passing the one that has already been associated to this project"
return a.SendError(ctx, errors.BadRequestError(fmt.Errorf(errMsg)))
}
}
if err := a.projectCtl.Update(ctx, p); err != nil {
return a.SendError(ctx, err)
}
@ -671,6 +684,10 @@ func (a *projectAPI) getProject(ctx context.Context, projectNameOrID interface{}
}
func (a *projectAPI) validateProjectReq(ctx context.Context, req *models.ProjectReq) error {
if req.Metadata.RetentionID != nil && *req.Metadata.RetentionID != "" {
return errors.BadRequestError(fmt.Errorf("the retention_id in the request's payload when creating a project should be omitted, alternatively passing an empty string"))
}
if req.RegistryID != nil {
if *req.RegistryID <= 0 {
return errors.BadRequestError(fmt.Errorf("%d is invalid value of registry_id, it should be geater than 0", *req.RegistryID))