1718 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Neil Alexander	ae02c5e6ae	Revert "Error if no servers available to join via" ... This reverts commit 2c543ac034.	2021-11-15 15:40:38 +00:00
Neil Alexander	2c543ac034	Error if no servers available to join via	2021-11-15 15:29:39 +00:00
Neil Alexander	0c3d2f0f64	Fall back to federation if we can't satisfy with any of our local users	2021-11-15 15:16:57 +00:00
Neil Alexander	2890218c4b	Tweak requirement checking for send join	2021-11-15 14:05:52 +00:00
Neil Alexander	61e14ba3e7	Put the default room version back	2021-11-15 13:57:24 +00:00
Neil Alexander	5882264dc8	Update client error for incompatible room versions	2021-11-15 13:38:33 +00:00
Neil Alexander	1e3c19f31d	Use "event" field from RespSendJoin	2021-11-15 13:13:33 +00:00
Neil Alexander	046a6331bd	Update to matrix-org/gomatrixserverlib@ba4a3b9	2021-11-15 13:09:05 +00:00
Neil Alexander	9c4bfba01b	Try to match by type/state key tuple rather than event ID	2021-11-15 11:56:53 +00:00
Neil Alexander	19ee1a4f38	Push fixes	2021-11-15 11:27:07 +00:00
Neil Alexander	623b61b3c2	Update check for remote join event	2021-11-15 10:26:12 +00:00
Neil Alexander	d0e7bc0f27	Refactor restricted joins, modify join response to include membership in all cases, modify federation sender to use membership event from remote side	2021-11-15 10:02:48 +00:00
Neil Alexander	f4ad4db6fb	Fix return codes	2021-11-12 17:20:36 +00:00
Neil Alexander	e1c61122e7	Update to matrix-org/gomatrixserverlib@315b9c9	2021-11-12 16:49:35 +00:00
Neil Alexander	c5a3a70d59	Update to matrix-org/gomatrixserverlib@07ae300	2021-11-12 16:34:52 +00:00
Neil Alexander	a4e4d236eb	Update to matrix-org/gomatrixserverlib@9eea1bf	2021-11-12 15:56:41 +00:00
Neil Alexander	7a818ca7d4	Update to matrix-org/gomatrixserverlib@ce8954e	2021-11-12 15:49:33 +00:00
Neil Alexander	bc5b7ab995	Update to matrix-org/gomatrixserverlib@3273645	2021-11-12 15:44:35 +00:00
Neil Alexander	c7aa7a7b3e	Merge branch 'master' into neilalexander/restrictedjoin	2021-11-12 15:17:03 +00:00
Neil Alexander	5565e40395	Fix default power levels (update to matrix-org/gomatrixserverlib@af2616b)	2021-11-12 15:16:22 +00:00
Neil Alexander	fbc654d477	Remove some redundant logging	2021-11-12 13:59:57 +00:00
Neil Alexander	72b65640a4	Don't add to server_names if some are already specified	2021-11-12 13:57:50 +00:00
Neil Alexander	e874853ed0	Clean up a bit	2021-11-12 09:38:14 +00:00
Neil Alexander	6016d378a0	Update to matrix-org/gomatrixserverlib@610bd483d0	2021-11-11 16:29:29 +00:00
Neil Alexander	f0c169b2a2	Two-step unmarshalling in federation API too	2021-11-11 16:01:36 +00:00
Neil Alexander	9ad0a85df9	Tweak error handling some more	2021-11-11 15:42:58 +00:00
Neil Alexander	9fb7b59648	Comments	2021-11-11 15:11:41 +00:00
Neil Alexander	24904a56a9	Update to matrix-org/gomatrixserverlib@6e0b05a	2021-11-11 15:07:58 +00:00
Neil Alexander	9e694f3fe5	Improve error handling some more	2021-11-11 14:29:20 +00:00
Neil Alexander	6123c0edca	Handle the case that the join rules are nonsense	2021-11-11 14:06:13 +00:00
Neil Alexander	9ea8dc71eb	Make sure that invalid join rules returns a 403	2021-11-11 14:01:49 +00:00
Neil Alexander	3300effe39	Update error codes	2021-11-11 13:44:22 +00:00
Neil Alexander	43727e978d	Update local restricted joins some more	2021-11-11 13:33:25 +00:00
Neil Alexander	b1c024c9c1	Don't fail hard, let roomserver reject event if it fails auth	2021-11-11 12:29:33 +00:00
Neil Alexander	498fbc277b	Try to process local restricted joins	2021-11-11 12:09:49 +00:00
Neil Alexander	84fd88052b	Update to matrix-org/gomatrixserverlib@610bd48	2021-11-10 16:22:51 +00:00
Neil Alexander	38fa483091	Tweak error handling	2021-11-10 14:00:29 +00:00
Neil Alexander	2e9a727620	Try to generate HTTP error for gomatrixserverlib.NotAllowed	2021-11-10 13:32:48 +00:00
Neil Alexander	a28297c39d	Tweak performJoinUsingServer error handling	2021-11-10 13:04:59 +00:00
Neil Alexander	3ba7291598	Ignore invalid room IDs in allow rules	2021-11-10 12:34:05 +00:00
Neil Alexander	e9bee83b03	Tweak join rule unmarshalling	2021-11-10 11:55:58 +00:00
Neil Alexander	84c7205b54	Update to matrix-org/gomatrixserverlib@62a0f29	2021-11-10 11:36:30 +00:00
Neil Alexander	df778309ea	Update to matrix-org/gomatrixserverlib@644c168	2021-11-10 11:09:49 +00:00
Neil Alexander	825ef6ba3a	Update to matrix-org/gomatrixserverlib@1c69dda	2021-11-10 10:24:28 +00:00
Neil Alexander	7ff22db6f8	Update to matrix-org/gomatrixserverlib@14eacc0	2021-11-10 09:56:41 +00:00
Neil Alexander	20844ea2e0	Update to matrix-org/gomatrixserverlib@7181881	2021-11-10 09:38:17 +00:00
Neil Alexander	5a270ba59f	Return 403s for now, might placate the tests	2021-11-09 16:16:04 +00:00
Neil Alexander	f21a585647	Error on obvious problems with the make_join response instead of overwriting them	2021-11-09 15:55:53 +00:00
Neil Alexander	f3e83c1a07	More logging	2021-11-09 15:03:35 +00:00
Neil Alexander	20e96f5332	logging	2021-11-09 14:39:50 +00:00