Commit graph

842 commits

Author SHA1 Message Date
Neil Alexander d3baee1d37
Merge branch 'master' into neilalexander/keydb 2020-05-27 09:46:33 +01:00
Neil Alexander 2e83bf212f Overwrite server_key_api listen in monolith hybrid mode 2020-05-27 09:45:43 +01:00
Neil Alexander 80be97e5af HTTP API to cache keys that have been requested 2020-05-27 09:42:59 +01:00
Neil Alexander 28520143ff Review comments 2020-05-27 09:41:04 +01:00
Kegan Dougal 267a4d1823 Update p2p docs 2020-05-27 09:39:26 +01:00
Kegsay c0c5d9452a Convert room_aliases previous_events state_block and state_snapshot tables (#1064)
* Convert state_snapshot and state_block tables

* Convert room_aliases and previous_events tables

* Add missing table
2020-05-27 09:36:09 +01:00
Neil Alexander f7b981be7c Add server_key_api to sample config 2020-05-26 18:23:41 +01:00
Kegsay 19aa44ecae
Convert transactions/rooms table to share more code (#1063)
* Convert rooms table

* Convert transactions table

* Convert rooms table and factor out lots of functions

* I think you'll be needing this..
2020-05-26 18:23:39 +01:00
Neil Alexander 11de37e2a7 Fix comments, don't use federation sender URL in polylith mode 2020-05-26 17:58:31 +01:00
Neil Alexander e182cb524c
Merge branch 'master' into neilalexander/keydb 2020-05-26 17:53:16 +01:00
Neil Alexander c9f1399ea6 Remove unused code 2020-05-26 17:52:09 +01:00
Neil Alexander 445082d6c5 Move things about a bit 2020-05-26 17:16:10 +01:00
Kegsay 803af87dc4
Convert events/event_json tables to share code (#1062)
* Convert event_json table

* Convert the events table
2020-05-26 16:45:28 +01:00
Neil Alexander ad0f1ee2ff Return results anyway 2020-05-26 16:41:32 +01:00
Neil Alexander d4db450f14 Return error if we failed to fetch some keys 2020-05-26 16:41:13 +01:00
Neil Alexander 483594b319 Add fetcher behaviour into server key API implementation 2020-05-26 16:34:44 +01:00
Neil Alexander 1a29596f2e Fix server key API URLs 2020-05-26 15:53:47 +01:00
Neil Alexander 0a3d2fdf0d Route server key API endpoints on internal API mux 2020-05-26 15:53:25 +01:00
Kegsay 737c83e0ae
roomserver: start refactoring storage layer (#1061)
* Begin refactoring out roomserver/storage/*/storage.go

* Convert event_types table
2020-05-26 15:42:42 +01:00
Neil Alexander a435154fc1 Create maps 2020-05-26 15:38:40 +01:00
Neil Alexander 6f8ebc173d Wire in new server key API into hybrid monolith mode 2020-05-26 15:17:16 +01:00
Neil Alexander 68f96d17a5 Merge branch 'master' into neilalexander/keydb 2020-05-26 14:57:04 +01:00
Neil Alexander 6d50212f29
Miscellaneous fixes (#1060)
* Add missing routing for PerformDirectoryLookupRequest

* Tweak output

* Fix some bugs in devices

* Don't default to federated room joins in response to invite

* Update sytest-whitelist

* Update comments

* Return correct room ID from PerformJoin

* Fix appservice and EDU server API setup, update sytest-whitelist

* Update sytest-whitelist
2020-05-26 14:41:16 +01:00
Kegan Dougal 492af0f2ec Use Opaque in addition to Path to set naffka DB names 2020-05-25 15:29:49 +01:00
Neil Alexander 3c3e014901 Define path prefixes in a package that doesn't create import cycles 2020-05-22 14:18:41 +01:00
Neil Alexander 06d5f1e6dc Fix API paths 2020-05-22 14:14:39 +01:00
Neil Alexander 0978630b55 Fix monolith room server-federation sender connection 2020-05-22 14:11:06 +01:00
Neil Alexander 3d06fe91f2 Fix internal HTTP API calls 2020-05-22 13:54:04 +01:00
Kegsay 3daa2327ed
dendritejs tweaks for persisting sqlite DBs (#1058)
* Use uri.path so we don't have file: in the filename

* New go-sqlite-js version
2020-05-22 12:28:48 +01:00
Neil Alexander fbdcfdd256
Use HTTP APIs when -api specified (#1057) 2020-05-22 12:28:36 +01:00
Neil Alexander fe82e1f725
Separate muxes for public and internal APIs (#1056)
* Separate muxes for public and internal APIs

* Update client-api-proxy and federation-api-proxy so they don't add /api to the path

* Tidy up

* Consistent HTTP setup

* Set up prefixes properly
2020-05-22 11:43:17 +01:00
Neil Alexander 506c5ff00b Merge branch 'master' into neilalexander/keydb 2020-05-21 16:23:57 +01:00
Neil Alexander f223da2f35 Fix URL in compose file 2020-05-21 16:22:25 +01:00
Neil Alexander 2977c3a92e YAML is funny about indentation 2020-05-21 15:29:26 +01:00
Neil Alexander b739c72042 Update Docker Hub for server key API 2020-05-21 15:27:42 +01:00
Neil Alexander 768b2ddd26 remove keyring.go 2020-05-21 15:13:38 +01:00
Neil Alexander 8121ff929b Common -> internal 2020-05-21 15:11:50 +01:00
Neil Alexander f19109a45c Merge branch 'master' into neilalexander/keydb 2020-05-21 15:06:40 +01:00
Kegsay 24d8df664c
Fix #897 and shuffle directory around (#1054)
* Fix #897 and shuffle directory around

* Update find-lint

* goimports

Co-authored-by: Neil Alexander <neilalexander@users.noreply.github.com>
2020-05-21 14:40:13 +01:00
Neil Alexander 8aa3acb300
Merge branch 'master' into neilalexander/keydb 2020-05-21 13:13:46 +01:00
Neil Alexander 3fdb045116
Docker Hub (#1053)
* Initial Docker Hub test

* Change upstream from for now

* Working polylith setup and build tools

* Some readme and other bits

* Remove the readme for now

* Add readme, rename a couple of things

* COPY instead of ADD

* Simplify component builds

* Fix the docker-compose things

* Build the base image again

* Update readme, add .dockerignore

* Indentation

* Whitespace

* Update images-push.sh

* Update images-push.sh
2020-05-21 13:02:28 +01:00
Kegan Dougal 91902df95d Add tests due to https://github.com/matrix-org/sytest/pull/876 2020-05-21 11:51:15 +01:00
Neil Alexander 45adc51790 go mod tidy 2020-05-21 11:27:05 +01:00
Neil Alexander 035d94dd3c Update gomatrixserverlib 2020-05-21 11:26:54 +01:00
Neil Alexander c73df4d7fe Simplify public key request marshalling from map keys 2020-05-21 11:24:42 +01:00
Neil Alexander 2f645cb6da Hopefully implement HTTP for server key API 2020-05-21 10:40:57 +01:00
Neil Alexander 45488487a2
Merge branch 'master' into neilalexander/keydb 2020-05-21 10:35:47 +01:00
Kegan Dougal 7d91ef0616 This now passes on sytest/develop 2020-05-20 18:31:02 +01:00
Neil Alexander f2c07437fe
Use memberships to determine whether to reset latest events/state on room join (#1047)
* Track local/remote memberships, re-scope some input stuff

* Check if we're in the room already before resetting latest events/state

* Fix postgres, fix lint

* Review comments
2020-05-20 18:03:06 +01:00
Kegsay 6091bf044f
sytest: Add remaining backfill tests (#1052)
One failed because of `null` instead of `[]` in HTTP responses.

One failed because we hadn't implemented in-line filter limits!
2020-05-20 17:30:03 +01:00