Devon Hudson
0aa1b6c218
Merge branch 'main' into s7evink/memberships
2023-07-21 11:37:50 -06:00
devonh
c809e95335
Fix event federation with pseudoID rooms ( #3156 )
2023-07-21 16:08:40 +00:00
Sam Wedgwood
9582827493
de-MSC-ifying space summaries (MSC2946) ( #3134 )
...
- This PR moves and refactors the
[code](https://github.com/matrix-org/dendrite/blob/main/setup/mscs/msc2946/msc2946.go )
for
[MSC2946](https://github.com/matrix-org/matrix-spec-proposals/pull/2946 )
('Space Summaries') to integrate it into the rest of the codebase.
- Means space summaries are no longer hidden behind an MSC flag
- Solves #3096
Signed-off-by: Sam Wedgwood <sam@wedgwood.dev>
2023-07-20 15:06:05 +01:00
Till Faelligen
16075ce657
Merge branch 'main' of github.com:matrix-org/dendrite into s7evink/memberships
2023-07-13 14:33:44 +02:00
Till Faelligen
0df982a2e5
Update NATS again [skip ci]
2023-07-13 14:17:48 +02:00
Till Faelligen
92a633d0e4
Merge branch 'main' of github.com:matrix-org/dendrite into s7evink/memberships
2023-07-12 11:17:57 +02:00
Till Faelligen
6942c198b9
Update GMSL
2023-07-12 11:16:06 +02:00
Till Faelligen
b965a08faa
Unknown issue
2023-07-07 22:52:23 +02:00
Till Faelligen
ef32de928d
[NATS] Issue identified and fixed applied, workaround known.
2023-07-07 22:10:52 +02:00
Till
74a5ab6c24
Fix issues reported by Sentry ( #3143 )
...
This should fix a few issues reported by Sentry
2023-07-07 22:00:10 +02:00
Till
eb9e90379d
Add event size checks similar to Synapse ( #3140 )
...
Companion to https://github.com/matrix-org/gomatrixserverlib/pull/400
This tries to mimic the logic found in Synapse, as dropping events can
break rooms (and we may end up in endless loops..)
2023-07-07 20:37:23 +02:00
Devon Hudson
f825ce2935
Fix gmsl to point to memberships branch
2023-07-06 15:45:19 -06:00
Devon Hudson
2bcb89ad4c
Merge branch 'main' into s7evink/memberships
2023-07-06 15:41:27 -06:00
devonh
d507c5fc95
Add pseudoID compatibility to Invites ( #3126 )
2023-07-06 15:15:24 +00:00
Till Faelligen
fea946d914
Don't spam the logs - downgrade sentry
2023-07-06 10:55:21 +02:00
Till Faelligen
9f7e14e4d0
Back to the original version for now
2023-07-06 10:44:11 +02:00
Till Faelligen
4a666932f5
[debug] Downgrade NATS
2023-07-06 10:31:32 +02:00
Till
49d75d3cf6
Version 0.13.1 ( #3136 )
2023-07-06 09:28:39 +02:00
Till Faelligen
9569498761
Update GMSL
2023-07-05 10:59:42 +02:00
Till Faelligen
da51f32e03
Update GMSL
2023-07-03 09:01:43 +02:00
Till
23cd7877a1
Add MXIDMapping for pseudoID rooms ( #3112 )
...
Add `MXIDMapping` on membership events when
creating/joining rooms.
2023-06-28 20:29:49 +02:00
devonh
e4665979bf
Merge SenderID & Per Room User Key work ( #3109 )
2023-06-14 14:23:46 +00:00
devonh
77d9e4e93d
Cleanup remaining statekey usage for senderIDs ( #3106 )
2023-06-12 11:19:25 +00:00
devonh
8ea1a11105
Use SenderID Type ( #3105 )
2023-06-07 17:14:35 +00:00
devonh
7a1fd7f512
PDU Sender split ( #3100 )
...
Initial cut of splitting PDU Sender into SenderID & looking up UserID where required.
2023-06-06 20:55:18 +00:00
Till
725ff5567d
Make StrictValidityChecking a function ( #3092 )
...
Companion PR to https://github.com/matrix-org/gomatrixserverlib/pull/388
2023-06-06 15:16:55 +02:00
devonh
ea6b368ad4
Move Invite logic to GMSL ( #3086 )
...
This is both the federation receiving & sending side logic (which were
previously entangeld in a single function)
2023-05-31 16:33:49 +00:00
devonh
cbdc601f1b
Move CreateRoom logic to Roomserver ( #3093 )
...
Move create room logic over to roomserver.
2023-05-31 15:27:08 +00:00
Till
3dcca4017c
Fix potential state reset when trying to join a room ( #3040 )
...
When trying to join a room in short sequence, it is possible that a
state reset occurs. This fixes it by using `singleflight`.
2023-05-30 15:27:11 +02:00
Till
11b557097c
Drop reference_sha column ( #3083 )
...
Companion PR to https://github.com/matrix-org/gomatrixserverlib/pull/383
2023-05-24 12:14:42 +02:00
Till
5d6221d191
Move MakeLeave to GMSL ( #3085 )
...
Basically the same API shape as for `/make_join`
https://github.com/matrix-org/gomatrixserverlib/pull/385
2023-05-23 19:37:04 +02:00
devonh
2eae8dc489
Move SendJoin logic to GMSL ( #3084 )
...
Moves the core matrix logic for handling the send_join endpoint over to
gmsl.
2023-05-19 16:27:01 +00:00
dependabot[bot]
345f025ee3
Bump github.com/docker/distribution from 2.8.1+incompatible to 2.8.2+incompatible ( #3082 )
...
Bumps
[github.com/docker/distribution](https://github.com/docker/distribution )
from 2.8.1+incompatible to 2.8.2+incompatible.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/docker/distribution/releases ">github.com/docker/distribution's
releases</a>.</em></p>
<blockquote>
<h2>v2.8.2</h2>
<h2>What's Changed</h2>
<ul>
<li>Revert registry/client: set <code>Accept: identity</code> header
when getting layers by <a
href="https://github.com/ndeloof "><code>@ndeloof</code></a> in <a
href="https://redirect.github.com/distribution/distribution/pull/3783 ">distribution/distribution#3783</a></li>
<li>Parse <code>http</code> forbidden as denied by <a
href="https://github.com/vvoland "><code>@vvoland</code></a> in <a
href="https://redirect.github.com/distribution/distribution/pull/3914 ">distribution/distribution#3914</a></li>
<li>Fix <a
href="https://www.cve.org/CVERecord?id=CVE-2022-28391 ">CVE-2022-28391</a>
by bumping alpine from 3.14 to 3.16 by <a
href="https://github.com/thaJeztah "><code>@thaJeztah</code></a> (<a
href="https://redirect.github.com/distribution/distribution/pull/3650 ">#3650</a>)</li>
<li>Fix <a
href="https://www.cve.org/CVERecord?id=CVE-2023-2253 ">CVE-2023-2253</a>
runaway allocation on /v2/_catalog by <a
href="https://github.com/josegomezr "><code>@josegomezr</code></a> <a
href="521ea3d973https://github.com/wy65701436 "><code>@wy65701436</code></a> in <a
href="https://redirect.github.com/distribution/distribution/pull/3815 ">distribution/distribution#3815</a></li>
<li>bump up golang version (alternative) by <a
href="https://github.com/thaJeztah "><code>@thaJeztah</code></a> in <a
href="https://redirect.github.com/distribution/distribution/pull/3903 ">distribution/distribution#3903</a></li>
<li>Dockerfile: update xx to v1.2.1 by <a
href="https://github.com/thaJeztah "><code>@thaJeztah</code></a> in <a
href="https://redirect.github.com/distribution/distribution/pull/3907 ">distribution/distribution#3907</a></li>
<li>update to go1.19.9 by <a
href="https://github.com/thaJeztah "><code>@thaJeztah</code></a> in <a
href="https://redirect.github.com/distribution/distribution/pull/3908 ">distribution/distribution#3908</a></li>
<li>Add code to handle pagination of parts. Fixes max layer size of 10GB
bug by <a
href="https://github.com/DavidSpek "><code>@DavidSpek</code></a> in <a
href="https://redirect.github.com/distribution/distribution/pull/3893 ">distribution/distribution#3893</a></li>
<li>Dockerfile: fix filenames of artifacts by <a
href="https://github.com/thaJeztah "><code>@thaJeztah</code></a> in <a
href="https://redirect.github.com/distribution/distribution/pull/3911 ">distribution/distribution#3911</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/distribution/distribution/compare/v2.8.1...v2.8.2 ">https://github.com/distribution/distribution/compare/v2.8.1...v2.8.2 </a></p>
<h2>v2.8.2-beta.2</h2>
<h2>What's Changed</h2>
<ul>
<li>Fix <a
href="https://www.cve.org/CVERecord?id=CVE-2022-28391 ">CVE-2022-28391</a>
by bumping alpine from 3.14 to 3.16 by <a
href="https://github.com/thaJeztah "><code>@thaJeztah</code></a> (<a
href="https://redirect.github.com/distribution/distribution/pull/3650 ">#3650</a>)</li>
<li>Fix <a
href="https://www.cve.org/CVERecord?id=CVE-2023-2253 ">CVE-2023-2253</a>
runaway allocation on /v2/_catalog by <a
href="https://github.com/josegomezr "><code>@josegomezr</code></a> <a
href="521ea3d973https://github.com/wy65701436 "><code>@wy65701436</code></a> in <a
href="https://redirect.github.com/distribution/distribution/pull/3815 ">distribution/distribution#3815</a></li>
<li>bump up golang version (alternative) by <a
href="https://github.com/thaJeztah "><code>@thaJeztah</code></a> in <a
href="https://redirect.github.com/distribution/distribution/pull/3903 ">distribution/distribution#3903</a></li>
<li>Dockerfile: update xx to v1.2.1 by <a
href="https://github.com/thaJeztah "><code>@thaJeztah</code></a> in <a
href="https://redirect.github.com/distribution/distribution/pull/3907 ">distribution/distribution#3907</a></li>
<li>update to go1.19.9 by <a
href="https://github.com/thaJeztah "><code>@thaJeztah</code></a> in <a
href="https://redirect.github.com/distribution/distribution/pull/3908 ">distribution/distribution#3908</a></li>
<li>Add code to handle pagination of parts. Fixes max layer size of 10GB
bug by <a
href="https://github.com/DavidSpek "><code>@DavidSpek</code></a> in <a
href="https://redirect.github.com/distribution/distribution/pull/3893 ">distribution/distribution#3893</a></li>
<li>Dockerfile: fix filenames of artifacts by <a
href="https://github.com/thaJeztah "><code>@thaJeztah</code></a> in <a
href="https://redirect.github.com/distribution/distribution/pull/3911 ">distribution/distribution#3911</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/distribution/distribution/compare/v2.8.1...v2.8.2-beta.2 ">https://github.com/distribution/distribution/compare/v2.8.1...v2.8.2-beta.2 </a></p>
<h2>v2.8.2-beta.1</h2>
<h3><strong>NOTE: This is a pre-release that does not contain any
artifacts!</strong></h3>
<h2>What's Changed</h2>
<ul>
<li>Fix runaway allocation on /v2/_catalog by <a
href="https://github.com/josegomezr "><code>@josegomezr</code></a> <a
href="521ea3d973https://github.com/thaJeztah "><code>@thaJeztah</code></a> in <a
href="https://redirect.github.com/distribution/distribution/pull/3650 ">distribution/distribution#3650</a></li>
<li>Fix panic in inmemory driver by <a
href="https://github.com/wy65701436 "><code>@wy65701436</code></a> in <a
href="https://redirect.github.com/distribution/distribution/pull/3815 ">distribution/distribution#3815</a></li>
<li>bump up golang version (alternative) by <a
href="https://github.com/thaJeztah "><code>@thaJeztah</code></a> in <a
href="https://redirect.github.com/distribution/distribution/pull/3903 ">distribution/distribution#3903</a></li>
<li>Dockerfile: update xx to v1.2.1 by <a
href="https://github.com/thaJeztah "><code>@thaJeztah</code></a> in <a
href="https://redirect.github.com/distribution/distribution/pull/3907 ">distribution/distribution#3907</a></li>
<li>update to go1.19.9 by <a
href="https://github.com/thaJeztah "><code>@thaJeztah</code></a> in <a
href="https://redirect.github.com/distribution/distribution/pull/3908 ">distribution/distribution#3908</a></li>
<li>Add code to handle pagination of parts. Fixes max layer size of 10GB
bug by <a
href="https://github.com/DavidSpek "><code>@DavidSpek</code></a> in <a
href="https://redirect.github.com/distribution/distribution/pull/3893 ">distribution/distribution#3893</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/distribution/distribution/compare/v2.8.1...v2.8.2-beta.1 ">https://github.com/distribution/distribution/compare/v2.8.1...v2.8.2-beta.1 </a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="7c354a4b40https://redirect.github.com/docker/distribution/issues/3915 ">#3915</a>
from distribution/2.8.2-release-notes</li>
<li><a
href="a173a9c6254894d35ecchttps://redirect.github.com/docker/distribution/issues/3914 ">#3914</a>
from vvoland/handle-forbidden-28</li>
<li><a
href="f067f66d3dhttps://redirect.github.com/docker/distribution/issues/3783 ">#3783</a>
from ndeloof/accept-encoding-28</li>
<li><a
href="483ad69da32b0f84df21320d6a141fhttps://redirect.github.com/docker/distribution/issues/3912 ">#3912</a>
from distribution/2.8.2-beta.2-release-notes</li>
<li><a
href="5f3ca1b2fbcb840f63b3https://redirect.github.com/docker/distribution/issues/3911 ">#3911</a>
from thaJeztah/2.8_backport_fix_releaser_filenames</li>
<li><a
href="e884644fffhttps://github.com/docker/distribution/compare/v2.8.1...v2.8.2 ">compare
view</a></li>
</ul>
</details>
<br />
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores )
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
You can disable automated security fix PRs for this repo from the
[Security Alerts
page](https://github.com/matrix-org/dendrite/network/alerts ).
</details>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-05-17 17:44:59 +02:00
devonh
67d6876857
Move MakeJoin logic to GMSL ( #3081 )
2023-05-17 00:33:27 +00:00
devonh
0489d16f95
Move json errors over to gmsl ( #3080 )
2023-05-09 22:46:49 +00:00
kegsay
2b34f88fde
Use ProtoEvent where needed instead of EventBuilder ( #3075 )
...
They are fundamentally different concepts, so should be represented as
such. Proto events are exchanged in /make_xxx calls over federation, and
made as "fledgling" events in /createRoom and general event sending.
*Building* events is a reasonably complex VERSION SPECIFIC process which
needs amongst other things, auth event providers, prev events, signing
keys, etc.
Requires https://github.com/matrix-org/gomatrixserverlib/pull/379
2023-05-04 11:17:42 +01:00
kegsay
6284790f98
Use PDU in even more places ( #3074 )
...
- No longer rely on *Event returning from NewEventFrom... functions
Requires https://github.com/matrix-org/gomatrixserverlib/pull/377
2023-05-03 10:21:27 +01:00
kegsay
f5b3144dc3
Use PDU not *Event in HeaderedEvent ( #3073 )
...
Requires https://github.com/matrix-org/gomatrixserverlib/pull/376
This has numerous upsides:
- Less type casting to `*Event` is required.
- Making Dendrite work with `PDU` interfaces means we can swap out Event
impls more easily.
- Tests which represent weird event shapes are easier to write.
Part of a series of refactors on GMSL.
2023-05-02 15:03:16 +01:00
Devon Hudson
b00e272e6f
Use new gmsl to use new String() API
2023-04-28 13:31:21 -06:00
kegsay
1432743d1a
Use PDU in more places ( #3072 )
2023-04-28 16:00:22 +01:00
Devon Hudson
d23d0369cc
Pass RoomID to gmsl.PerformJoin
2023-04-27 18:34:43 -06:00
kegsay
6171310307
Use PDU interface ( #3070 )
...
We only use it in a few places currently, enough to get things to
compile and run. We should be using it in much more places.
Similarly, in some places we cast []PDU back to []*Event, we need to not
do that. Likewise, in some places we cast PDU to *Event, we need to not
do that. For now though, hopefully this is a start.
2023-04-27 16:35:19 +01:00
Till
c6457cd4e5
Add CS API /keys tests ( #3069 )
...
This is slightly cheating, as the heavy lifting, with regards to key
generation, is done using `mautrix/go`.
2023-04-27 16:43:28 +02:00
kegsay
b189edf4f4
Remove gmsl.HeaderedEvent ( #3068 )
...
Replaced with types.HeaderedEvent _for now_. In reality we want to move
them all to gmsl.Event and only use HeaderedEvent when we _need_ to
bundle the version/event ID with the event (seriailsation boundaries,
and even then only when we don't have the room version).
Requires https://github.com/matrix-org/gomatrixserverlib/pull/373
2023-04-27 12:54:20 +01:00
devonh
dd5e47a9a7
Move high level room joining logic to GMSL ( #3065 )
...
GMSL PR: https://github.com/matrix-org/gomatrixserverlib/pull/372
2023-04-27 00:43:46 +00:00
devonh
ed19efc5d7
Move fedclient interface over to gmsl ( #3061 )
...
Companion PR: https://github.com/matrix-org/gomatrixserverlib/pull/366
2023-04-24 16:23:25 +00:00
kegsay
4679098a64
Use IRoomVersion ( #3064 )
...
This is a step towards allowing arbitrary room version impls.
2023-04-24 11:50:37 +01:00
kegsay
1647213fac
Implement new RoomVersionImpl API ( #3062 )
...
As outlined in https://github.com/matrix-org/gomatrixserverlib/pull/368
The main change Dendrite side is that `RoomVersion` no longer has any
methods on it. Instead, you need to bounce via `gmsl.GetRoomVersion`.
It's very interesting to see where exactly Dendrite cares about this.
For some places it's creating events (fine) but others are way more
specific. Those areas will need to migrate to GMSL at some point.
2023-04-21 17:06:29 +01:00
kegsay
71eeccf34a
refactor: funnel event creation through room versions ( #3060 )
...
In preparation of interfacing up the room version value.
2023-04-20 19:07:31 +01:00
kegsay
72285b2659
refactor: update GMSL ( #3058 )
...
Sister PR to https://github.com/matrix-org/gomatrixserverlib/pull/364
Read this commit by commit to avoid going insane.
2023-04-19 15:50:33 +01:00
