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 4d80dff4583d278620d9b3ed437e9fcd8d4674ee. * 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>
115 lines
3.6 KiB
Go
115 lines
3.6 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"
|
|
"math"
|
|
|
|
"golang.org/x/crypto/ed25519"
|
|
|
|
"github.com/matrix-org/gomatrixserverlib"
|
|
|
|
_ "github.com/mattn/go-sqlite3"
|
|
)
|
|
|
|
// A Database implements gomatrixserverlib.KeyDatabase and is used to store
|
|
// the public keys for other matrix servers.
|
|
type Database struct {
|
|
statements serverKeyStatements
|
|
}
|
|
|
|
// NewDatabase prepares a new key database.
|
|
// It creates the necessary tables if they don't already exist.
|
|
// It prepares all the SQL statements that it will use.
|
|
// Returns an error if there was a problem talking to the database.
|
|
func NewDatabase(
|
|
dataSourceName string,
|
|
serverName gomatrixserverlib.ServerName,
|
|
serverKey ed25519.PublicKey,
|
|
serverKeyID gomatrixserverlib.KeyID,
|
|
) (*Database, error) {
|
|
db, err := sql.Open("sqlite3", dataSourceName)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
d := &Database{}
|
|
err = d.statements.prepare(db)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
// Store our own keys so that we don't end up making HTTP requests to find our
|
|
// own keys
|
|
index := gomatrixserverlib.PublicKeyLookupRequest{
|
|
ServerName: serverName,
|
|
KeyID: serverKeyID,
|
|
}
|
|
value := gomatrixserverlib.PublicKeyLookupResult{
|
|
VerifyKey: gomatrixserverlib.VerifyKey{
|
|
Key: gomatrixserverlib.Base64String(serverKey),
|
|
},
|
|
ValidUntilTS: math.MaxUint64 >> 1,
|
|
ExpiredTS: gomatrixserverlib.PublicKeyNotExpired,
|
|
}
|
|
err = d.StoreKeys(
|
|
context.Background(),
|
|
map[gomatrixserverlib.PublicKeyLookupRequest]gomatrixserverlib.PublicKeyLookupResult{
|
|
index: value,
|
|
},
|
|
)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return d, nil
|
|
}
|
|
|
|
// FetcherName implements KeyFetcher
|
|
func (d Database) FetcherName() string {
|
|
return "KeyDatabase"
|
|
}
|
|
|
|
// FetchKeys implements gomatrixserverlib.KeyDatabase
|
|
func (d *Database) FetchKeys(
|
|
ctx context.Context,
|
|
requests map[gomatrixserverlib.PublicKeyLookupRequest]gomatrixserverlib.Timestamp,
|
|
) (map[gomatrixserverlib.PublicKeyLookupRequest]gomatrixserverlib.PublicKeyLookupResult, error) {
|
|
return d.statements.bulkSelectServerKeys(ctx, requests)
|
|
}
|
|
|
|
// StoreKeys implements gomatrixserverlib.KeyDatabase
|
|
func (d *Database) StoreKeys(
|
|
ctx context.Context,
|
|
keyMap map[gomatrixserverlib.PublicKeyLookupRequest]gomatrixserverlib.PublicKeyLookupResult,
|
|
) error {
|
|
// TODO: Inserting all the keys within a single transaction may
|
|
// be more efficient since the transaction overhead can be quite
|
|
// high for a single insert statement.
|
|
var lastErr error
|
|
for request, keys := range keyMap {
|
|
if err := d.statements.upsertServerKeys(ctx, request, keys); err != nil {
|
|
// Rather than returning immediately on error we try to insert the
|
|
// remaining keys.
|
|
// Since we are inserting the keys outside of a transaction it is
|
|
// possible for some of the inserts to succeed even though some
|
|
// of the inserts have failed.
|
|
// Ensuring that we always insert all the keys we can means that
|
|
// this behaviour won't depend on the iteration order of the map.
|
|
lastErr = err
|
|
}
|
|
}
|
|
return lastErr
|
|
}
|