mirror of
https://github.com/goharbor/harbor
synced 2025-04-20 16:28:56 +00:00
Add disable push for proxy project
Add middleware for blob and manifest push operation Signed-off-by: stonezdj <stonezdj@gmail.com>
This commit is contained in:
parent
f187509a90
commit
b9c861f3f1
|
@ -17,6 +17,8 @@ package repoproxy
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"github.com/goharbor/harbor/src/common/secret"
|
||||||
|
"github.com/goharbor/harbor/src/common/security"
|
||||||
"github.com/goharbor/harbor/src/lib/errors"
|
"github.com/goharbor/harbor/src/lib/errors"
|
||||||
httpLib "github.com/goharbor/harbor/src/lib/http"
|
httpLib "github.com/goharbor/harbor/src/lib/http"
|
||||||
"github.com/goharbor/harbor/src/replication/model"
|
"github.com/goharbor/harbor/src/replication/model"
|
||||||
|
@ -136,3 +138,45 @@ func setHeaders(w http.ResponseWriter, size int64, mediaType string, dig string)
|
||||||
h.Set("Docker-Content-Digest", dig)
|
h.Set("Docker-Content-Digest", dig)
|
||||||
h.Set("Etag", dig)
|
h.Set("Etag", dig)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// isProxyProject check the project is a proxy project
|
||||||
|
func isProxyProject(p *models.Project) bool {
|
||||||
|
if p == nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return p.RegistryID > 0
|
||||||
|
}
|
||||||
|
|
||||||
|
// isProxySession check if current security context is proxy session
|
||||||
|
func isProxySession(ctx context.Context) bool {
|
||||||
|
sc, ok := security.FromContext(ctx)
|
||||||
|
if !ok {
|
||||||
|
log.Error("Failed to get security context")
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if sc.IsSolutionUser() && sc.GetUsername() == secret.ProxyserviceUser {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
// DisableBlobAndManifestUploadMiddleware disable push artifact to a proxy project with a non-proxy session
|
||||||
|
func DisableBlobAndManifestUploadMiddleware() func(http.Handler) http.Handler {
|
||||||
|
return middleware.New(func(w http.ResponseWriter, r *http.Request, next http.Handler) {
|
||||||
|
ctx := r.Context()
|
||||||
|
art := lib.GetArtifactInfo(ctx)
|
||||||
|
p, err := project.Ctl.GetByName(ctx, art.ProjectName)
|
||||||
|
if err != nil {
|
||||||
|
httpLib.SendError(w, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if isProxyProject(p) && !isProxySession(ctx) {
|
||||||
|
httpLib.SendError(w,
|
||||||
|
errors.MethodNotAllowedError(
|
||||||
|
errors.Errorf("can not push artifact to a proxy project: %v", p.Name)))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
next.ServeHTTP(w, r)
|
||||||
|
return
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
90
src/server/middleware/repoproxy/proxy_test.go
Normal file
90
src/server/middleware/repoproxy/proxy_test.go
Normal file
|
@ -0,0 +1,90 @@
|
||||||
|
// Copyright Project Harbor Authors
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
|
package repoproxy
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"github.com/goharbor/harbor/src/common/models"
|
||||||
|
"github.com/goharbor/harbor/src/common/security"
|
||||||
|
securitySecret "github.com/goharbor/harbor/src/common/security/secret"
|
||||||
|
"github.com/goharbor/harbor/src/core/config"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestIsProxyProject(t *testing.T) {
|
||||||
|
cases := []struct {
|
||||||
|
name string
|
||||||
|
in *models.Project
|
||||||
|
want bool
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: `no proxy`,
|
||||||
|
in: &models.Project{RegistryID: 0},
|
||||||
|
want: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: `normal proxy`,
|
||||||
|
in: &models.Project{RegistryID: 1},
|
||||||
|
want: true,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range cases {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
|
||||||
|
got := isProxyProject(tt.in)
|
||||||
|
|
||||||
|
if got != tt.want {
|
||||||
|
t.Errorf(`(%v) = %v; want "%v"`, tt.in, got, tt.want)
|
||||||
|
}
|
||||||
|
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestIsProxySession(t *testing.T) {
|
||||||
|
config.Init()
|
||||||
|
sc1 := securitySecret.NewSecurityContext("123456789", config.SecretStore)
|
||||||
|
otherCtx := security.NewContext(context.Background(), sc1)
|
||||||
|
|
||||||
|
sc2 := securitySecret.NewSecurityContext(config.ProxyServiceSecret, config.SecretStore)
|
||||||
|
proxyCtx := security.NewContext(context.Background(), sc2)
|
||||||
|
cases := []struct {
|
||||||
|
name string
|
||||||
|
in context.Context
|
||||||
|
want bool
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: `normal`,
|
||||||
|
in: otherCtx,
|
||||||
|
want: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: `proxy user`,
|
||||||
|
in: proxyCtx,
|
||||||
|
want: true,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range cases {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
got := isProxySession(tt.in)
|
||||||
|
if got != tt.want {
|
||||||
|
t.Errorf(`(%v) = %v; want "%v"`, tt.in, got, tt.want)
|
||||||
|
}
|
||||||
|
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
|
@ -64,6 +64,7 @@ func RegisterRoutes() {
|
||||||
root.NewRoute().
|
root.NewRoute().
|
||||||
Method(http.MethodPut).
|
Method(http.MethodPut).
|
||||||
Path("/*/manifests/:reference").
|
Path("/*/manifests/:reference").
|
||||||
|
Middleware(repoproxy.DisableBlobAndManifestUploadMiddleware()).
|
||||||
Middleware(immutable.Middleware()).
|
Middleware(immutable.Middleware()).
|
||||||
Middleware(quota.PutManifestMiddleware()).
|
Middleware(quota.PutManifestMiddleware()).
|
||||||
Middleware(blob.PutManifestMiddleware()).
|
Middleware(blob.PutManifestMiddleware()).
|
||||||
|
@ -85,11 +86,13 @@ func RegisterRoutes() {
|
||||||
root.NewRoute().
|
root.NewRoute().
|
||||||
Method(http.MethodPatch).
|
Method(http.MethodPatch).
|
||||||
Path("/*/blobs/uploads/:session_id").
|
Path("/*/blobs/uploads/:session_id").
|
||||||
|
Middleware(repoproxy.DisableBlobAndManifestUploadMiddleware()).
|
||||||
Middleware(blob.PatchBlobUploadMiddleware()).
|
Middleware(blob.PatchBlobUploadMiddleware()).
|
||||||
Handler(proxy)
|
Handler(proxy)
|
||||||
root.NewRoute().
|
root.NewRoute().
|
||||||
Method(http.MethodPut).
|
Method(http.MethodPut).
|
||||||
Path("/*/blobs/uploads/:session_id").
|
Path("/*/blobs/uploads/:session_id").
|
||||||
|
Middleware(repoproxy.DisableBlobAndManifestUploadMiddleware()).
|
||||||
Middleware(quota.PutBlobUploadMiddleware()).
|
Middleware(quota.PutBlobUploadMiddleware()).
|
||||||
Middleware(blob.PutBlobUploadMiddleware()).
|
Middleware(blob.PutBlobUploadMiddleware()).
|
||||||
Handler(proxy)
|
Handler(proxy)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user