Просмотр исходного кода

Add endpoint for not implemented Docker auth (#28457) (#28462)

Backport #28457 by @KN4CK3R

Recently Docker started to use the optional `POST /v2/token` endpoint
which should respond with a `404 Not Found` status code instead of the
current `405 Method Not Allowed`.

> Note: Not all token servers implement oauth2. If the request to the
endpoint returns 404 using the HTTP POST method, refer to Token
Documentation for using the HTTP GET method supported by all token
servers.

Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
tags/v1.21.3
Giteabot 6 месяцев назад
Родитель
Сommit
74ab798033
Аккаунт пользователя с таким Email не найден
2 измененных файлов: 15 добавлений и 1 удалений
  1. 4
    1
      routers/api/packages/api.go
  2. 11
    0
      routers/api/packages/container/container.go

+ 4
- 1
routers/api/packages/api.go Просмотреть файл

@@ -603,7 +603,10 @@ func ContainerRoutes() *web.Route {
})

r.Get("", container.ReqContainerAccess, container.DetermineSupport)
r.Get("/token", container.Authenticate)
r.Group("/token", func() {
r.Get("", container.Authenticate)
r.Post("", container.AuthenticateNotImplemented)
})
r.Get("/_catalog", container.ReqContainerAccess, container.GetRepositoryList)
r.Group("/{username}", func() {
r.Group("/{image}", func() {

+ 11
- 0
routers/api/packages/container/container.go Просмотреть файл

@@ -156,6 +156,17 @@ func Authenticate(ctx *context.Context) {
})
}

// https://distribution.github.io/distribution/spec/auth/oauth/
func AuthenticateNotImplemented(ctx *context.Context) {
// This optional endpoint can be used to authenticate a client.
// It must implement the specification described in:
// https://datatracker.ietf.org/doc/html/rfc6749
// https://distribution.github.io/distribution/spec/auth/oauth/
// Purpose of this stub is to respond with 404 Not Found instead of 405 Method Not Allowed.

ctx.Status(http.StatusNotFound)
}

// https://docs.docker.com/registry/spec/api/#listing-repositories
func GetRepositoryList(ctx *context.Context) {
n := ctx.FormInt("n")

Загрузка…
Отмена
Сохранить