16669: Accept OIDC access token in federated requests.

[arvados.git] / lib / controller / federation.go

diff --git a/lib/controller/federation.go b/lib/controller/federation.go
index cab5e4c4ca45172edb28f07210b001456f1e11af..419d8b01049b21d97ccebe6c5f9ec394208e1336 100644 (file)
--- a/lib/controller/federation.go
+++ b/lib/controller/federation.go
@@ -263,10 +263,10 @@ func (h *Handler) saltAuthToken(req *http.Request, remote string) (updatedReq *h
                return updatedReq, nil
        }
 
-       ctxlog.FromContext(req.Context()).Infof("saltAuthToken: cluster %s token %s remote %s", h.Cluster.ClusterID, creds.Tokens[0], remote)
+       ctxlog.FromContext(req.Context()).Debugf("saltAuthToken: cluster %s token %s remote %s", h.Cluster.ClusterID, creds.Tokens[0], remote)
        token, err := auth.SaltToken(creds.Tokens[0], remote)
 
-       if err == auth.ErrObsoleteToken {
+       if err == auth.ErrObsoleteToken || err == auth.ErrTokenFormat {
                // If the token exists in our own database for our own
                // user, salt it for the remote. Otherwise, assume it
                // was issued by the remote, and pass it through