mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-08 22:53:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use WithAllDatabases where possible

Browse source
This commit is contained in:
Till Faelligen 2022-05-04 20:15:43 +02:00
parent 5960b0aaf4
commit 86c8212557
1 changed files with 95 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

181
userapi/userapi_test.go
View file

@ -23,17 +23,17 @@ import (
"time" "time"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/matrix-org/dendrite/internal/httputil"
internalTest "github.com/matrix-org/dendrite/internal/test"
"github.com/matrix-org/dendrite/test" "github.com/matrix-org/dendrite/test"
"github.com/matrix-org/dendrite/userapi" "github.com/matrix-org/dendrite/userapi"
"github.com/matrix-org/dendrite/userapi/inthttp"
"github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib"
"golang.org/x/crypto/bcrypt" "golang.org/x/crypto/bcrypt"
"github.com/matrix-org/dendrite/internal/httputil"
internalTest "github.com/matrix-org/dendrite/internal/test"
"github.com/matrix-org/dendrite/setup/config" "github.com/matrix-org/dendrite/setup/config"
"github.com/matrix-org/dendrite/userapi/api" "github.com/matrix-org/dendrite/userapi/api"
"github.com/matrix-org/dendrite/userapi/internal" "github.com/matrix-org/dendrite/userapi/internal"
"github.com/matrix-org/dendrite/userapi/inthttp"
"github.com/matrix-org/dendrite/userapi/storage" "github.com/matrix-org/dendrite/userapi/storage"
) )
@ -73,6 +73,7 @@ func MustMakeInternalAPI(t *testing.T, opts apiTestOpts, dbType test.DBType) (ap
func TestQueryProfile(t *testing.T) { func TestQueryProfile(t *testing.T) {
aliceAvatarURL := "mxc://example.com/alice" aliceAvatarURL := "mxc://example.com/alice"
aliceDisplayName := "Alice" aliceDisplayName := "Alice"
// only one DBType, since userapi.AddInternalRoutes complains about multiple prometheus counters added
userAPI, accountDB, close := MustMakeInternalAPI(t, apiTestOpts{}, test.DBTypeSQLite) userAPI, accountDB, close := MustMakeInternalAPI(t, apiTestOpts{}, test.DBTypeSQLite)
defer close() defer close()
_, err := accountDB.CreateAccount(context.TODO(), "alice", "foobar", "", api.AccountTypeUser) _, err := accountDB.CreateAccount(context.TODO(), "alice", "foobar", "", api.AccountTypeUser)
@ -151,112 +152,120 @@ func TestLoginToken(t *testing.T) {
ctx := context.Background() ctx := context.Background()
t.Run("tokenLoginFlow", func(t *testing.T) { t.Run("tokenLoginFlow", func(t *testing.T) {
userAPI, accountDB, close := MustMakeInternalAPI(t, apiTestOpts{}, test.DBTypeSQLite) test.WithAllDatabases(t, func(t *testing.T, dbType test.DBType) {
defer close() userAPI, accountDB, close := MustMakeInternalAPI(t, apiTestOpts{}, dbType)
_, err := accountDB.CreateAccount(ctx, "auser", "apassword", "", api.AccountTypeUser) defer close()
if err != nil { _, err := accountDB.CreateAccount(ctx, "auser", "apassword", "", api.AccountTypeUser)
t.Fatalf("failed to make account: %s", err) if err != nil {
} t.Fatalf("failed to make account: %s", err)
}
t.Log("Creating a login token like the SSO callback would...") t.Log("Creating a login token like the SSO callback would...")
creq := api.PerformLoginTokenCreationRequest{ creq := api.PerformLoginTokenCreationRequest{
Data: api.LoginTokenData{UserID: "@auser:example.com"}, Data: api.LoginTokenData{UserID: "@auser:example.com"},
} }
var cresp api.PerformLoginTokenCreationResponse var cresp api.PerformLoginTokenCreationResponse
if err := userAPI.PerformLoginTokenCreation(ctx, &creq, &cresp); err != nil { if err := userAPI.PerformLoginTokenCreation(ctx, &creq, &cresp); err != nil {
t.Fatalf("PerformLoginTokenCreation failed: %v", err) t.Fatalf("PerformLoginTokenCreation failed: %v", err)
} }
if cresp.Metadata.Token == "" { if cresp.Metadata.Token == "" {
t.Errorf("PerformLoginTokenCreation Token: got %q, want non-empty", cresp.Metadata.Token) t.Errorf("PerformLoginTokenCreation Token: got %q, want non-empty", cresp.Metadata.Token)
} }
if cresp.Metadata.Expiration.Before(time.Now()) { if cresp.Metadata.Expiration.Before(time.Now()) {
t.Errorf("PerformLoginTokenCreation Expiration: got %v, want non-expired", cresp.Metadata.Expiration) t.Errorf("PerformLoginTokenCreation Expiration: got %v, want non-expired", cresp.Metadata.Expiration)
} }
t.Log("Querying the login token like /login with m.login.token would...") t.Log("Querying the login token like /login with m.login.token would...")
qreq := api.QueryLoginTokenRequest{Token: cresp.Metadata.Token} qreq := api.QueryLoginTokenRequest{Token: cresp.Metadata.Token}
var qresp api.QueryLoginTokenResponse var qresp api.QueryLoginTokenResponse
if err := userAPI.QueryLoginToken(ctx, &qreq, &qresp); err != nil { if err := userAPI.QueryLoginToken(ctx, &qreq, &qresp); err != nil {
t.Fatalf("QueryLoginToken failed: %v", err) t.Fatalf("QueryLoginToken failed: %v", err)
} }
if qresp.Data == nil { if qresp.Data == nil {
t.Errorf("QueryLoginToken Data: got %v, want non-nil", qresp.Data) t.Errorf("QueryLoginToken Data: got %v, want non-nil", qresp.Data)
} else if want := "@auser:example.com"; qresp.Data.UserID != want { } else if want := "@auser:example.com"; qresp.Data.UserID != want {
t.Errorf("QueryLoginToken UserID: got %q, want %q", qresp.Data.UserID, want) t.Errorf("QueryLoginToken UserID: got %q, want %q", qresp.Data.UserID, want)
} }
t.Log("Deleting the login token like /login with m.login.token would...") t.Log("Deleting the login token like /login with m.login.token would...")
dreq := api.PerformLoginTokenDeletionRequest{Token: cresp.Metadata.Token} dreq := api.PerformLoginTokenDeletionRequest{Token: cresp.Metadata.Token}
var dresp api.PerformLoginTokenDeletionResponse var dresp api.PerformLoginTokenDeletionResponse
if err := userAPI.PerformLoginTokenDeletion(ctx, &dreq, &dresp); err != nil { if err := userAPI.PerformLoginTokenDeletion(ctx, &dreq, &dresp); err != nil {
t.Fatalf("PerformLoginTokenDeletion failed: %v", err) t.Fatalf("PerformLoginTokenDeletion failed: %v", err)
} }
})
}) })
t.Run("expiredTokenIsNotReturned", func(t *testing.T) { t.Run("expiredTokenIsNotReturned", func(t *testing.T) {
userAPI, _, close := MustMakeInternalAPI(t, apiTestOpts{loginTokenLifetime: -1 * time.Second}, test.DBTypeSQLite) test.WithAllDatabases(t, func(t *testing.T, dbType test.DBType) {
defer close() userAPI, _, close := MustMakeInternalAPI(t, apiTestOpts{loginTokenLifetime: -1 * time.Second}, dbType)
defer close()
creq := api.PerformLoginTokenCreationRequest{ creq := api.PerformLoginTokenCreationRequest{
Data: api.LoginTokenData{UserID: "@auser:example.com"}, Data: api.LoginTokenData{UserID: "@auser:example.com"},
} }
var cresp api.PerformLoginTokenCreationResponse var cresp api.PerformLoginTokenCreationResponse
if err := userAPI.PerformLoginTokenCreation(ctx, &creq, &cresp); err != nil { if err := userAPI.PerformLoginTokenCreation(ctx, &creq, &cresp); err != nil {
t.Fatalf("PerformLoginTokenCreation failed: %v", err) t.Fatalf("PerformLoginTokenCreation failed: %v", err)
} }
qreq := api.QueryLoginTokenRequest{Token: cresp.Metadata.Token} qreq := api.QueryLoginTokenRequest{Token: cresp.Metadata.Token}
var qresp api.QueryLoginTokenResponse var qresp api.QueryLoginTokenResponse
if err := userAPI.QueryLoginToken(ctx, &qreq, &qresp); err != nil { if err := userAPI.QueryLoginToken(ctx, &qreq, &qresp); err != nil {
t.Fatalf("QueryLoginToken failed: %v", err) t.Fatalf("QueryLoginToken failed: %v", err)
} }
if qresp.Data != nil { if qresp.Data != nil {
t.Errorf("QueryLoginToken Data: got %v, want nil", qresp.Data) t.Errorf("QueryLoginToken Data: got %v, want nil", qresp.Data)
} }
})
}) })
t.Run("deleteWorks", func(t *testing.T) { t.Run("deleteWorks", func(t *testing.T) {
userAPI, _, close := MustMakeInternalAPI(t, apiTestOpts{}, test.DBTypeSQLite) test.WithAllDatabases(t, func(t *testing.T, dbType test.DBType) {
defer close() userAPI, _, close := MustMakeInternalAPI(t, apiTestOpts{}, dbType)
defer close()
creq := api.PerformLoginTokenCreationRequest{ creq := api.PerformLoginTokenCreationRequest{
Data: api.LoginTokenData{UserID: "@auser:example.com"}, Data: api.LoginTokenData{UserID: "@auser:example.com"},
} }
var cresp api.PerformLoginTokenCreationResponse var cresp api.PerformLoginTokenCreationResponse
if err := userAPI.PerformLoginTokenCreation(ctx, &creq, &cresp); err != nil { if err := userAPI.PerformLoginTokenCreation(ctx, &creq, &cresp); err != nil {
t.Fatalf("PerformLoginTokenCreation failed: %v", err) t.Fatalf("PerformLoginTokenCreation failed: %v", err)
} }
dreq := api.PerformLoginTokenDeletionRequest{Token: cresp.Metadata.Token} dreq := api.PerformLoginTokenDeletionRequest{Token: cresp.Metadata.Token}
var dresp api.PerformLoginTokenDeletionResponse var dresp api.PerformLoginTokenDeletionResponse
if err := userAPI.PerformLoginTokenDeletion(ctx, &dreq, &dresp); err != nil { if err := userAPI.PerformLoginTokenDeletion(ctx, &dreq, &dresp); err != nil {
t.Fatalf("PerformLoginTokenDeletion failed: %v", err) t.Fatalf("PerformLoginTokenDeletion failed: %v", err)
} }
qreq := api.QueryLoginTokenRequest{Token: cresp.Metadata.Token} qreq := api.QueryLoginTokenRequest{Token: cresp.Metadata.Token}
var qresp api.QueryLoginTokenResponse var qresp api.QueryLoginTokenResponse
if err := userAPI.QueryLoginToken(ctx, &qreq, &qresp); err != nil { if err := userAPI.QueryLoginToken(ctx, &qreq, &qresp); err != nil {
t.Fatalf("QueryLoginToken failed: %v", err) t.Fatalf("QueryLoginToken failed: %v", err)
} }
if qresp.Data != nil { if qresp.Data != nil {
t.Errorf("QueryLoginToken Data: got %v, want nil", qresp.Data) t.Errorf("QueryLoginToken Data: got %v, want nil", qresp.Data)
} }
})
}) })
t.Run("deleteUnknownIsNoOp", func(t *testing.T) { t.Run("deleteUnknownIsNoOp", func(t *testing.T) {
userAPI, _, close := MustMakeInternalAPI(t, apiTestOpts{}, test.DBTypeSQLite) test.WithAllDatabases(t, func(t *testing.T, dbType test.DBType) {
defer close() userAPI, _, close := MustMakeInternalAPI(t, apiTestOpts{}, dbType)
dreq := api.PerformLoginTokenDeletionRequest{Token: "non-existent token"} defer close()
var dresp api.PerformLoginTokenDeletionResponse dreq := api.PerformLoginTokenDeletionRequest{Token: "non-existent token"}
if err := userAPI.PerformLoginTokenDeletion(ctx, &dreq, &dresp); err != nil { var dresp api.PerformLoginTokenDeletionResponse
t.Fatalf("PerformLoginTokenDeletion failed: %v", err) if err := userAPI.PerformLoginTokenDeletion(ctx, &dreq, &dresp); err != nil {
} t.Fatalf("PerformLoginTokenDeletion failed: %v", err)
}
})
}) })
} }