f371783da7
* Add tests for device list updates * Add stale_device_lists table and use db before asking remote for device keys * Fetch remote keys if all devices are requested * Add display_name col to store remote device names Few other tweaks to make `Server correctly handles incoming m.device_list_update` pass. * Fix sqlite otk bug * Unbuffered channel to block /send causing sytest to not race anymore * Linting and fix bug whereby we didn't send updated dl tokens to the client causing a tightloop on /sync sometimes * No longer assert staleness as Update blocks on workers now * Back out tweaks * Bugfixes
55 lines
1.5 KiB
Go
55 lines
1.5 KiB
Go
// Copyright 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 (
|
|
"github.com/matrix-org/dendrite/internal/sqlutil"
|
|
"github.com/matrix-org/dendrite/keyserver/storage/shared"
|
|
)
|
|
|
|
func NewDatabase(dataSourceName string) (*shared.Database, error) {
|
|
var err error
|
|
cs, err := sqlutil.ParseFileURI(dataSourceName)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
db, err := sqlutil.Open(sqlutil.SQLiteDriverName(), cs, nil)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
otk, err := NewSqliteOneTimeKeysTable(db)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
dk, err := NewSqliteDeviceKeysTable(db)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
kc, err := NewSqliteKeyChangesTable(db)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
sdl, err := NewSqliteStaleDeviceListsTable(db)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &shared.Database{
|
|
DB: db,
|
|
OneTimeKeysTable: otk,
|
|
DeviceKeysTable: dk,
|
|
KeyChangesTable: kc,
|
|
StaleDeviceListsTable: sdl,
|
|
}, nil
|
|
}
|