X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e4b9cffde1c932a0ca880d1542c62b4611142352..bbb7119496c003930c887f056353e8dfda152669:/lib/ctrlctx/auth_test.go diff --git a/lib/ctrlctx/auth_test.go b/lib/ctrlctx/auth_test.go index add7a67d17..e6803e5c4e 100644 --- a/lib/ctrlctx/auth_test.go +++ b/lib/ctrlctx/auth_test.go @@ -8,6 +8,7 @@ import ( "context" "git.arvados.org/arvados.git/lib/config" + "git.arvados.org/arvados.git/sdk/go/arvadostest" "git.arvados.org/arvados.git/sdk/go/auth" "git.arvados.org/arvados.git/sdk/go/ctxlog" "github.com/jmoiron/sqlx" @@ -29,9 +30,10 @@ func (*DatabaseSuite) TestAuthContext(c *check.C) { // valid tokens for _, token := range []string{ - "3kg6k6lzmp9kj5cpkcoxie963cmvjahbt2fod9zru30k1jqdmi", - "v2/zzzzz-gj3su-077z32aux8dg2s1/3kg6k6lzmp9kj5cpkcoxie963cmvjahbt2fod9zru30k1jqdmi", - "v2/zzzzz-gj3su-077z32aux8dg2s1/3kg6k6lzmp9kj5cpkcoxie963cmvjahbt2fod9zru30k1jqdmi/asdfasdfasdf", + arvadostest.ActiveToken, + arvadostest.ActiveTokenV2, + arvadostest.ActiveTokenV2 + "/asdfasdfasdf", + arvadostest.ActiveTokenV2, // cached } { ok, err := dbwrapper(authwrapper(func(ctx context.Context, opts interface{}) (interface{}, error) { user, aca, err := CurrentAuth(ctx) @@ -48,8 +50,10 @@ func (*DatabaseSuite) TestAuthContext(c *check.C) { // bad tokens for _, token := range []string{ - "3kg6k6lzmp9kj5cpkcoxie963cmvjahbt2fod9zru30k1jqdmI", // note last char mangled - "v2/zzzzz-gj3su-077z32aux8dg2s1/", + arvadostest.ActiveToken + "X", + arvadostest.ActiveTokenV2 + "X", + arvadostest.ActiveTokenV2[:30], // "v2/{uuid}" + arvadostest.ActiveTokenV2[:31], // "v2/{uuid}/" "bogus", "", } {