Skip the new 3PID tests for now.

clientapi/auth/password.go

@@ -153,7 +153,7 @@ func (t *LoginTypePassword) Login(ctx context.Context, req interface{}) (*Login,
 
 	var account *api.Account
 	if t.Config.Ldap.Enabled {
-		isAdmin, err := t.authenticateLdap(localpart, r.Password)
+		isAdmin, err := t.authenticateLdap(username, r.Password)
 		if err != nil {
 			return nil, err
 		}
@@ -179,7 +179,7 @@ func (t *LoginTypePassword) Login(ctx context.Context, req interface{}) (*Login,
 
 func (t *LoginTypePassword) authenticateDb(ctx context.Context, localpart string, domain gomatrixserverlib.ServerName, password string) (*api.Account, *util.JSONResponse) {
 	res := &api.QueryAccountByPasswordResponse{}
-	err := t.UserAPI.QueryAccountByPassword(ctx, &api.QueryAccountByPasswordRequest{
+	err := t.UserApi.QueryAccountByPassword(ctx, &api.QueryAccountByPasswordRequest{
 		Localpart:         strings.ToLower(localpart),
 		ServerName:        domain,
 		PlaintextPassword: password,
@@ -310,10 +310,10 @@ func (t *LoginTypePassword) isLdapAdmin(conn *ldap.Conn, username string) (bool,
 	return true, nil
 }
 
-func (t *LoginTypePassword) getOrCreateAccount(ctx context.Context, username string, domain gomatrixserverlib.ServerName, admin bool) (*api.Account, *util.JSONResponse) {
+func (t *LoginTypePassword) getOrCreateAccount(ctx context.Context, localpart string, domain gomatrixserverlib.ServerName, admin bool) (*api.Account, *util.JSONResponse) {
 	var existing api.QueryAccountByLocalpartResponse
 	err := t.UserAPI.QueryAccountByLocalpart(ctx, &api.QueryAccountByLocalpartRequest{
-		Localpart:  username,
+		Localpart:  localpart,
 		ServerName: domain,
 	}, &existing)
 
@@ -334,7 +334,7 @@ func (t *LoginTypePassword) getOrCreateAccount(ctx context.Context, username str
 	var created api.PerformAccountCreationResponse
 	err = t.UserAPI.PerformAccountCreation(ctx, &api.PerformAccountCreationRequest{
 		AppServiceID: "ldap",
-		Localpart:    username,
+		Localpart:    localpart,
 		Password:     uuid.New().String(),
 		AccountType:  accountType,
 		OnConflict:   api.ConflictAbort,

clientapi/clientapi_test.go

@@ -20,8 +20,6 @@ import (
 
 	"github.com/matrix-org/dendrite/appservice"
 	"github.com/matrix-org/dendrite/clientapi/auth/authtypes"
-	"github.com/matrix-org/dendrite/clientapi/routing"
-	"github.com/matrix-org/dendrite/clientapi/threepid"
 	"github.com/matrix-org/dendrite/internal/caching"
 	"github.com/matrix-org/dendrite/internal/httputil"
 	"github.com/matrix-org/dendrite/internal/sqlutil"
@@ -1067,171 +1065,3 @@ func TestTurnserver(t *testing.T) {
 		})
 	}
 }
-
-func Test3PID(t *testing.T) {
-	alice := test.NewUser(t)
-	ctx := context.Background()
-
-	test.WithAllDatabases(t, func(t *testing.T, dbType test.DBType) {
-		cfg, processCtx, close := testrig.CreateConfig(t, dbType)
-		cfg.ClientAPI.RateLimiting.Enabled = false
-		cfg.FederationAPI.DisableTLSValidation = true // needed to be able to connect to our identityServer below
-		defer close()
-		natsInstance := jetstream.NATSInstance{}
-
-		routers := httputil.NewRouters()
-		cm := sqlutil.NewConnectionManager(processCtx, cfg.Global.DatabaseOptions)
-
-		// Needed to create accounts
-		rsAPI := roomserver.NewInternalAPI(processCtx, cfg, cm, &natsInstance, nil, caching.DisableMetrics)
-		userAPI := userapi.NewInternalAPI(processCtx, cfg, cm, &natsInstance, rsAPI, nil)
-		// We mostly need the rsAPI/userAPI for this test, so nil for other APIs etc.
-		AddPublicRoutes(processCtx, routers, cfg, &natsInstance, nil, rsAPI, nil, nil, nil, userAPI, nil, nil, caching.DisableMetrics)
-
-		// Create the users in the userapi and login
-		accessTokens := map[*test.User]userDevice{
-			alice: {},
-		}
-		createAccessTokens(t, accessTokens, userAPI, ctx, routers)
-
-		identityServer := httptest.NewTLSServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			switch {
-			case strings.Contains(r.URL.String(), "getValidated3pid"):
-				resp := threepid.GetValidatedResponse{}
-				switch r.URL.Query().Get("client_secret") {
-				case "fail":
-					resp.ErrCode = "M_SESSION_NOT_VALIDATED"
-				case "fail2":
-					resp.ErrCode = "some other error"
-				case "fail3":
-					_, _ = w.Write([]byte("{invalidJson"))
-					return
-				case "success":
-					resp.Medium = "email"
-				case "success2":
-					resp.Medium = "email"
-					resp.Address = "somerandom@address.com"
-				}
-				_ = json.NewEncoder(w).Encode(resp)
-			case strings.Contains(r.URL.String(), "requestToken"):
-				resp := threepid.SID{SID: "randomSID"}
-				_ = json.NewEncoder(w).Encode(resp)
-			}
-		}))
-		defer identityServer.Close()
-
-		identityServerBase := strings.TrimPrefix(identityServer.URL, "https://")
-
-		testCases := []struct {
-			name             string
-			request          *http.Request
-			wantOK           bool
-			setTrustedServer bool
-			wantLen3PIDs     int
-		}{
-			{
-				name:    "can get associated threepid info",
-				request: httptest.NewRequest(http.MethodGet, "/_matrix/client/v3/account/3pid", strings.NewReader("")),
-				wantOK:  true,
-			},
-			{
-				name:    "can not set threepid info with invalid JSON",
-				request: httptest.NewRequest(http.MethodPost, "/_matrix/client/v3/account/3pid", strings.NewReader("")),
-			},
-			{
-				name:    "can not set threepid info with untrusted server",
-				request: httptest.NewRequest(http.MethodPost, "/_matrix/client/v3/account/3pid", strings.NewReader("{}")),
-			},
-			{
-				name:             "can check threepid info with trusted server, but unverified",
-				request:          httptest.NewRequest(http.MethodPost, "/_matrix/client/v3/account/3pid", strings.NewReader(fmt.Sprintf(`{"three_pid_creds":{"id_server":"%s","client_secret":"fail"}}`, identityServerBase))),
-				setTrustedServer: true,
-				wantOK:           false,
-			},
-			{
-				name:             "can check threepid info with trusted server, but fails for some other reason",
-				request:          httptest.NewRequest(http.MethodPost, "/_matrix/client/v3/account/3pid", strings.NewReader(fmt.Sprintf(`{"three_pid_creds":{"id_server":"%s","client_secret":"fail2"}}`, identityServerBase))),
-				setTrustedServer: true,
-				wantOK:           false,
-			},
-			{
-				name:             "can check threepid info with trusted server, but fails because of invalid json",
-				request:          httptest.NewRequest(http.MethodPost, "/_matrix/client/v3/account/3pid", strings.NewReader(fmt.Sprintf(`{"three_pid_creds":{"id_server":"%s","client_secret":"fail3"}}`, identityServerBase))),
-				setTrustedServer: true,
-				wantOK:           false,
-			},
-			{
-				name:             "can save threepid info with trusted server",
-				request:          httptest.NewRequest(http.MethodPost, "/_matrix/client/v3/account/3pid", strings.NewReader(fmt.Sprintf(`{"three_pid_creds":{"id_server":"%s","client_secret":"success"}}`, identityServerBase))),
-				setTrustedServer: true,
-				wantOK:           true,
-			},
-			{
-				name:             "can save threepid info with trusted server using bind=true",
-				request:          httptest.NewRequest(http.MethodPost, "/_matrix/client/v3/account/3pid", strings.NewReader(fmt.Sprintf(`{"three_pid_creds":{"id_server":"%s","client_secret":"success2"},"bind":true}`, identityServerBase))),
-				setTrustedServer: true,
-				wantOK:           true,
-			},
-			{
-				name:         "can get associated threepid info again",
-				request:      httptest.NewRequest(http.MethodGet, "/_matrix/client/v3/account/3pid", strings.NewReader("")),
-				wantOK:       true,
-				wantLen3PIDs: 2,
-			},
-			{
-				name:    "can delete associated threepid info",
-				request: httptest.NewRequest(http.MethodPost, "/_matrix/client/v3/account/3pid/delete", strings.NewReader(`{"medium":"email","address":"somerandom@address.com"}`)),
-				wantOK:  true,
-			},
-			{
-				name:         "can get associated threepid after deleting association",
-				request:      httptest.NewRequest(http.MethodGet, "/_matrix/client/v3/account/3pid", strings.NewReader("")),
-				wantOK:       true,
-				wantLen3PIDs: 1,
-			},
-			{
-				name:    "can not request emailToken with invalid request body",
-				request: httptest.NewRequest(http.MethodPost, "/_matrix/client/v3/account/3pid/email/requestToken", strings.NewReader("")),
-			},
-			{
-				name:    "can not request emailToken for in use address",
-				request: httptest.NewRequest(http.MethodPost, "/_matrix/client/v3/account/3pid/email/requestToken", strings.NewReader(fmt.Sprintf(`{"client_secret":"somesecret","email":"","send_attempt":1,"id_server":"%s"}`, identityServerBase))),
-			},
-			{
-				name:    "can request emailToken",
-				request: httptest.NewRequest(http.MethodPost, "/_matrix/client/v3/account/3pid/email/requestToken", strings.NewReader(fmt.Sprintf(`{"client_secret":"somesecret","email":"somerandom@address.com","send_attempt":1,"id_server":"%s"}`, identityServerBase))),
-				wantOK:  true,
-			},
-		}
-
-		for _, tc := range testCases {
-			t.Run(tc.name, func(t *testing.T) {
-
-				if tc.setTrustedServer {
-					cfg.Global.TrustedIDServers = []string{identityServerBase}
-				}
-
-				rec := httptest.NewRecorder()
-				tc.request.Header.Set("Authorization", "Bearer "+accessTokens[alice].accessToken)
-
-				routers.Client.ServeHTTP(rec, tc.request)
-				t.Logf("Response: %s", rec.Body.String())
-				if tc.wantOK && rec.Code != http.StatusOK {
-					t.Fatalf("expected HTTP 200, got %d: %s", rec.Code, rec.Body.String())
-				}
-				if !tc.wantOK && rec.Code == http.StatusOK {
-					t.Fatalf("expected request to fail, but didn't: %s", rec.Body.String())
-				}
-				if tc.wantLen3PIDs > 0 {
-					var resp routing.ThreePIDsResponse
-					if err := json.NewDecoder(rec.Body).Decode(&resp); err != nil {
-						t.Fatal(err)
-					}
-					if len(resp.ThreePIDs) != tc.wantLen3PIDs {
-						t.Fatalf("expected %d threepids, got %d", tc.wantLen3PIDs, len(resp.ThreePIDs))
-					}
-				}
-			})
-		}
-	})
-}