mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/element-hq/dendrite.git synced 2025-09-14 13:22:26 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mas: store crossSigngingKeysReplacement period in sessionsDict struct instead of db

Browse source
This commit is contained in:
Roman Isaev 2025-01-24 23:22:02 +00:00
parent b5f34dfe47
commit 453445695c
No known key found for this signature in database
GPG key ID: 7BE2B6A6C89AEC7F
3 changed files with 61 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

25
clientapi/routing/admin.go
View file

@ -35,10 +35,6 @@ import (
"github.com/element-hq/dendrite/userapi/storage/shared"
)
const (
replacementPeriod time.Duration = 10 * time.Minute
)
var (
validRegistrationTokenRegex = regexp.MustCompile("^[[:ascii:][:digit:]_]*$")
deviceDisplayName = "OIDC-native client"
@ -807,27 +803,10 @@ func AdminAllowCrossSigningReplacementWithoutUIA(
switch req.Method {
case http.MethodPost:
rq := userapi.PerformAllowingMasterCrossSigningKeyReplacementWithoutUIARequest{
UserID: userID.String(),
Duration: replacementPeriod,
}
var rs userapi.PerformAllowingMasterCrossSigningKeyReplacementWithoutUIAResponse
err = userAPI.PerformAllowingMasterCrossSigningKeyReplacementWithoutUIA(req.Context(), &rq, &rs)
if err != nil && !errors.Is(err, sql.ErrNoRows) {
util.GetLogger(req.Context()).WithError(err).Error("userAPI.PerformAllowingMasterCrossSigningKeyReplacementWithoutUIA")
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."),
}
}
ts := sessions.allowCrossSigningKeysReplacement(userID.String())
return util.JSONResponse{
Code: http.StatusOK,
JSON: map[string]int64{"updatable_without_uia_before_ms": rs.Timestamp},
JSON: map[string]int64{"updatable_without_uia_before_ms": ts},
}
default:
return util.JSONResponse{