Merge pull request #12792 from ywk253100/200814_proxy_cache

Return 403 when trying to push artifacts into the proxy cache project…
This commit is contained in:
stonezdj(Daojun Zhang) 2020-08-18 16:22:51 +08:00 committed by GitHub
commit f7e1d186e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions

View File

@ -184,7 +184,7 @@ func DisableBlobAndManifestUploadMiddleware() func(http.Handler) http.Handler {
}
if isProxyProject(p) && !isProxySession(ctx) {
httpLib.SendError(w,
errors.MethodNotAllowedError(
errors.DeniedError(
errors.Errorf("can not push artifact to a proxy project: %v", p.Name)))
return
}

View File

@ -77,6 +77,7 @@ func RegisterRoutes() {
root.NewRoute().
Method(http.MethodPost).
Path("/*/blobs/uploads").
Middleware(repoproxy.DisableBlobAndManifestUploadMiddleware()).
Middleware(quota.PostInitiateBlobUploadMiddleware()).
Middleware(blob.PostInitiateBlobUploadMiddleware()).
Handler(proxy)
@ -84,13 +85,11 @@ func RegisterRoutes() {
root.NewRoute().
Method(http.MethodPatch).
Path("/*/blobs/uploads/:session_id").
Middleware(repoproxy.DisableBlobAndManifestUploadMiddleware()).
Middleware(blob.PatchBlobUploadMiddleware()).
Handler(proxy)
root.NewRoute().
Method(http.MethodPut).
Path("/*/blobs/uploads/:session_id").
Middleware(repoproxy.DisableBlobAndManifestUploadMiddleware()).
Middleware(quota.PutBlobUploadMiddleware()).
Middleware(blob.PutBlobUploadMiddleware()).
Handler(proxy)