mirror of
https://github.com/matrix-org/dendrite.git
synced 2024-11-27 08:41:57 -06:00
b6ea1bc67a
* Move current work into single branch
* Initial massaging of clientapi etc (not working yet)
* Interfaces for accounts/devices databases
* Duplicate postgres package for sqlite3 (no changes made to it yet)
* Some keydb, accountdb, devicedb, common partition fixes, some more syncapi tweaking
* Fix accounts DB, device DB
* Update naffka dependency for SQLite
* Naffka SQLite
* Update naffka to latest master
* SQLite support for federationsender
* Mostly not-bad support for SQLite in syncapi (although there are problems where lots of events get classed incorrectly as backward extremities, probably because of IN/ANY clauses that are badly supported)
* Update Dockerfile -> Go 1.13.7, add build-base (as gcc and friends are needed for SQLite)
* Implement GET endpoints for account_data in clientapi
* Nuke filtering for now...
* Revert "Implement GET endpoints for account_data in clientapi"
This reverts commit 4d80dff458
.
* Implement GET endpoints for account_data in clientapi (#861)
* Implement GET endpoints for account_data in clientapi
* Fix accountDB parameter
* Remove fmt.Println
* Fix insertAccountData SQLite query
* Fix accountDB storage interfaces
* Add empty push rules into account data on account creation (#862)
* Put SaveAccountData into the right function this time
* Not sure if roomserver is better or worse now
* sqlite work
* Allow empty last sent ID for the first event
* sqlite: room creation works
* Support sending messages
* Nuke fmt.println
* Move QueryVariadic etc into common, other device fixes
* Fix some linter issues
* Fix bugs
* Fix some linting errors
* Fix errcheck lint errors
* Make naffka use postgres as fallback, fix couple of compile errors
* What on earth happened to the /rooms/{roomID}/send/{eventType} routing
Co-authored-by: Neil Alexander <neilalexander@users.noreply.github.com>
143 lines
4.5 KiB
Go
143 lines
4.5 KiB
Go
// Copyright 2017-2018 New Vector Ltd
|
|
// Copyright 2019-2020 The Matrix.org Foundation C.I.C.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package sqlite3
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
|
|
"github.com/lib/pq"
|
|
"github.com/matrix-org/gomatrixserverlib"
|
|
)
|
|
|
|
const serverKeysSchema = `
|
|
-- A cache of signing keys downloaded from remote servers.
|
|
CREATE TABLE IF NOT EXISTS keydb_server_keys (
|
|
-- The name of the matrix server the key is for.
|
|
server_name TEXT NOT NULL,
|
|
-- The ID of the server key.
|
|
server_key_id TEXT NOT NULL,
|
|
-- Combined server name and key ID separated by the ASCII unit separator
|
|
-- to make it easier to run bulk queries.
|
|
server_name_and_key_id TEXT NOT NULL,
|
|
-- When the key is valid until as a millisecond timestamp.
|
|
-- 0 if this is an expired key (in which case expired_ts will be non-zero)
|
|
valid_until_ts BIGINT NOT NULL,
|
|
-- When the key expired as a millisecond timestamp.
|
|
-- 0 if this is an active key (in which case valid_until_ts will be non-zero)
|
|
expired_ts BIGINT NOT NULL,
|
|
-- The base64-encoded public key.
|
|
server_key TEXT NOT NULL,
|
|
UNIQUE (server_name, server_key_id)
|
|
);
|
|
|
|
CREATE INDEX IF NOT EXISTS keydb_server_name_and_key_id ON keydb_server_keys (server_name_and_key_id);
|
|
`
|
|
|
|
const bulkSelectServerKeysSQL = "" +
|
|
"SELECT server_name, server_key_id, valid_until_ts, expired_ts, " +
|
|
" server_key FROM keydb_server_keys" +
|
|
" WHERE server_name_and_key_id IN ($1)"
|
|
|
|
const upsertServerKeysSQL = "" +
|
|
"INSERT INTO keydb_server_keys (server_name, server_key_id," +
|
|
" server_name_and_key_id, valid_until_ts, expired_ts, server_key)" +
|
|
" VALUES ($1, $2, $3, $4, $5, $6)" +
|
|
" ON CONFLICT (server_name, server_key_id)" +
|
|
" DO UPDATE SET valid_until_ts = $4, expired_ts = $5, server_key = $6"
|
|
|
|
type serverKeyStatements struct {
|
|
bulkSelectServerKeysStmt *sql.Stmt
|
|
upsertServerKeysStmt *sql.Stmt
|
|
}
|
|
|
|
func (s *serverKeyStatements) prepare(db *sql.DB) (err error) {
|
|
_, err = db.Exec(serverKeysSchema)
|
|
if err != nil {
|
|
return
|
|
}
|
|
if s.bulkSelectServerKeysStmt, err = db.Prepare(bulkSelectServerKeysSQL); err != nil {
|
|
return
|
|
}
|
|
if s.upsertServerKeysStmt, err = db.Prepare(upsertServerKeysSQL); err != nil {
|
|
return
|
|
}
|
|
return
|
|
}
|
|
|
|
func (s *serverKeyStatements) bulkSelectServerKeys(
|
|
ctx context.Context,
|
|
requests map[gomatrixserverlib.PublicKeyLookupRequest]gomatrixserverlib.Timestamp,
|
|
) (map[gomatrixserverlib.PublicKeyLookupRequest]gomatrixserverlib.PublicKeyLookupResult, error) {
|
|
var nameAndKeyIDs []string
|
|
for request := range requests {
|
|
nameAndKeyIDs = append(nameAndKeyIDs, nameAndKeyID(request))
|
|
}
|
|
stmt := s.bulkSelectServerKeysStmt
|
|
rows, err := stmt.QueryContext(ctx, pq.StringArray(nameAndKeyIDs))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer rows.Close() // nolint: errcheck
|
|
results := map[gomatrixserverlib.PublicKeyLookupRequest]gomatrixserverlib.PublicKeyLookupResult{}
|
|
for rows.Next() {
|
|
var serverName string
|
|
var keyID string
|
|
var key string
|
|
var validUntilTS int64
|
|
var expiredTS int64
|
|
if err = rows.Scan(&serverName, &keyID, &validUntilTS, &expiredTS, &key); err != nil {
|
|
return nil, err
|
|
}
|
|
r := gomatrixserverlib.PublicKeyLookupRequest{
|
|
ServerName: gomatrixserverlib.ServerName(serverName),
|
|
KeyID: gomatrixserverlib.KeyID(keyID),
|
|
}
|
|
vk := gomatrixserverlib.VerifyKey{}
|
|
err = vk.Key.Decode(key)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
results[r] = gomatrixserverlib.PublicKeyLookupResult{
|
|
VerifyKey: vk,
|
|
ValidUntilTS: gomatrixserverlib.Timestamp(validUntilTS),
|
|
ExpiredTS: gomatrixserverlib.Timestamp(expiredTS),
|
|
}
|
|
}
|
|
return results, nil
|
|
}
|
|
|
|
func (s *serverKeyStatements) upsertServerKeys(
|
|
ctx context.Context,
|
|
request gomatrixserverlib.PublicKeyLookupRequest,
|
|
key gomatrixserverlib.PublicKeyLookupResult,
|
|
) error {
|
|
_, err := s.upsertServerKeysStmt.ExecContext(
|
|
ctx,
|
|
string(request.ServerName),
|
|
string(request.KeyID),
|
|
nameAndKeyID(request),
|
|
key.ValidUntilTS,
|
|
key.ExpiredTS,
|
|
key.Key.Encode(),
|
|
)
|
|
return err
|
|
}
|
|
|
|
func nameAndKeyID(request gomatrixserverlib.PublicKeyLookupRequest) string {
|
|
return string(request.ServerName) + "\x1F" + string(request.KeyID)
|
|
}
|