mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-29 01:33:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Migrate old style tokens to new style because element-web doesn't soft-logoout on 4xx errors on /sync

Browse source
This commit is contained in:
Kegan Dougal 2022-01-20 10:39:41 +00:00
parent 31f1810814
commit 842887982c
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
syncapi/sync/requestpool.go
View file

@ -142,7 +142,7 @@ func (rp *RequestPool) OnIncomingSyncRequest(req *http.Request, device *userapi.
if err != nil {
if err == types.ErrMalformedSyncToken {
return util.JSONResponse{
Code: http.StatusUnauthorized,
Code: http.StatusBadRequest,
JSON: jsonerror.InvalidArgumentValue(err.Error()),
}
}

3
syncapi/types/types.go
View file

@ -273,6 +273,9 @@ func NewStreamTokenFromString(tok string) (token StreamingToken, err error) {
err = ErrMalformedSyncToken
return
}
// Migration: Remove everything after and including '.' - we previously had tokens like:
// s478_0_0_0_0_13.dl-0-2 but we have now removed partitioned stream positions
tok = strings.Split(tok, ".")[0]
parts := strings.Split(tok[1:], "_")
var positions [7]StreamPosition
for i, p := range parts {