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

Canonicalize JSON and mention race condition

Browse source 
Signed-off-by: Andrew (anoa) <anoa@openmailbox.org>
This commit is contained in:
Andrew (anoa) 2017-11-12 12:55:16 -08:00
parent 5a09d5123d
commit 8c217e9f6e
No known key found for this signature in database
GPG key ID: 174BEAB009FD176D
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/github.com/matrix-org/dendrite/clientapi/auth/storage/accounts/filter_table.go
View file

@ -17,6 +17,8 @@ package accounts
import (
"context"
"database/sql"
"github.com/matrix-org/gomatrixserverlib"
)
const filterSchema = `
@ -70,7 +72,7 @@ func (s *filterStatements) prepare(db *sql.DB) (err error) {
func (s *filterStatements) selectFilter(
ctx context.Context, localpart string, filterID string,
) (filter string, err error) {
err = s.selectFilterStmt.QueryRowContext(ctx, localpart, filterID).Scan(&filter)
err = s.selectFilterStmt.QueryRowContext(ctx, localpart, filterID).Scan(&filterJSON)
return
}
@ -79,13 +81,21 @@ func (s *filterStatements) insertFilter(
) (pos string, err error) {
var existingFilter string
// This can result in a race condition when two clients try to insert the
// same filter and localpart at the same time, however this is not a
// problem as both calls will result in the same filterID
filterJSON, errN := gomatrixserverlib.CanonicalJSON(filter)
if err {
return "", err
}
// Check if filter already exists in the database
err = s.selectFilterByContentStmt.QueryRowContext(ctx,
localpart, filter).Scan(&existingFilter)
localpart, filterJSON).Scan(&existingFilter)
if existingFilter != "" {
return existingFilter, err
}
err = s.insertFilterStmt.QueryRowContext(ctx, filter, localpart).Scan(&pos)
err = s.insertFilterStmt.QueryRowContext(ctx, filterJSON, localpart).Scan(&pos)
return
}