lovely-projects/dendrite
lovely-projects/dendrite
1
0
Fork 0
mirror of https://github.com/element-hq/dendrite.git synced 2025-03-14 14:15:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mas: fix tests

Browse source
This commit is contained in:
Roman Isaev 2025-01-25 00:56:19 +00:00
parent 0b4cf3badd
commit 27f7a5e3eb
No known key found for this signature in database
GPG key ID: 7BE2B6A6C89AEC7F
2 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
clientapi/admin_test.go
View file

@ -2021,16 +2021,10 @@ func TestAdminAllowCrossSigningReplacementWithoutUIA(t *testing.T) {
t.Errorf("failed to create account: %s", err)
}
_ = userAPI.KeyDatabase.StoreCrossSigningKeysForUser(ctx, alice.ID, types.CrossSigningKeyMap{
fclient.CrossSigningKeyPurposeMaster: types.CrossSigningKey{
KeyData: spec.Base64Bytes("Og7D7+RQS030dOsWEtS/juJLTOVojXk1DoNKadyXWyk"),
},
fclient.CrossSigningKeyPurposeSelfSigning: types.CrossSigningKey{
KeyData: spec.Base64Bytes("Og7D7+RQS030dOsWEtS/juJLTOVojXk1DoNKadyXWyk"),
},
fclient.CrossSigningKeyPurposeUserSigning: types.CrossSigningKey{
KeyData: spec.Base64Bytes("Og7D7+RQS030dOsWEtS/juJLTOVojXk1DoNKadyXWyk"),
},
}, nil)
fclient.CrossSigningKeyPurposeMaster: spec.Base64Bytes("Og7D7+RQS030dOsWEtS/juJLTOVojXk1DoNKadyXWyk"),
fclient.CrossSigningKeyPurposeSelfSigning: spec.Base64Bytes("Og7D7+RQS030dOsWEtS/juJLTOVojXk1DoNKadyXWyk"),
fclient.CrossSigningKeyPurposeUserSigning: spec.Base64Bytes("Og7D7+RQS030dOsWEtS/juJLTOVojXk1DoNKadyXWyk"),
})
}

17
clientapi/routing/admin.go
View file

@ -801,6 +801,23 @@ func AdminAllowCrossSigningReplacementWithoutUIA(
}
}
var rs api.QueryAccountByLocalpartResponse
err = userAPI.QueryAccountByLocalpart(req.Context(), &api.QueryAccountByLocalpartRequest{
Localpart: userID.Local(),
ServerName: userID.Domain(),
}, &rs)
if err != nil && !errors.Is(err, sql.ErrNoRows) {
util.GetLogger(req.Context()).WithError(err).Error("userAPI.QueryAccountByLocalpart")
return util.JSONResponse{
Code: http.StatusInternalServerError,
JSON: spec.Unknown(err.Error()),
}
} else if errors.Is(err, sql.ErrNoRows) {
return util.JSONResponse{
Code: http.StatusNotFound,
JSON: spec.NotFound("User not found."),
}
}
switch req.Method {
case http.MethodPost:
ts := sessions.allowCrossSigningKeysReplacement(userID.String())