2257ef7e0a
The server configuration already keeps the current version if the daemon. This patch changes the middleware logic to use it rather than using the global value. This removes the dockerversion package dependency from the api. Signed-off-by: David Calavera <david.calavera@gmail.com> Upstream-commit: accf28a7dbdd46203c661d30b80326df4d447cea Component: engine
41 lines
1.3 KiB
Go
41 lines
1.3 KiB
Go
package server
|
|
|
|
import (
|
|
"github.com/Sirupsen/logrus"
|
|
"github.com/docker/docker/api"
|
|
"github.com/docker/docker/api/server/httputils"
|
|
"github.com/docker/docker/api/server/middleware"
|
|
"github.com/docker/docker/pkg/authorization"
|
|
)
|
|
|
|
// handleWithGlobalMiddlwares wraps the handler function for a request with
|
|
// the server's global middlewares. The order of the middlewares is backwards,
|
|
// meaning that the first in the list will be evaluated last.
|
|
func (s *Server) handleWithGlobalMiddlewares(handler httputils.APIFunc) httputils.APIFunc {
|
|
next := handler
|
|
|
|
handleVersion := middleware.NewVersionMiddleware(s.cfg.Version, api.DefaultVersion, api.MinVersion)
|
|
next = handleVersion(next)
|
|
|
|
if s.cfg.EnableCors {
|
|
handleCORS := middleware.NewCORSMiddleware(s.cfg.CorsHeaders)
|
|
next = handleCORS(next)
|
|
}
|
|
|
|
handleUserAgent := middleware.NewUserAgentMiddleware(s.cfg.Version)
|
|
next = handleUserAgent(next)
|
|
|
|
// Only want this on debug level
|
|
if s.cfg.Logging && logrus.GetLevel() == logrus.DebugLevel {
|
|
next = middleware.DebugRequestMiddleware(next)
|
|
}
|
|
|
|
if len(s.cfg.AuthorizationPluginNames) > 0 {
|
|
s.authZPlugins = authorization.NewPlugins(s.cfg.AuthorizationPluginNames)
|
|
handleAuthorization := middleware.NewAuthorizationMiddleware(s.authZPlugins)
|
|
next = handleAuthorization(next)
|
|
}
|
|
|
|
return next
|
|
}
|