6042 Commits

Author	SHA1	Message	Date
Erik Johnston	f2b2cd8eb4	Amalgamate two identical consecutive if statements	2016-09-14 11:16:22 +01:00
Erik Johnston	00f51493f5	Fix reindex	2016-09-14 10:18:30 +01:00
Erik Johnston	d5ae1f1291	Ensure we don't mutate state cache entries	2016-09-14 10:03:48 +01:00
Matthew Hodgson	1b01488d27	Merge pull request #1111 from matrix-org/matthew/device-ids ... make device IDs more useful for human disambiguation	2016-09-14 01:18:02 +01:00
Paul Evans	0f73f0e70e	Merge pull request #1116 from matrix-org/paul/tiny-fixes ... Fix typo "persiting"	2016-09-13 13:27:42 +01:00
Paul "LeoNerd" Evans	ca35e54d6b	Fix typo "persiting"	2016-09-13 13:26:33 +01:00
Mark Haines	ad816b0add	Limit how often we ask for keys from dead servers	2016-09-13 11:53:50 +01:00
Erik Johnston	43253c10b8	Remove redundant event_auth index	2016-09-13 11:47:48 +01:00
Mark Haines	18ab019a4a	Move the E2E key handling into the e2e handler	2016-09-13 11:35:35 +01:00
Mark Haines	76b09c29b0	Merge pull request #1110 from matrix-org/markjh/e2e_timeout ... Add a timeout parameter for end2end key queries.	2016-09-13 10:50:45 +01:00
Erik Johnston	ba6bc2faa0	Merge pull request #1109 from matrix-org/erikj/partial_indices ... Add WHERE clause support to index creation	2016-09-13 09:06:16 +01:00
Matthew Hodgson	edbcb4152b	make device IDs more useful for human disambiguation	2016-09-13 00:02:39 +01:00
Mark Haines	949c2c5435	Add a timeout parameter for end2end key queries. ... Add a timeout parameter for controlling how long synapse will wait for responses from remote servers. For servers that fail include how they failed to make it easier to debug. Fetch keys from different servers in parallel rather than in series. Set the default timeout to 10s.	2016-09-12 18:17:09 +01:00
Erik Johnston	b17af156c7	Remove where clause	2016-09-12 17:05:54 +01:00
Erik Johnston	1c9da43a95	Merge pull request #1108 from matrix-org/erikj/create_dm ... Add is_direct param to /createRoom	2016-09-12 16:57:16 +01:00
Erik Johnston	0b32bb20bb	Index contains_url for file search queries	2016-09-12 16:57:05 +01:00
Erik Johnston	c94de0ab60	Add WHERE clause support to index creation	2016-09-12 16:55:01 +01:00
Erik Johnston	502c901e11	Merge pull request #1107 from matrix-org/erikj/backfill_none ... Fix backfill when cannot find an event.	2016-09-12 16:48:01 +01:00
Erik Johnston	48a5a7552d	Add is_direct param to /createRoom	2016-09-12 16:34:20 +01:00
Erik Johnston	706b5d76ed	Fix backfill when cannot find an event. ... `get_pdu` can succeed but return None.	2016-09-12 14:59:51 +01:00
Erik Johnston	7c679b1118	Merge pull request #1106 from matrix-org/erikj/state_reindex_concurrent ... Create new index concurrently	2016-09-12 14:38:40 +01:00
Erik Johnston	d080b3425c	Merge pull request #1105 from matrix-org/erikj/make_notif_highlight_query_fast ... Optimise /notifications query	2016-09-12 14:34:12 +01:00
Erik Johnston	03a98aff3c	Create new index concurrently	2016-09-12 14:27:01 +01:00
Erik Johnston	fa20c9ce94	Change the index to be stream_ordering, highlight	2016-09-12 14:04:08 +01:00
Erik Johnston	5ef5435529	Remove unused import	2016-09-12 13:32:58 +01:00
Mark Haines	aa7b890cfe	Merge pull request #1104 from matrix-org/markjh/direct_to_device_federation_sync ... Fix direct to device messages recieved over federation to notify sync	2016-09-12 13:25:23 +01:00
Erik Johnston	7cd6edb947	Use register_background_index_update	2016-09-12 12:54:48 +01:00
Erik Johnston	0294c14ec4	Add back in query change	2016-09-12 12:43:56 +01:00
Erik Johnston	7fe42cf949	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/make_notif_highlight_query_fast	2016-09-12 12:37:09 +01:00
Erik Johnston	15ca0c6a4d	Make reindex happen in bg	2016-09-12 12:36:36 +01:00
Mark Haines	a232e06100	Fix direct to device messages recieved over federation to notify sync	2016-09-12 12:30:46 +01:00
Mark Haines	4a32d25d4c	Merge branch 'develop' into markjh/bearer_token	2016-09-12 11:14:56 +01:00
Mark Haines	31f85f9db9	Add comments to existing schema deltas that used "CREATE INDEX" directly	2016-09-12 11:00:26 +01:00
Mark Haines	ec609f8094	Fix unit tests	2016-09-12 10:46:02 +01:00
Erik Johnston	54417999b6	Revert "Add index to event_push_actions"	2016-09-12 10:39:55 +01:00
Erik Johnston	45dc260060	Merge pull request #1101 from matrix-org/erikj/state_types_idx ... Change state fetch query for postgres to be faster	2016-09-12 10:20:38 +01:00
Erik Johnston	d1c217c823	Merge pull request #1097 from matrix-org/erikj/replication_typing_rest ... Correctly handle typing stream id resetting	2016-09-12 10:10:15 +01:00
Erik Johnston	897d57bc58	Change state fetch query for postgres to be faster ... It turns out that postgres doesn't like doing a list of OR's and is about 1000x slower, so we just issue a query for each specific type seperately.	2016-09-12 10:05:07 +01:00
Erik Johnston	555460ae1b	Merge pull request #1095 from matrix-org/erikj/batch_edus ... Clobber EDUs in send queue	2016-09-12 08:04:15 +01:00
Richard van der Hoff	4162f820ff	Merge pull request #1100 from VShell/fix-cas ... Conform better to the CAS protocol specification	2016-09-09 21:57:42 +01:00
Shell Turner	29205e9596	Conform better to the CAS protocol specification ... Redirect to CAS's /login endpoint properly, and don't require an <attributes> element. Signed-off-by: Shell Turner <cam.turn@gmail.com>	2016-09-09 21:20:14 +01:00
David Baker	b91e2833b3	Merge remote-tracking branch 'origin/develop' into dbkr/make_notif_highlight_query_fast	2016-09-09 19:11:34 +01:00
David Baker	f2acc3dcf9	Add index to event_push_actions ... and remove room_id caluse so it uses it Mostly from @negativemjark	2016-09-09 18:54:54 +01:00
Mark Haines	3ddec016ff	Merge branch 'develop' into markjh/bearer_token	2016-09-09 18:51:22 +01:00
Mark Haines	8e01263587	Allow clients to supply access_tokens as headers ... Clients can continue to supply access tokens as query parameters or can supply the token as a header: Authorization: Bearer <access_token_goes_here> This matches the ouath2 format of https://tools.ietf.org/html/rfc6750#section-2.1	2016-09-09 18:17:42 +01:00
Erik Johnston	3265def8c7	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/batch_edus	2016-09-09 18:06:01 +01:00
Erik Johnston	af4701b311	Fix incorrect attribute name	2016-09-09 17:36:56 +01:00
Erik Johnston	44330a21e9	Comment	2016-09-09 17:22:07 +01:00
Erik Johnston	464ffd1b5e	Comment	2016-09-09 17:17:23 +01:00
Erik Johnston	327425764e	Add edu.type as part of key. Remove debug logging	2016-09-09 17:13:30 +01:00
Mark Haines	dbff7e9436	Merge pull request #1096 from matrix-org/markjh/get_access_token ... Add helper function for getting access_tokens from requests	2016-09-09 17:09:27 +01:00
Erik Johnston	a4339de9de	Correctly handle typing stream id resetting	2016-09-09 16:44:26 +01:00
Mark Haines	8aee5aa068	Add helper function for getting access_tokens from requests ... Rather than reimplementing the token parsing in the various places. This will make it easier to change the token parsing to allow access_tokens in HTTP headers.	2016-09-09 16:33:15 +01:00
Erik Johnston	52b2318777	Clobber EDUs in send queue	2016-09-09 15:59:08 +01:00
Paul Evans	56f38d1776	Merge pull request #1091 from matrix-org/paul/third-party-lookup ... Improvements to 3PE lookup API	2016-09-09 15:43:11 +01:00
Paul Evans	8cb252d00c	Merge pull request #1094 from matrix-org/paul/get-state-whole-event ... Allow clients to ask for the whole of a single state event	2016-09-09 15:26:17 +01:00
Paul "LeoNerd" Evans	776594f99d	Log if rejecting 3PE query metadata result due to type check	2016-09-09 15:11:31 +01:00
Paul "LeoNerd" Evans	ed44c475d8	Reject malformed 3PE query metadata results earlier in AS API handling code	2016-09-09 15:07:04 +01:00
Erik Johnston	ab80d5e0a9	Drop replication log levels	2016-09-09 14:56:50 +01:00
Paul "LeoNerd" Evans	f25d74f69c	Minor fixes from PR comments	2016-09-09 14:54:16 +01:00
Paul "LeoNerd" Evans	d271383e63	Filter returned events for client-facing format	2016-09-09 14:40:15 +01:00
Paul "LeoNerd" Evans	0fc0a3bdff	Allow clients to specify the format a room state event is returned in	2016-09-09 14:34:29 +01:00
Erik Johnston	6c4d582144	Deduplicate presence in _update_states	2016-09-09 14:28:22 +01:00
Erik Johnston	685da5a3b0	Merge pull request #1092 from matrix-org/erikj/transaction_queue_check ... Check if destination is ready for retry earlier	2016-09-09 13:49:56 +01:00
Erik Johnston	a6c6750166	Check if destination is ready for retry earlier	2016-09-09 13:46:05 +01:00
Paul "LeoNerd" Evans	bdbcfc2a80	appease pep8	2016-09-09 13:31:39 +01:00
Paul "LeoNerd" Evans	6eb0c8a2e4	Python isn't JavaScript; have to quote dict keys	2016-09-09 13:31:17 +01:00
Mark Haines	6b54fa81de	Merge pull request #1089 from matrix-org/markjh/direct_to_device_stream ... Track the max device stream_id in a separate table,	2016-09-09 13:31:07 +01:00
Paul "LeoNerd" Evans	25eb769b26	Efficiency fix for lookups of a single protocol	2016-09-09 13:25:02 +01:00
Paul "LeoNerd" Evans	3328428d05	Allow lookup of a single 3PE protocol query metadata	2016-09-09 13:19:04 +01:00
Erik Johnston	4598682b43	Fix tightloop on sending transaction	2016-09-09 13:12:53 +01:00
Paul "LeoNerd" Evans	033d43e419	Don't corrupt shared cache on subsequent protocol requests	2016-09-09 13:10:36 +01:00
Mark Haines	647c724573	Use the previous MAX value if any to set the stream_id	2016-09-09 11:52:44 +01:00
Erik Johnston	a15ba15e64	Merge pull request #1088 from matrix-org/erikj/transaction_queue_check ... Correctly guard against multiple concurrent transactions	2016-09-09 11:49:06 +01:00
Mark Haines	6a6cbfcf1e	Track the max_stream_device_id in a separate table, since we delete from the inbox table	2016-09-09 11:48:23 +01:00
Erik Johnston	d2688d7f03	Correctly guard against multiple concurrent transactions	2016-09-09 11:44:36 +01:00
Mark Haines	303b6f29f0	Merge pull request #1087 from matrix-org/markjh/reapply_delta ... Reapply 34/device_outbox in 35/device_outbox_again.py since the schem…	2016-09-09 11:24:27 +01:00
Erik Johnston	1fe7ca1362	Merge branch 'release-v0.17.3' of github.com:matrix-org/synapse into develop	2016-09-09 11:15:40 +01:00
Erik Johnston	66efcbbff1	Bump changelog and version	2016-09-09 11:07:39 +01:00
Mark Haines	0877157353	Just move the schema and add some DROPs	2016-09-09 11:04:47 +01:00
Erik Johnston	2ffec928e2	Reduce batch size to be under SQL limit	2016-09-09 11:03:31 +01:00
Erik Johnston	b390756150	Update last_device_stream_id_by_dest if there is nothing to send	2016-09-09 11:00:15 +01:00
Matthew Hodgson	b8f84f99ff	Merge pull request #1081 from matrix-org/dbkr/notifications_only_highlight ... Implement `only=highlight` on `/notifications`	2016-09-09 00:09:51 +01:00
Mark Haines	43b77c5d97	Only catch databas errors	2016-09-08 17:44:21 +01:00
Paul "LeoNerd" Evans	2f267ee160	Collect up all the "instances" lists of individual AS protocol results into one combined answer to the client	2016-09-08 17:43:53 +01:00
Mark Haines	7d5b142547	Add a stub run_upgrade	2016-09-08 17:39:11 +01:00
David Baker	c3276aef25	Merge pull request #1080 from matrix-org/dbkr/fix_notifications_api_with_from ... Fix /notifications API when used with `from` param	2016-09-08 17:35:35 +01:00
Mark Haines	fa722a699c	Reapply 34/device_outbox in 35/device_outbox_again.py since the schema was bumped before it landed on develop	2016-09-08 17:35:16 +01:00
Erik Johnston	5c688739d6	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/reindex_state_groups	2016-09-08 16:52:09 +01:00
Erik Johnston	ebb46497ba	Add delta file	2016-09-08 16:38:54 +01:00
Mark Haines	91ec972277	Merge pull request #1084 from matrix-org/markjh/direct_to_device_wildcard ... Support wildcard device_ids for direct to device messages	2016-09-08 16:28:08 +01:00
Erik Johnston	5beda10bbd	Reindex state_groups_state after pruning	2016-09-08 16:18:01 +01:00
Erik Johnston	257025ac89	Merge pull request #1082 from matrix-org/erikj/remote_public_rooms ... Add server param to /publicRooms	2016-09-08 16:04:22 +01:00
Erik Johnston	3f9889bfd6	Use parse_string	2016-09-08 15:51:10 +01:00
Erik Johnston	caa22334b3	Merge branch 'master' of github.com:matrix-org/synapse into develop	2016-09-08 15:33:00 +01:00
Erik Johnston	b152ee71fe	Bump version and changelog	2016-09-08 15:23:44 +01:00
Mark Haines	a1c8f268e5	Support wildcard device_ids for direct to device messages	2016-09-08 15:13:05 +01:00
Erik Johnston	8b93af662d	Check the user_id for presence/typing matches origin	2016-09-08 15:07:38 +01:00
Mark Haines	fa9d36e050	Merge branch 'develop' into markjh/direct_to_device_federation	2016-09-08 13:43:43 +01:00
David Baker	4ef222ab61	Implement only=highlight on /notifications	2016-09-08 13:43:35 +01:00
Erik Johnston	61cd9af09b	Log delta files we're applying	2016-09-08 13:40:46 +01:00
Erik Johnston	791658b576	Add server param to /publicRooms	2016-09-08 11:53:05 +01:00
David Baker	c5b49eb7ca	Fix /notifications API when used with from param	2016-09-08 09:40:10 +01:00
Erik Johnston	b568ca309c	Temporarily disable sequential scans for state fetching	2016-09-08 09:38:54 +01:00
Mark Haines	3c320c006c	Merge pull request #1077 from matrix-org/markjh/device_logging ... Log the types and values when failing to store devices	2016-09-07 18:24:24 +01:00
Mark Haines	85b51fdd6b	Log the types and values when failing to store devices	2016-09-07 17:19:18 +01:00
Mark Haines	43954d000e	Add a new method to enqueue the device messages rather than sending a dummy EDU	2016-09-07 16:10:51 +01:00
Mark Haines	2a0159b8ae	Fix the stream change cache to work over replication	2016-09-07 15:58:00 +01:00
Mark Haines	cb98ac261b	Move the check for federated device_messages. ... Move the check into _attempt_new_transaction. Only delete messages if there were messages to delete.	2016-09-07 15:39:13 +01:00
Mark Haines	31a07d2335	Add stream change caches for device messages	2016-09-07 15:27:07 +01:00
Erik Johnston	513188aa56	Comment	2016-09-07 14:53:23 +01:00
Erik Johnston	fadb01551a	Add appopriate framing clause	2016-09-07 14:39:01 +01:00
Erik Johnston	d25c20ccbe	Use windowing function to make use of index	2016-09-07 14:22:22 +01:00
Mark Haines	7d893beebe	Comment the add_messages storage functions	2016-09-07 12:03:37 +01:00
Erik Johnston	94a83b534f	Merge pull request #1065 from matrix-org/erikj/state_storage ... Move to storing state_groups_state as deltas	2016-09-07 09:39:58 +01:00
Mark Haines	d4a35ada28	Send device messages over federation	2016-09-06 18:16:20 +01:00
Mark Haines	e020834e4f	Add storage methods for federated device messages	2016-09-06 15:12:13 +01:00
Mark Haines	2ad72da931	Add tables for federated device messages ... Adds tables for storing the messages that need to be sent to a remote device and for deduplicating messages received.	2016-09-06 15:10:40 +01:00
Erik Johnston	3c4208a057	Record counts of state changes	2016-09-06 11:31:01 +01:00
Mark Haines	f4164edb70	Move _add_messages_to_device_inbox_txn into a separate method	2016-09-06 11:26:37 +01:00
Erik Johnston	2eed4d7af4	Merge pull request #1072 from matrix-org/erikj/presence_fiddle ... Fiddle should_notify to better report stats	2016-09-06 10:57:48 +01:00
Erik Johnston	438ef47637	Short circuit if presence is the same	2016-09-06 10:28:35 +01:00
Erik Johnston	74a3b4a650	Fiddle should_notify to better report stats	2016-09-06 10:23:38 +01:00
Erik Johnston	d51b8a1674	Add quotes and be explicity about script-src	2016-09-05 17:35:01 +01:00
Erik Johnston	662b031a30	Allow PDF to be rendered from media repo	2016-09-05 17:25:26 +01:00
Erik Johnston	0595413c0f	Scale the batch size so that we're not bitten by the minimum	2016-09-05 15:49:57 +01:00
Erik Johnston	a7032abb2e	Correctly handle reindexing state groups that already have an edge	2016-09-05 15:07:23 +01:00
Erik Johnston	9e6d88f4e2	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_storage	2016-09-05 15:01:33 +01:00
Erik Johnston	8c93e0bae7	Merge pull request #1070 from matrix-org/erikj/presence_stats ... Record why we have chosen to notify	2016-09-05 15:01:30 +01:00
Erik Johnston	70332a12dd	Take value in a better way	2016-09-05 14:57:14 +01:00
Erik Johnston	373654c635	Comment about sqlite and WITH RECURSIVE	2016-09-05 14:50:36 +01:00
Erik Johnston	485d999c8a	Correctly delete old state groups in purge history API	2016-09-05 14:49:08 +01:00
Erik Johnston	69054e3d4c	Record why we have chosen to notify	2016-09-05 14:12:11 +01:00
Erik Johnston	69a2d4e38c	Use get_joined_users_from_context instead of manually looking up hosts	2016-09-05 13:44:40 +01:00
Erik Johnston	f12993ec16	Bump changelog and version	2016-09-05 13:01:14 +01:00
Erik Johnston	bb36b93f71	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_storage	2016-09-05 11:53:11 +01:00
Erik Johnston	d87b87adf7	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/bulk_push	2016-09-05 11:52:49 +01:00
Erik Johnston	caed150363	Remove unused imports	2016-09-05 10:52:01 +01:00
Erik Johnston	80a6a445fa	Only fetch local pushers	2016-09-05 10:43:32 +01:00
Erik Johnston	628e65721b	Add comments	2016-09-05 10:41:27 +01:00
Mark Haines	274c2f50a5	Merge pull request #1067 from matrix-org/markjh/idempotent ... Fix membership changes to be idempotent	2016-09-05 10:21:25 +01:00
Erik Johnston	a99e933550	Add upgrade script that will slowly prune state_groups_state entries	2016-09-05 10:05:36 +01:00
Erik Johnston	3847fa38c4	Make bulk_get_push_rules_for_room use get_joined_users_from_context cache	2016-09-05 10:02:38 +01:00
Mark Haines	f2690c6423	Fix membership changes to be idempotent	2016-09-02 19:23:22 +01:00
Mark Haines	81b94c5750	Merge pull request #1066 from matrix-org/markjh/direct_to_device_lowerbound ... Only return new device messages in /sync	2016-09-02 16:18:34 +01:00
Mark Haines	65fa37ac5e	Only return new device messages in /sync	2016-09-02 15:50:37 +01:00
Erik Johnston	3baf641a48	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_storage	2016-09-02 14:54:07 +01:00
Erik Johnston	c0238ecbed	Explicitly specify state_key for history_visibility fetching	2016-09-02 14:53:46 +01:00
Erik Johnston	273b6bcf22	Merge pull request #1064 from matrix-org/erikj/on_receive_check ... Only check if host is in room if we have state and auth_chain	2016-09-02 14:43:35 +01:00
Erik Johnston	f7f1027d3d	Comment on when auth chain and state are None	2016-09-02 14:42:38 +01:00
Erik Johnston	34e5e17f91	Comment	2016-09-02 14:26:07 +01:00
Erik Johnston	b96c6c3185	Docstrings	2016-09-02 14:19:22 +01:00
Erik Johnston	1ffe9578d1	Merge pull request #1063 from matrix-org/erikj/pull_out_ids_only ... Only pull out IDs from DB for /state_ids/ request	2016-09-02 14:16:28 +01:00
Erik Johnston	cce957e254	Bump max_entries on get_destination_retry_timings	2016-09-02 14:08:33 +01:00
Erik Johnston	bd9b8d87ae	Only check if host is in room if we have state and auth_chain	2016-09-02 13:40:28 +01:00
Erik Johnston	657847e4c6	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_storage	2016-09-02 11:04:48 +01:00
Mark Haines	965168a842	Merge branch 'develop' into markjh/direct_to_device_synchrotron	2016-09-02 10:59:24 +01:00
Erik Johnston	2854ee2a52	Only pull out IDs from DB for /state_ids/ request	2016-09-02 10:53:36 +01:00
Erik Johnston	598317927c	Limit the length of state chains	2016-09-02 10:41:38 +01:00
Mark Haines	7ed5acacf4	Fix up the calls to the notifier for device messages	2016-09-01 18:08:40 +01:00
Erik Johnston	051a9ea921	Linearize state resolution to help caches	2016-09-01 14:55:03 +01:00
Erik Johnston	265d847ffd	Fix typo in log line	2016-09-01 14:50:06 +01:00
Erik Johnston	f4778d4cd9	Merge branch 'erikj/pdu_check' of github.com:matrix-org/synapse into develop	2016-09-01 14:40:36 +01:00
Erik Johnston	9e25443db8	Move to storing state_groups_state as deltas	2016-09-01 14:31:26 +01:00
Erik Johnston	44982606ee	Merge pull request #1060 from matrix-org/erikj/state_ids ... Assign state groups in state handler.	2016-09-01 14:20:42 +01:00
Erik Johnston	516a272aca	Ensure we only return a validated pdu in get_pdu	2016-09-01 10:55:02 +01:00
Erik Johnston	0cfd6c3161	Use state_groups table to test existence	2016-08-31 16:25:57 +01:00
Erik Johnston	5405351b14	Lower get_linearized_receipts_for_room cache size	2016-08-31 16:19:44 +01:00
Erik Johnston	ed7a703d4c	Handle the fact that workers can't generate state groups	2016-08-31 15:53:19 +01:00
Erik Johnston	1671913287	Merge pull request #1059 from matrix-org/erikj/sent_transaction_delete ... Clean up old sent transactions	2016-08-31 15:07:33 +01:00
Erik Johnston	f51888530d	Always specify state_group so that its in the cache	2016-08-31 14:58:11 +01:00
Erik Johnston	826ca61745	Add storage function to SlaveStore	2016-08-31 14:45:04 +01:00
Erik Johnston	fbd2615de4	Merge pull request #1057 from matrix-org/erikj/fix_email_name ... Fix email notifs by adding missing param	2016-08-31 14:33:45 +01:00
Erik Johnston	c10cb581c6	Correctly handle the difference between prev and current state	2016-08-31 14:26:22 +01:00
Erik Johnston	ef0cc648cf	Clean up old sent transactions	2016-08-31 11:12:02 +01:00
Mark Haines	761f9fccff	Merge pull request #1058 from matrix-org/markjh/direct_to_device_synchrotron ... Add a replication stream for direct to device messages	2016-08-31 11:08:18 +01:00
Mark Haines	a662252758	Return the current stream position from add_messages_to_device_inbox	2016-08-31 10:42:52 +01:00
Mark Haines	1aa3e1d287	Add a replication stream for direct to device messages	2016-08-31 10:38:58 +01:00
Erik Johnston	1bb8ec296d	Generate state group ids in state layer	2016-08-31 10:09:46 +01:00
Erik Johnston	d80f64d370	Fix email notifs by adding missing param	2016-08-30 21:46:39 +01:00
Kegan Dougal	c882783535	flake8	2016-08-30 17:20:31 +01:00
Kegan Dougal	572acde483	Use None instead of the empty string ... Change how we validate the 'url' field as a result.	2016-08-30 17:16:00 +01:00
Erik Johnston	5dc2a702cf	Make _state_groups_id_gen a normal IdGenerator	2016-08-30 16:55:11 +01:00
Erik Johnston	3e784eff74	Remove state replication stream	2016-08-30 16:51:36 +01:00
Kegan Dougal	16b652f0a3	Flake8	2016-08-30 16:30:12 +01:00
Kegan Dougal	e82247f990	Allow application services to have an optional 'url' ... If 'url' is not specified, they will not be pushed for events or queries. This is useful for bots who simply wish to reserve large chunks of user/alias namespace, and don't care about being pushed for events.	2016-08-30 16:21:16 +01:00
Erik Johnston	c7f665d700	Merge pull request #1055 from matrix-org/erikj/occaisonally_persist ... Occaisonally persist unpersisted presence updates	2016-08-30 15:59:00 +01:00
Erik Johnston	097330bae8	Check correct variable	2016-08-30 15:50:20 +01:00
Erik Johnston	21b977ccfe	Occaisonally persist unpersisted presence updates	2016-08-30 15:39:50 +01:00
Erik Johnston	bc1a8b1f7a	Don't notify for online -> online transitions. ... Specifically, if currently_active remains true then we should not notify if only the last active time changes.	2016-08-30 15:05:32 +01:00
Erik Johnston	67f0c990f8	Merge pull request #1051 from matrix-org/erikj/fix_push_names ... Fix push room names for rooms with only an alias	2016-08-30 11:50:34 +01:00
Erik Johnston	c8cd87b21b	Comment about message deletion	2016-08-30 11:23:26 +01:00
Erik Johnston	55e17d3697	Fix push room names for rooms with only an alias	2016-08-30 11:19:59 +01:00
Erik Johnston	1ee6285905	Fix check	2016-08-30 11:17:46 +01:00
Erik Johnston	68e1a872fd	Noop get_new_messages_for_device if token hasn't changed	2016-08-30 10:58:46 +01:00
Erik Johnston	55fc17cf4b	Merge pull request #1049 from matrix-org/erikj/presence_users_in_room ... Use state handler instead of get_users_in_room/get_joined_hosts	2016-08-30 10:50:37 +01:00
Erik Johnston	41788bba50	Add to slave store	2016-08-30 09:55:17 +01:00
Erik Johnston	873f870e5a	Add new direct message storage functions to slave store	2016-08-30 09:40:32 +01:00
Erik Johnston	bed10f9880	Use state handler instead of get_users_in_room/get_joined_hosts	2016-08-26 14:54:30 +01:00
Mark Haines	4bbef62124	Merge remote-tracking branch 'origin/develop' into markjh/direct_to_device	2016-08-26 14:35:31 +01:00
Erik Johnston	a234e895cf	Fix room name in email notifs	2016-08-26 14:10:21 +01:00
Erik Johnston	4daa397a00	Add is_host_joined to slave storage	2016-08-26 13:10:56 +01:00
Erik Johnston	c7cd35d682	Typo	2016-08-26 11:23:58 +01:00
Erik Johnston	54cc69154e	Make None optional	2016-08-26 11:20:59 +01:00
Erik Johnston	11faa4296d	Measure _filter_events_for_server	2016-08-26 11:15:40 +01:00
Erik Johnston	f6338d6a3e	Don't pull out full state for _filter_events_for_server	2016-08-26 11:13:16 +01:00
Erik Johnston	1ccdc1e93a	Cache check_host_in_room	2016-08-26 10:59:40 +01:00
Erik Johnston	25414b44a2	Add measure on check_host_in_room	2016-08-26 10:47:00 +01:00
Erik Johnston	50943ab942	Add new state storage funcs to replication	2016-08-26 09:57:32 +01:00
Erik Johnston	30961182f2	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_ids	2016-08-26 09:48:13 +01:00
Erik Johnston	c1a133a6b6	Merge pull request #1043 from matrix-org/erikj/backfill_fix ... Fix None check in backfill	2016-08-26 09:07:05 +01:00
Erik Johnston	778fa85f47	Make sync not pull out full state	2016-08-25 18:59:44 +01:00
Erik Johnston	7356d52e73	Fix up push to use get_current_state_ids	2016-08-25 18:35:49 +01:00
Paul "LeoNerd" Evans	9459137f1e	Just sprintf the 'kind' argument into uri directly	2016-08-25 18:35:38 +01:00
Paul "LeoNerd" Evans	1294d4a329	Move ThirdPartyEntityKind into api.constants so the expectation becomes that the value is significant	2016-08-25 18:34:47 +01:00
Mark Haines	ab34fdecb7	Merge branch 'develop' into markjh/direct_to_device	2016-08-25 18:34:46 +01:00
Mark Haines	b162cb2e41	Add some TODOs	2016-08-25 18:18:53 +01:00
Erik Johnston	0e1900d819	Pull out full state less	2016-08-25 18:15:51 +01:00
Mark Haines	641efb6a39	Fix the deduplication of incoming direct-to-device messages	2016-08-25 18:14:02 +01:00
Paul "LeoNerd" Evans	e7af8be5ae	Root the 3PE lookup API within /_matrix/app/unstable instead of at toplevel	2016-08-25 18:06:29 +01:00
Paul "LeoNerd" Evans	142983b4ea	APP_SERVICE_PREFIX is never used; don't bother	2016-08-25 18:06:05 +01:00
Erik Johnston	721414d98a	Add desc	2016-08-25 17:49:05 +01:00
Mark Haines	e993925279	Add store-and-forward direct-to-device messaging	2016-08-25 17:35:37 +01:00
Erik Johnston	a3dc1e9cbe	Replace context.current_state with context.current_state_ids	2016-08-25 17:32:22 +01:00
Paul Evans	d9dcb2ba3a	Merge pull request #1041 from matrix-org/paul/third-party-lookup ... Extend 3PE lookup APIs for metadata query	2016-08-25 17:06:53 +01:00
Paul "LeoNerd" Evans	adf53f04ce	appease pep8	2016-08-25 16:00:31 +01:00
Paul "LeoNerd" Evans	c435bfee9c	Don't need toplevel cache on 3PE lookup metadata any more	2016-08-25 15:57:07 +01:00
Paul "LeoNerd" Evans	db7283cc6b	Implement a ResponseCache around 3PE lookup metadata lookups	2016-08-25 15:56:27 +01:00
Paul "LeoNerd" Evans	d0b8d49f71	Kill PROTOCOL_META since I'm not using it any more	2016-08-25 15:45:28 +01:00
Paul "LeoNerd" Evans	5474824975	Actually query over AS API for 3PE lookup metadata	2016-08-25 15:29:36 +01:00
Erik Johnston	17f4f14df7	Pull out event ids rather than full events for state	2016-08-25 13:42:44 +01:00
Erik Johnston	cd5b264b03	Fix None check in backfill	2016-08-25 10:39:19 +01:00
Erik Johnston	60a015550a	Bump changelog and version	2016-08-24 14:31:13 +01:00
Erik Johnston	90d5983d7a	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.1	2016-08-24 14:28:57 +01:00
Erik Johnston	c20cb5160d	Remove tracer	2016-08-24 13:22:47 +01:00
Erik Johnston	fda97dd58a	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/preserve_log_contexts	2016-08-24 13:22:02 +01:00
Paul "LeoNerd" Evans	8e1ed09dff	Move static knowledge of protocol metadata into AS handler; cache the result	2016-08-24 13:01:53 +01:00
Paul "LeoNerd" Evans	965f33c901	Declare 'gitter' known protocol, with user lookup	2016-08-24 12:34:03 +01:00
Paul "LeoNerd" Evans	9899824b85	Initial hack at the 3PN protocols metadata lookup API	2016-08-24 12:33:01 +01:00
Erik Johnston	9219139351	Preserve some logcontexts	2016-08-24 11:58:40 +01:00
Paul "LeoNerd" Evans	63c19e1df9	Move 3PU/3PL lookup APIs into /thirdparty containing entity	2016-08-24 11:55:57 +01:00
Erik Johnston	86bcf4d6a7	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/pagination	2016-08-24 10:38:21 +01:00
Erik Johnston	ba07d4a70e	Add None checks to backfill	2016-08-24 10:31:05 +01:00
Kegan Dougal	4b31426a02	Pass through user-supplied content in /join/$room_id ... It was always intended to allow custom keys on the join event, but this has at some point been lost. Restore it. If the user specifies keys like "avatar_url" then they will be clobbered.	2016-08-23 16:32:04 +01:00
Erik Johnston	122c7a43c9	Merge pull request #1038 from matrix-org/erikj/receved_txn_purge ... Delete old received_transactions rows	2016-08-23 11:02:40 +01:00
Erik Johnston	14047126d8	Bump changelog and version	2016-08-22 18:26:07 +01:00
Erik Johnston	d143f211c8	Merge pull request #1028 from matrix-org/dbkr/notifications_api ... Add the Notifications API	2016-08-22 18:23:24 +01:00
Erik Johnston	aad8a1a825	Delete old received_transactions	2016-08-22 16:29:46 +01:00
Mark Haines	689f4cb914	Update comment	2016-08-22 16:17:31 +01:00
Mark Haines	c8f9b45bc2	Add usage stats to prometheus monitoring	2016-08-22 15:34:38 +01:00
Erik Johnston	e65bc7d315	Merge pull request #1031 from matrix-org/erikj/measure_notifier ... Add more Measure blocks	2016-08-22 12:13:07 +01:00
Erik Johnston	33f3624ff7	Add exception logging. Fix typo	2016-08-22 10:49:31 +01:00
Erik Johnston	8c52160b07	Allow request handlers to override metric name	2016-08-22 10:44:45 +01:00
Erik Johnston	a093fab253	Use top level measure	2016-08-22 10:18:12 +01:00
Matthew Hodgson	6e80c03d45	Merge branch 'develop' into dbkr/notifications_api	2016-08-20 00:16:18 +01:00
Erik Johnston	27e0178da9	Add a top level measure	2016-08-19 18:49:37 +01:00
Erik Johnston	6d1a94d218	Remove redundant measure	2016-08-19 18:40:31 +01:00
Erik Johnston	8731197e54	Only abort Measure on Exceptions	2016-08-19 18:23:45 +01:00
Erik Johnston	afbf6b33fc	defer.returnValue must not be called within Measure	2016-08-19 18:23:44 +01:00
Erik Johnston	37adde32dc	Move defer.returnValue out of Measure	2016-08-19 18:23:44 +01:00
Erik Johnston	04fc8bbcb0	Update keyring Measure	2016-08-19 18:23:44 +01:00
Erik Johnston	39b900b316	Measure http.server render	2016-08-19 18:23:44 +01:00
Erik Johnston	47dd8f02a1	Measure _get_event_from_row	2016-08-19 18:23:44 +01:00
Erik Johnston	2426c2f21a	Measure keyrings	2016-08-19 18:23:44 +01:00
Erik Johnston	39242090e3	Add measure blocks to notifier	2016-08-19 18:23:44 +01:00
Erik Johnston	e6784daf07	Merge pull request #1030 from matrix-org/erikj/cache_contexts ... Add concept of cache contexts	2016-08-19 16:29:58 +01:00
Erik Johnston	45fd2c8942	Ensure invalidation list does not grow unboundedly	2016-08-19 16:09:16 +01:00
Erik Johnston	c0d7d9d642	Rename to on_invalidate	2016-08-19 15:13:58 +01:00
Erik Johnston	dc76a3e909	Make cache_context an explicit option	2016-08-19 15:02:38 +01:00
Erik Johnston	f164fd9220	Move _bulk_get_push_rules_for_room to storage layer	2016-08-19 14:29:20 +01:00
Erik Johnston	ba214a5e32	Remove lru option	2016-08-19 14:17:11 +01:00
Erik Johnston	4161ff2fc4	Add concept of cache contexts	2016-08-19 14:17:07 +01:00
Erik Johnston	b770435389	Make get_new_events_for_appservice use indices	2016-08-19 10:28:42 +01:00
Paul Evans	5674ea3e6c	Merge pull request #1026 from matrix-org/paul/thirdpartylookup ... 3rd party entity lookup	2016-08-18 20:52:50 +01:00
David Baker	1e4217c90c	Explicit join	2016-08-18 17:53:44 +01:00
David Baker	0acdd0f1ea	Use tuple comparison ... Hopefully easier to read	2016-08-18 17:51:08 +01:00
Paul "LeoNerd" Evans	65201631a4	Move validation logic for AS 3PE query response into ApplicationServiceApi class, to keep the handler logic neater	2016-08-18 17:33:56 +01:00
Paul "LeoNerd" Evans	697872cf08	More warnings about invalid results from AS 3PE query	2016-08-18 17:24:39 +01:00
Paul "LeoNerd" Evans	b515f844ee	Avoid so much copypasta between 3PU and 3PL query by unifying around a ThirdPartyEntityKind enumeration	2016-08-18 17:19:55 +01:00
David Baker	602c84cd9c	Merge remote-tracking branch 'origin/develop' into dbkr/notifications_api	2016-08-18 17:15:26 +01:00
Paul "LeoNerd" Evans	2a91799fcc	Minor syntax neatenings	2016-08-18 16:58:25 +01:00
Paul "LeoNerd" Evans	fcf1dec809	Appease pep8	2016-08-18 16:26:19 +01:00
Paul "LeoNerd" Evans	105ff162d4	Authenticate 3PE lookup requests	2016-08-18 16:19:23 +01:00
Paul "LeoNerd" Evans	06964c4a0a	Copypasta the 3PU support code to also do 3PL	2016-08-18 16:09:50 +01:00
Paul "LeoNerd" Evans	f3afd6ef1a	Remove TODO note about request fields being strings - they're always strings	2016-08-18 15:53:01 +01:00
Erik Johnston	bcbd74dc5b	Remove log lines	2016-08-18 15:52:10 +01:00
Paul "LeoNerd" Evans	d7b42afc74	Log a warning if an AS yields an invalid 3PU lookup result	2016-08-18 15:49:55 +01:00
Paul "LeoNerd" Evans	80f4740c8f	Scattergather the call out to ASes; validate received results	2016-08-18 15:40:41 +01:00
Erik Johnston	07229bbdae	Add appservice worker	2016-08-18 14:59:55 +01:00
Paul "LeoNerd" Evans	434bbf2cb5	Filter 3PU lookups by only ASes that declare knowledge of that protocol	2016-08-18 14:56:02 +01:00
Paul "LeoNerd" Evans	d5bf7a4a99	Merge remote-tracking branch 'origin/develop' into paul/thirdpartylookup	2016-08-18 14:21:01 +01:00
Paul "LeoNerd" Evans	718ffcf8bb	Since empty lookups now return 200/empty list not 404, we can safely log failures as exceptions	2016-08-18 14:18:37 +01:00
Paul "LeoNerd" Evans	3856582741	Ensure that 3PU lookup request fields actually get passed in	2016-08-18 14:06:02 +01:00
Paul "LeoNerd" Evans	f0c73a1e7a	Extend individual list results into the main return list, don't append	2016-08-18 13:53:54 +01:00
Paul "LeoNerd" Evans	b3511adb92	Don't catch the return-value-as-exception that @defer.inlineCallbacks will use	2016-08-18 13:45:18 +01:00
Erik Johnston	9da84a9a1e	Make AppserviceHandler stream events from database ... This is for two reasons: 1. Suppresses duplicates correctly, as the notifier doesn't do any duplicate suppression. 2. Makes it easier to connect the AppserviceHandler to the replication stream.	2016-08-18 11:54:41 +01:00
Mark Haines	403ecd8a2c	Missed a s/federation reader/media repository/ in a log message	2016-08-18 10:26:15 +01:00
Mark Haines	47fbff7a05	Merge pull request #1024 from matrix-org/markjh/media_repository ... Add a media repository worker	2016-08-18 10:12:17 +01:00
Mark Haines	396624864a	Add a media repository worker	2016-08-18 09:38:42 +01:00
Erik Johnston	e73dcb66da	Merge pull request #1022 from matrix-org/erikj/as_notify_perf ... Make notify_interested_services faster	2016-08-18 09:35:19 +01:00
Paul "LeoNerd" Evans	3ec10dffd6	Actually make 3PU lookup calls out to ASes	2016-08-18 00:39:09 +01:00
Erik Johnston	732cf72b86	Fix push_display_name_rename schema update	2016-08-17 18:12:21 +01:00
Erik Johnston	abcb9aee5b	Make push Measure finer grained	2016-08-17 18:00:18 +01:00
Erik Johnston	2a0d8f8219	Merge pull request #1021 from matrix-org/erikj/mediasecurity_policy ... Set `Content-Security-Policy` on media repo	2016-08-17 17:22:43 +01:00
Erik Johnston	320dfe523c	Make notify_interested_services faster	2016-08-17 17:20:50 +01:00
Erik Johnston	0af9e1a637	Set Content-Security-Policy on media repo ... This is to inform browsers that they should sandbox the returned media. This is particularly cruical for javascript/HTML files.	2016-08-17 16:27:39 +01:00
Paul "LeoNerd" Evans	fa87c981e1	Thread 3PU lookup through as far as the AS API object; which currently noöps it	2016-08-17 16:17:28 +01:00
David Baker	0d7cef0943	Merge pull request #1011 from matrix-org/dbkr/contains_display_name_override ... Move display name rule	2016-08-17 16:15:45 +01:00
Erik Johnston	f90b3d83a3	Add None check to _iterate_over_text	2016-08-17 15:17:17 +01:00
Matrix	f743471380	Change name of metric	2016-08-17 15:05:50 +01:00
Erik Johnston	b9e888858c	Move Measure block inside loop	2016-08-17 14:52:26 +01:00
Erik Johnston	973d67a033	Merge pull request #1019 from matrix-org/erikj/appservice_clean ... Clean up _ServiceQueuer	2016-08-17 14:37:21 +01:00
Paul "LeoNerd" Evans	e3e3fbc23a	Initial empty implementation that just registers an API endpoint handler	2016-08-17 12:46:49 +01:00
Erik Johnston	7321f45457	Clean up _ServiceQueuer	2016-08-17 12:03:04 +01:00
Erik Johnston	b9abf3e4e3	Remove dead appservice code	2016-08-17 11:48:23 +01:00
Erik Johnston	62c5245c87	Measure notify_interested_services	2016-08-17 11:12:29 +01:00
Erik Johnston	949629291c	Do it in storage function	2016-08-16 17:05:34 +01:00
David Baker	ad42322257	Add migration script ... To port existing rule actions & enable entries to the new name	2016-08-16 16:56:30 +01:00
David Baker	0bba2799b6	Merge remote-tracking branch 'origin/develop' into dbkr/contains_display_name_override	2016-08-16 16:46:37 +01:00
Erik Johnston	64a2acb161	Don't update caches replication stream if tokens haven't advanced	2016-08-16 16:44:19 +01:00
David Baker	1594eba29e	s/underride/override/ in the rule_id too	2016-08-16 16:44:07 +01:00
Erik Johnston	109a560905	Flake8	2016-08-16 14:57:21 +01:00
Erik Johnston	48b5829aea	Fix up preview URL API. Add tests. ... This includes: - Splitting out methods of a class into stand alone functions, to make them easier to test. - Adding unit tests to split out functions, testing HTML -> preview. - Handle the fact that elements in lxml may have tail text.	2016-08-16 14:53:24 +01:00
Erik Johnston	7c6f4f9427	Merge pull request #1012 from matrix-org/erikj/limit_backfill_uri ... Limit number of extremeties in backfill request	2016-08-16 12:55:42 +01:00
Erik Johnston	25c2332071	Merge pull request #1010 from matrix-org/erikj/refactor_deletions ... Refactor user_delete_access_tokens. Invalidate get_user_by_access_token to slaves.	2016-08-16 11:37:53 +01:00
Erik Johnston	2ee1bd124c	Limit number of extremeties in backfill request ... This works around a bug where if we make a backfill request with too many extremeties it causes the request URI to be too long.	2016-08-16 11:34:36 +01:00
Erik Johnston	a2427981b7	Use cached get_user_by_access_token in slaves	2016-08-16 11:24:32 +01:00
Erik Johnston	6cbd1b495e	Merge branch 'fix_integrity_retry' of https://github.com/Ralith/synapse into Ralith-fix_integrity_retry	2016-08-16 10:50:24 +01:00
David Baker	1c7c317df1	Move display name rule ... As per https://github.com/matrix-org/matrix-doc/pull/373 and comment	2016-08-15 18:34:53 +01:00
Erik Johnston	dc3a00f24f	Refactor user_delete_access_tokens. Invalidate get_user_by_access_token to slaves.	2016-08-15 17:04:39 +01:00
Erik Johnston	75299af4fc	Merge pull request #1009 from matrix-org/erikj/event_split ... Split out /events to synchrotron	2016-08-15 15:39:05 +01:00
Erik Johnston	89e786bd85	Doc get_next() context manager usage	2016-08-15 13:45:26 +01:00
Erik Johnston	d9664344ec	Rename table. Add docs.	2016-08-15 11:45:57 +01:00
Erik Johnston	784a2d4f2c	Remove broken cache stuff	2016-08-15 11:25:48 +01:00
Erik Johnston	0be963472b	Use cached version of get_aliases_for_room	2016-08-15 11:24:12 +01:00
Erik Johnston	64e7e11853	Implement cache replication stream	2016-08-15 11:16:45 +01:00
Erik Johnston	4d70d1f80e	Add some invalidations to a cache_stream	2016-08-15 11:15:17 +01:00
Erik Johnston	99bbd90b0d	Always run txn.after_callbacks	2016-08-15 09:45:44 +01:00
Benjamin Saunders	8a57cc3123	Add missing database corruption recovery case ... Signed-off-by: Benjamin Saunders <ben.e.saunders@gmail.com>	2016-08-14 11:50:22 -07:00
Daniel Ehlers	dfaf0fee31	Log the value which is observed in the first place. ... The name 'result' is of bool type and has no len property, resulting in a TypeError. Futhermore in the flow control conn.response is observed and hence should be reported. Signed-off-by: Daniel Ehlers <sargon@toppoint.de>	2016-08-14 16:49:05 +02:00
Daniel Ehlers	e380538b59	Fix AttributeError when bind_dn is not defined. ... In case one does not define bind_dn in ldap configuration, filter attribute is not declared. Since auth code only uses ldap_filter attribute when according LDAP mode is selected, it is safe to only declare the attribute in that case. Signed-off-by: Daniel Ehlers <sargon@toppoint.de>	2016-08-14 16:48:33 +02:00
Erik Johnston	4e1cebd56f	Make synchrotron accept /events	2016-08-12 15:31:44 +01:00
Erik Johnston	866a5320de	Dont invoke get_handlers fromClientV1RestServlet ... hs.get_handlers() can not be invoked from split out processes. Moving the invocations down a level means that we can slowly split out individual servlets.	2016-08-12 10:03:19 +01:00
Erik Johnston	448ac6cf0d	Only process one local membership event per room at a time	2016-08-12 09:32:19 +01:00
Erik Johnston	832799dbff	Merge pull request #997 from Half-Shot/develop ... Don't change status_msg on /sync	2016-08-11 14:10:55 +01:00
David Baker	b4ecf0b886	Merge remote-tracking branch 'origin/develop' into dbkr/notifications_api	2016-08-11 14:09:13 +01:00
Will Hunt	5b5148b7ec	Synced up synchrotron set_state with PresenceHandler set_state	2016-08-11 11:48:30 +01:00
Erik Johnston	1d40373c9d	Include prev_content in redacted state events	2016-08-11 10:24:41 +01:00
Erik Johnston	c315922b5f	PEP8	2016-08-10 16:34:10 +01:00
Erik Johnston	ca8abfbf30	Clean up TransactionQueue	2016-08-10 16:24:16 +01:00
Erik Johnston	5aeadb7414	Merge pull request #999 from matrix-org/erikj/measure_more ... Measure federation send transaction resources	2016-08-10 14:16:14 +01:00
Erik Johnston	487bc49bf8	Don't stop on 4xx series errors	2016-08-10 13:39:12 +01:00
Erik Johnston	739ea29d1e	Also check if server is in the room	2016-08-10 13:32:23 +01:00
Erik Johnston	ea8c4094db	Also pull out rejected events	2016-08-10 13:26:13 +01:00
Erik Johnston	7f41bcbeec	Correctly auth /event/ requests	2016-08-10 13:22:20 +01:00
Erik Johnston	11fdfaf03b	Only resign our own events	2016-08-10 13:16:58 +01:00
Will Hunt	2510db3e76	Don't change status_msg on /sync	2016-08-10 12:59:59 +01:00
Erik Johnston	f91df1f761	Store if we fail to fetch an event from a destination	2016-08-10 11:31:46 +01:00
Erik Johnston	3bc9629be5	Measure federation send transaction resources	2016-08-10 10:56:38 +01:00
Erik Johnston	d45489474d	Merge pull request #996 from matrix-org/erikj/tls_error ... Don't print stack traces when failing to get remote keys	2016-08-10 10:56:08 +01:00
Erik Johnston	fa1ce4d8ad	Don't print stack traces when failing to get remote keys	2016-08-10 10:44:37 +01:00
Richard van der Hoff	79ebfbe7c6	/login: Respond with a 403 when we get an invalid m.login.token	2016-08-09 16:29:28 +01:00
David Baker	cd41c6ece2	Merge pull request #995 from matrix-org/rav/clean_up_cas_login ... Clean up CAS login code	2016-08-09 10:21:56 +01:00
David Baker	27771b2495	Merge pull request #994 from matrix-org/rav/fix_cas_login ... Fix CAS login	2016-08-08 17:47:45 +01:00
Richard van der Hoff	d3250499c1	Merge pull request #993 from matrix-org/rav/fix_token_login ... Fix token login	2016-08-08 17:43:02 +01:00
Richard van der Hoff	65666fedd5	Clean up CAS login code ... Remove some apparently unused code. Clean up parse_cas_response, mostly to catch the exception if the CAS response isn't valid XML.	2016-08-08 17:17:25 +01:00
Richard van der Hoff	0682ca04b3	Fix CAS login ... Attempting to log in with CAS was giving a 500 error.	2016-08-08 17:01:30 +01:00
Richard van der Hoff	6fe6a6f029	Fix login with m.login.token ... login with token (as used by CAS auth) was broken by 067596d, such that it always returned a 401.	2016-08-08 16:40:39 +01:00
Erik Johnston	27fe3e2d4f	Bump changelog and version	2016-08-08 11:31:12 +01:00
Erik Johnston	3410142741	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0	2016-08-08 11:24:53 +01:00
Erik Johnston	7c1a92274c	Make psutil optional	2016-08-08 11:12:21 +01:00
Erik Johnston	f5deaff424	Merge pull request #991 from matrix-org/erikj/retry_make ... Retry joining via other servers if first one failed. Fix some other bugs.	2016-08-05 18:21:27 +01:00
Erik Johnston	5f360182c6	Fix a couple of python bugs	2016-08-05 18:08:32 +01:00
Erik Johnston	46453bfc2f	Retry joining via other servers if first one failed	2016-08-05 18:02:03 +01:00
Erik Johnston	6bf6bc1d1d	Merge pull request #990 from matrix-org/erikj/fed_vers ... Add federation /version API	2016-08-05 16:59:16 +01:00
Erik Johnston	24f36469bc	Add federation /version API	2016-08-05 16:36:07 +01:00
Erik Johnston	597c79be10	Change the way we specify if we require auth or not	2016-08-05 16:17:04 +01:00
Erik Johnston	e6021c370e	Merge pull request #989 from matrix-org/erikj/raise_404 ... Raise 404 when couldn't find event	2016-08-05 15:54:16 +01:00
Erik Johnston	a8b946decb	Raise 404 when couldn't find event	2016-08-05 15:31:02 +01:00
Erik Johnston	5bcccfde6c	Don't include html comments in description	2016-08-05 14:45:11 +01:00
Erik Johnston	4d87d3659a	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0	2016-08-05 13:19:22 +01:00
Erik Johnston	93acf49e9b	Fix backfill auth events	2016-08-05 12:59:04 +01:00
Erik Johnston	b2c290a6e5	Bump version and changelog	2016-08-05 11:16:54 +01:00
Erik Johnston	499dc1b349	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0	2016-08-05 11:15:48 +01:00
Erik Johnston	2d4de61fb7	Fix typo	2016-08-05 10:48:56 +01:00
Erik Johnston	fccadb7719	Check if we already have the events returned by /state/	2016-08-05 10:43:47 +01:00
Erik Johnston	f0fa66f495	Delete more tables	2016-08-05 10:40:08 +01:00
Erik Johnston	1515d1b581	Fallback to /state/ on both 400 and 404	2016-08-05 10:24:23 +01:00
Benjamin Saunders	a2b7102eea	Tweak integrity error recovery to work as intended	2016-08-04 20:38:08 -07:00
Erik Johnston	a5d7968b3e	Merge pull request #973 from matrix-org/erikj/xpath_fix ... Change the way we summarize URLs	2016-08-04 16:37:25 +01:00
Erik Johnston	b5525c76d1	Typo	2016-08-04 16:10:08 +01:00
Erik Johnston	e97648c4e2	Test summarization	2016-08-04 16:09:09 +01:00
Erik Johnston	835ceeee76	Merge pull request #983 from matrix-org/erikj/retry_on_integrity_error ... Retry event persistence on IntegrityError	2016-08-04 15:40:03 +01:00
Erik Johnston	b3682df2ca	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/xpath_fix	2016-08-04 15:29:45 +01:00
Erik Johnston	8ad8490cff	Fix typo	2016-08-04 15:21:29 +01:00
Erik Johnston	59fa91fe88	Retry event persistence on IntegrityError ... Due to a bug in the porting script some backfilled events were not correctly persisted, causing irrecoverable IntegrityErrors on future attempts to persist those events. This commit adds a retry mechanism invoked upon IntegrityError, where when retried the tables are purged for all references to the events being persisted.	2016-08-04 15:02:15 +01:00
Erik Johnston	257c41cc2e	Fix typos.	2016-08-04 14:05:45 +01:00
Erik Johnston	b4e2290d89	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_ids_api	2016-08-04 14:04:35 +01:00
Erik Johnston	e3ee63578f	Tidy up get_events	2016-08-04 14:01:18 +01:00
Richard van der Hoff	f131cd9e53	keys/query: Omit device displayname if null ... ... which makes it more consistent with user displaynames.	2016-08-04 10:59:51 +01:00
Erik Johnston	edb33eb163	Rename fields to _ids	2016-08-03 17:19:15 +01:00
Erik Johnston	bcc9cda8ca	Fix copy + paste fails	2016-08-03 17:17:26 +01:00
Richard van der Hoff	98385888b8	PEP8	2016-08-03 15:42:08 +01:00
Richard van der Hoff	68264d7404	Include device name in /keys/query response ... Add an 'unsigned' section which includes the device display name.	2016-08-03 15:42:08 +01:00
Richard van der Hoff	91fa69e029	keys/query: return all users which were asked for ... In the situation where all of a user's devices get deleted, we want to indicate this to a client, so we want to return an empty dictionary, rather than nothing at all.	2016-08-03 15:41:44 +01:00
Erik Johnston	4c56bedee3	Actually call get_room_state	2016-08-03 15:04:29 +01:00
Erik Johnston	520ee9bd2c	Fix syntax error	2016-08-03 15:03:15 +01:00
Erik Johnston	a60a2eaa02	Comment	2016-08-03 14:52:43 +01:00
Erik Johnston	e3a720217a	Add /state_ids federation API ... The new API only returns the event_ids for the state, as most requesters will already have the vast majority of the events already.	2016-08-03 14:47:37 +01:00
Richard van der Hoff	530bc862dc	Merge branch 'rav/null_default_device_displayname' into develop	2016-08-03 14:30:32 +01:00
Richard van der Hoff	a6f5cc65d9	PEP8	2016-08-03 14:30:06 +01:00
Richard van der Hoff	e555bc6551	Merge branch 'rav/refactor_device_query' into develop	2016-08-03 14:26:01 +01:00
Richard van der Hoff	a843868fe9	E2eKeysHandler: minor tweaks ... PR feedback	2016-08-03 14:24:33 +01:00
Erik Johnston	80ad710217	Remove other bit of deduplication	2016-08-03 13:25:59 +01:00
Richard van der Hoff	4fec5e57be	Default device_display_name to null ... It turns out that it's more useful to return a null device display name (and let clients decide how to handle it: eg, falling back to device_id) than using a constant string like "unknown device".	2016-08-03 11:53:00 +01:00
Erik Johnston	a8a32d2714	Ensure we only persist an event once at a time	2016-08-03 11:23:39 +01:00
Mark Haines	921f17f938	Merge branch 'develop' into rav/refactor_device_query	2016-08-03 11:12:47 +01:00
Erik Johnston	58c9653c6b	Don't infer paragrahs from newlines	2016-08-02 18:50:24 +01:00
Erik Johnston	6b58ade2f0	Comment on why we clone	2016-08-02 18:41:22 +01:00
Erik Johnston	9e66c58ceb	Spelling.	2016-08-02 18:37:31 +01:00
Erik Johnston	f83f5fbce8	Make it actually compile	2016-08-02 18:32:42 +01:00
Erik Johnston	aecaec3e10	Change the way we summarize URLs ... Using XPath is slow on some machines (for unknown reasons), so use a different approach to get a list of text nodes. Try to generate a summary that respect paragraph and then word boundaries, adding ellipses when appropriate.	2016-08-02 18:25:53 +01:00
Richard van der Hoff	1efee2f52b	E2E keys: Make federation query share code with client query ... Refactor the e2e query handler to separate out the local query, and then make the federation handler use it.	2016-08-02 18:12:00 +01:00
Erik Johnston	49e047c55e	Bump version and changelog	2016-08-02 17:10:26 +01:00
Erik Johnston	59a2c6d60e	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0	2016-08-02 17:07:54 +01:00
Erik Johnston	c9154b970c	Don't double wrap 200	2016-08-02 16:45:53 +01:00
Erik Johnston	b3d5c4ad9d	Fix response cache	2016-08-02 16:42:21 +01:00
Erik Johnston	8f650bd338	Bump changeog and version	2016-08-02 15:43:52 +01:00
Erik Johnston	7b0f6293f2	Merge pull request #940 from matrix-org/erikj/fed_state_cache ... Cache federation state responses	2016-08-02 15:21:37 +01:00
Erik Johnston	342e072024	Merge pull request #967 from matrix-org/erikj/fed_reader ... Split out the federation reading portions into a separate.	2016-08-02 13:59:47 +01:00
Mark Haines	54de6a812a	Merge branch 'develop' into dbkr/fix_add_email_on_register	2016-08-02 10:18:15 +01:00
Erik Johnston	733bf44290	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader	2016-08-02 09:56:31 +01:00
Richard van der Hoff	986615b0b2	Move e2e query logic into a handler	2016-08-01 18:02:07 +01:00
Erik Johnston	b260f92936	Ignore AlreadyCalled errors on timer cancel	2016-07-31 16:00:12 +01:00
David Baker	271d3e7865	Fix adding emails on registration ... Synapse was not adding email addresses to accounts registered with an email address, due to too many different variables called 'result'. Rename both of them. Also remove the defer.returnValue() with no params because that's not a thing.	2016-07-29 15:25:24 +01:00
Paul Evans	18b7eb830b	Merge pull request #958 from matrix-org/paul/SYN-738 ... Forbid non-ASes from registering users whose names begin with '_'	2016-07-29 14:10:45 +01:00
Erik Johnston	2a9ce8c422	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader	2016-07-29 11:33:46 +01:00
Erik Johnston	cbea0c7044	Merge pull request #964 from matrix-org/erikj/fed_join_fix ... Handle the case of missing auth events when joining a room	2016-07-29 11:33:16 +01:00
Erik Johnston	5aa024e501	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader	2016-07-29 11:24:56 +01:00
Erik Johnston	c51a52f300	Mention that func will fetch auth events	2016-07-29 11:17:04 +01:00
Erik Johnston	3d13c3a295	Update docstring	2016-07-29 10:45:05 +01:00
Mark Haines	8dad08a950	Fix SQL to supply arguments in the same order	2016-07-29 09:57:13 +01:00
Mark Haines	0a7d3cd00f	Create separate methods for getting messages to push ... for the email and http pushers rather than trying to make a single method that will work with their conflicting requirements. The http pusher needs to get the messages in ascending stream order, and doesn't want to miss a message. The email pusher needs to get the messages in descending timestamp order, and doesn't mind if it misses messages.	2016-07-28 20:24:24 +01:00
Erik Johnston	ec8b217722	Add destination retry to slave store	2016-07-28 17:35:53 +01:00
Erik Johnston	76b89d0edb	Add slace storage functions for public room list	2016-07-28 17:03:40 +01:00
Kegan Dougal	370135ad0b	Comment get_unread_push_actions_for_user_in_range function	2016-07-28 16:47:37 +01:00
Erik Johnston	0fcbca531f	Add get_auth_chain to slave store	2016-07-28 16:36:28 +01:00
Erik Johnston	1e2740caab	Handle the case of missing auth events when joining a room	2016-07-28 16:08:33 +01:00
Erik Johnston	6ede23ff1b	Add more key storage funcs into slave store	2016-07-28 15:41:26 +01:00
Erik Johnston	5fb41a955c	Merge branch 'release-v0.17.0' of github.com:matrix-org/synapse into develop	2016-07-28 14:56:32 +01:00
Mark Haines	4329f20e3f	Merge pull request #962 from matrix-org/markjh/retry ... Fix retry utils to check if the exception is a subclass of CME	2016-07-28 11:12:19 +01:00
Erik Johnston	a285194021	Merge branch 'erikj/key_client_fix' of github.com:matrix-org/synapse into release-v0.17.0	2016-07-28 10:47:06 +01:00
Mark Haines	bf81e38d36	Fix retry utils to check if the exception is a subclass of CME	2016-07-28 10:47:02 +01:00
Erik Johnston	78cac3e594	Merge pull request #941 from matrix-org/erikj/key_client_fix ... Send the correct host header when fetching keys	2016-07-28 10:46:36 +01:00
Erik Johnston	7871790db1	Bump version and changelog	2016-07-28 10:38:56 +01:00
Erik Johnston	18e044628e	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0	2016-07-28 10:37:43 +01:00
Erik Johnston	b557b682d9	Merge pull request #961 from matrix-org/dbkr/fix_push_invite_name ... Don't include name of room for invites in push	2016-07-28 10:36:41 +01:00
David Baker	389c890f14	Don't include name of room for invites in push ... Avoids insane pushes like, "Bob invited you to invite from Bob"	2016-07-28 10:20:47 +01:00
Richard van der Hoff	cd8738ab63	Merge pull request #960 from matrix-org/rav/support_r0.2 ... Add r0.2.0 to the "supported versions" list	2016-07-28 10:14:33 +01:00
Richard van der Hoff	f6f8f81a48	Add r0.1.0 to the "supported versions" list	2016-07-28 10:14:07 +01:00
David Baker	ecd5e6bfa4	Typo	2016-07-28 10:04:52 +01:00
Richard van der Hoff	fda078f995	Add r0.2.0 to the "supported versions" list	2016-07-28 09:14:21 +01:00
Richard van der Hoff	40e539683c	Merge pull request #956 from matrix-org/rav/check_device_id_on_key_upload ... Make the device id on e2e key upload optional	2016-07-27 18:16:57 +01:00
Paul "LeoNerd" Evans	05f6447301	Forbid non-ASes from registering users whose names begin with '_' (SYN-738)	2016-07-27 17:54:26 +01:00
Erik Johnston	5238960850	Bump CHANGES and version	2016-07-27 17:33:09 +01:00
Richard van der Hoff	ccec25e2c6	key upload tweaks ... 1. Add v2_alpha URL back in, since things seem to be using it. 2. Don't reject the request if the device_id in the upload request fails to match that in the access_token.	2016-07-27 16:41:06 +01:00
Mark Haines	29b25d59c6	Merge branch 'develop' into markjh/verify ... Conflicts: synapse/crypto/keyring.py	2016-07-27 15:11:02 +01:00
Mark Haines	884b800899	Merge pull request #955 from matrix-org/markjh/only_from2 ... Add a couple more checks to the keyring	2016-07-27 15:08:22 +01:00
Mark Haines	09d31815b4	Merge pull request #954 from matrix-org/markjh/even_more_fixes ... Fix a couple of bugs in the transaction and keyring code	2016-07-27 15:08:14 +01:00
Mark Haines	fe1b369946	Clean up verify_json_objects_for_server	2016-07-27 14:10:43 +01:00
Richard van der Hoff	26cb0efa88	SQL syntax fix	2016-07-27 12:30:22 +01:00
Richard van der Hoff	d47115ff8b	Delete e2e keys on device delete	2016-07-27 12:24:52 +01:00
Richard van der Hoff	2e3d90d67c	Make the device id on e2e key upload optional ... We should now be able to get our device_id from the access_token, so the device_id on the upload request is optional. Where it is supplied, we should check that it matches. For active access_tokens without an associated device_id, we ought to register the device in the devices table. Also update the table on upgrade so that all of the existing e2e keys are associated with real devices.	2016-07-26 23:38:12 +01:00
Mark Haines	a4b06b619c	Add a couple more checks to the keyring	2016-07-26 19:50:11 +01:00
Mark Haines	c63b1697f4	Merge pull request #952 from matrix-org/markjh/more_fixes ... Check if the user is banned when handling 3pid invites	2016-07-26 19:20:56 +01:00
Mark Haines	87ffd21b29	Fix a couple of bugs in the transaction and keyring code	2016-07-26 19:19:08 +01:00
Richard van der Hoff	eb359eced4	Add create_requester function ... Wrap the `Requester` constructor with a function which provides sensible defaults, and use it throughout	2016-07-26 16:46:53 +01:00
Mark Haines	c824b29e77	Check if the user is banned when handling 3pid invites	2016-07-26 16:39:14 +01:00
Richard van der Hoff	33d7776473	Fix typo	2016-07-26 13:32:15 +01:00
Richard van der Hoff	9ad8d9b17c	Merge branch 'develop' into rav/delete_refreshtoken_on_delete_device	2016-07-26 13:29:46 +01:00
Richard van der Hoff	5b1825ba5b	Merge pull request #951 from matrix-org/rav/flake8 ... Fix flake8 noise	2016-07-26 13:27:54 +01:00
Mark Haines	9c4cf83259	Merge pull request #948 from matrix-org/markjh/auth_fixes ... Don't add rejections to the state_group, persist all rejections	2016-07-26 13:22:57 +01:00
Richard van der Hoff	05e7e5e972	Fix flake8 violation ... Apparently flake8 v3 puts the error on a different line to v2. Easiest way to make sure that happens is by putting the whole statement on one line :)	2016-07-26 11:59:08 +01:00
Richard van der Hoff	8e02494166	Delete refresh tokens when deleting devices	2016-07-26 11:10:37 +01:00
Mark Haines	a6f06ce3e2	Fix how push_actions are redacted.	2016-07-26 11:05:39 +01:00
David Baker	d34e9f93b7	Merge pull request #949 from matrix-org/rav/update_devices ... Implement updates and deletes for devices	2016-07-26 10:49:55 +01:00
Mark Haines	efeb6176c1	Don't add rejected events if we've seen them befrore. Add some comments to explain what the code is doing mechanically	2016-07-26 10:49:52 +01:00
Matthew Hodgson	242c52d607	typo	2016-07-26 10:09:25 +02:00
Richard van der Hoff	012b4c1913	Implement updating devices ... You can update the displayname of devices now.	2016-07-26 07:35:48 +01:00
Richard van der Hoff	436bffd15f	Implement deleting devices	2016-07-26 07:35:48 +01:00
Mark Haines	1b3c3e6d68	Only update the events and event_json tables for rejected events	2016-07-25 18:44:30 +01:00
Richard van der Hoff	33d08e8433	Log when adding listeners	2016-07-25 17:22:15 +01:00
Mark Haines	8f7f4cb92b	Don't add the events to forward extremities if the event is rejected	2016-07-25 17:13:37 +01:00
Mark Haines	2623cec874	Don't add rejections to the state_group, persist all rejections	2016-07-25 16:12:16 +01:00
David Baker	4fcdf7b4b2	Merge pull request #946 from matrix-org/dbkr/log_recaptcha_hostname ... Log the hostname the reCAPTCHA was completed on	2016-07-25 16:10:39 +01:00
Mark Haines	955ef1f06c	fix: defer.returnValue takes one argument	2016-07-25 16:04:45 +01:00
Richard van der Hoff	2ee4c9ee02	background updates: fix assert again	2016-07-25 16:01:46 +01:00
Richard van der Hoff	9dbd903f41	background updates: Fix assertion to do something	2016-07-25 14:05:23 +01:00
Richard van der Hoff	465117d7ca	Fix background_update tests ... A bit of a cleanup for background_updates, and make sure that the real background updates have run before we start the unit tests, so that they don't interfere with the tests.	2016-07-25 12:10:42 +01:00
David Baker	7ed58bb347	Use get to avoid KeyErrors	2016-07-22 17:18:50 +01:00
David Baker	dad2da7e54	Log the hostname the reCAPTCHA was completed on ... This could be useful information to have in the logs. Also comment about how & why we don't verify the hostname.	2016-07-22 17:00:56 +01:00
Richard van der Hoff	363786845b	PEP8	2016-07-22 13:21:07 +01:00
Richard van der Hoff	ec5717caf5	Create index on user_ips in the background ... user_ips is kinda big, so really we want to add the index in the background once we're running. Replace the schema delta with one which will do that. I've done this in a way that's reasonably easy to reuse as there a few other indexes I need, and I don't suppose they will be the last.	2016-07-22 13:16:39 +01:00
Erik Johnston	d26b660aa6	Cache getPeer	2016-07-21 17:38:51 +01:00
Erik Johnston	aede7248ab	Split out a FederationReader process	2016-07-21 17:37:44 +01:00
Richard van der Hoff	55abbe1850	make /devices return a list ... Turns out I specced this to return a list of devices rather than a dict of them	2016-07-21 15:57:28 +01:00
David Baker	2c28e25bda	Merge pull request #943 from matrix-org/rav/get_device_api ... Implement GET /device/{deviceId}	2016-07-21 13:41:42 +01:00
David Baker	1e6e370b76	Merge pull request #942 from matrix-org/rav/fix_register_deviceid ... Preserve device_id from first call to /register	2016-07-21 13:16:31 +01:00
Richard van der Hoff	1c3c202b96	Fix PEP8 errors	2016-07-21 13:15:15 +01:00
Richard van der Hoff	406f7aa0f6	Implement GET /device/{deviceId}	2016-07-21 12:00:29 +01:00
Richard van der Hoff	c445f5fec7	storage/client_ips: remove some dead code	2016-07-21 11:58:47 +01:00
Erik Johnston	cf94a78872	Set host not path	2016-07-21 11:45:53 +01:00
Richard van der Hoff	1a64dffb00	Preserve device_id from first call to /register ... device_id may only be passed in the first call to /register, so make sure we fish it out of the register `params` rather than the body of the final call.	2016-07-21 11:34:16 +01:00
Erik Johnston	081e5d55e6	Send the correct host header when fetching keys	2016-07-21 11:14:54 +01:00
Erik Johnston	248e6770ca	Cache federation state responses	2016-07-21 10:30:12 +01:00
Richard van der Hoff	7314bf4682	Merge branch 'develop' into rav/get_devices_api ... (pick up PR #938 in the hope of fixing the UTs)	2016-07-20 17:40:00 +01:00
Richard van der Hoff	e9e3eaa67d	Merge pull request #938 from matrix-org/rav/add_device_id_to_client_ips ... Record device_id in client_ips	2016-07-20 17:38:45 +01:00
Erik Johnston	d36b1d849d	Don't explode if we have no snapshots yet	2016-07-20 16:59:52 +01:00
David Baker	742056be0d	Merge pull request #937 from matrix-org/rav/register_device_on_register ... Register a device_id in the /v2/register flow.	2016-07-20 16:51:27 +01:00
Richard van der Hoff	bc8f265f0a	GET /devices endpoint ... implement a GET /devices endpoint which lists all of the user's devices. It also returns the last IP where we saw that device, so there is some dancing to fish that out of the user_ips table.	2016-07-20 16:42:32 +01:00
Richard van der Hoff	ec041b335e	Record device_id in client_ips ... Record the device_id when we add a client ip; it's somewhat redundant as we could get it via the access_token, but it will make querying rather easier.	2016-07-20 16:41:03 +01:00
Richard van der Hoff	053e83dafb	More doc-comments ... Fix some more comments on some things	2016-07-20 16:40:28 +01:00
Richard van der Hoff	b97a1356b1	Register a device_id in the /v2/register flow. ... This doesn't cover *all* of the registration flows, but it does cover the most common ones: in particular: shared_secret registration, appservice registration, and normal user/pass registration. Pull device_id from the registration parameters. Register the device in the devices table. Associate the device with the returned access and refresh tokens. Profit.	2016-07-20 16:38:27 +01:00
Erik Johnston	b73dc0ef4d	Merge pull request #936 from matrix-org/erikj/log_rss ... Add metrics for psutil derived memory usage	2016-07-20 16:32:38 +01:00
Erik Johnston	66868119dc	Add metrics for psutil derived memory usage	2016-07-20 16:00:21 +01:00
Erik Johnston	aba0b2a39b	Merge pull request #935 from matrix-org/erikj/backfill_notifs ... Don't notify pusher pool for backfilled events	2016-07-20 13:39:16 +01:00
Erik Johnston	57dca35692	Don't notify pusher pool for backfilled events	2016-07-20 13:25:06 +01:00
Richard van der Hoff	c68518dfbb	Merge pull request #933 from matrix-org/rav/type_annotations ... Type annotations	2016-07-20 12:26:32 +01:00
David Baker	e967bc86e7	Merge pull request #932 from matrix-org/rav/register_refactor ... Further registration refactoring	2016-07-20 11:03:33 +01:00
Erik Johnston	1e2a7f18a1	Merge pull request #922 from matrix-org/erikj/file_api2 ... Feature: Add filter to /messages. Add 'contains_url' to filter.	2016-07-20 10:40:48 +01:00
Erik Johnston	f91faf09b3	Comment	2016-07-20 10:18:09 +01:00
Richard van der Hoff	3413f1e284	Type annotations ... Add some type annotations to help PyCharm (in particular) to figure out the types of a bunch of things.	2016-07-19 18:56:16 +01:00
Richard van der Hoff	40cbffb2d2	Further registration refactoring ... * `RegistrationHandler.appservice_register` no longer issues an access token: instead it is left for the caller to do it. (There are two of these, one in `synapse/rest/client/v1/register.py`, which now simply calls `AuthHandler.issue_access_token`, and the other in `synapse/rest/client/v2_alpha/register.py`, which is covered below). * In `synapse/rest/client/v2_alpha/register.py`, move the generation of access_tokens into `_create_registration_details`. This means that the normal flow no longer needs to call `AuthHandler.issue_access_token`; the shared-secret flow can tell `RegistrationHandler.register` not to generate a token; and the appservice flow continues to work despite the above change.	2016-07-19 18:46:19 +01:00
David Baker	b9e997f561	Merge pull request #931 from matrix-org/rav/refactor_register ... rest/client/v2_alpha/register.py: Refactor flow somewhat.	2016-07-19 16:13:45 +01:00
Richard van der Hoff	9a7a77a22a	Merge pull request #929 from matrix-org/rav/support_deviceid_in_login ... Add device_id support to /login	2016-07-19 15:53:04 +01:00
Richard van der Hoff	8f6281ab0c	Don't bind email unless threepid contains expected fields	2016-07-19 15:50:01 +01:00
Richard van der Hoff	0da0d0a29d	rest/client/v2_alpha/register.py: Refactor flow somewhat. ... This is meant to be an *almost* non-functional change, with the exception that it fixes what looks a lot like a bug in that it only calls `auth_handler.add_threepid` and `add_pusher` once instead of three times. The idea is to move the generation of the `access_token` out of `registration_handler.register`, because `access_token`s now require a device_id, and we only want to generate a device_id once registration has been successful.	2016-07-19 13:12:22 +01:00
Richard van der Hoff	022b9176fe	schema fix ... device_id should be text, not bigint.	2016-07-19 11:44:05 +01:00
Mark Haines	c41d52a042	Summary line	2016-07-19 10:28:27 +01:00
Mark Haines	7e554aac86	Update docstring on Handlers. ... To indicate it is deprecated.	2016-07-19 10:20:58 +01:00
Richard van der Hoff	f863a52cea	Add device_id support to /login ... Add a 'devices' table to the storage, as well as a 'device_id' column to refresh_tokens. Allow the client to pass a device_id, and initial_device_display_name, to /login. If login is successful, then register the device in the devices table if it wasn't known already. If no device_id was supplied, make one up. Associate the device_id with the access token and refresh token, so that we can get at it again later. Ensure that the device_id is copied from the refresh token to the access_token when the token is refreshed.	2016-07-18 16:39:44 +01:00
Richard van der Hoff	93efcb8526	Merge pull request #928 from matrix-org/rav/refactor_login ... Refactor login flow	2016-07-18 16:12:35 +01:00
Richard van der Hoff	dcfd71aa4c	Refactor login flow ... Make sure that we have the canonical user_id *before* calling get_login_tuple_for_user_id. Replace login_with_password with a method which just validates the password, and have the caller call get_login_tuple_for_user_id. This brings the password flow into line with the other flows, and will give us a place to register the device_id if necessary.	2016-07-18 15:23:54 +01:00
Erik Johnston	fca90b3445	Merge pull request #924 from matrix-org/erikj/purge_history ... Fix /purge_history bug	2016-07-18 15:11:11 +01:00
Mark Haines	a292454aa1	Merge pull request #925 from matrix-org/markjh/auth_fix ... Fix 500 ISE when sending alias event without a state_key	2016-07-18 15:04:47 +01:00
Erik Johnston	4f81edbd4f	Merge pull request #927 from Half-Shot/develop ... Fall back to 'username' if 'user' is not given for appservice registration.	2016-07-18 10:44:56 +01:00
Richard van der Hoff	6344db659f	Fix a doc-comment ... The `store` in a handler is a generic DataStore, not just an events.StateStore.	2016-07-18 09:48:10 +01:00
Will Hunt	511a52afc8	Use body.get to check for 'user'	2016-07-16 18:44:08 +01:00
Will Hunt	e885e2a623	Fall back to 'username' if 'user' is not given for appservice reg.	2016-07-16 18:33:48 +01:00
Mark Haines	d137e03231	Fix 500 ISE when sending alias event without a state_key	2016-07-15 18:58:25 +01:00
Erik Johnston	f52565de50	Fix /purge_history bug ... This was caused by trying to insert duplicate backward extremeties	2016-07-15 14:23:15 +01:00
Erik Johnston	a2d288c6a9	Merge pull request #923 from matrix-org/erikj/purge_history ... Various purge_history fixes	2016-07-15 13:23:29 +01:00
Erik Johnston	bd7c51921d	Merge pull request #919 from matrix-org/erikj/auth_fix ... Various auth.py fixes.	2016-07-15 11:38:33 +01:00
Erik Johnston	978fa53cc2	Pull out min stream_ordering from ex_outlier_stream	2016-07-15 10:22:30 +01:00
Erik Johnston	eec9609e96	event_backwards_extremeties may not be empty	2016-07-15 10:22:09 +01:00
Erik Johnston	9e1b43bcbf	Comment	2016-07-15 09:29:54 +01:00
Erik Johnston	a3036ac37e	Merge pull request #921 from matrix-org/erikj/account_deactivate ... Feature: Add an /account/deactivate endpoint	2016-07-14 17:25:15 +01:00
Erik Johnston	ebdafd8114	Check sender signed event	2016-07-14 17:03:24 +01:00
Erik Johnston	a98d215204	Add filter param to /messages API	2016-07-14 16:30:56 +01:00
Erik Johnston	d554ca5e1d	Add support for filters in paginate_room_events	2016-07-14 15:59:04 +01:00
Erik Johnston	209e04fa11	Merge pull request #918 from negzi/bugfix_for_token_expiry ... Bug fix: expire invalid access tokens	2016-07-14 15:51:52 +01:00
Erik Johnston	e5142f65a6	Add 'contains_url' to filter	2016-07-14 15:35:48 +01:00
Erik Johnston	b64aa6d687	Add sender and contains_url field to events table	2016-07-14 15:35:43 +01:00
Erik Johnston	848d3bf2e1	Add hs object	2016-07-14 10:25:52 +01:00
Erik Johnston	b55c770271	Only accept password auth	2016-07-14 10:00:38 +01:00
Erik Johnston	d543b72562	Add an /account/deactivate endpoint	2016-07-14 09:56:53 +01:00
Negar Fazeli	0136a522b1	Bug fix: expire invalid access tokens	2016-07-13 15:00:37 +02:00
Erik Johnston	2cb758ac75	Check if alias event's state_key matches sender's domain	2016-07-13 13:12:25 +01:00
Erik Johnston	560c71c735	Check creation event's room_id domain matches sender's	2016-07-13 13:07:19 +01:00
David Baker	a37ee2293c	Merge pull request #915 from matrix-org/dbkr/more_requesttokens ... Add requestToken endpoints	2016-07-13 11:51:46 +01:00
David Baker	c55ad2e375	be more pythonic	2016-07-12 14:15:10 +01:00
David Baker	aaa9d9f0e1	on_OPTIONS isn't neccessary	2016-07-12 14:13:14 +01:00
David Baker	75fa7f6b3c	Remove other debug logging	2016-07-12 14:08:57 +01:00
David Baker	a5db0026ed	Separate out requestTokens to separate handlers	2016-07-11 09:57:07 +01:00
David Baker	9c491366c5	Oops, remove debug logging	2016-07-11 09:07:40 +01:00
David Baker	385aec4010	Implement https://github.com/matrix-org/matrix-doc/pull/346/files	2016-07-08 17:42:48 +01:00
Mark Haines	dfde67a6fe	Add a comment explaining allow_none	2016-07-08 15:57:06 +01:00
Mark Haines	10c843fcfb	Ensure that the guest user is in the database when upgrading accounts	2016-07-08 15:15:55 +01:00
Erik Johnston	58930da52b	Merge branch 'master' of github.com:matrix-org/synapse into develop	2016-07-08 14:11:37 +01:00
Erik Johnston	0870588c20	Merge branch 'hotfixes-v0.16.1'	2016-07-08 13:22:32 +01:00
Erik Johnston	f90cf150e2	Bump version and changelog	2016-07-07 16:33:00 +01:00
Erik Johnston	067596d341	Fix bug where we did not correctly explode when multiple user_ids were set in macaroon	2016-07-07 16:22:24 +01:00
Erik Johnston	b92e7955be	Comment	2016-07-07 11:42:15 +01:00
Erik Johnston	c98e1479bd	Return 400 rather than 500	2016-07-07 11:41:07 +01:00
Erik Johnston	67f2c901ea	Add rest servlet. Fix SQL.	2016-07-06 15:56:59 +01:00
Erik Johnston	eef7778af9	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/test2	2016-07-06 14:50:22 +01:00
Erik Johnston	a17e7caeb7	Merge branch 'erikj/shared_secret' into erikj/test2	2016-07-06 14:46:31 +01:00
Erik Johnston	f0c06ac65c	Merge pull request #909 from matrix-org/erikj/shared_secret ... Add an admin option to shared secret registration (breaks backwards compat)	2016-07-06 14:08:51 +01:00
Erik Johnston	76b18df3d9	Check that there are no null bytes in user and passsword	2016-07-06 11:17:53 +01:00
Erik Johnston	0da24cac8b	Add null separator to hmac	2016-07-06 11:05:16 +01:00
Kent Shikama	8d9a884cee	Update password config comment ... Signed-off-by: Kent Shikama <kent@kentshikama.com>	2016-07-06 12:18:19 +09:00
Erik Johnston	be3548f7e1	Remove spurious txn	2016-07-05 17:46:51 +01:00
Erik Johnston	4adf93e0f7	Fix for postgres	2016-07-05 17:34:25 +01:00
Erik Johnston	651faee698	Add an admin option to shared secret registration	2016-07-05 17:30:22 +01:00
Erik Johnston	caf33b2d9b	Protect password when registering using shared secret	2016-07-05 17:18:19 +01:00
Erik Johnston	8f8798bc0d	Add ReadWriteLock for pagination and history prune	2016-07-05 15:30:25 +01:00
Erik Johnston	7335f0adda	Add ReadWriteLock	2016-07-05 15:23:17 +01:00
David Baker	ef535178ff	Merge pull request #904 from matrix-org/dbkr/register_email_no_untrusted_id_server ... requestToken update	2016-07-05 15:13:34 +01:00
Mark Haines	04dee11e97	Merge pull request #906 from matrix-org/markjh/faster_events_around ... Use a query that postgresql optimises better for get_events_around	2016-07-05 14:48:34 +01:00
Mark Haines	dd2ccee27d	Fix typo	2016-07-05 14:06:07 +01:00
Mark Haines	b6b0132ac7	Make get_events_around more efficient on sqlite3	2016-07-05 13:55:18 +01:00
Kent Shikama	252ee2d979	Remove default password pepper string	2016-07-05 19:15:51 +09:00
Kent Shikama	14362bf359	Fix password config	2016-07-05 19:12:53 +09:00
Kent Shikama	1ee2584307	Fix pep8	2016-07-05 19:01:00 +09:00
Kent Shikama	507b8bb091	Add comment to prompt changing of pepper	2016-07-05 18:42:35 +09:00
Mark Haines	d44d11d864	Use true/false for boolean parameter inclusive to avoid potential for sqli, and possibly make the code clearer	2016-07-05 10:39:13 +01:00
Erik Johnston	2d21d43c34	Add purge_history API	2016-07-05 10:28:51 +01:00
Mark Haines	0fb76c71ac	Use different SQL for postgres and sqlite3 for when using multicolumn indexes	2016-07-04 19:44:55 +01:00
Kent Shikama	8bdaf5f7af	Add pepper to password hashing ... Signed-off-by: Kent Shikama <kent@kentshikama.com>	2016-07-05 02:13:52 +09:00
Erik Johnston	a67bf0b074	Add storage function to purge history for a room	2016-07-04 16:02:50 +01:00
Mark Haines	f18d7546c6	Use a query that postgresql optimises better for get_events_around	2016-07-04 15:48:25 +01:00
Kent Shikama	bb069079bb	Fix style violations ... Signed-off-by: Kent Shikama <kent@kentshikama.com>	2016-07-04 22:07:11 +09:00
Kent Shikama	2e5a31f197	Use .get() instead of [] to access password_hash	2016-07-04 22:00:13 +09:00
Kent Shikama	fc8007dbec	Optionally include password hash in createUser endpoint ... Signed-off-by: Kent Shikama <kent@kentshikama.com>	2016-07-03 15:08:15 +09:00
David Baker	be8be535f7	requestToken update ... Don't send requestToken request to untrusted ID servers Also correct the THREEPID_IN_USE error to add the M_ prefix. This is a backwards incomaptible change, but the only thing using this is the angular client which is now unmaintained, so it's probably better to just do this now.	2016-06-30 17:51:28 +01:00
Erik Johnston	f328d95cef	Feature: Add deactivate account admin API ... Allows server admins to "deactivate" accounts, which: - Revokes all access tokens - Removes all threepids - Removes password The API is a POST to `/admin/deactivate/<user_id>`	2016-06-30 15:40:58 +01:00
Erik Johnston	f52cb4cd78	Remove race	2016-06-29 15:24:50 +01:00
Mark Haines	6783534a0f	Merge pull request #886 from matrix-org/markjh/async_commit ... Optionally make committing to postgres asynchronous.	2016-06-29 15:21:58 +01:00
Erik Johnston	a70688445d	Implement purge_media_cache admin API	2016-06-29 14:57:59 +01:00
Erik Johnston	314b146b2e	Track approximate last access time for remote media	2016-06-29 11:41:20 +01:00
David Baker	db74dcda5b	Merge pull request #894 from matrix-org/dbkr/push_room_naming ... Use similar naming we use in email notifs for push	2016-06-28 10:12:24 +01:00
Matthew Hodgson	63bb8f0df9	remove vector.im from default secondary DS list	2016-06-27 13:13:33 +04:00
David Baker	0b640aa56b	even more pep8	2016-06-24 11:47:11 +01:00
David Baker	aa3a4944d5	more pep8	2016-06-24 11:45:23 +01:00
David Baker	46b7362304	pep8	2016-06-24 11:44:57 +01:00
David Baker	870c45913e	Use similar naming we use in email notifs for push ... Fixes https://github.com/vector-im/vector-web/issues/1654	2016-06-24 11:41:11 +01:00
Mark Haines	05f1a4596a	Merge branch 'master' into develop	2016-06-23 11:17:48 +01:00
David Baker	b5fb7458d5	Actually we need to order these properly ... otherwise we'll end up returning the wrong 20	2016-06-22 18:07:14 +01:00
David Baker	f73fdb04a6	Style	2016-06-22 17:51:40 +01:00
David Baker	3a4120e49a	Put most recent 20 messages in notif ... Fixes https://github.com/vector-im/vector-web/issues/1648	2016-06-22 17:47:18 +01:00
Martin Weinelt	0a32208e5d	Rework ldap integration with ldap3 ... Use the pure-python ldap3 library, which eliminates the need for a system dependency. Offer both a `search` and `simple_bind` mode, for more sophisticated ldap scenarios. - `search` tries to find a matching DN within the `user_base` while employing the `user_filter`, then tries the bind when a single matching DN was found. - `simple_bind` tries the bind against a specific DN by combining the localpart and `user_base` Offer support for STARTTLS on a plain connection. The configuration was changed to reflect these new possibilities. Signed-off-by: Martin Weinelt <hexa@darmstadt.ccc.de>	2016-06-22 17:51:59 +02:00
Mark Haines	774f3a692c	Merge pull request #889 from matrix-org/markjh/synctl_workers ... Optionally start or stop workers in synctl.	2016-06-21 17:58:19 +01:00
Mark Haines	5cc7564c5c	Optionally start or stop workers in synctl. ... Optionally start or stop an individual worker by passing -w with the path to the worker config. Optionally start or stop every worker and the main synapse by passing -a with a path to a directory containing worker configs. The "-w" is intended to be used to bounce individual workers proceses. THe "-a" is intended for when you want to restart all the workers simultaneuously, for example when performing database upgrades.	2016-06-21 16:38:05 +01:00
Mark Haines	0fe0b0eeb6	Merge pull request #888 from matrix-org/markjh/content_repo ... Remove the legacy v0 content upload API.	2016-06-21 14:01:01 +01:00
Mark Haines	13e334506c	Remove the legacy v0 content upload API. ... The existing content can still be downloaded. The last upload to the matrix.org server was in January 2015, so it is probably safe to remove the upload API.	2016-06-21 11:47:39 +01:00
Mark Haines	d5fb561709	Optionally make committing to postgres asynchronous. ... Useful when running tests when you don't care whether the server will lose data that it claims that it has committed.	2016-06-20 17:53:38 +01:00
Erik Johnston	d8ec81cc31	Merge pull request #879 from matrix-org/erikj/linearize_fed_server ... Linearize some federation endpoints based on (origin, room_id)	2016-06-20 17:34:29 +01:00
Erik Johnston	bc72d381b2	Merge branch 'release-v0.16.1' of github.com:matrix-org/synapse	2016-06-20 14:18:04 +01:00
Erik Johnston	4d362a61ea	Bump version and changelog	2016-06-20 14:17:42 +01:00
Mark Haines	41e4b2efea	Add the create_profile method back since the tests use it	2016-06-17 19:20:47 +01:00
Mark Haines	0c13d45522	Add a comment on why we don't create a profile for upgrading users	2016-06-17 19:18:53 +01:00
Mark Haines	9f1800fba8	Remove registered_users from the distributor. ... The only place that was observed was to set the profile. I've made it so that the profile is set within store.register in the same transaction that creates the user. This required some slight changes to the registration code for upgrading guest users, since it previously relied on the distributor swallowing errors if the profile already existed.	2016-06-17 19:14:16 +01:00
Erik Johnston	8f4a9bbc16	Linearize some federation endpoints based on (origin, room_id)	2016-06-17 16:43:45 +01:00
Erik Johnston	9ba2bf1570	Merge pull request #878 from matrix-org/erikj/ujson ... Disable responding with canonical json for federation	2016-06-17 16:22:12 +01:00
Erik Johnston	120c238705	Disable responding with canonical json for federation	2016-06-17 16:10:37 +01:00
Erik Johnston	1c1f633b13	Merge pull request #877 from matrix-org/erikj/frozen_default ... Turn use_frozen_events off by default	2016-06-17 15:33:55 +01:00
Erik Johnston	6660f37558	Merge pull request #876 from matrix-org/erikj/sign_own ... Only re-sign our own events	2016-06-17 15:23:20 +01:00
Erik Johnston	3e41de05cc	Turn use_frozen_events off by default	2016-06-17 15:11:22 +01:00
Erik Johnston	2884712ca7	Only re-sign our own events	2016-06-17 14:47:33 +01:00
Mark Haines	ded01c3bf6	Fix `KeyError: 'msgtype'. Use .get` ... Fixes a key error where the mailer tried to get the ``msgtype`` of an event that was missing a ``msgtype``. ``` File "synapse/push/mailer.py", line 264, in get_notif_vars File "synapse/push/mailer.py", line 285, in get_message_vars File ".../frozendict/__init__.py", line 10, in __getitem__ return self.__dict[key] KeyError: 'msgtype' ```	2016-06-17 13:49:16 +01:00
Mark Haines	8c75040c25	Fix setting gc thresholds in the workers	2016-06-17 11:48:12 +01:00
Mark Haines	a352b68acf	Use worker_ prefixes for worker config, use existing support for multiple config files	2016-06-16 17:29:50 +01:00
Mark Haines	364d616792	Access the event_cache_size directly from the server object. ... This means that the workers can override the event_cache_size directly without clobbering the value in the main synapse config.	2016-06-16 12:53:15 +01:00
Mark Haines	bde13833cb	Access replication_url from the worker config directly	2016-06-16 12:44:40 +01:00
Mark Haines	80a1bc7db5	Comment on what's going on in clobber_with_worker_config	2016-06-16 11:29:45 +01:00
Mark Haines	f1f70bf4b5	Merge remote-tracking branch 'origin/develop' into markjh/worker_config	2016-06-16 11:20:17 +01:00
Mark Haines	dbb5a39b64	Add worker config module	2016-06-16 11:09:15 +01:00
Mark Haines	885ee861f7	Inline the synchrotron and pusher configs into the main config	2016-06-16 11:06:12 +01:00
Erik Johnston	486b9a6a2d	Merge pull request #873 from vt0r/bugfix/bcrypt-utf8-encode ... Fix TypeError in call to bcrypt.hashpw	2016-06-16 10:12:17 +01:00
Salvatore LaMendola	ed5f43a55a	Fix TypeError in call to bcrypt.hashpw ... - At the very least, this TypeError caused logins to fail on my own running instance of Synapse, and the simple (explicit) UTF-8 conversion resolved login errors for me. Signed-off-by: Salvatore LaMendola <salvatore.lamendola@gmail.com>	2016-06-16 00:43:42 -04:00
Erik Johnston	09a17f965c	Line lengths	2016-06-15 16:58:12 +01:00
Erik Johnston	1e9026e484	Handle floats as img widths	2016-06-15 16:58:05 +01:00
Erik Johnston	a60169ea09	Handle og props with not content	2016-06-15 16:57:48 +01:00
Erik Johnston	0ef0655b83	Bump version and changelog	2016-06-15 15:50:48 +01:00
Erik Johnston	d41a1a91d3	Linearize fetching of gaps on incoming events ... This potentially stops the server from doing multiple requests for the same data.	2016-06-15 15:16:14 +01:00
Richard van der Hoff	15bf3e3376	Merge pull request #870 from matrix-org/rav/work_around_tls_bug ... Work around TLS bug in twisted	2016-06-15 13:28:13 +01:00
Erik Johnston	b31c49d676	Correctly mark backfilled events as backfilled	2016-06-15 10:59:08 +01:00
Richard van der Hoff	255c229f23	Work around TLS bug in twisted ... Wrap up twisted's FileBodyProducer to work around https://twistedmatrix.com/trac/ticket/8473. Hopefully this fixes https://matrix.org/jira/browse/SYN-700.	2016-06-15 10:39:08 +01:00
Erik Johnston	d12134ce37	Merge pull request #868 from matrix-org/erikj/invalid_id ... Make get_domain_from_id throw SynapseError on invalid ID	2016-06-14 15:09:07 +01:00
Erik Johnston	36e2aade87	Make get_domain_from_id throw SynapseError on invalid ID	2016-06-14 13:25:29 +01:00
Matthew Hodgson	33546b58aa	point to the CAPTCHA docs	2016-06-12 23:11:29 +01:00
Mark Haines	41b35412bf	Merge pull request #863 from matrix-org/markjh/load_config ... Add function to load config without generating it	2016-06-10 11:12:32 +01:00
Mark Haines	7dbb473339	Add function to load config without generating it ... Renames ``load_config`` to ``load_or_generate_config`` Adds a method called ``load_config`` that just loads the config. The main synapse.app.homeserver will continue to use ``load_or_generate_config`` to retain backwards compat. However new worker processes can use ``load_config`` to load the config avoiding some of the cruft needed to generate the config. As the new ``load_config`` method is expected to be used by new configs it removes support for the legacy commandline overrides that ``load_or_generate_config`` supports	2016-06-09 18:50:38 +01:00
Erik Johnston	16a8884233	Merge branch 'master' of github.com:matrix-org/synapse into develop	2016-06-09 16:57:33 +01:00
Erik Johnston	a31befbcd0	Bump version and changelog	2016-06-09 13:23:41 +01:00
Erik Johnston	5ee5b655b2	Merge pull request #862 from matrix-org/erikj/media_remote_error ... 502 on /thumbnail when can't contact remote server	2016-06-09 13:11:02 +01:00
Erik Johnston	0a43219a27	Merge pull request #860 from negzi/bug_fix_get_or_create_user ... Fix a bug caused by a change in auth_handler function	2016-06-09 11:40:12 +01:00
Erik Johnston	eba4ff1bcb	502 on /thumbnail when can't contact remote server	2016-06-09 11:29:43 +01:00
Erik Johnston	95f305c35a	Remove redundant exception log in /events	2016-06-09 11:15:04 +01:00
Negar Fazeli	6e7dc7c7dd	Fix a bug caused by a change in auth_handler function ... Fix the relevant unit test cases	2016-06-08 23:22:39 +02:00
Erik Johnston	b7fbc9bd95	Merge pull request #859 from matrix-org/erikj/public_room_performance ... Pull full state for each room all at once	2016-06-08 16:36:06 +01:00
Erik Johnston	919a2c74f6	Merge branch 'release-v0.16.0' of github.com:matrix-org/synapse into develop	2016-06-08 16:26:26 +01:00
Erik Johnston	81c07a32fd	Pull full state for each room all at once	2016-06-08 15:51:49 +01:00
Erik Johnston	690029d1a3	Don't make rooms visibile by default	2016-06-08 14:47:42 +01:00
Erik Johnston	d88faf92d1	Fix up federation PublicRoomList	2016-06-08 14:39:31 +01:00
Erik Johnston	958c968d02	Merge pull request #856 from matrix-org/erikj/fed_pub_rooms ... Enable auth on /publicRoom endpoints	2016-06-08 14:36:09 +01:00
Erik Johnston	746b2f5657	Merge pull request #854 from matrix-org/erikj/federation_logging ... Add some logging for when servers ask for missing events	2016-06-08 14:31:41 +01:00
Erik Johnston	efeabd3180	Log user that is making /publicRooms calls	2016-06-08 14:23:15 +01:00
Erik Johnston	1fd6eb695d	Enable auth on federation PublicRoomList	2016-06-08 14:15:18 +01:00
Erik Johnston	17aab5827a	Add some logging for when servers ask for missing events	2016-06-08 11:55:31 +01:00
Erik Johnston	1a815fb04f	Don't hit DB for noop replications queries	2016-06-08 11:33:30 +01:00
Erik Johnston	bab916bccc	Bump version and changelog to v0.16.0-rc2	2016-06-08 11:05:45 +01:00
Erik Johnston	e0fda29f94	Merge pull request #850 from matrix-org/erikj/gc_threshold ... Add gc_threshold to pusher and synchrotron	2016-06-08 10:05:56 +01:00
Erik Johnston	0f2165ccf4	Don't track total objects as its too expensive to calculate	2016-06-07 17:00:45 +01:00
Erik Johnston	18f0cc7d99	Record some more GC metrics	2016-06-07 16:55:49 +01:00
Erik Johnston	2d1d1025fa	Add gc_threshold to pusher and synchrotron	2016-06-07 16:26:25 +01:00
Erik Johnston	b01e71e719	Merge pull request #849 from matrix-org/erikj/gc_threshold ... Allow setting of gc.set_thresholds	2016-06-07 16:07:54 +01:00
Erik Johnston	dded389ac1	Allow setting of gc.set_thresholds	2016-06-07 15:45:56 +01:00
Mark Haines	0b2158719c	Remove dead code. ... Loading push rules now happens in the datastore, so we can remove the methods that loaded them outside the datastore. The ``waiting_for_join_list`` in federation handler is populated by anything, so can be removed. The ``_get_members_events_txn`` method isn't called from anywhere so can be removed.	2016-06-07 15:07:11 +01:00
Erik Johnston	48e65099b5	Also record number of unreachable objects	2016-06-07 13:40:22 +01:00
Erik Johnston	75331c5fca	Change the way we do stats	2016-06-07 13:33:13 +01:00
Erik Johnston	8c966fbd51	Merge pull request #771 from matrix-org/erikj/gc_tick ... Manually run GC on reactor tick.	2016-06-07 13:18:36 +01:00
Mark Haines	88625db05f	Notify users for events in rooms they join. ... Change how the notifier updates the map from room_id to user streams on receiving a join event. Make it update the map when it notifies for the join event, rather than using the "user_joined_room" distributor signal	2016-06-07 11:33:36 +01:00
Erik Johnston	84379062f9	Fix AS retries, but with correct ordering	2016-06-07 10:24:50 +01:00
Erik Johnston	310197bab5	Fix AS retries	2016-06-07 09:34:50 +01:00
Mark Haines	b0932b34cb	Merge pull request #845 from matrix-org/markjh/synchrotron_presence ... Fix a KeyError in the synchrotron presence	2016-06-06 16:52:27 +01:00
Mark Haines	4a5bbb1941	Fix a KeyError in the synchrotron presence	2016-06-06 16:37:12 +01:00
Mark Haines	87f60e7053	Merge pull request #844 from matrix-org/markjh/yield_on_sleep ... Yield on the sleeps intended to backoff replication	2016-06-06 16:20:54 +01:00
Mark Haines	5ef84da4f1	Yield on the sleeps intended to backoff replication	2016-06-06 16:05:28 +01:00
Erik Johnston	216a05b3e3	.values() returns list of sets	2016-06-06 16:00:09 +01:00
Erik Johnston	96dc600579	Fix typos	2016-06-06 15:44:41 +01:00
Erik Johnston	377eb480ca	Fire after 30s not 8h	2016-06-06 15:14:21 +01:00
Erik Johnston	e4134c5e13	Merge pull request #841 from matrix-org/erikj/event_counter ... Add metric counter for number of persisted events	2016-06-06 14:17:40 +01:00
Erik Johnston	7aa778fba9	Add metric counter for number of persisted events	2016-06-06 11:58:09 +01:00
Erik Johnston	70aee0717c	Add events to cache when we persist them	2016-06-06 11:34:53 +01:00
Erik Johnston	3210f4c385	Merge pull request #836 from matrix-org/erikj/change_event_cache ... Change the way we cache events	2016-06-03 18:47:46 +01:00
Erik Johnston	cffe46408f	Don't rely on options when inserting event into cache	2016-06-03 18:25:21 +01:00
Mark Haines	ac9716f154	Fix spelling	2016-06-03 18:10:00 +01:00
Mark Haines	8f79084bd4	Add get_presence_list_accepted to the broken caches in synchrotron	2016-06-03 18:03:40 +01:00
Erik Johnston	10ea3f46ba	Change the way we cache events	2016-06-03 17:57:50 +01:00
Erik Johnston	f6be734be9	Merge pull request #835 from matrix-org/erikj/get_event_txn ... Remove event fetching from DB threads	2016-06-03 17:30:00 +01:00
Erik Johnston	05e01f21d7	Remove event fetching from DB threads	2016-06-03 17:22:13 +01:00
David Baker	72c4d482e9	3rd time lucky: we'd already calculated it above	2016-06-03 16:39:50 +01:00
David Baker	fbf608decb	Oops, we're using the dict form	2016-06-03 16:38:39 +01:00
David Baker	06d40c8b98	Add substitutions to email notif From	2016-06-03 16:31:23 +01:00
Erik Johnston	5f88549f4a	Merge branch 'release-v0.16.0' of github.com:matrix-org/synapse into develop	2016-06-03 16:27:24 +01:00
Mark Haines	ca457f594e	Merge pull request #831 from matrix-org/markjh/synchrotronII ... Add a separate process that can handle /sync requests	2016-06-03 16:06:25 +01:00
Erik Johnston	21961c93c7	Bump changelog and version	2016-06-03 15:33:14 +01:00
Mark Haines	48340e4f13	Clear the list of ongoing syncs on shutdown	2016-06-03 15:02:27 +01:00
Erik Johnston	fcbc282f56	Merge branch 'release-v0.15.0' of github.com:matrix-org/synapse into release-v0.16.0	2016-06-03 15:02:04 +01:00
Erik Johnston	51773bcbaf	Merge pull request #832 from matrix-org/erikj/presence_coount ... Change def of small delta in presence stream. Add metrics.	2016-06-03 14:57:00 +01:00
Mark Haines	da491e75b2	Appease flake8	2016-06-03 14:56:36 +01:00
Mark Haines	0b3c80a234	Use ClientIpStore to record client ips	2016-06-03 14:55:01 +01:00
Mark Haines	dd6f62ed99	Merge branch 'develop' into markjh/synchrotronII	2016-06-03 14:51:33 +01:00
Mark Haines	eef541a291	Move insert_client_ip to a separate class	2016-06-03 14:42:35 +01:00
Mark Haines	80aade3805	Send updates to the syncing users every ten seconds or immediately if they've just come online	2016-06-03 14:24:19 +01:00
Erik Johnston	ab116bdb0c	Fix typo	2016-06-03 14:03:42 +01:00
Erik Johnston	4ce84a1acd	Change metric style	2016-06-03 13:49:16 +01:00
Erik Johnston	a7ff5a1770	Presence metrics. Change def of small delta	2016-06-03 13:40:55 +01:00
Matthew Hodgson	8d740132f4	Merge branch 'develop' into matthew/brand-from-header	2016-06-03 12:14:18 +01:00
Erik Johnston	3b096c5f5c	Merge branch 'erikj/cache_perf' of github.com:matrix-org/synapse into develop	2016-06-03 12:00:33 +01:00
Erik Johnston	43b7f371f5	Merge pull request #830 from matrix-org/erikj/metrics_perf ... Change CacheMetrics to be quicker	2016-06-03 11:57:29 +01:00
Mark Haines	abb151f3c9	Add a separate process that can handle /sync requests	2016-06-03 11:57:26 +01:00
Erik Johnston	4982b28868	Merge pull request #829 from matrix-org/erikj/poke_notifier ... Poke notifier on next reactor tick	2016-06-03 11:52:10 +01:00
Erik Johnston	d06f2a229e	Merge pull request #828 from matrix-org/erikj/joined_hosts_for_room ... Make get_joined_hosts_for_room use get_users_in_room	2016-06-03 11:50:30 +01:00
Erik Johnston	58a224a651	Pull out update_results_dict	2016-06-03 11:47:07 +01:00
Mark Haines	20eccd84d4	Merge pull request #827 from matrix-org/markjh/more_slaved_methods ... Add methods to events, account data and receipt slaves	2016-06-03 11:46:21 +01:00
Erik Johnston	722472b48c	Merge pull request #825 from matrix-org/erikj/cache_push_rules ... Load push rules in storage layer so that they get cached	2016-06-03 11:44:32 +01:00
Erik Johnston	73c7112433	Change CacheMetrics to be quicker ... We change it so that each cache has an individual CacheMetric, instead of having one global CacheMetric. This means that when a cache tries to increment a counter it does not need to go through so many indirections.	2016-06-03 11:26:52 +01:00
Mark Haines	b09f348530	Merge pull request #824 from matrix-org/markjh/slaved_presence_store ... Add a slaved store for presence	2016-06-03 11:26:33 +01:00
Erik Johnston	4c04222fa5	Poke notifier on next reactor tick	2016-06-03 11:24:16 +01:00
Erik Johnston	ccb56fc24b	Make get_joined_hosts_for_room use get_users_in_room	2016-06-03 11:20:23 +01:00
Mark Haines	81cf449daa	Add methods to events, account data and receipt slaves ... Adds the methods needed by /sync to the slaved events, account data and receipt stores.	2016-06-03 11:19:27 +01:00
Erik Johnston	e043ede4a2	Small optimisation to CacheListDescriptor	2016-06-03 11:19:22 +01:00
Mark Haines	b821c839dc	Merge pull request #823 from matrix-org/markjh/more_slaved_stores ... Add slaved stores for filters, tokens, and push rules	2016-06-03 11:17:43 +01:00
Erik Johnston	597013caa5	Make cachedList go a bit faster	2016-06-03 11:13:29 +01:00
Erik Johnston	6a0afa582a	Load push rules in storage layer, so that they get cached	2016-06-03 11:10:00 +01:00
Mark Haines	3ae915b27e	Add a slaved store for presence	2016-06-03 11:05:53 +01:00
Erik Johnston	59f2d73522	Remove unnecessary sets	2016-06-03 11:05:45 +01:00
Erik Johnston	9c26b390a2	Only get local users	2016-06-03 11:04:31 +01:00
Mark Haines	f88d747f79	Add a comment explaining why the filter cache doesn't need exipiring	2016-06-03 11:03:10 +01:00
Erik Johnston	065e739d6e	Merge pull request #811 from matrix-org/erikj/state_users_in_room ... Use state to calculate get_users_in_room	2016-06-03 10:58:27 +01:00
Erik Johnston	696d7c5937	Merge pull request #809 from matrix-org/erikj/cache_receipts_in_room ... Add get_users_with_read_receipts_in_room cache	2016-06-03 10:58:24 +01:00
Mark Haines	0eae075723	Add slaved stores for filters, tokens, and push rules	2016-06-03 10:58:03 +01:00
Matthew Hodgson	79d1f072f4	brand the email from header	2016-06-02 21:34:40 +01:00
David Baker	6bb9aacf9d	Merge pull request #821 from matrix-org/dbkr/email_unsubscribe ... Email unsubscribe links that don't require logging in	2016-06-02 17:44:55 +01:00
David Baker	745ddb4dd0	peppate	2016-06-02 17:38:41 +01:00
David Baker	7a5a5f2df2	Merge pull request #820 from matrix-org/dbkr/email_notif_string_fmt_error ... Fix error in email notification string formatting	2016-06-02 17:26:06 +01:00
David Baker	1f31cc37f8	Working unsubscribe links going straight to the HS ... and authed by macaroons that let you delete pushers and nothing else	2016-06-02 17:21:31 +01:00
Matthew Hodgson	2675c1e40e	add some branding debugging	2016-06-02 17:21:12 +01:00
David Baker	c71177f285	Merge remote-tracking branch 'origin/dbkr/email_notif_string_fmt_error' into dbkr/email_unsubscribe	2016-06-02 17:20:56 +01:00
David Baker	07a5559916	Fix error in email notification string formatting	2016-06-02 17:17:16 +01:00
Mark Haines	56d15a0530	Store the typing users as user_id strings. (#819) ... Rather than storing them as UserID objects.	2016-06-02 16:28:54 +01:00
David Baker	812b5de0fe	Merge remote-tracking branch 'origin/develop' into dbkr/email_unsubscribe	2016-06-02 15:33:28 +01:00
Mark Haines	80f34d7b57	Fix setting the _clock in SQLBaseStore	2016-06-02 15:23:56 +01:00
Mark Haines	661a540dd1	Deduplicate presence entries in sync (#818)	2016-06-02 15:20:28 +01:00
Mark Haines	70599ce925	Allow external processes to mark a user as syncing. (#812) ... * Add infrastructure to the presence handler to track sync requests in external processes * Expire stale entries for dead external processes * Add an http endpoint for making users as syncing Add some docstrings and comments. * Fixes	2016-06-02 15:20:15 +01:00
David Baker	fb2193cc63	Merge pull request #817 from matrix-org/dbkr/split_out_auth_handler ... Split out the auth handler	2016-06-02 14:31:35 +01:00
Erik Johnston	356f13c069	Disable INCLUDE_ALL_UNREAD_NOTIFS	2016-06-02 14:07:38 +01:00
Erik Johnston	02ac463dbf	Merge pull request #800 from matrix-org/erikj/sync_refactor ... Refactor SyncHandler	2016-06-02 14:02:13 +01:00
Matthew Hodgson	c5af1b6b00	Merge pull request #814 from matrix-org/matthew/3pid_invite_auth ... special case m.room.third_party_invite event auth to match invites,	2016-06-02 13:47:40 +01:00
David Baker	3a3fb2f6f9	Merge branch 'dbkr/split_out_auth_handler' into dbkr/email_unsubscribe	2016-06-02 13:35:25 +01:00
David Baker	4a10510cd5	Split out the auth handler	2016-06-02 13:31:45 +01:00
Matthew Hodgson	f84b89f0c6	if an email pusher specifies a brand param, use it	2016-06-02 13:29:48 +01:00
David Baker	a15ad60849	Email unsubscribing that may in theory, work ... Were it not for that fact that you can't use the base handler in the pusher because it pulls in the world. Comitting while I fix that on a different branch.	2016-06-02 11:44:15 +01:00
David Baker	e793866398	Use user_id in email greeting if display name is null	2016-06-02 09:41:13 +01:00
Matthew Hodgson	aaa70e26a2	special case m.room.third_party_invite event auth to match invites, otherwise they get out of sync and you get https://github.com/vector-im/vector-web/issues/1208	2016-06-01 22:13:47 +01:00
Erik Johnston	a04a2d043c	Merge pull request #807 from matrix-org/erikj/push_rules_cache ... Ensure we always return boolean in push rules	2016-06-01 18:07:48 +01:00
Erik Johnston	0f06b496d1	Merge pull request #806 from matrix-org/erikj/hash_cache ... Cache get_event_reference_hashes	2016-06-01 18:07:42 +01:00
David Baker	e0deeff23e	Fix room list spidering	2016-06-01 17:58:58 +01:00
David Baker	991af8b0d6	WIP on unsubscribing email notifs without logging in	2016-06-01 17:40:52 +01:00
David Baker	00c487a8db	Merge pull request #808 from matrix-org/dbkr/room_list_spider ... Add secondary_directory_servers option to fetch room list from other servers	2016-06-01 15:32:52 +01:00
Erik Johnston	c8285564a3	Use state to calculate get_users_in_room	2016-06-01 15:25:25 +01:00
David Baker	d60eed0710	Limit number of notifications in an email notification	2016-06-01 11:45:43 +01:00
Erik Johnston	43db0d9f6a	Add get_users_with_read_receipts_in_room cache	2016-06-01 10:54:32 +01:00
David Baker	8e539f13c0	Merge remote-tracking branch 'origin/develop' into dbkr/room_list_spider	2016-06-01 09:54:36 +01:00
David Baker	6ecb2ca4ec	pep8	2016-06-01 09:48:55 +01:00
David Baker	2a449fec4d	Add cache to remote room lists ... Poll for updates from remote servers, waiting for the poll if there's no cache entry.	2016-05-31 18:27:23 +01:00
David Baker	6ca4d3ae9a	Add vector.im to default secondary_directory_servers and add comment explaining it's not a permanent solution	2016-05-31 17:24:50 +01:00
Erik Johnston	dea9f20f8c	Force boolean	2016-05-31 17:24:30 +01:00