X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6e5b24e817a0972ab30c9065cfc6a726821e7b66..15661585c028bedf752603b37cab07746209c3cc:/lib/controller/router/router.go diff --git a/lib/controller/router/router.go b/lib/controller/router/router.go index 2944524344..e42d9a555b 100644 --- a/lib/controller/router/router.go +++ b/lib/controller/router/router.go @@ -7,6 +7,7 @@ package router import ( "context" "fmt" + "math" "net/http" "strings" @@ -20,24 +21,32 @@ import ( ) type router struct { - mux *mux.Router - backend arvados.API - wrapCalls func(api.RoutableFunc) api.RoutableFunc + mux *mux.Router + backend arvados.API + config Config +} + +type Config struct { + // Return an error if request body exceeds this size. 0 means + // unlimited. + MaxRequestSize int + + // If wrapCalls is not nil, it is called once for each API + // method, and the returned method is used in its place. This + // can be used to install hooks before and after each API call + // and alter responses; see localdb.WrapCallsInTransaction for + // an example. + WrapCalls func(api.RoutableFunc) api.RoutableFunc } // New returns a new router (which implements the http.Handler // interface) that serves requests by calling Arvados API methods on // the given backend. -// -// If wrapCalls is not nil, it is called once for each API method, and -// the returned method is used in its place. This can be used to -// install hooks before and after each API call and alter responses; -// see localdb.WrapCallsInTransaction for an example. -func New(backend arvados.API, wrapCalls func(api.RoutableFunc) api.RoutableFunc) *router { +func New(backend arvados.API, config Config) *router { rtr := &router{ - mux: mux.NewRouter(), - backend: backend, - wrapCalls: wrapCalls, + mux: mux.NewRouter(), + backend: backend, + config: config, } rtr.addRoutes() return rtr @@ -56,6 +65,13 @@ func (rtr *router) addRoutes() { return rtr.backend.ConfigGet(ctx) }, }, + { + arvados.EndpointVocabularyGet, + func() interface{} { return &struct{}{} }, + func(ctx context.Context, opts interface{}) (interface{}, error) { + return rtr.backend.VocabularyGet(ctx) + }, + }, { arvados.EndpointLogin, func() interface{} { return &arvados.LoginOptions{} }, @@ -168,6 +184,41 @@ func (rtr *router) addRoutes() { return rtr.backend.ContainerDelete(ctx, *opts.(*arvados.DeleteOptions)) }, }, + { + arvados.EndpointContainerRequestCreate, + func() interface{} { return &arvados.CreateOptions{} }, + func(ctx context.Context, opts interface{}) (interface{}, error) { + return rtr.backend.ContainerRequestCreate(ctx, *opts.(*arvados.CreateOptions)) + }, + }, + { + arvados.EndpointContainerRequestUpdate, + func() interface{} { return &arvados.UpdateOptions{} }, + func(ctx context.Context, opts interface{}) (interface{}, error) { + return rtr.backend.ContainerRequestUpdate(ctx, *opts.(*arvados.UpdateOptions)) + }, + }, + { + arvados.EndpointContainerRequestGet, + func() interface{} { return &arvados.GetOptions{} }, + func(ctx context.Context, opts interface{}) (interface{}, error) { + return rtr.backend.ContainerRequestGet(ctx, *opts.(*arvados.GetOptions)) + }, + }, + { + arvados.EndpointContainerRequestList, + func() interface{} { return &arvados.ListOptions{Limit: -1} }, + func(ctx context.Context, opts interface{}) (interface{}, error) { + return rtr.backend.ContainerRequestList(ctx, *opts.(*arvados.ListOptions)) + }, + }, + { + arvados.EndpointContainerRequestDelete, + func() interface{} { return &arvados.DeleteOptions{} }, + func(ctx context.Context, opts interface{}) (interface{}, error) { + return rtr.backend.ContainerRequestDelete(ctx, *opts.(*arvados.DeleteOptions)) + }, + }, { arvados.EndpointContainerLock, func() interface{} { @@ -186,6 +237,118 @@ func (rtr *router) addRoutes() { return rtr.backend.ContainerUnlock(ctx, *opts.(*arvados.GetOptions)) }, }, + { + arvados.EndpointContainerSSH, + func() interface{} { return &arvados.ContainerSSHOptions{} }, + func(ctx context.Context, opts interface{}) (interface{}, error) { + return rtr.backend.ContainerSSH(ctx, *opts.(*arvados.ContainerSSHOptions)) + }, + }, + { + arvados.EndpointGroupCreate, + func() interface{} { return &arvados.CreateOptions{} }, + func(ctx context.Context, opts interface{}) (interface{}, error) { + return rtr.backend.GroupCreate(ctx, *opts.(*arvados.CreateOptions)) + }, + }, + { + arvados.EndpointGroupUpdate, + func() interface{} { return &arvados.UpdateOptions{} }, + func(ctx context.Context, opts interface{}) (interface{}, error) { + return rtr.backend.GroupUpdate(ctx, *opts.(*arvados.UpdateOptions)) + }, + }, + { + arvados.EndpointGroupList, + func() interface{} { return &arvados.ListOptions{Limit: -1} }, + func(ctx context.Context, opts interface{}) (interface{}, error) { + return rtr.backend.GroupList(ctx, *opts.(*arvados.ListOptions)) + }, + }, + { + arvados.EndpointGroupContents, + func() interface{} { return &arvados.GroupContentsOptions{Limit: -1} }, + func(ctx context.Context, opts interface{}) (interface{}, error) { + return rtr.backend.GroupContents(ctx, *opts.(*arvados.GroupContentsOptions)) + }, + }, + { + arvados.EndpointGroupContentsUUIDInPath, + func() interface{} { return &arvados.GroupContentsOptions{Limit: -1} }, + func(ctx context.Context, opts interface{}) (interface{}, error) { + return rtr.backend.GroupContents(ctx, *opts.(*arvados.GroupContentsOptions)) + }, + }, + { + arvados.EndpointGroupShared, + func() interface{} { return &arvados.ListOptions{Limit: -1} }, + func(ctx context.Context, opts interface{}) (interface{}, error) { + return rtr.backend.GroupShared(ctx, *opts.(*arvados.ListOptions)) + }, + }, + { + arvados.EndpointGroupGet, + func() interface{} { return &arvados.GetOptions{} }, + func(ctx context.Context, opts interface{}) (interface{}, error) { + return rtr.backend.GroupGet(ctx, *opts.(*arvados.GetOptions)) + }, + }, + { + arvados.EndpointGroupDelete, + func() interface{} { return &arvados.DeleteOptions{} }, + func(ctx context.Context, opts interface{}) (interface{}, error) { + return rtr.backend.GroupDelete(ctx, *opts.(*arvados.DeleteOptions)) + }, + }, + { + arvados.EndpointGroupTrash, + func() interface{} { return &arvados.DeleteOptions{} }, + func(ctx context.Context, opts interface{}) (interface{}, error) { + return rtr.backend.GroupTrash(ctx, *opts.(*arvados.DeleteOptions)) + }, + }, + { + arvados.EndpointGroupUntrash, + func() interface{} { return &arvados.UntrashOptions{} }, + func(ctx context.Context, opts interface{}) (interface{}, error) { + return rtr.backend.GroupUntrash(ctx, *opts.(*arvados.UntrashOptions)) + }, + }, + { + arvados.EndpointLinkCreate, + func() interface{} { return &arvados.CreateOptions{} }, + func(ctx context.Context, opts interface{}) (interface{}, error) { + return rtr.backend.LinkCreate(ctx, *opts.(*arvados.CreateOptions)) + }, + }, + { + arvados.EndpointLinkUpdate, + func() interface{} { return &arvados.UpdateOptions{} }, + func(ctx context.Context, opts interface{}) (interface{}, error) { + return rtr.backend.LinkUpdate(ctx, *opts.(*arvados.UpdateOptions)) + }, + }, + { + arvados.EndpointLinkList, + func() interface{} { return &arvados.ListOptions{Limit: -1} }, + func(ctx context.Context, opts interface{}) (interface{}, error) { + return rtr.backend.LinkList(ctx, *opts.(*arvados.ListOptions)) + }, + }, + { + arvados.EndpointLinkGet, + func() interface{} { return &arvados.GetOptions{} }, + func(ctx context.Context, opts interface{}) (interface{}, error) { + return rtr.backend.LinkGet(ctx, *opts.(*arvados.GetOptions)) + }, + }, + { + arvados.EndpointLinkDelete, + func() interface{} { return &arvados.DeleteOptions{} }, + func(ctx context.Context, opts interface{}) (interface{}, error) { + return rtr.backend.LinkDelete(ctx, *opts.(*arvados.DeleteOptions)) + }, + }, { arvados.EndpointSpecimenCreate, func() interface{} { return &arvados.CreateOptions{} }, @@ -221,6 +384,48 @@ func (rtr *router) addRoutes() { return rtr.backend.SpecimenDelete(ctx, *opts.(*arvados.DeleteOptions)) }, }, + { + arvados.EndpointAPIClientAuthorizationCreate, + func() interface{} { return &arvados.CreateOptions{} }, + func(ctx context.Context, opts interface{}) (interface{}, error) { + return rtr.backend.APIClientAuthorizationCreate(ctx, *opts.(*arvados.CreateOptions)) + }, + }, + { + arvados.EndpointAPIClientAuthorizationUpdate, + func() interface{} { return &arvados.UpdateOptions{} }, + func(ctx context.Context, opts interface{}) (interface{}, error) { + return rtr.backend.APIClientAuthorizationUpdate(ctx, *opts.(*arvados.UpdateOptions)) + }, + }, + { + arvados.EndpointAPIClientAuthorizationDelete, + func() interface{} { return &arvados.DeleteOptions{} }, + func(ctx context.Context, opts interface{}) (interface{}, error) { + return rtr.backend.APIClientAuthorizationDelete(ctx, *opts.(*arvados.DeleteOptions)) + }, + }, + { + arvados.EndpointAPIClientAuthorizationList, + func() interface{} { return &arvados.ListOptions{} }, + func(ctx context.Context, opts interface{}) (interface{}, error) { + return rtr.backend.APIClientAuthorizationList(ctx, *opts.(*arvados.ListOptions)) + }, + }, + { + arvados.EndpointAPIClientAuthorizationCurrent, + func() interface{} { return &arvados.GetOptions{} }, + func(ctx context.Context, opts interface{}) (interface{}, error) { + return rtr.backend.APIClientAuthorizationCurrent(ctx, *opts.(*arvados.GetOptions)) + }, + }, + { + arvados.EndpointAPIClientAuthorizationGet, + func() interface{} { return &arvados.GetOptions{} }, + func(ctx context.Context, opts interface{}) (interface{}, error) { + return rtr.backend.APIClientAuthorizationGet(ctx, *opts.(*arvados.GetOptions)) + }, + }, { arvados.EndpointUserCreate, func() interface{} { return &arvados.CreateOptions{} }, @@ -277,13 +482,6 @@ func (rtr *router) addRoutes() { return rtr.backend.UserGet(ctx, *opts.(*arvados.GetOptions)) }, }, - { - arvados.EndpointUserUpdateUUID, - func() interface{} { return &arvados.UpdateUUIDOptions{} }, - func(ctx context.Context, opts interface{}) (interface{}, error) { - return rtr.backend.UserUpdateUUID(ctx, *opts.(*arvados.UpdateUUIDOptions)) - }, - }, { arvados.EndpointUserUpdate, func() interface{} { return &arvados.UpdateOptions{} }, @@ -321,8 +519,8 @@ func (rtr *router) addRoutes() { }, } { exec := route.exec - if rtr.wrapCalls != nil { - exec = rtr.wrapCalls(exec) + if rtr.config.WrapCalls != nil { + exec = rtr.config.WrapCalls(exec) } rtr.addRoute(route.endpoint, route.defaultOpts, exec) } @@ -390,6 +588,19 @@ func (rtr *router) addRoute(endpoint arvados.APIEndpoint, defaultOpts func() int "apiOptsType": fmt.Sprintf("%T", opts), "apiOpts": opts, }).Debug("exec") + // Extract the token UUIDs (or a placeholder for v1 tokens) + var tokenUUIDs []string + for _, t := range creds.Tokens { + if strings.HasPrefix(t, "v2/") { + tokenParts := strings.Split(t, "/") + if len(tokenParts) >= 3 { + tokenUUIDs = append(tokenUUIDs, tokenParts[1]) + } + } else { + tokenUUIDs = append(tokenUUIDs, "v1 token ending in "+t[len(t)-5:]) + } + } + httpserver.SetResponseLogFields(req.Context(), logrus.Fields{"tokenUUIDs": tokenUUIDs}) resp, err := exec(ctx, opts) if err != nil { logger.WithError(err).Debugf("returning error type %T", err) @@ -412,8 +623,26 @@ func (rtr *router) ServeHTTP(w http.ResponseWriter, r *http.Request) { if r.Method == "OPTIONS" { return } + if r.Body != nil { + // Wrap r.Body in a http.MaxBytesReader(), otherwise + // r.ParseForm() uses a default max request body size + // of 10 megabytes. Note we rely on the Nginx + // configuration to enforce the real max body size. + max := int64(rtr.config.MaxRequestSize) + if max < 1 { + max = math.MaxInt64 - 1 + } + r.Body = http.MaxBytesReader(w, r.Body, max) + } if r.Method == "POST" { - r.ParseForm() + err := r.ParseForm() + if err != nil { + if err.Error() == "http: request body too large" { + err = httpError(http.StatusRequestEntityTooLarge, err) + } + rtr.sendError(w, err) + return + } if m := r.FormValue("_method"); m != "" { r2 := *r r = &r2