aboutsummaryrefslogtreecommitdiff
path: root/roomserver
diff options
context:
space:
mode:
authorKegsay <kegan@matrix.org>2020-03-06 10:23:55 +0000
committerGitHub <noreply@github.com>2020-03-06 10:23:55 +0000
commita97b8eafd459c6a5c742333e2d0d93385da6db95 (patch)
treefa52ae89e74218d09d355139003bd26cf8113297 /roomserver
parent0cda3c52d0dc0462b204c8dc455762821bb74c3f (diff)
Add peer-to-peer support into Dendrite via libp2p and fetch (#880)
* Use a fork of pq which supports userCurrent on wasm * Use sqlite3_js driver when running in JS * Add cmd/dendritejs to pull in sqlite3_js driver for wasm only * Update to latest go-sqlite-js version * Replace prometheus with a stub. sigh * Hard-code a config and don't use opentracing * Latest go-sqlite3-js version * Generate a key for now * Listen for fetch traffic rather than HTTP * Latest hacks for js * libp2p support * More libp2p * Fork gjson to allow us to enforce auth checks as before Previously, all events would come down redacted because the hash checks would fail. They would fail because sjson.DeleteBytes didn't remove keys not used for hashing. This didn't work because of a build tag which included a file which no-oped the index returned. See https://github.com/tidwall/gjson/issues/157 When it's resolved, let's go back to mainline. * Use gjson@1.6.0 as it fixes https://github.com/tidwall/gjson/issues/157 * Use latest gomatrixserverlib for sig checks * Fix a bug which could cause exclude_from_sync to not be set Caused when sending events over federation. * Use query variadic to make lookups actually work! * Latest gomatrixserverlib * Add notes on getting p2p up and running Partly so I don't forget myself! * refactor: Move p2p specific stuff to cmd/dendritejs This is important or else the normal build of dendrite will fail because the p2p libraries depend on syscall/js which doesn't work on normal builds. Also, clean up main.go to read a bit better. * Update ho-http-js-libp2p to return errors from RoundTrip * Add an LRU cache around the key DB We actually need this for P2P because otherwise we can *segfault* with things like: "runtime: unexpected return pc for runtime.handleEvent" where the event is a `syscall/js` event, caused by spamming sql.js caused by "Checking event signatures for 14 events of room state" which hammers the key DB repeatedly in quick succession. Using a cache fixes this, though the underlying cause is probably a bug in the version of Go I'm on (1.13.7) * breaking: Add Tracing.Enabled to toggle whether we do opentracing Defaults to false, which is why this is a breaking change. We need this flag because WASM builds cannot do opentracing. * Start adding conditional builds for wasm to handle lib/pq The general idea here is to have the wasm build have a `NewXXXDatabase` that doesn't import any postgres package and hence we never import `lib/pq`, which doesn't work under WASM (undefined `userCurrent`). * Remove lib/pq for wasm for syncapi * Add conditional building to remaining storage APIs * Update build script to set env vars correctly for dendritejs * sqlite bug fixes * Docs * Add a no-op main for dendritejs when not building under wasm * Use the real prometheus, even for WASM Instead, the dendrite-sw.js must mock out `process.pid` and `fs.stat` - which must invoke the callback with an error (e.g `EINVAL`) in order for it to work: ``` global.process = { pid: 1, }; global.fs.stat = function(path, cb) { cb({ code: "EINVAL", }); } ``` * Linting
Diffstat (limited to 'roomserver')
-rw-r--r--roomserver/storage/interface.go49
-rw-r--r--roomserver/storage/sqlite3/events_table.go15
-rw-r--r--roomserver/storage/sqlite3/list.go18
-rw-r--r--roomserver/storage/sqlite3/rooms_table.go24
-rw-r--r--roomserver/storage/sqlite3/state_block_table.go7
-rw-r--r--roomserver/storage/sqlite3/state_snapshot_table.go21
-rw-r--r--roomserver/storage/sqlite3/storage.go2
-rw-r--r--roomserver/storage/storage.go32
-rw-r--r--roomserver/storage/storage_wasm.go38
9 files changed, 121 insertions, 85 deletions
diff --git a/roomserver/storage/interface.go b/roomserver/storage/interface.go
new file mode 100644
index 00000000..f03d6fea
--- /dev/null
+++ b/roomserver/storage/interface.go
@@ -0,0 +1,49 @@
+// 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 storage
+
+import (
+ "context"
+
+ "github.com/matrix-org/dendrite/roomserver/api"
+ statedb "github.com/matrix-org/dendrite/roomserver/state/database"
+ "github.com/matrix-org/dendrite/roomserver/types"
+ "github.com/matrix-org/gomatrixserverlib"
+)
+
+type Database interface {
+ statedb.RoomStateDatabase
+ StoreEvent(ctx context.Context, event gomatrixserverlib.Event, txnAndSessionID *api.TransactionID, authEventNIDs []types.EventNID) (types.RoomNID, types.StateAtEvent, error)
+ StateEntriesForEventIDs(ctx context.Context, eventIDs []string) ([]types.StateEntry, error)
+ EventStateKeys(ctx context.Context, eventStateKeyNIDs []types.EventStateKeyNID) (map[types.EventStateKeyNID]string, error)
+ EventNIDs(ctx context.Context, eventIDs []string) (map[string]types.EventNID, error)
+ SetState(ctx context.Context, eventNID types.EventNID, stateNID types.StateSnapshotNID) error
+ EventIDs(ctx context.Context, eventNIDs []types.EventNID) (map[types.EventNID]string, error)
+ GetLatestEventsForUpdate(ctx context.Context, roomNID types.RoomNID) (types.RoomRecentEventsUpdater, error)
+ GetTransactionEventID(ctx context.Context, transactionID string, sessionID int64, userID string) (string, error)
+ RoomNID(ctx context.Context, roomID string) (types.RoomNID, error)
+ LatestEventIDs(ctx context.Context, roomNID types.RoomNID) ([]gomatrixserverlib.EventReference, types.StateSnapshotNID, int64, error)
+ GetInvitesForUser(ctx context.Context, roomNID types.RoomNID, targetUserNID types.EventStateKeyNID) (senderUserIDs []types.EventStateKeyNID, err error)
+ SetRoomAlias(ctx context.Context, alias string, roomID string, creatorUserID string) error
+ GetRoomIDForAlias(ctx context.Context, alias string) (string, error)
+ GetAliasesForRoomID(ctx context.Context, roomID string) ([]string, error)
+ GetCreatorIDForAlias(ctx context.Context, alias string) (string, error)
+ RemoveRoomAlias(ctx context.Context, alias string) error
+ MembershipUpdater(ctx context.Context, roomID, targetUserID string) (types.MembershipUpdater, error)
+ GetMembership(ctx context.Context, roomNID types.RoomNID, requestSenderUserID string) (membershipEventNID types.EventNID, stillInRoom bool, err error)
+ GetMembershipEventNIDsForRoom(ctx context.Context, roomNID types.RoomNID, joinOnly bool) ([]types.EventNID, error)
+ EventsFromIDs(ctx context.Context, eventIDs []string) ([]types.Event, error)
+ GetRoomVersionForRoom(ctx context.Context, roomNID types.RoomNID) (int64, error)
+}
diff --git a/roomserver/storage/sqlite3/events_table.go b/roomserver/storage/sqlite3/events_table.go
index 4ed1395d..56e37910 100644
--- a/roomserver/storage/sqlite3/events_table.go
+++ b/roomserver/storage/sqlite3/events_table.go
@@ -18,10 +18,10 @@ package sqlite3
import (
"context"
"database/sql"
+ "encoding/json"
"fmt"
"strings"
- "github.com/lib/pq"
"github.com/matrix-org/dendrite/common"
"github.com/matrix-org/dendrite/roomserver/types"
"github.com/matrix-org/gomatrixserverlib"
@@ -38,7 +38,7 @@ const eventsSchema = `
depth INTEGER NOT NULL,
event_id TEXT NOT NULL UNIQUE,
reference_sha256 BLOB NOT NULL,
- auth_event_nids TEXT NOT NULL DEFAULT '{}'
+ auth_event_nids TEXT NOT NULL DEFAULT '[]'
);
`
@@ -463,17 +463,14 @@ func (s *eventStatements) bulkSelectEventNID(ctx context.Context, txn *sql.Tx, e
func (s *eventStatements) selectMaxEventDepth(ctx context.Context, txn *sql.Tx, eventNIDs []types.EventNID) (int64, error) {
var result int64
selectStmt := common.TxStmt(txn, s.selectMaxEventDepthStmt)
- err := selectStmt.QueryRowContext(ctx, sqliteIn(eventNIDsAsArray(eventNIDs))).Scan(&result)
+ err := selectStmt.QueryRowContext(ctx, eventNIDsAsArray(eventNIDs)).Scan(&result)
if err != nil {
return 0, err
}
return result, nil
}
-func eventNIDsAsArray(eventNIDs []types.EventNID) pq.Int64Array {
- nids := make([]int64, len(eventNIDs))
- for i := range eventNIDs {
- nids[i] = int64(eventNIDs[i])
- }
- return nids
+func eventNIDsAsArray(eventNIDs []types.EventNID) string {
+ b, _ := json.Marshal(eventNIDs)
+ return string(b)
}
diff --git a/roomserver/storage/sqlite3/list.go b/roomserver/storage/sqlite3/list.go
deleted file mode 100644
index 4fe4e334..00000000
--- a/roomserver/storage/sqlite3/list.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package sqlite3
-
-import (
- "strconv"
- "strings"
-
- "github.com/lib/pq"
-)
-
-type SqliteList string
-
-func sqliteIn(a pq.Int64Array) string {
- var b []string
- for _, n := range a {
- b = append(b, strconv.FormatInt(n, 10))
- }
- return strings.Join(b, ",")
-}
diff --git a/roomserver/storage/sqlite3/rooms_table.go b/roomserver/storage/sqlite3/rooms_table.go
index bf237728..99c03476 100644
--- a/roomserver/storage/sqlite3/rooms_table.go
+++ b/roomserver/storage/sqlite3/rooms_table.go
@@ -18,8 +18,8 @@ package sqlite3
import (
"context"
"database/sql"
+ "encoding/json"
- "github.com/lib/pq"
"github.com/matrix-org/dendrite/common"
"github.com/matrix-org/dendrite/roomserver/types"
)
@@ -28,7 +28,7 @@ const roomsSchema = `
CREATE TABLE IF NOT EXISTS roomserver_rooms (
room_nid INTEGER PRIMARY KEY AUTOINCREMENT,
room_id TEXT NOT NULL UNIQUE,
- latest_event_nids TEXT NOT NULL DEFAULT '{}',
+ latest_event_nids TEXT NOT NULL DEFAULT '[]',
last_event_sent_nid INTEGER NOT NULL DEFAULT 0,
state_snapshot_nid INTEGER NOT NULL DEFAULT 0,
room_version INTEGER NOT NULL DEFAULT 1
@@ -104,16 +104,16 @@ func (s *roomStatements) selectRoomNID(
func (s *roomStatements) selectLatestEventNIDs(
ctx context.Context, txn *sql.Tx, roomNID types.RoomNID,
) ([]types.EventNID, types.StateSnapshotNID, error) {
- var nids pq.Int64Array
+ var eventNIDs []types.EventNID
+ var nidsJSON string
var stateSnapshotNID int64
stmt := common.TxStmt(txn, s.selectLatestEventNIDsStmt)
- err := stmt.QueryRowContext(ctx, int64(roomNID)).Scan(&nids, &stateSnapshotNID)
+ err := stmt.QueryRowContext(ctx, int64(roomNID)).Scan(&nidsJSON, &stateSnapshotNID)
if err != nil {
return nil, 0, err
}
- eventNIDs := make([]types.EventNID, len(nids))
- for i := range nids {
- eventNIDs[i] = types.EventNID(nids[i])
+ if err := json.Unmarshal([]byte(nidsJSON), &eventNIDs); err != nil {
+ return nil, 0, err
}
return eventNIDs, types.StateSnapshotNID(stateSnapshotNID), nil
}
@@ -121,17 +121,17 @@ func (s *roomStatements) selectLatestEventNIDs(
func (s *roomStatements) selectLatestEventsNIDsForUpdate(
ctx context.Context, txn *sql.Tx, roomNID types.RoomNID,
) ([]types.EventNID, types.EventNID, types.StateSnapshotNID, error) {
- var nids pq.Int64Array
+ var eventNIDs []types.EventNID
+ var nidsJSON string
var lastEventSentNID int64
var stateSnapshotNID int64
stmt := common.TxStmt(txn, s.selectLatestEventNIDsForUpdateStmt)
- err := stmt.QueryRowContext(ctx, int64(roomNID)).Scan(&nids, &lastEventSentNID, &stateSnapshotNID)
+ err := stmt.QueryRowContext(ctx, int64(roomNID)).Scan(&nidsJSON, &lastEventSentNID, &stateSnapshotNID)
if err != nil {
return nil, 0, 0, err
}
- eventNIDs := make([]types.EventNID, len(nids))
- for i := range nids {
- eventNIDs[i] = types.EventNID(nids[i])
+ if err := json.Unmarshal([]byte(nidsJSON), &eventNIDs); err != nil {
+ return nil, 0, 0, err
}
return eventNIDs, types.EventNID(lastEventSentNID), types.StateSnapshotNID(stateSnapshotNID), nil
}
diff --git a/roomserver/storage/sqlite3/state_block_table.go b/roomserver/storage/sqlite3/state_block_table.go
index d75abcee..c94ca238 100644
--- a/roomserver/storage/sqlite3/state_block_table.go
+++ b/roomserver/storage/sqlite3/state_block_table.go
@@ -22,7 +22,6 @@ import (
"sort"
"strings"
- "github.com/lib/pq"
"github.com/matrix-org/dendrite/common"
"github.com/matrix-org/dendrite/roomserver/types"
"github.com/matrix-org/util"
@@ -268,9 +267,9 @@ func (s stateKeyTupleSorter) contains(value types.StateKeyTuple) bool {
// List the unique eventTypeNIDs and eventStateKeyNIDs.
// Assumes that the list is sorted.
-func (s stateKeyTupleSorter) typesAndStateKeysAsArrays() (eventTypeNIDs pq.Int64Array, eventStateKeyNIDs pq.Int64Array) {
- eventTypeNIDs = make(pq.Int64Array, len(s))
- eventStateKeyNIDs = make(pq.Int64Array, len(s))
+func (s stateKeyTupleSorter) typesAndStateKeysAsArrays() (eventTypeNIDs []int64, eventStateKeyNIDs []int64) {
+ eventTypeNIDs = make([]int64, len(s))
+ eventStateKeyNIDs = make([]int64, len(s))
for i := range s {
eventTypeNIDs[i] = int64(s[i].EventTypeNID)
eventStateKeyNIDs[i] = int64(s[i].EventStateKeyNID)
diff --git a/roomserver/storage/sqlite3/state_snapshot_table.go b/roomserver/storage/sqlite3/state_snapshot_table.go
index df97aa41..0e1786ea 100644
--- a/roomserver/storage/sqlite3/state_snapshot_table.go
+++ b/roomserver/storage/sqlite3/state_snapshot_table.go
@@ -18,10 +18,10 @@ package sqlite3
import (
"context"
"database/sql"
+ "encoding/json"
"fmt"
"strings"
- "github.com/lib/pq"
"github.com/matrix-org/dendrite/common"
"github.com/matrix-org/dendrite/roomserver/types"
)
@@ -30,7 +30,7 @@ const stateSnapshotSchema = `
CREATE TABLE IF NOT EXISTS roomserver_state_snapshots (
state_snapshot_nid INTEGER PRIMARY KEY AUTOINCREMENT,
room_nid INTEGER NOT NULL,
- state_block_nids TEXT NOT NULL DEFAULT '{}'
+ state_block_nids TEXT NOT NULL DEFAULT '[]'
);
`
@@ -67,12 +67,12 @@ func (s *stateSnapshotStatements) prepare(db *sql.DB) (err error) {
func (s *stateSnapshotStatements) insertState(
ctx context.Context, txn *sql.Tx, roomNID types.RoomNID, stateBlockNIDs []types.StateBlockNID,
) (stateNID types.StateSnapshotNID, err error) {
- nids := make([]int64, len(stateBlockNIDs))
- for i := range stateBlockNIDs {
- nids[i] = int64(stateBlockNIDs[i])
+ stateBlockNIDsJSON, err := json.Marshal(stateBlockNIDs)
+ if err != nil {
+ return
}
insertStmt := txn.Stmt(s.insertStateStmt)
- if res, err2 := insertStmt.ExecContext(ctx, int64(roomNID), pq.Int64Array(nids)); err2 == nil {
+ if res, err2 := insertStmt.ExecContext(ctx, int64(roomNID), string(stateBlockNIDsJSON)); err2 == nil {
lastRowID, err3 := res.LastInsertId()
if err3 != nil {
err = err3
@@ -104,13 +104,12 @@ func (s *stateSnapshotStatements) bulkSelectStateBlockNIDs(
i := 0
for ; rows.Next(); i++ {
result := &results[i]
- var stateBlockNIDs pq.Int64Array
- if err := rows.Scan(&result.StateSnapshotNID, &stateBlockNIDs); err != nil {
+ var stateBlockNIDsJSON string
+ if err := rows.Scan(&result.StateSnapshotNID, &stateBlockNIDsJSON); err != nil {
return nil, err
}
- result.StateBlockNIDs = make([]types.StateBlockNID, len(stateBlockNIDs))
- for k := range stateBlockNIDs {
- result.StateBlockNIDs[k] = types.StateBlockNID(stateBlockNIDs[k])
+ if err := json.Unmarshal([]byte(stateBlockNIDsJSON), &result.StateBlockNIDs); err != nil {
+ return nil, err
}
}
if i != len(stateNIDs) {
diff --git a/roomserver/storage/sqlite3/storage.go b/roomserver/storage/sqlite3/storage.go
index aebb308c..41d4c2a9 100644
--- a/roomserver/storage/sqlite3/storage.go
+++ b/roomserver/storage/sqlite3/storage.go
@@ -49,7 +49,7 @@ func Open(dataSourceName string) (*Database, error) {
} else {
return nil, errors.New("no filename or path in connect string")
}
- if d.db, err = sql.Open("sqlite3", cs); err != nil {
+ if d.db, err = sql.Open(common.SQLiteDriverName(), cs); err != nil {
return nil, err
}
//d.db.Exec("PRAGMA journal_mode=WAL;")
diff --git a/roomserver/storage/storage.go b/roomserver/storage/storage.go
index 551d97cd..7b9109aa 100644
--- a/roomserver/storage/storage.go
+++ b/roomserver/storage/storage.go
@@ -12,45 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+// +build !wasm
+
package storage
import (
- "context"
"net/url"
- "github.com/matrix-org/dendrite/roomserver/api"
- statedb "github.com/matrix-org/dendrite/roomserver/state/database"
"github.com/matrix-org/dendrite/roomserver/storage/postgres"
"github.com/matrix-org/dendrite/roomserver/storage/sqlite3"
- "github.com/matrix-org/dendrite/roomserver/types"
- "github.com/matrix-org/gomatrixserverlib"
)
-type Database interface {
- statedb.RoomStateDatabase
- StoreEvent(ctx context.Context, event gomatrixserverlib.Event, txnAndSessionID *api.TransactionID, authEventNIDs []types.EventNID) (types.RoomNID, types.StateAtEvent, error)
- StateEntriesForEventIDs(ctx context.Context, eventIDs []string) ([]types.StateEntry, error)
- EventStateKeys(ctx context.Context, eventStateKeyNIDs []types.EventStateKeyNID) (map[types.EventStateKeyNID]string, error)
- EventNIDs(ctx context.Context, eventIDs []string) (map[string]types.EventNID, error)
- SetState(ctx context.Context, eventNID types.EventNID, stateNID types.StateSnapshotNID) error
- EventIDs(ctx context.Context, eventNIDs []types.EventNID) (map[types.EventNID]string, error)
- GetLatestEventsForUpdate(ctx context.Context, roomNID types.RoomNID) (types.RoomRecentEventsUpdater, error)
- GetTransactionEventID(ctx context.Context, transactionID string, sessionID int64, userID string) (string, error)
- RoomNID(ctx context.Context, roomID string) (types.RoomNID, error)
- LatestEventIDs(ctx context.Context, roomNID types.RoomNID) ([]gomatrixserverlib.EventReference, types.StateSnapshotNID, int64, error)
- GetInvitesForUser(ctx context.Context, roomNID types.RoomNID, targetUserNID types.EventStateKeyNID) (senderUserIDs []types.EventStateKeyNID, err error)
- SetRoomAlias(ctx context.Context, alias string, roomID string, creatorUserID string) error
- GetRoomIDForAlias(ctx context.Context, alias string) (string, error)
- GetAliasesForRoomID(ctx context.Context, roomID string) ([]string, error)
- GetCreatorIDForAlias(ctx context.Context, alias string) (string, error)
- RemoveRoomAlias(ctx context.Context, alias string) error
- MembershipUpdater(ctx context.Context, roomID, targetUserID string) (types.MembershipUpdater, error)
- GetMembership(ctx context.Context, roomNID types.RoomNID, requestSenderUserID string) (membershipEventNID types.EventNID, stillInRoom bool, err error)
- GetMembershipEventNIDsForRoom(ctx context.Context, roomNID types.RoomNID, joinOnly bool) ([]types.EventNID, error)
- EventsFromIDs(ctx context.Context, eventIDs []string) ([]types.Event, error)
- GetRoomVersionForRoom(ctx context.Context, roomNID types.RoomNID) (int64, error)
-}
-
// NewPublicRoomsServerDatabase opens a database connection.
func Open(dataSourceName string) (Database, error) {
uri, err := url.Parse(dataSourceName)
diff --git a/roomserver/storage/storage_wasm.go b/roomserver/storage/storage_wasm.go
new file mode 100644
index 00000000..d7fc352e
--- /dev/null
+++ b/roomserver/storage/storage_wasm.go
@@ -0,0 +1,38 @@
+// 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 storage
+
+import (
+ "fmt"
+ "net/url"
+
+ "github.com/matrix-org/dendrite/roomserver/storage/sqlite3"
+)
+
+// NewPublicRoomsServerDatabase opens a database connection.
+func Open(dataSourceName string) (Database, error) {
+ uri, err := url.Parse(dataSourceName)
+ if err != nil {
+ return nil, fmt.Errorf("Cannot use postgres implementation")
+ }
+ switch uri.Scheme {
+ case "postgres":
+ return nil, fmt.Errorf("Cannot use postgres implementation")
+ case "file":
+ return sqlite3.Open(dataSourceName)
+ default:
+ return nil, fmt.Errorf("Cannot use postgres implementation")
+ }
+}