Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-01-25 17:11:24 +01:00
Code Issues Projects Releases Wiki Activity

Filter the pulling manifest request from replication service

Browse Source 
Filter the pulling manifest request from replication service so that the audit log will not record the pulling action

Signed-off-by: Wenkai Yin <yinw@vmware.com>
This commit is contained in:
Wenkai Yin 2020-03-17 16:32:11 +08:00
parent ced78d0afc
commit e8935dd804
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pkg/registry/client.go
View File

@ -55,6 +55,11 @@ var (
} }
) )
// const definition
const (
UserAgent = "harbor-registry-client"
)
// Client defines the methods that a registry client should implements // Client defines the methods that a registry client should implements
type Client interface { type Client interface {
// Ping the base API endpoint "/v2/" // Ping the base API endpoint "/v2/"
@ -503,6 +508,7 @@ func (c *client) do(req *http.Request) (*http.Response, error) {
return nil, err return nil, err
} }
} }
req.Header.Set(http.CanonicalHeaderKey("User-Agent"), UserAgent)
resp, err := c.client.Do(req) resp, err := c.client.Do(req)
if err != nil { if err != nil {
return nil, err return nil, err

27
src/server/registry/manifest.go
View File

@ -22,6 +22,7 @@ import (
"github.com/goharbor/harbor/src/internal" "github.com/goharbor/harbor/src/internal"
ierror "github.com/goharbor/harbor/src/internal/error" ierror "github.com/goharbor/harbor/src/internal/error"
"github.com/goharbor/harbor/src/pkg/notification" "github.com/goharbor/harbor/src/pkg/notification"
"github.com/goharbor/harbor/src/pkg/registry"
serror "github.com/goharbor/harbor/src/server/error" serror "github.com/goharbor/harbor/src/server/error"
"github.com/goharbor/harbor/src/server/router" "github.com/goharbor/harbor/src/server/router"
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"
@ -48,20 +49,20 @@ func getManifest(w http.ResponseWriter, req *http.Request) {
recorder := internal.NewResponseRecorder(w) recorder := internal.NewResponseRecorder(w)
proxy.ServeHTTP(recorder, req) proxy.ServeHTTP(recorder, req)
// fire event // fire event, ignore the HEAD request and pulling request from replication service
if recorder.Success() { if !recorder.Success() || req.Method == http.MethodHead ||
// TODO don't fire event for the pulling from replication req.UserAgent() == registry.UserAgent {
e := &metadata.PullArtifactEventMetadata{ return
Ctx: req.Context(),
Artifact: &artifact.Artifact,
}
// TODO provide a util function to determine whether the reference is tag or not
// the reference is tag
if _, err = digest.Parse(reference); err != nil {
e.Tag = reference
}
notification.AddEvent(req.Context(), e)
} }
e := &metadata.PullArtifactEventMetadata{
Ctx: req.Context(),
Artifact: &artifact.Artifact,
}
// the reference is tag
if _, err = digest.Parse(reference); err != nil {
e.Tag = reference
}
notification.AddEvent(req.Context(), e)
} }
// just delete the artifact from database // just delete the artifact from database