9410 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Johnston	4ce4379235	Fix attestations to check correct server name	2017-10-11 14:11:43 +01:00
Erik Johnston	c2c47550f9	Fix schema delta versions	2017-10-11 13:23:15 +01:00
Erik Johnston	535cc49f27	Merge pull request #2466 from matrix-org/erikj/groups_merged ... Initial Group Implementation	2017-10-11 13:20:07 +01:00
Erik Johnston	dfbf73408c	Merge pull request #2501 from matrix-org/dbkr/channel_notifications ... Support for channel notifications	2017-10-11 13:19:29 +01:00
Erik Johnston	bc7f3eb32f	Merge pull request #2483 from jeremycline/unfreeze-ujson-dump ... Unfreeze event before serializing with ujson	2017-10-11 13:18:52 +01:00
Erik Johnston	ec954f47fb	Validate room ids	2017-10-11 13:15:44 +01:00
David Baker	81a5e0073c	pep8	2017-10-10 15:53:34 +01:00
David Baker	ab1bc9bf5f	Don't KeyError if no power_levels event	2017-10-10 15:34:05 +01:00
David Baker	0f1eb3e914	Use notification levels in power_levels ... Rather than making the condition directly require a specific power level. This way the level require to notify a room can be configured per room.	2017-10-10 15:23:00 +01:00
Erik Johnston	84e27a592d	Merge pull request #2490 from matrix-org/erikj/drop_left_room_events ... Ignore incoming events for rooms that we have left	2017-10-10 11:58:32 +01:00
David Baker	c9f034b4ac	There was already a constant for this ... also update copyright	2017-10-10 11:47:10 +01:00
David Baker	a9f9d68631	More optimisation	2017-10-10 11:38:31 +01:00
David Baker	707374d5dc	What year is it!? Who's the president!?	2017-10-10 11:21:41 +01:00
David Baker	89fa00ddff	Merge branch 'develop' into dbkr/channel_notifications	2017-10-10 11:20:17 +01:00
Richard van der Hoff	79bea15830	Merge pull request #2520 from matrix-org/rav/process_incoming_rooms_in_parallel ... fed server: process PDUs for different rooms in parallel	2017-10-10 10:26:21 +01:00
Richard van der Hoff	426f8b0f66	Merge pull request #2518 from matrix-org/rav/linearize_incoming_transactions ... Fed server: use a linearizer for ongoing transactions	2017-10-10 10:20:51 +01:00
Richard van der Hoff	6a6cc27aee	fed server: process PDUs for different rooms in parallel ... With luck, this will give a real-time improvement when there are many rooms and the server ends up calling out to fetch missing events.	2017-10-09 18:30:31 +01:00
Richard van der Hoff	4c7c4d4061	Fed server: use a linearizer for ongoing transactions ... We don't want to process the same transaction multiple times concurrently, so use a linearizer.	2017-10-09 18:30:10 +01:00
Richard van der Hoff	4d24becf7f	Merge pull request #2517 from matrix-org/rav/fed_server_refactor ... fed server: refactor on_incoming_transaction	2017-10-09 18:19:23 +01:00
Richard van der Hoff	ba5b9b80a5	fed server: refactor on_incoming_transaction ... Move as much as possible to after the have_responded check, and reduce the number of times we iterate over the pdu list.	2017-10-09 18:10:53 +01:00
Richard van der Hoff	c7b0678356	Merge pull request #2516 from matrix-org/rav/fix_fed_server_origin_check ... Fed server: Move origin-check code to _handle_received_pdu	2017-10-09 18:09:43 +01:00
Richard van der Hoff	a6e3222fe5	Fed server: Move origin-check code to _handle_received_pdu ... The response-building code expects there to be an entry in the `results` list for each entry in the pdu_list, so the early `continue` was messing this up. That doesn't really matter, because all that the federation client does is log any errors, but it's pretty poor form.	2017-10-09 17:53:32 +01:00
Richard van der Hoff	3cc852d339	Fancy logformatter to format exceptions better ... This is a bit of an experimental change at this point; the idea is to see if it helps us track down where our stack overflows are coming from by logging the stack when the exception was caught and turned into a Failure. (We'll also need edf2704420). If we deploy this, we'll be able to enable it via the log config yaml.	2017-10-09 17:44:42 +01:00
Richard van der Hoff	0eeaa25694	Merge pull request #2508 from matrix-org/rav/federation_queue_logcontexts ... Fix up logcontext handling in (federation) TransactionQueue	2017-10-09 17:43:48 +01:00
Richard van der Hoff	aa3fac8057	Merge pull request #2507 from matrix-org/rav/execute_concurrently_log_contexts ... Fix logcontext handling for concurrently_execute	2017-10-09 17:43:32 +01:00
Richard van der Hoff	c1c81ee2a4	Merge pull request #2506 from matrix-org/rav/unhandled_failure ... Fix up deferred handling in federation.py	2017-10-09 17:43:10 +01:00
Erik Johnston	e8496efe84	Fix up comment	2017-10-09 15:17:34 +01:00
Richard van der Hoff	01bbacf3c4	Fix up logcontext handling in (federation) TransactionQueue ... Avoid using preserve_context_over_function, which has problems with respect to logcontexts.	2017-10-06 22:39:25 +01:00
Richard van der Hoff	148428ce76	Fix logcontext handling for concurrently_execute ... Avoid preserve_context_over_deferred, which is broken.	2017-10-06 22:24:28 +01:00
Richard van der Hoff	c8f568ddf9	Fix up deferred handling in federation.py ... * Avoid preserve_context_over_deferred, which is broken * set consumeErrors=True on defer.gatherResults, to avoid spurious "unhandled failure" erros	2017-10-06 22:14:24 +01:00
Richard van der Hoff	3ddda939d3	some comments in the state res code	2017-10-05 14:58:17 +01:00
David Baker	5de926d66f	Merge pull request #2502 from matrix-org/dbkr/allow_dms_to_admins ... Spam checking: add the invitee to user_may_invite	2017-10-05 14:14:13 +01:00
David Baker	f878e6f8af	Spam checking: add the invitee to user_may_invite	2017-10-05 14:02:28 +01:00
David Baker	269af961e9	Make be faster	2017-10-05 13:27:12 +01:00
David Baker	ed80c6b6cc	Add fastpath optimisation	2017-10-05 13:20:22 +01:00
David Baker	e433393c4f	pep8	2017-10-05 13:08:02 +01:00
David Baker	985ce80375	They're called rooms	2017-10-05 13:03:44 +01:00
David Baker	b9b9714fd5	Get rule type right	2017-10-05 13:02:19 +01:00
David Baker	fa969cfdde	Support for channel notifications ... Add condition type to check the sender's power level and add a base rule using it for @channel notifications.	2017-10-05 12:39:18 +01:00
David Baker	44f8e383f3	Merge pull request #2500 from matrix-org/dbkr/fix_word_boundary_mentions ... Fix notif kws that start/end with non-word chars	2017-10-05 12:27:59 +01:00
David Baker	0c8da8b519	Use better method for word boundary searching ... From ebc95667b8	2017-10-05 11:57:43 +01:00
Erik Johnston	eaaa837e00	Don't corrupt cache	2017-10-05 11:43:22 +01:00
David Baker	cbe3c3fdd4	pep8	2017-10-05 11:43:10 +01:00
David Baker	6748f0a579	Fix notif kws that start/end with non-word chars ... Only prepend / append word bounary characters if the search expression starts or ends with a word character, otherwise they don't work because there's no word bounary between whitespace and a non-word char.	2017-10-05 11:33:30 +01:00
David Baker	93b0cf7a99	Merge pull request #2495 from matrix-org/dbkr/spam_check_room_creation ... Add room creation checks to spam checker	2017-10-04 14:49:20 +01:00
David Baker	d8ce68b09b	spam check room publishing	2017-10-04 14:29:33 +01:00
David Baker	78d4ced829	un-double indent	2017-10-04 12:44:27 +01:00
David Baker	197c14dbcf	Add room creation checks to spam checker ... Lets the spam checker deny attempts to create rooms and add aliases to them.	2017-10-04 10:47:54 +01:00
David Baker	5f20a91fa1	Merge pull request #2492 from matrix-org/dbkr/spam_check_invites ... Allow spam checker to reject invites too	2017-10-03 18:10:23 +01:00
David Baker	1e2ac54351	s/roomid/room_id/	2017-10-03 17:41:38 +01:00