Merge pull request #12768 from stonezdj/200813_bug12741

Use orm.Context instead request context in background go routing

src/controller/event/metadata/artifact.go

@@ -55,9 +55,9 @@ func (p *PushArtifactEventMetadata) Resolve(event *event.Event) error {
 
 // PullArtifactEventMetadata is the metadata from which the pull artifact event can be resolved
 type PullArtifactEventMetadata struct {
-	Ctx      context.Context
 	Artifact *artifact.Artifact
 	Tag      string
+	Operator string
 }
 
 // Resolve to the event from the metadata
@@ -74,10 +74,7 @@ func (p *PullArtifactEventMetadata) Resolve(event *event.Event) error {
 	data := &event2.PullArtifactEvent{
 		ArtifactEvent: ae,
 	}
-	ctx, exist := security.FromContext(p.Ctx)
+	data.Operator = p.Operator
-	if exist {
-		data.Operator = ctx.GetUsername()
-	}
 	event.Topic = event2.TopicPullArtifact
 	event.Data = data
 	return nil

src/controller/event/metadata/artifact_test.go

@@ -47,9 +47,9 @@ func (a *artifactEventTestSuite) TestResolveOfPushArtifactEventMetadata() {
 func (a *artifactEventTestSuite) TestResolveOfPullArtifactEventMetadata() {
 	e := &event.Event{}
 	metadata := &PullArtifactEventMetadata{
-		Ctx:      context.Background(),
 		Artifact: &artifact.Artifact{ID: 1},
 		Tag:      "latest",
+		Operator: "admin",
 	}
 	err := metadata.Resolve(e)
 	a.Require().Nil(err)

src/controller/proxy/controller.go

@@ -16,6 +16,8 @@ package proxy
 
 import (
 	"context"
+	"github.com/goharbor/harbor/src/common/security"
+	"github.com/goharbor/harbor/src/lib/orm"
 	"github.com/opencontainers/go-digest"
 	"io"
 	"strings"
@@ -120,9 +122,14 @@ func (c *controller) ProxyManifest(ctx context.Context, p *models.Project, art l
 	if err != nil {
 		return man, err
 	}
+	operator := ""
+	if secCtx, ok := security.FromContext(ctx); ok {
+		operator = secCtx.GetUsername()
+	}
 	// Push manifest in background
 	go func() {
-		a, err := c.local.GetManifest(ctx, art)
+		bCtx := orm.Context()
+		a, err := c.local.GetManifest(bCtx, art)
 		if err != nil {
 			log.Errorf("failed to get manifest, error %v", err)
 		}
@@ -140,7 +147,7 @@ func (c *controller) ProxyManifest(ctx context.Context, p *models.Project, art l
 			}
 		}
 		if a != nil {
-			SendPullEvent(ctx, a, art.Tag)
+			SendPullEvent(a, art.Tag, operator)
 		}
 	}()
 

src/controller/proxy/local.go

@@ -210,11 +210,11 @@ func (l *localHelper) CheckDependencies(ctx context.Context, repo string, man di
 }
 
 // SendPullEvent send a pull image event
-func SendPullEvent(ctx context.Context, a *artifact.Artifact, tag string) {
+func SendPullEvent(a *artifact.Artifact, tag, operator string) {
 	e := &metadata.PullArtifactEventMetadata{
-		Ctx:      ctx,
 		Artifact: &a.Artifact,
 		Tag:      tag,
+		Operator: operator,
 	}
 	event.BuildAndPublish(e)
 }

src/server/registry/manifest.go

@@ -15,6 +15,7 @@
 package registry
 
 import (
+	"github.com/goharbor/harbor/src/common/security"
 	"github.com/goharbor/harbor/src/controller/artifact"
 	"github.com/goharbor/harbor/src/controller/event/metadata"
 	"github.com/goharbor/harbor/src/controller/repository"
@@ -54,9 +55,13 @@ func getManifest(w http.ResponseWriter, req *http.Request) {
 		req.UserAgent() == registry.UserAgent {
 		return
 	}
+	operator := ""
+	if secCtx, exist := security.FromContext(req.Context()); exist {
+		operator = secCtx.GetUsername()
+	}
 	e := &metadata.PullArtifactEventMetadata{
-		Ctx:      req.Context(),
 		Artifact: &art.Artifact,
+		Operator: operator,
 	}
 	// the reference is tag
 	if _, err = digest.Parse(reference); err != nil {