4406 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Daniel Wagner-Hall	3e6fdfda00	Fix some formatting to use tuples	2015-08-18 15:18:50 +01:00
Erik Johnston	ee59af9ac0	Set request.authenticated_entity for application services	2015-08-18 15:17:47 +01:00
Daniel Wagner-Hall	1469141023	Merge branch 'develop' into auth	2015-08-18 14:43:44 +01:00
Daniel Wagner-Hall	cacdb529ab	Remove accidentally added file	2015-08-18 14:27:23 +01:00
Daniel Wagner-Hall	2d3462714e	Issue macaroons as opaque auth tokens ... This just replaces random bytes with macaroons. The macaroons are not inspected by the client or server. In particular, they claim to have an expiry time, but nothing verifies that they have not expired. Follow-up commits will actually enforce the expiration, and allow for token refresh. See https://bit.ly/matrix-auth for more information	2015-08-18 14:22:02 +01:00
Erik Johnston	f704c10f29	Rename unhelpful variable name	2015-08-18 11:54:03 +01:00
Erik Johnston	6e7d36a72c	Also check for presence of 'threadCallQueue' in reactor	2015-08-18 11:51:08 +01:00
Erik Johnston	d3da63f766	Use more helpful variable names	2015-08-18 11:47:00 +01:00
Erik Johnston	8199475ce0	Ensure we never return a None event from _get_state_for_groups	2015-08-18 11:44:10 +01:00
Erik Johnston	0d4abf7777	Typo	2015-08-18 11:19:08 +01:00
Erik Johnston	e55291ce5e	None check	2015-08-18 11:17:37 +01:00
Erik Johnston	8e254862f4	Don't assume @cachedList function returns keys for everything	2015-08-18 11:11:33 +01:00
Erik Johnston	85d0bc3bdc	Reduce cache size from obscenely large to quite large	2015-08-18 11:00:38 +01:00
Erik Johnston	cfc503681f	Comments	2015-08-18 10:49:23 +01:00
Erik Johnston	dc2a105fca	Merge pull request #226 from matrix-org/erikj/room_presence ... Add and use cached batched storage.get_state function.	2015-08-18 10:43:50 +01:00
Erik Johnston	83eb627b5a	More helpful variable names	2015-08-18 10:33:11 +01:00
Erik Johnston	776ee6d92b	Doc strings	2015-08-18 10:30:07 +01:00
Erik Johnston	f72ed6c6a3	Remove debug try/catch	2015-08-18 10:29:49 +01:00
Mark Haines	8899df13bf	Merge pull request #208 from matrix-org/markjh/end-to-end-key-federation ... Federation for end-to-end key requests.	2015-08-18 09:12:54 +01:00
Erik Johnston	8f4165628b	Add index receipts_linearized_room_stream	2015-08-17 14:43:54 +01:00
Erik Johnston	d3d582bc1c	Remove unused import	2015-08-17 13:38:09 +01:00
Erik Johnston	4d8e1e1f9e	Remove added unused methods	2015-08-17 13:36:07 +01:00
Erik Johnston	afef6f5d16	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts_take2	2015-08-17 13:23:44 +01:00
Erik Johnston	2d97e65558	Remember to invalidate caches	2015-08-17 10:46:55 +01:00
Erik Johnston	1a9510bb84	Implement a batched presence_handler.get_state and use it	2015-08-17 10:40:23 +01:00
Erik Johnston	47abebfd6d	Add batched version of store.get_presence_state	2015-08-17 09:50:50 +01:00
Erik Johnston	f9d4da7f45	Fix bug where we were leaking None into state event lists	2015-08-17 09:39:45 +01:00
Daniel Wagner-Hall	30883d8409	Merge pull request #221 from matrix-org/auth ... Simplify LoginHander and AuthHandler	2015-08-14 17:02:22 +01:00
Erik Johnston	891dfd90bd	Fix pending_calls metric to not lie	2015-08-14 15:43:11 +01:00
Erik Johnston	68b255c5a1	Batch _get_linearized_receipts_for_rooms	2015-08-14 15:06:22 +01:00
Mark Haines	95b0f5449d	Fix flake8 warning	2015-08-13 17:34:22 +01:00
Erik Johnston	129ee4e149	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts_take2	2015-08-13 17:28:43 +01:00
Mark Haines	c5966b2a97	Merge remote-tracking branch 'origin/develop' into markjh/end-to-end-key-federation	2015-08-13 17:27:53 +01:00
Mark Haines	0cceb2ac92	Add a few strategic new lines to break up the on_query_client_keys and on_claim_client_keys methods in federation_server.py	2015-08-13 17:27:46 +01:00
Erik Johnston	d6bcc68ea7	Merge pull request #219 from matrix-org/erikj/dictionary_cache ... Dictionary and list caches	2015-08-13 17:27:08 +01:00
Mark Haines	b16cd18a86	Merge remote-tracking branch 'origin/develop' into erikj/generate_presice_thumbnails	2015-08-13 17:23:39 +01:00
Erik Johnston	9f7f228ec2	Remove pointless map	2015-08-13 17:20:59 +01:00
Erik Johnston	3d77e56c12	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary_cache	2015-08-13 17:18:52 +01:00
Erik Johnston	d884047d34	Merge pull request #224 from matrix-org/erikj/reactor_metrics ... Add some metrics about the reactor	2015-08-13 17:17:07 +01:00
Erik Johnston	2bb2c02571	Remove some vertical space	2015-08-13 17:11:30 +01:00
Mark Haines	3d1cdda762	Merge branch 'develop' into erikj/reactor_metrics	2015-08-13 17:03:58 +01:00
Erik Johnston	57877b01d7	Replace list comprehension	2015-08-13 17:00:17 +01:00
Erik Johnston	5db5677969	Add metrics to the receipts cache	2015-08-13 16:58:23 +01:00
Erik Johnston	7e77a82c5f	Re-enable receipts	2015-08-13 16:58:10 +01:00
Mark Haines	7eb4d626ba	Add max-line-length to the flake8 section of setup.cfg	2015-08-13 13:12:33 +01:00
Erik Johnston	06750140f6	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary_cache	2015-08-13 11:55:20 +01:00
Erik Johnston	adbd720fab	PEP8	2015-08-13 11:47:38 +01:00
Erik Johnston	8b7ce2945b	Merge branch 'erikj/reactor_metrics' into erikj/dictionary_cache	2015-08-13 11:42:22 +01:00
Erik Johnston	a6c27de1aa	Don't time getDelayedCalls	2015-08-13 11:41:57 +01:00
Erik Johnston	c044aca1fd	Merge branch 'erikj/reactor_metrics' into erikj/dictionary_cache	2015-08-13 11:39:38 +01:00