X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/83974ae9df4060f7aaa6bba61997404a2a7405b2..60b6f4e619f1a22405e831eda2186d61f7f1ea48:/lib/controller/federation/conn.go diff --git a/lib/controller/federation/conn.go b/lib/controller/federation/conn.go index 89f68a5ef1..949cc56dd2 100644 --- a/lib/controller/federation/conn.go +++ b/lib/controller/federation/conn.go @@ -14,6 +14,7 @@ import ( "net/url" "regexp" "strings" + "sync" "time" "git.arvados.org/arvados.git/lib/config" @@ -23,16 +24,18 @@ import ( "git.arvados.org/arvados.git/sdk/go/auth" "git.arvados.org/arvados.git/sdk/go/ctxlog" "git.arvados.org/arvados.git/sdk/go/health" + "github.com/jmoiron/sqlx" ) type Conn struct { + bgCtx context.Context cluster *arvados.Cluster local backend remotes map[string]backend } -func New(cluster *arvados.Cluster, healthFuncs *map[string]health.Func) *Conn { - local := localdb.NewConn(cluster) +func New(bgCtx context.Context, cluster *arvados.Cluster, healthFuncs *map[string]health.Func, getdb func(context.Context) (*sqlx.DB, error)) *Conn { + local := localdb.NewConn(bgCtx, cluster, getdb) remotes := map[string]backend{} for id, remote := range cluster.RemoteClusters { if !remote.Proxy || id == cluster.ClusterID { @@ -51,6 +54,7 @@ func New(cluster *arvados.Cluster, healthFuncs *map[string]health.Func) *Conn { } return &Conn{ + bgCtx: bgCtx, cluster: cluster, local: local, remotes: remotes, @@ -175,20 +179,29 @@ func (conn *Conn) tryLocalThenRemotes(ctx context.Context, forwardedFor string, errchan <- fn(ctx, remoteID, be) }() } - all404 := true + returncode := http.StatusNotFound var errs []error for i := 0; i < cap(errchan); i++ { err := <-errchan if err == nil { return nil } - all404 = all404 && errStatus(err) == http.StatusNotFound errs = append(errs, err) + if code := errStatus(err); code >= 500 || code == http.StatusTooManyRequests { + // If any of the remotes have a retryable + // error (and none succeed) we'll return 502. + returncode = http.StatusBadGateway + } else if code != http.StatusNotFound && returncode != http.StatusBadGateway { + // If some of the remotes have non-retryable + // non-404 errors (and none succeed or have + // retryable errors) we'll return 422. + returncode = http.StatusUnprocessableEntity + } } - if all404 { + if returncode == http.StatusNotFound { return notFoundError{} } - return httpErrorf(http.StatusBadGateway, "errors: %v", errs) + return httpErrorf(returncode, "errors: %v", errs) } func (conn *Conn) CollectionCreate(ctx context.Context, options arvados.CreateOptions) (arvados.Collection, error) { @@ -212,7 +225,11 @@ func (conn *Conn) ConfigGet(ctx context.Context) (json.RawMessage, error) { } func (conn *Conn) VocabularyGet(ctx context.Context) (arvados.Vocabulary, error) { - return conn.chooseBackend(conn.cluster.ClusterID).VocabularyGet(ctx) + return conn.local.VocabularyGet(ctx) +} + +func (conn *Conn) DiscoveryDocument(ctx context.Context) (arvados.DiscoveryDocument, error) { + return conn.local.DiscoveryDocument(ctx) } func (conn *Conn) Login(ctx context.Context, options arvados.LoginOptions) (arvados.LoginResponse, error) { @@ -241,30 +258,71 @@ func (conn *Conn) Login(ctx context.Context, options arvados.LoginOptions) (arva return conn.local.Login(ctx, options) } +var v2TokenRegexp = regexp.MustCompile(`^v2/[a-z0-9]{5}-gj3su-[a-z0-9]{15}/`) + func (conn *Conn) Logout(ctx context.Context, options arvados.LogoutOptions) (arvados.LogoutResponse, error) { - // If the logout request comes with an API token from a known - // remote cluster, redirect to that cluster's logout handler - // so it has an opportunity to clear sessions, expire tokens, - // etc. Otherwise use the local endpoint. - reqauth, ok := auth.FromContext(ctx) - if !ok || len(reqauth.Tokens) == 0 || len(reqauth.Tokens[0]) < 8 || !strings.HasPrefix(reqauth.Tokens[0], "v2/") { - return conn.local.Logout(ctx, options) - } - id := reqauth.Tokens[0][3:8] - if id == conn.cluster.ClusterID { - return conn.local.Logout(ctx, options) - } - remote, ok := conn.remotes[id] - if !ok { - return conn.local.Logout(ctx, options) + // If the token was issued by another cluster, we want to issue a logout + // request to the issuing instance to invalidate the token federation-wide. + // If this federation has a login cluster, that's always considered the + // issuing cluster. + // Otherwise, if this is a v2 token, use the UUID to find the issuing + // cluster. + // Note that remoteBE may still be conn.local even *after* one of these + // conditions is true. + var remoteBE backend = conn.local + if conn.cluster.Login.LoginCluster != "" { + remoteBE = conn.chooseBackend(conn.cluster.Login.LoginCluster) + } else { + reqauth, ok := auth.FromContext(ctx) + if ok && len(reqauth.Tokens) > 0 && v2TokenRegexp.MatchString(reqauth.Tokens[0]) { + remoteBE = conn.chooseBackend(reqauth.Tokens[0][3:8]) + } } - baseURL := remote.BaseURL() - target, err := baseURL.Parse(arvados.EndpointLogout.Path) - if err != nil { - return arvados.LogoutResponse{}, fmt.Errorf("internal error getting redirect target: %s", err) + + // We always want to invalidate the token locally. Start that process. + var localResponse arvados.LogoutResponse + var localErr error + wg := sync.WaitGroup{} + wg.Add(1) + go func() { + localResponse, localErr = conn.local.Logout(ctx, options) + wg.Done() + }() + + // If the token was issued by another cluster, log out there too. + if remoteBE != conn.local { + response, err := remoteBE.Logout(ctx, options) + // If the issuing cluster returns a redirect or error, that's more + // important to return to the user than anything that happens locally. + if response.RedirectLocation != "" || err != nil { + return response, err + } } - target.RawQuery = url.Values{"return_to": {options.ReturnTo}}.Encode() - return arvados.LogoutResponse{RedirectLocation: target.String()}, nil + + // Either the local cluster is the issuing cluster, or the issuing cluster's + // response was uninteresting. + wg.Wait() + return localResponse, localErr +} + +func (conn *Conn) AuthorizedKeyCreate(ctx context.Context, options arvados.CreateOptions) (arvados.AuthorizedKey, error) { + return conn.chooseBackend(options.ClusterID).AuthorizedKeyCreate(ctx, options) +} + +func (conn *Conn) AuthorizedKeyUpdate(ctx context.Context, options arvados.UpdateOptions) (arvados.AuthorizedKey, error) { + return conn.chooseBackend(options.UUID).AuthorizedKeyUpdate(ctx, options) +} + +func (conn *Conn) AuthorizedKeyGet(ctx context.Context, options arvados.GetOptions) (arvados.AuthorizedKey, error) { + return conn.chooseBackend(options.UUID).AuthorizedKeyGet(ctx, options) +} + +func (conn *Conn) AuthorizedKeyList(ctx context.Context, options arvados.ListOptions) (arvados.AuthorizedKeyList, error) { + return conn.generated_AuthorizedKeyList(ctx, options) +} + +func (conn *Conn) AuthorizedKeyDelete(ctx context.Context, options arvados.DeleteOptions) (arvados.AuthorizedKey, error) { + return conn.chooseBackend(options.UUID).AuthorizedKeyDelete(ctx, options) } func (conn *Conn) CollectionGet(ctx context.Context, options arvados.GetOptions) (arvados.Collection, error) { @@ -362,6 +420,10 @@ func (conn *Conn) ContainerUpdate(ctx context.Context, options arvados.UpdateOpt return conn.chooseBackend(options.UUID).ContainerUpdate(ctx, options) } +func (conn *Conn) ContainerPriorityUpdate(ctx context.Context, options arvados.UpdateOptions) (arvados.Container, error) { + return conn.chooseBackend(options.UUID).ContainerPriorityUpdate(ctx, options) +} + func (conn *Conn) ContainerGet(ctx context.Context, options arvados.GetOptions) (arvados.Container, error) { return conn.chooseBackend(options.UUID).ContainerGet(ctx, options) } @@ -448,6 +510,14 @@ func (conn *Conn) ContainerRequestDelete(ctx context.Context, options arvados.De return conn.chooseBackend(options.UUID).ContainerRequestDelete(ctx, options) } +func (conn *Conn) ContainerRequestContainerStatus(ctx context.Context, options arvados.GetOptions) (arvados.ContainerStatus, error) { + return conn.chooseBackend(options.UUID).ContainerRequestContainerStatus(ctx, options) +} + +func (conn *Conn) ContainerRequestLog(ctx context.Context, options arvados.ContainerLogOptions) (http.Handler, error) { + return conn.chooseBackend(options.UUID).ContainerRequestLog(ctx, options) +} + func (conn *Conn) GroupCreate(ctx context.Context, options arvados.CreateOptions) (arvados.Group, error) { return conn.chooseBackend(options.ClusterID).GroupCreate(ctx, options) } @@ -515,6 +585,26 @@ func (conn *Conn) LinkDelete(ctx context.Context, options arvados.DeleteOptions) return conn.chooseBackend(options.UUID).LinkDelete(ctx, options) } +func (conn *Conn) LogCreate(ctx context.Context, options arvados.CreateOptions) (arvados.Log, error) { + return conn.chooseBackend(options.ClusterID).LogCreate(ctx, options) +} + +func (conn *Conn) LogUpdate(ctx context.Context, options arvados.UpdateOptions) (arvados.Log, error) { + return conn.chooseBackend(options.UUID).LogUpdate(ctx, options) +} + +func (conn *Conn) LogGet(ctx context.Context, options arvados.GetOptions) (arvados.Log, error) { + return conn.chooseBackend(options.UUID).LogGet(ctx, options) +} + +func (conn *Conn) LogList(ctx context.Context, options arvados.ListOptions) (arvados.LogList, error) { + return conn.generated_LogList(ctx, options) +} + +func (conn *Conn) LogDelete(ctx context.Context, options arvados.DeleteOptions) (arvados.Log, error) { + return conn.chooseBackend(options.UUID).LogDelete(ctx, options) +} + func (conn *Conn) SpecimenList(ctx context.Context, options arvados.ListOptions) (arvados.SpecimenList, error) { return conn.generated_SpecimenList(ctx, options) } @@ -545,6 +635,7 @@ var userAttrsCachedFromLoginCluster = map[string]bool{ "first_name": true, "is_active": true, "is_admin": true, + "is_invited": true, "last_name": true, "modified_at": true, "prefs": true, @@ -554,7 +645,6 @@ var userAttrsCachedFromLoginCluster = map[string]bool{ "etag": false, "full_name": false, "identity_url": false, - "is_invited": false, "modified_by_client_uuid": false, "modified_by_user_uuid": false, "owner_uuid": false, @@ -566,7 +656,8 @@ var userAttrsCachedFromLoginCluster = map[string]bool{ func (conn *Conn) batchUpdateUsers(ctx context.Context, options arvados.ListOptions, - items []arvados.User) (err error) { + items []arvados.User, + includeAdminAndInvited bool) (err error) { id := conn.cluster.Login.LoginCluster logger := ctxlog.FromContext(ctx) @@ -613,6 +704,11 @@ func (conn *Conn) batchUpdateUsers(ctx context.Context, } } } + if !includeAdminAndInvited { + // make sure we don't send these fields. + delete(updates, "is_admin") + delete(updates, "is_invited") + } batchOpts.Updates[user.UUID] = updates } if len(batchOpts.Updates) > 0 { @@ -625,13 +721,47 @@ func (conn *Conn) batchUpdateUsers(ctx context.Context, return nil } +func (conn *Conn) includeAdminAndInvitedInBatchUpdate(ctx context.Context, be backend, updateUserUUID string) (bool, error) { + // API versions prior to 20231117 would only include the + // is_invited and is_admin fields if the current user is an + // admin, or is requesting their own user record. If those + // fields aren't actually valid then we don't want to + // send them in the batch update. + dd, err := be.DiscoveryDocument(ctx) + if err != nil { + // couldn't get discovery document + return false, err + } + if dd.Revision >= "20231117" { + // newer version, fields are valid. + return true, nil + } + selfuser, err := be.UserGetCurrent(ctx, arvados.GetOptions{}) + if err != nil { + // couldn't get our user record + return false, err + } + if selfuser.IsAdmin || selfuser.UUID == updateUserUUID { + // we are an admin, or the current user is the same as + // the user that we are updating. + return true, nil + } + // Better safe than sorry. + return false, nil +} + func (conn *Conn) UserList(ctx context.Context, options arvados.ListOptions) (arvados.UserList, error) { if id := conn.cluster.Login.LoginCluster; id != "" && id != conn.cluster.ClusterID && !options.BypassFederation { - resp, err := conn.chooseBackend(id).UserList(ctx, options) + be := conn.chooseBackend(id) + resp, err := be.UserList(ctx, options) if err != nil { return resp, err } - err = conn.batchUpdateUsers(ctx, options, resp.Items) + includeAdminAndInvited, err := conn.includeAdminAndInvitedInBatchUpdate(ctx, be, "") + if err != nil { + return arvados.UserList{}, err + } + err = conn.batchUpdateUsers(ctx, options, resp.Items, includeAdminAndInvited) if err != nil { return arvados.UserList{}, err } @@ -648,13 +778,18 @@ func (conn *Conn) UserUpdate(ctx context.Context, options arvados.UpdateOptions) if options.BypassFederation { return conn.local.UserUpdate(ctx, options) } - resp, err := conn.chooseBackend(options.UUID).UserUpdate(ctx, options) + be := conn.chooseBackend(options.UUID) + resp, err := be.UserUpdate(ctx, options) if err != nil { return resp, err } if !strings.HasPrefix(options.UUID, conn.cluster.ClusterID) { + includeAdminAndInvited, err := conn.includeAdminAndInvitedInBatchUpdate(ctx, be, options.UUID) + if err != nil { + return arvados.User{}, err + } // Copy the updated user record to the local cluster - err = conn.batchUpdateUsers(ctx, arvados.ListOptions{}, []arvados.User{resp}) + err = conn.batchUpdateUsers(ctx, arvados.ListOptions{}, []arvados.User{resp}, includeAdminAndInvited) if err != nil { return arvados.User{}, err } @@ -701,7 +836,8 @@ func (conn *Conn) UserUnsetup(ctx context.Context, options arvados.GetOptions) ( } func (conn *Conn) UserGet(ctx context.Context, options arvados.GetOptions) (arvados.User, error) { - resp, err := conn.chooseBackend(options.UUID).UserGet(ctx, options) + be := conn.chooseBackend(options.UUID) + resp, err := be.UserGet(ctx, options) if err != nil { return resp, err } @@ -709,7 +845,11 @@ func (conn *Conn) UserGet(ctx context.Context, options arvados.GetOptions) (arva return arvados.User{}, httpErrorf(http.StatusBadGateway, "Had requested %v but response was for %v", options.UUID, resp.UUID) } if options.UUID[:5] != conn.cluster.ClusterID { - err = conn.batchUpdateUsers(ctx, arvados.ListOptions{Select: options.Select}, []arvados.User{resp}) + includeAdminAndInvited, err := conn.includeAdminAndInvitedInBatchUpdate(ctx, be, options.UUID) + if err != nil { + return arvados.User{}, err + } + err = conn.batchUpdateUsers(ctx, arvados.ListOptions{Select: options.Select}, []arvados.User{resp}, includeAdminAndInvited) if err != nil { return arvados.User{}, err }