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

Fix PaginationTokens

Browse source
This commit is contained in:
Neil Alexander 2020-01-21 11:54:07 +00:00
parent 2541946c1f
commit 5f791f5e42
4 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
syncapi/routing/routing.go
View file

@ -81,7 +81,10 @@ func Setup(
})).Methods(http.MethodGet, http.MethodOptions)
r0mux.Handle("/rooms/{roomID}/messages", common.MakeAuthAPI("room_messages", authData, func(req *http.Request, device *authtypes.Device) util.JSONResponse {
vars := mux.Vars(req)
vars, err := common.URLDecodeMapValues(mux.Vars(req))
if err != nil {
return util.ErrorResponse(err)
}
return OnIncomingMessagesRequest(req, syncDB, vars["roomID"], federation, queryAPI, cfg)
})).Methods(http.MethodGet, http.MethodOptions)
}

4
syncapi/storage/postgres/syncserver.go
View file

@ -566,12 +566,11 @@ func (d *SyncServerDatasource) getResponseWithPDUsForCompleteSync(
defer common.EndTransaction(txn, &succeeded)
// Get the current sync position which we will base the sync response on.
/*
toPos, err = d.syncPositionTx(ctx, txn)
if err != nil {
return
}
*/
// Get the current stream position which we will base the sync response on.
pos, err := d.syncStreamPositionTx(ctx, txn)
if err != nil {
@ -628,6 +627,7 @@ func (d *SyncServerDatasource) getResponseWithPDUsForCompleteSync(
jr.Timeline.PrevBatch = types.NewPaginationTokenFromTypeAndPosition(
types.PaginationTokenTypeTopology, backwardTopologyPos, 0,
).String()
// TODO: do we want short-form here? adds complexity elsewhere
if prevPDUPos := recentStreamEvents[0].StreamPosition - 1; prevPDUPos > 0 {
// Use the short form of batch token for prev_batch
jr.Timeline.PrevBatch = strconv.FormatInt(int64(prevPDUPos), 10)

15
syncapi/sync/request.go
View file

@ -52,7 +52,7 @@ func newSyncRequest(req *http.Request, device authtypes.Device) (*syncRequest, e
timeout := getTimeout(req.URL.Query().Get("timeout"))
fullState := req.URL.Query().Get("full_state")
wantFullState := fullState != "" && fullState != "false"
since, err := getSyncStreamPosition(req.URL.Query().Get("since"))
since, err := getPaginationToken(req.URL.Query().Get("since"))
if err != nil {
return nil, err
}
@ -82,11 +82,11 @@ func getTimeout(timeoutMS string) time.Duration {
// getPaginationToken tries to parse a 'since' token taken from the API to a
// pagination token. If the string is empty then (nil, nil) is returned.
// Returns an error if the parsed token's type isn't types.PaginationTokenTypeStream.
func getPaginationToken(since string) (*types.StreamPosition, error) {
func getSyncStreamPosition(since string) (*types.StreamPosition, error) {
if since == "" {
return nil, nil
}
p, err := types.NewPaginationTokenFromString(since)
p, err := getPaginationToken(since)
if err != nil {
return nil, err
}
@ -101,15 +101,10 @@ func getPaginationToken(since string) (*types.StreamPosition, error) {
// There are two forms of tokens: The full length form containing all PDU and EDU
// positions separated by "_", and the short form containing only the PDU
// position. Short form can be used for, e.g., `prev_batch` tokens.
func getSyncStreamPosition(since string) (*types.PaginationToken, error) {
func getPaginationToken(since string) (*types.PaginationToken, error) {
if since == "" {
return nil, nil
}
pos, err := types.NewPaginationTokenFromString(since)
if err != nil {
return nil, err
}
return pos, nil
return types.NewPaginationTokenFromString(since)
}

10
syncapi/types/types.go
View file

@ -76,12 +76,18 @@ func NewPaginationTokenFromString(s string) (p *PaginationToken, err error) {
// Check if the type is among the known ones.
p.Type = PaginationTokenType(s[:1])
if p.Type != PaginationTokenTypeStream && p.Type != PaginationTokenTypeTopology {
err = ErrInvalidPaginationTokenType
if pduPos, perr := strconv.ParseInt(s, 10, 64); perr != nil {
return nil, ErrInvalidPaginationTokenType
} else {
// TODO: should this be topograpical?
p.Type = PaginationTokenTypeTopology
p.PDUPosition = StreamPosition(pduPos)
return
}
}
// Parse the token (aka position).
positions := strings.Split(s[:1], "_")
positions := strings.Split(s[1:], "_")
// Try to get the PDU position.
if len(positions) >= 1 {