hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-04-21 19:23:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

oh wait

Browse source
This commit is contained in:
Neil Alexander 2021-07-28 16:26:21 +01:00
parent 946d15f976
commit 3dd80d4cd2
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
keyserver/storage/postgres/cross_signing_keys_table.go
View file

@ -68,7 +68,6 @@ func (s *crossSigningKeysStatements) SelectCrossSigningKeysForUser(
return nil, err return nil, err
} }
defer internal.CloseAndLogIfError(ctx, rows, "selectCrossSigningKeysForUserStmt: rows.close() failed") defer internal.CloseAndLogIfError(ctx, rows, "selectCrossSigningKeysForUserStmt: rows.close() failed")
r = api.CrossSigningKeyMap{}
for rows.Next() { for rows.Next() {
var keyType gomatrixserverlib.CrossSigningKeyPurpose var keyType gomatrixserverlib.CrossSigningKeyPurpose
var keyID gomatrixserverlib.KeyID var keyID gomatrixserverlib.KeyID
@ -76,6 +75,9 @@ func (s *crossSigningKeysStatements) SelectCrossSigningKeysForUser(
if err := rows.Scan(&keyType, &keyID, &keyData); err != nil { if err := rows.Scan(&keyType, &keyID, &keyData); err != nil {
return nil, err return nil, err
} }
if _, ok := r[keyType]; !ok {
r[keyType] = map[gomatrixserverlib.KeyID]gomatrixserverlib.Base64Bytes{}
}
r[keyType][keyID] = keyData r[keyType][keyID] = keyData
} }
return return

4
keyserver/storage/sqlite3/cross_signing_keys_table.go
View file

@ -68,7 +68,6 @@ func (s *crossSigningKeysStatements) SelectCrossSigningKeysForUser(
return nil, err return nil, err
} }
defer internal.CloseAndLogIfError(ctx, rows, "selectCrossSigningKeysForUserStmt: rows.close() failed") defer internal.CloseAndLogIfError(ctx, rows, "selectCrossSigningKeysForUserStmt: rows.close() failed")
r = api.CrossSigningKeyMap{}
for rows.Next() { for rows.Next() {
var keyType gomatrixserverlib.CrossSigningKeyPurpose var keyType gomatrixserverlib.CrossSigningKeyPurpose
var keyID gomatrixserverlib.KeyID var keyID gomatrixserverlib.KeyID
@ -76,6 +75,9 @@ func (s *crossSigningKeysStatements) SelectCrossSigningKeysForUser(
if err := rows.Scan(&keyType, &keyID, &keyData); err != nil { if err := rows.Scan(&keyType, &keyID, &keyData); err != nil {
return nil, err return nil, err
} }
if _, ok := r[keyType]; !ok {
r[keyType] = map[gomatrixserverlib.KeyID]gomatrixserverlib.Base64Bytes{}
}
r[keyType][keyID] = keyData r[keyType][keyID] = keyData
} }
return return