2540 Commits

Author	SHA1	Message	Date
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
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	e0deeff23e	Fix room list spidering	2016-06-01 17:58:58 +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	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	d240796ded	Basic, un-cached support for secondary_directory_servers	2016-05-31 17:20:07 +01:00
Mark Haines	c626fc576a	Move the AS handler out of the Handlers object. ... Access it directly from the homeserver itself. It already wasn't inheriting from BaseHandler storing it on the Handlers object was already somewhat dubious.	2016-05-31 13:53:48 +01:00
David Baker	887c6e6f05	Split out the room list handler ... So I can use it from federation bits without pulling in all the handlers.	2016-05-31 11:05:16 +01:00
Erik Johnston	cc84f7cb8e	Send down correct error response if user not found	2016-05-27 10:35:15 +01:00
Erik Johnston	faad233ea6	Change short circuit path	2016-05-24 14:27:19 +01:00
Erik Johnston	6900303997	Don't send down all ephemeral events	2016-05-24 11:44:55 +01:00
Erik Johnston	1c5ed2a19b	Only work out newly_joined_users for incremental sync	2016-05-24 11:21:34 +01:00
Erik Johnston	b08ad0389e	Only include non-offline presence in initial sync	2016-05-24 11:15:05 +01:00
Erik Johnston	be2c677386	Spell builder correctly	2016-05-24 10:53:03 +01:00
Erik Johnston	79bea8ab9a	Inline function. Make load_filtered_recents private	2016-05-24 10:22:24 +01:00
Erik Johnston	84f94e4cbb	Add comments	2016-05-24 10:14:53 +01:00
Erik Johnston	137e6a4557	Shuffle things room	2016-05-24 09:50:55 +01:00
Negi Fazeli	6fe04ffef2	Fix set profile error with Requester. ... Replace flush_user with delete access token due to function removal Add a new test case for if the user is already registered	2016-05-23 19:50:28 +02:00
Erik Johnston	c0c79ef444	Add back concurrently_execute	2016-05-23 18:21:27 +01:00
Erik Johnston	b5605dfecc	Refactor SyncHandler	2016-05-23 18:08:18 +01:00
Mark Haines	0cb441fedd	Move typing handler out of the Handlers object	2016-05-17 15:58:46 +01:00
Mark Haines	523d5bcd0b	Merge remote-tracking branch 'origin/develop' into markjh/liberate_sync_handler	2016-05-17 10:43:58 +01:00
Mark Haines	526bf8126f	Remove unused get_joined_rooms_for_user	2016-05-17 10:20:51 +01:00
Mark Haines	425e6b4983	Merge branch 'develop' into markjh/member_cleanup	2016-05-17 10:13:16 +01:00
Mark Haines	b153f5b150	Merge pull request #787 from matrix-org/markjh/liberate_presence_handler ... Move the presence handler out of the Handlers object	2016-05-17 10:09:43 +01:00
Mark Haines	f68eea808a	Move SyncHandler out of the Handlers object	2016-05-16 20:19:26 +01:00
Mark Haines	53e171f345	Merge branch 'markjh/liberate_presence_handler' into markjh/liberate_sync_handler	2016-05-16 20:08:32 +01:00
Mark Haines	80cb9becd8	Remove get_joined_rooms_for_user from RoomMemberHandler	2016-05-16 20:06:55 +01:00
Mark Haines	821306120a	Replaces calls to fetch_room_distributions_into with get_joined_hosts_for_room	2016-05-16 19:48:07 +01:00
Mark Haines	1a3a2002ff	Spell "domain" correctly ... s/domian/domain/g	2016-05-16 19:17:23 +01:00
Mark Haines	e168abbcff	Don't inherit PresenceHandler from BaseHandler, remove references to self.hs from presence handler	2016-05-16 19:08:40 +01:00
Mark Haines	3b86ecfa79	Move the presence handler out of the Handlers object	2016-05-16 18:56:37 +01:00
Erik Johnston	99b5a2e560	Merge pull request #741 from negzi/create_user_with_expiry ... Create user with expiry	2016-05-13 14:46:53 +01:00
Negi Fazeli	40aa6e8349	Create user with expiry ... - Add unittests for client, api and handler Signed-off-by: Negar Fazeli <negar.fazeli@ericsson.com>	2016-05-13 15:34:15 +02:00
Mark Haines	a458a40337	missed a spot	2016-05-12 18:19:58 +01:00
Mark Haines	7e23476814	move filter_events_for_client out of base handler	2016-05-11 13:42:37 +01:00
Mark Haines	1620578b13	Shuffle when we get the signing_key attribute. ... Wait until we sign a message to get the signing key from the homeserver config. This means that the message handler can be created without having a signing key in the config which means that separate processes like the pusher that don't send messages and don't need to sign them can still access the handlers.	2016-05-11 12:20:57 +01:00
Erik Johnston	108434e53d	Merge pull request #775 from matrix-org/erikj/password_hash ... Correctly handle NULL password hashes from the database	2016-05-11 12:18:13 +01:00
Erik Johnston	1400bb1663	Correctly handle NULL password hashes from the database	2016-05-11 12:06:02 +01:00
Mark Haines	458a435114	Fix typo	2016-05-11 10:35:33 +01:00
Mark Haines	30057b1e15	Move _create_new_client_event and handle_new_client_event out of base handler	2016-05-11 09:09:20 +01:00
Matthew Hodgson	fe97b81c09	Merge pull request #759 from matrix-org/dbkr/email_notifs ... Send email notifications for missed messages	2016-05-10 16:30:05 +02:00
David Baker	997db04648	Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs	2016-05-10 14:40:19 +02:00
Erik Johnston	c9eb6dfc1b	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user	2016-05-09 13:21:06 +01:00
Erik Johnston	def64d6ef3	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user	2016-05-09 13:05:09 +01:00
Erik Johnston	08dfa8eee2	Add and use get_domian_from_id	2016-05-09 10:36:03 +01:00
Erik Johnston	56b5e83e36	Reduce database inserts when sending transactions	2016-05-06 11:20:18 +01:00
Erik Johnston	1f0f5ffa1e	Add bulk fetch storage API	2016-05-05 10:03:15 +01:00
Erik Johnston	a438a6d2bc	Implement basic ignore user	2016-05-04 10:16:46 +01:00
David Baker	acded821c4	Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs	2016-04-29 10:05:20 +01:00
Matthew Hodgson	aebd0c9717	fix typo	2016-04-28 15:09:25 +01:00
David Baker	424a7f48f8	Run filter_events_for_client ... so we don't accidentally mail out events people shouldn't see	2016-04-27 17:50:49 +01:00
Erik Johnston	6fd2f685fe	Simplify _check_password	2016-04-15 11:17:18 +01:00
Mark Haines	3c79bdd7a0	Fix check_password rather than inverting the meaning of _check_local_password (#730)	2016-04-14 19:00:21 +01:00
David Baker	4c1b32d7e2	Fix login to error for nonexistent users ... Fixes SYN-680	2016-04-14 18:28:42 +01:00
Erik Johnston	5880bc5417	Merge pull request #718 from matrix-org/erikj/public_room_list ... Don't return empty public rooms	2016-04-13 14:07:26 +01:00
Erik Johnston	c53f9d561e	Don't auto log failed auth checks	2016-04-13 11:11:46 +01:00
Erik Johnston	72f454b752	Don't return empty public rooms	2016-04-12 16:06:18 +01:00
Erik Johnston	c48465dbaa	More comments	2016-04-12 12:48:30 +01:00
Erik Johnston	8be1a37909	More comments	2016-04-12 12:04:19 +01:00
Erik Johnston	d3d0be4167	Don't append to unused list	2016-04-12 11:59:00 +01:00
Erik Johnston	762ada1e07	Add back backfilled parameter that was removed	2016-04-12 11:58:04 +01:00
Erik Johnston	0d3da210f0	Add comment	2016-04-12 11:54:41 +01:00
Erik Johnston	cccf86dd05	Check if we've already backfilled events	2016-04-12 11:19:32 +01:00
David Baker	2547dffccc	Merge pull request #705 from matrix-org/dbkr/pushers_use_event_actions ... Change pushers to use the event_actions table	2016-04-11 12:58:55 +01:00
Erik Johnston	96bd8ff57c	Merge pull request #707 from matrix-org/markjh/remove_changed_presencelike_data ... changed_presencelike_data isn't observed anywhere so can be removed	2016-04-08 14:04:54 +01:00
Mark Haines	7e2f971c08	Remove some unused functions (#711) ... * Remove some unused functions * get_room_events_stream is only used in tests * is_exclusive_room might actually be something we want	2016-04-08 14:01:56 +01:00
Mark Haines	b9ee5650b0	Move all the wrapper functions for distributor.fire ... Move the functions inside the distributor and import them where needed. This reduces duplication and makes it possible for flake8 to detect when the functions aren't used in a given file.	2016-04-08 11:01:38 +01:00
Mark Haines	caef337587	changed_presencelike_data isn't observed anywhere in synapse so can be removed	2016-04-08 10:37:19 +01:00
Mark Haines	b4a5002a6e	Merge pull request #708 from matrix-org/markjh/remove_collect_presencelike_data ... Call profile handler get_displayname directly	2016-04-08 09:51:36 +01:00
Mark Haines	86be915cce	Call profile handler get_displayname directly rather than using collect_presencelike_data	2016-04-07 18:11:49 +01:00
Erik Johnston	f942980c0b	Merge pull request #701 from DoubleMalt/ldap-auth ... Add LDAP authentication	2016-04-07 17:35:28 +01:00
David Baker	e1e042f2a1	Add comments on min_stream_id ... saying that the min stream id won't be completely accurate all the time	2016-04-07 17:09:36 +01:00
Erik Johnston	a294b04bf0	Merge pull request #700 from matrix-org/erikj/deduplicate_joins ... Deduplicate membership changes	2016-04-07 16:35:40 +01:00
David Baker	9c99ab4572	Merge remote-tracking branch 'origin/develop' into dbkr/pushers_use_event_actions	2016-04-07 16:35:22 +01:00
David Baker	92e3071623	Send badge count pushes. ... Also fix bugs with retrying.	2016-04-07 15:39:53 +01:00
Erik Johnston	af03ecf352	Deduplicate joins	2016-04-07 14:19:02 +01:00
Erik Johnston	1ef0365670	Set profile information when joining rooms remotely	2016-04-07 09:42:52 +01:00
Christoph Witzany	ed4d18f516	fix check for failed authentication	2016-04-06 18:30:11 +02:00
Christoph Witzany	9c62fcdb68	remove line	2016-04-06 18:23:46 +02:00
Christoph Witzany	27a0c21c38	make tests for ldap more specific to not be fooled by Mocks	2016-04-06 18:23:46 +02:00
Christoph Witzany	3555a659ec	output ldap version for info and to pacify pep8	2016-04-06 18:23:46 +02:00
Christoph Witzany	4c5e8adf8b	conditionally import ldap	2016-04-06 18:23:46 +02:00
Christoph Witzany	875ed05bdc	fix pep8	2016-04-06 18:23:46 +02:00
Christoph Witzany	67f3a50e9a	fix exception handling	2016-04-06 18:23:46 +02:00
Christoph Witzany	afff321e9a	code style	2016-04-06 18:23:46 +02:00
Christoph Witzany	823b8be4b7	add tls property and twist my head around twisted	2016-04-06 18:23:45 +02:00
Christoph Witzany	7b9319b1c8	move LDAP authentication to AuthenticationHandler	2016-04-06 18:23:45 +02:00
David Baker	7e2c89a37f	Make pushers use the event_push_actions table instead of listening on an event stream & running the rules again. Sytest passes, but remaining to do: ... * Make badges work again * Remove old, unused code	2016-04-06 15:42:15 +01:00
Richard van der Hoff	1e05637e37	Let users see their own leave events ... ... otherwise clients get confused. Fixes https://matrix.org/jira/browse/SYN-662, https://github.com/vector-im/vector-web/issues/368	2016-04-06 15:36:19 +01:00
Erik Johnston	c2b429ab24	Merge pull request #693 from matrix-org/erikj/backfill_self ... Don't backfill from self	2016-04-05 13:04:36 +01:00
Erik Johnston	6222ae51ce	Don't backfill from self	2016-04-05 12:56:29 +01:00
Erik Johnston	b29f98377d	Merge pull request #691 from matrix-org/erikj/member ... Fix stuck invites	2016-04-05 12:44:39 +01:00
Erik Johnston	df727f2126	Fix stuck invites ... If rejecting a remote invite fails with an error response don't fail the entire request; instead mark the invite as locally rejected. This fixes the bug where users can get stuck invites which they can neither accept nor reject.	2016-04-05 11:13:24 +01:00
Erik Johnston	7a77f8b6d5	Merge pull request #690 from matrix-org/erikj/member ... Store invites in a separate table.	2016-04-05 09:12:27 +01:00
Erik Johnston	0c53d750e7	Docs and indents	2016-04-04 18:02:48 +01:00
Erik Johnston	3d76b7cb2b	Store invites in a separate table.	2016-04-04 16:30:15 +01:00
Erik Johnston	bf14883a04	Merge pull request #689 from matrix-org/erikj/member ... Do checks for memberships before creating events	2016-04-04 11:56:40 +01:00
Erik Johnston	d76d89323c	Use computed prev event ids	2016-04-01 17:39:32 +01:00
Erik Johnston	aa82cb38e9	Remove state hack from _create_new_client_event	2016-04-01 16:36:54 +01:00
Mark Haines	89e6839a48	Merge pull request #686 from matrix-org/markjh/doc_strings ... Use google style doc strings.	2016-04-01 16:20:09 +01:00
Erik Johnston	c906f30661	Do checks for memberships before creating events	2016-04-01 16:17:32 +01:00
Mark Haines	2a37467fa1	Use google style doc strings. ... pycharm supports them so there is no need to use the other format. Might as well convert the existing strings to reduce the risk of people accidentally cargo culting the wrong doc string format.	2016-04-01 16:12:07 +01:00
Erik Johnston	8d73cd502b	Add concurrently_execute function	2016-04-01 14:06:00 +01:00
Erik Johnston	35bb465b86	Filter rooms list before chunking	2016-04-01 13:14:53 +01:00
Mark Haines	dc4c1579d4	Remove outlier parameter from compute_event_context ... Use event.internal_metadata.is_outlier instead.	2016-03-31 15:32:24 +01:00
Mark Haines	03e406eefc	Merge pull request #680 from matrix-org/markjh/remove_is_new_state ... Remove the is_new_state argument to persist event.	2016-03-31 15:14:48 +01:00
Mark Haines	76503f95ed	Remove the is_new_state argument to persist event. ... Move the checks for whether an event is new state inside persist event itself. This was harder than expected because there wasn't enough information passed to persist event to correctly handle invites from remote servers for new rooms.	2016-03-31 15:00:42 +01:00
Erik Johnston	d35780eda0	Split out RoomMemberHandler	2016-03-31 13:08:45 +01:00
Erik Johnston	5260db7663	Line length	2016-03-31 10:49:27 +01:00
Erik Johnston	73b6bf4629	Only forget room if you were in the room	2016-03-30 15:09:18 +01:00
Erik Johnston	fddb6fddc1	Require user to have left room to forget room ... This dramatically simplifies the forget API code - in particular it no longer generates a leave event.	2016-03-30 11:03:00 +01:00
Mark Haines	54a546091a	Add a response cache for getting the public room list	2016-03-24 18:02:10 +00:00
Mark Haines	191c7bef6b	Deduplicate identical /sync requests	2016-03-24 17:47:31 +00:00
Erik Johnston	84afeb41f3	Ensure all old public rooms have aliases	2016-03-23 13:59:34 +00:00
Erik Johnston	b2802a1351	Ensure published rooms have public join rules	2016-03-23 13:59:31 +00:00
Erik Johnston	0677fc1c4e	Comment	2016-03-23 13:25:22 +00:00
Erik Johnston	34473a9c7f	Don't require alias in public room list. ... Rooms now no longer require an alias to be published. Also, changes the way we pull out state of each room to not require fetching all state events.	2016-03-23 10:42:19 +00:00
Erik Johnston	d6ac752538	Merge pull request #657 from matrix-org/erikj/roomlist ... Add published room list edit API	2016-03-22 11:57:39 +00:00
Erik Johnston	97785bfc0f	Doc string	2016-03-22 10:41:44 +00:00
Matthew Hodgson	d3654694d0	an invalide is something else...	2016-03-22 00:52:31 +00:00
Mark Haines	5244c0b48e	Remove unused backfilled parameter from persist_event	2016-03-21 18:06:08 +00:00
Erik Johnston	3e7fac0d56	Add published room list edit API	2016-03-21 15:06:07 +00:00
Mark Haines	58f8226c7f	remove unused current_state variable from on_receive_pdu	2016-03-21 14:20:34 +00:00
Erik Johnston	916227b4df	Merge pull request #652 from matrix-org/erikj/delete_alias ... Update aliases event after deletion	2016-03-18 14:02:46 +00:00
Erik Johnston	3bb3f02517	Enable guest access for private rooms by default	2016-03-17 16:23:53 +00:00
Erik Johnston	56aa4e7a9a	Check canonical alias event exists	2016-03-17 15:24:19 +00:00
David Baker	384ee6eafb	Merge pull request #650 from matrix-org/dbkr/register_idempotent_with_username ... Make registration idempotent, part 2	2016-03-17 14:34:08 +00:00
Mark Haines	7a38612620	Remove another unused function from presence	2016-03-17 11:54:19 +00:00
Erik Johnston	2cd9260500	Update aliases event after deletion ... Attempt to update the appropriate `m.room.aliases` event after deleting an alias. This may fail due to the deleter not being in the room. Will also check if the canonical alias of the event is set to the deleted alias, and if so will attempt to delete it.	2016-03-17 11:42:00 +00:00
Mark Haines	673c96ce97	Remove dead code left over from presence changes	2016-03-17 11:03:47 +00:00
David Baker	a7daa5ae13	Make registration idempotent, part 2: be idempotent if the client specifies a username.	2016-03-16 19:36:57 +00:00
David Baker	b58d10a875	pep8	2016-03-16 16:22:20 +00:00
David Baker	3ee7d7dc7f	time_msec()	2016-03-16 16:18:52 +00:00
David Baker	3176aebf9d	string with symbols is a bit too symboly.	2016-03-16 15:55:49 +00:00
David Baker	9671e6750c	Replace other time.time().	2016-03-16 15:51:28 +00:00
David Baker	742b6c6d15	Use hs get_clock instead of time.time()	2016-03-16 15:42:35 +00:00
David Baker	99797947aa	pep8 & remove debug logging	2016-03-16 12:51:34 +00:00
David Baker	c12b9d719a	Make registration idempotent: if you specify the same session, make it give you an access token for the user that was registered on previous uses of that session. Tweak the UI auth layer to not delete sessions when their auth has completed and hence expire themn so they don't hang around until server restart. Allow server-side data to be associated with UI auth sessions.	2016-03-16 11:56:24 +00:00
Erik Johnston	e5f0e58931	Remove needless PreserveLoggingContext	2016-03-15 13:48:40 +00:00
Erik Johnston	9e982750ee	Persist rejection of invites over federation	2016-03-15 13:24:31 +00:00
Erik Johnston	590fbbef03	Add config to create guest account on 3pid invite ... Currently, when a 3pid invite request is sent to an identity server, it includes a provisioned guest access token. This allows the link in the, say, invite email to include the guest access token ensuring that the same account is used each time the link is clicked. This flow has a number of flaws, including when using different servers or servers that have guest access disabled. For now, we keep this implementation but hide it behind a config option until a better flow is implemented.	2016-03-14 15:50:40 +00:00
David Baker	af59826a2f	Make select more sensible when dseleting access tokens, rename pusher deletion to match access token deletion and make exception arg optional.	2016-03-11 14:34:09 +00:00
David Baker	f523177850	Delete old, unused methods and rename new one to just be user_delete_access_tokens with an except_token_ids argument doing what it says on the tin.	2016-03-11 14:29:01 +00:00
David Baker	57c444b3ad	Dear PyCharm, please indent sensibly for me. Thx.	2016-03-11 14:25:05 +00:00
David Baker	aa11db5f11	Fix cache invalidation so deleting access tokens (which we did when changing password) actually takes effect without HS restart. Reinstate the code to avoid logging out the session that changed the password, removed in 415c2f0549	2016-03-11 13:14:18 +00:00
Daniel Wagner-Hall	465605d616	Store appservice ID on register	2016-03-10 15:58:22 +00:00
Mark Haines	ea72bd9600	Merge pull request #631 from matrix-org/markjh/py3v1 ... Use syntax that's valid on both py2.7 and py3	2016-03-08 11:08:20 +00:00
Mark Haines	239badea9b	Use syntax that works on both py2.7 and py3	2016-03-07 20:13:10 +00:00
David Baker	874fd43257	Send the user ID matching the guest access token, since there is no Matrix API to discover what user ID an access token is for.	2016-03-07 17:13:56 +00:00
Erik Johnston	80916e6884	Merge pull request #626 from matrix-org/erikj/visibility ... Send history visibility on boundary changes	2016-03-07 11:56:07 +00:00
Erik Johnston	2ab0bf4b97	Send history visibility on boundary changes	2016-03-04 16:54:32 +00:00
Mark Haines	b7a3be693b	Merge pull request #618 from matrix-org/markjh/pushrule_stream ... Add a stream for push rule updates	2016-03-04 16:35:08 +00:00
Erik Johnston	beebc0a40f	Merge pull request #625 from matrix-org/erikj/kick_ban_sync ... Always include kicks and bans in full /sync	2016-03-04 16:33:52 +00:00
Erik Johnston	125f674eae	Always include kicks and bans in full /sync	2016-03-04 15:27:55 +00:00
Erik Johnston	13cbd31040	Spelling	2016-03-04 15:22:39 +00:00
Mark Haines	ec7460b4f2	Merge branch 'develop' into markjh/pushrule_stream	2016-03-04 14:44:34 +00:00
Mark Haines	1b4f4a936f	Hook up the push rules stream to account_data in /sync	2016-03-04 14:44:01 +00:00
Erik Johnston	ed61a49169	Add profile information to invites	2016-03-04 14:35:02 +00:00
Erik Johnston	389d558a3b	Merge pull request #598 from Rugvip/invite-state ... config,handlers/_base: added homeserver config for what state is included in a room invite	2016-03-04 09:58:52 +00:00
Erik Johnston	44b084a75e	Merge pull request #596 from Rugvip/create ... handlers/_base: don't allow room create event to be changed	2016-03-04 09:43:20 +00:00
Patrik Oldsberg	5fc59f009c	config,handlers/_base: added homeserver config for what state is included in a room invite ... Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>	2016-03-04 10:43:17 +01:00
Erik Johnston	ce82b9e48f	Merge pull request #610 from Rugvip/unique-user ... handlers/register: make sure another user id is generated when a collision occurs	2016-03-04 09:40:20 +00:00
Richard van der Hoff	09b1d98070	Merge pull request #623 from matrix-org/rav/fix_createroom_race ... Make sure we add all invited members before returning from createRoom	2016-03-04 09:29:15 +00:00
Erik Johnston	dd463e246d	Merge pull request #614 from matrix-org/erikj/alias_delete ... Allow alias creators to delete aliases	2016-03-04 09:02:33 +00:00
Richard van der Hoff	a92b4ea76f	Make sure we add all invited members before returning from createRoom ... add a missing yield.	2016-03-04 00:06:03 +00:00
Richard van der Hoff	a85179aff3	Merge remote-tracking branch 'origin/develop' into rav/SYN-642	2016-03-03 19:05:54 +00:00
Daniel Wagner-Hall	0b3083c75b	Merge pull request #621 from matrix-org/daniel/ratelimiting ... Pass whole requester to ratelimiting	2016-03-03 17:02:48 +00:00
Daniel Wagner-Hall	b4022cc487	Pass whole requester to ratelimiting ... This will enable more detailed decisions	2016-03-03 16:43:42 +00:00
Mark Haines	ddf9e7b302	Hook up the push rules to the notifier	2016-03-03 14:57:45 +00:00
Richard van der Hoff	79f34bdbc2	Merge branch 'develop' into rav/SYN-642	2016-03-03 11:39:25 +00:00
Richard van der Hoff	74cd80e530	Fix typo	2016-03-03 10:28:58 +00:00
David Baker	ff8b87118d	Stop using checkpw as it seems to have vanished from bcrypt. Use bcrypt.hashpw(password, hashed) == hashed as per the bcrypt README.	2016-03-02 18:06:45 +00:00
Richard van der Hoff	fc1f932cc0	Move arg default to the start of the function ... Also don't overwrite the list that gets passed in.	2016-03-02 16:44:14 +00:00
Richard van der Hoff	863d3f26b3	fix pyflakes quibble	2016-03-02 15:52:50 +00:00
Richard van der Hoff	9ff940a0ef	Address review comments	2016-03-02 15:40:30 +00:00
Erik Johnston	2a78dac60d	Merge pull request #612 from matrix-org/erikj/cache_size ... Add environment variable SYNAPSE_CACHE_FACTOR, default it to 0.1	2016-03-02 14:36:10 +00:00
Richard van der Hoff	05ea111c47	Fix pyflakes warning	2016-03-01 17:45:24 +00:00
Richard van der Hoff	8a1d3b86af	Handle rejections of invites from local users locally ... Slightly hacky fix to SYN-642, which avoids the federation codepath when trying to reject invites from local users.	2016-03-01 17:27:22 +00:00
Mark Haines	60a0f81c7a	Add a /replication API for extracting the updates that happened on ... synapse This is necessary for replicating the data in synapse to be visible to a separate service because presence and typing notifications aren't stored in a database so won't be visible to another process. This API can be used to either get the raw data by requesting the tables themselves or to just receive notifications for updates by following the streams meta-stream. Returns updates for each table requested a JSON array of arrays with a row for each row in the table. Each table is prefixed by a header row with the: name of the table, current stream_id position for the table, number of rows, number of columns and the names of the columns. This is followed by the rows that have been added to the server since the requester last asked. The API has a timeout and is hooked up to the notifier so that a slave can long poll for updates.	2016-03-01 14:49:41 +00:00
Erik Johnston	f9af8962f8	Allow alias creators to delete aliases	2016-03-01 14:46:31 +00:00
Erik Johnston	910fc0f28f	Add enviroment variable SYNAPSE_CACHE_FACTOR, default it to 0.1	2016-03-01 12:56:39 +00:00
Patrik Oldsberg	9c48f1ed22	handlers/register: make sure another user id is generated when a collision occurs ... Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>	2016-02-29 23:12:37 +01:00
David Baker	0f0b011440	Send the invier's member event in room invite state so the invitee has their display name and avatar.	2016-02-25 18:12:09 +00:00
Daniel Wagner-Hall	33300673b7	Generate guest access token on 3pid invites ... This means that following the same link across multiple sessions or devices can re-use the same guest account. Note that this is somewhat of an abuse vector; we can't throw up captchas on this flow, so this is a way of registering ephemeral accounts for spam, whose sign-up we don't rate limit.	2016-02-24 14:41:25 +00:00
Erik Johnston	b5f77eb12a	Check presence token interval is less than 100, rather than the token itself	2016-02-23 15:47:37 +00:00
Erik Johnston	e3e0ac6ec7	Merge pull request #602 from matrix-org/erikj/presence ... Change the way we figure out presence updates for small deltas	2016-02-23 15:18:41 +00:00
Daniel Wagner-Hall	577951b032	Allow third_party_signed to be specified on /join	2016-02-23 15:11:25 +00:00
Erik Johnston	13f86c3489	Handle get_all_entities_changed returning None	2016-02-23 15:05:37 +00:00
Erik Johnston	6e0209112b	Add comments	2016-02-23 14:57:45 +00:00
Erik Johnston	c77dae7a1a	Change the way we figure out presence updates for small deltas	2016-02-23 14:54:40 +00:00
Erik Johnston	a7b2ce32f7	Merge pull request #600 from matrix-org/erikj/presence ... Measure PresenceEventSource.get_new_events	2016-02-23 14:54:26 +00:00
Erik Johnston	02e928cf9b	Don't include defer.returnValue in Measure block	2016-02-23 14:52:16 +00:00
Erik Johnston	56a94ccd9e	Measure PresenceEventSource.get_new_events	2016-02-23 14:52:16 +00:00
Patrik Oldsberg	baf056bae8	handlers/sync: style fix, line too long ... Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>	2016-02-23 15:49:36 +01:00
Erik Johnston	138c405974	Pick up currently_active across federation	2016-02-23 10:40:11 +00:00
Patrik Oldsberg	210b7d8e00	handlers/_base: don't allow room create event to be changed ... Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>	2016-02-23 00:22:41 +01:00
Patrik Oldsberg	1dcfb201c4	handlers/sync: fix SyncResult not counting account_data change when converting to bool ... This fixes account_data events not triggering an immediate /sync response Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>	2016-02-23 00:21:59 +01:00
Richard van der Hoff	f7e3de02ef	Merge pull request #587 from matrix-org/rav/guest_access_after_room_join ... Allow guest users access to messages in rooms they have joined	2016-02-22 16:36:06 +00:00
Richard van der Hoff	5be3944730	address review comments ... drop commented-out special casing for historyvisibility event s/he/they/ for users	2016-02-22 15:27:44 +00:00
Erik Johnston	9e696bd6a3	Remove superfluous call to get_state_at when we already have an event for that stream position	2016-02-22 13:54:46 +00:00
Richard van der Hoff	6c5b147a39	Interpret unknown visibilities the same as shared	2016-02-19 17:11:11 +00:00
Erik Johnston	3dbaeef58c	Correctly filter states	2016-02-19 12:27:35 +00:00
Erik Johnston	42ac5f0c1a	Only send presence updates to remote hosts if user is ours	2016-02-19 12:19:56 +00:00
Richard van der Hoff	05aee12652	Merge branch 'develop' into rav/guest_access_after_room_join	2016-02-19 12:00:16 +00:00
Erik Johnston	24d9f2c140	Add Measures to presence	2016-02-19 11:50:48 +00:00
Richard van der Hoff	b71ca2b014	Allow guest users access to messages in rooms they have joined ... There should be no difference between guest users and non-guest users in terms of access to messages. Define the semantics of the is_peeking argument to filter_events_for_clients (slightly) better; interpret it appropriately, and set it correctly from /sync.	2016-02-19 11:41:02 +00:00
Erik Johnston	4a95eb0a12	Add presence metric	2016-02-19 11:32:04 +00:00
Erik Johnston	be799453aa	Remove spurious extra metrics	2016-02-19 11:29:33 +00:00
Erik Johnston	ea7786e8ca	Merge pull request #586 from matrix-org/erikj/presence ... Fix presence `currently_active`. Add presence metrics.	2016-02-19 11:26:32 +00:00
Erik Johnston	929cb0ed7d	Don't set currently_active for remote presence	2016-02-19 10:58:27 +00:00
Erik Johnston	5f4eca3816	More metrics	2016-02-19 10:21:41 +00:00
Erik Johnston	5614b4dafb	Add presence metrics	2016-02-19 09:50:54 +00:00
Erik Johnston	e5ad2e5267	Merge pull request #582 from matrix-org/erikj/presence ... Rewrite presence for performance.	2016-02-19 09:37:50 +00:00
Erik Johnston	220231d8e3	Merge pull request #573 from matrix-org/erikj/sync_fix ... Mitigate against incorrect old state in /sync.	2016-02-18 16:40:58 +00:00
Erik Johnston	48b652bcbe	Remove invalid arg.	2016-02-18 14:57:09 +00:00
Erik Johnston	b4796a62ee	Add unit test	2016-02-18 11:52:33 +00:00
Daniel Wagner-Hall	f8d21e1431	Review comments	2016-02-18 11:02:14 +00:00
Erik Johnston	fe95f2217c	Add stuff pulled from the DB to the cache	2016-02-18 10:26:24 +00:00
Erik Johnston	8351538873	PEP8	2016-02-18 10:12:12 +00:00
Erik Johnston	112283e230	Prefix TS fields with _ts	2016-02-18 10:11:43 +00:00
Erik Johnston	b31ec214a5	Remove status_msg when going offline. Don't offline -> online if you send a message	2016-02-18 09:54:08 +00:00
Erik Johnston	114b929f8b	Check presence state is a valid one	2016-02-18 09:16:32 +00:00
Erik Johnston	ddca9c56fc	Move if statement	2016-02-18 09:11:53 +00:00
Erik Johnston	58371fa263	Comment	2016-02-18 09:09:50 +00:00
Daniel Wagner-Hall	591af2d074	Some cleanup ... I'm not particularly happy with the "action" switching, but there's no convenient way to defer the work that needs to happen after it, so... :(	2016-02-17 15:50:13 +00:00
Erik Johnston	c229c87398	Remove spurious comment	2016-02-17 15:48:29 +00:00
Erik Johnston	e5999bfb1a	Initial cut	2016-02-17 15:40:50 +00:00
Daniel Wagner-Hall	a4e278bfe7	Respond to federated invite with non-empty context ... Currently, we magically perform an extra database hit to find the inviter, and use this to guess where we should send the event. Instead, fill in a valid context, so that other callers relying on the context actually have one.	2016-02-17 15:25:12 +00:00
Daniel Wagner-Hall	6605adf669	Some cleanup, some TODOs, more to do	2016-02-16 19:05:02 +00:00
Daniel Wagner-Hall	d1fb790818	Some cleanup	2016-02-16 14:25:23 +00:00
Daniel Wagner-Hall	1f403325ac	Tidy? up room creation event sending	2016-02-16 12:00:50 +00:00
Daniel Wagner-Hall	04686df17a	Add comment	2016-02-16 11:52:46 +00:00
Daniel Wagner-Hall	feedaa37fa	Merge branch 'develop' into daniel/roomcleanupincremental ... Conflicts: synapse/handlers/room.py	2016-02-16 11:34:48 +00:00
Daniel Wagner-Hall	4bfb32f685	Branch off member and non member sends ... Unclean, needs tidy-up, but works	2016-02-15 18:21:30 +00:00
Daniel Wagner-Hall	1a2197d7bf	Simplify room creation code	2016-02-15 18:19:01 +00:00
Daniel Wagner-Hall	e560045cfd	Simplify room creation code	2016-02-15 18:18:39 +00:00
Daniel Wagner-Hall	8168341e9b	Use update_membership for profile updates	2016-02-15 17:14:34 +00:00
Daniel Wagner-Hall	1bbb67c452	Use update_membership to kick guests	2016-02-15 16:40:22 +00:00
Daniel Wagner-Hall	150fcde0dc	Reuse update_membership from /join	2016-02-15 16:16:03 +00:00
Daniel Wagner-Hall	73e616df2a	Inline _do_local_membership_update	2016-02-15 16:02:22 +00:00
Daniel Wagner-Hall	f318d4f2a4	Inline _do_join as it now only has one caller ... Also, consistently apply rate limiting. Again, ugly, but a step in the right direction.	2016-02-15 15:57:10 +00:00
Daniel Wagner-Hall	e71095801f	Merge implementation of /join by alias or ID ... This code is kind of rough (passing the remote servers down a long chain), but is a step towards improvement.	2016-02-15 15:39:16 +00:00
Daniel Wagner-Hall	dbeed36dec	Merge some room joining codepaths ... Force joining by alias to go through the send_membership_event checks, rather than bypassing them straight into _do_join. This is the first of many stages of cleanup.	2016-02-15 14:38:27 +00:00
Daniel Wagner-Hall	4de08a4672	Revert "Merge two of the room join codepaths" ... This reverts commit cf81375b94. It subtly violates a guest joining auth check	2016-02-12 16:17:24 +00:00
Daniel Wagner-Hall	cf81375b94	Merge two of the room join codepaths ... There's at least one more to merge in. Side-effects: * Stop reporting None as displayname and avatar_url in some cases * Joining a room by alias populates guest-ness in join event * Remove unspec'd PUT version of /join/<room_id_or_alias> which has not been called on matrix.org according to logs * Stop recording access_token_id on /join/room_id - currently we don't record it on /join/room_alias; I can try to thread it through at some point.	2016-02-12 15:11:49 +00:00
Erik Johnston	4d54d87c3e	Mitigate against incorrect old state in /sync. ... There have been reports from the field that servers occasionally have incorrect notions of what the old state of a room is. This proves problematic as /sync relies on a correct old state. This patch makes /sync specifically include in the 'state' key any current state events that haven't been correctly included.	2016-02-12 11:13:06 +00:00
Daniel Wagner-Hall	dc6da63e30	Enforce user_id exclusivity for AS registrations ... This whole set of checks is kind of an ugly mess, which I may clean up at some point, but for now let's be correct.	2016-02-11 17:37:38 +00:00
Erik Johnston	0eff740523	Return events in correct order for /events	2016-02-11 10:07:27 +00:00
Erik Johnston	24f00a6c33	Use _simple_select_many for _get_state_group_for_events	2016-02-10 12:57:50 +00:00
Erik Johnston	8e49892b21	Only calculate initial sync for 10 rooms at a time ... This helps to ensure we don't completely starve other requests.	2016-02-10 11:42:07 +00:00
Erik Johnston	7b0d846407	Atomically persit push actions when we persist the event	2016-02-09 16:19:15 +00:00
Erik Johnston	f28cc45183	Pass in current state to push action handler	2016-02-09 16:01:40 +00:00
Erik Johnston	feb294d552	Remove dead code	2016-02-09 14:32:17 +00:00
Erik Johnston	eff12e838c	Don't load all ephemeral state for a room on every sync	2016-02-09 13:55:59 +00:00
Erik Johnston	82631c5f94	Fix unit tests	2016-02-09 13:50:37 +00:00
Erik Johnston	6c558ee8bc	Measure some /sync related things	2016-02-09 11:31:42 +00:00
Erik Johnston	2c1fbea531	Fix up logcontexts	2016-02-08 14:26:45 +00:00
Daniel Wagner-Hall	79a1c0574b	Allocate guest user IDs numericcally ... The current random IDs are ugly and confusing when presented in UIs. This makes them prettier and easier to read. Also, disable non-automated registration of numeric IDs so that we don't need to worry so much about people carving out our automated address space and us needing to keep retrying ID registration.	2016-02-05 11:22:30 +00:00
Erik Johnston	c8e4d5de7f	Merge pull request #555 from matrix-org/erikj/logcontext ... Allowing tagging log contexts	2016-02-03 15:20:00 +00:00
Erik Johnston	8450114098	Merge pull request #554 from matrix-org/erikj/event_push ... Change event_push_actions_rm_tokens schema	2016-02-03 15:02:47 +00:00
Erik Johnston	d4f72a5bfb	Allowing tagging log contexts	2016-02-03 13:52:27 +00:00
Erik Johnston	9cd80a7b5c	PEP8	2016-02-03 11:52:57 +00:00
Erik Johnston	772b45c745	Remove unused method	2016-02-03 11:43:26 +00:00
Erik Johnston	6f52e90065	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/public_room_fix	2016-02-03 11:06:29 +00:00
Erik Johnston	771528ab13	Change event_push_actions_rm_tokens schema	2016-02-03 10:50:49 +00:00
Daniel Wagner-Hall	d83d004ccd	Fix flake8 warnings for new flake8	2016-02-02 17:18:50 +00:00
Erik Johnston	8a391e33ae	s/get_room_changes_for_user/get_membership_changes_for_user/	2016-02-02 16:12:10 +00:00
Erik Johnston	04ad93e6fd	Merge pull request #545 from matrix-org/erikj/sync ... Move /sync state calculations from rest to handler	2016-02-02 15:28:43 +00:00
Erik Johnston	65e92eca49	Change the way we do public room list fetching	2016-02-02 15:21:10 +00:00
David Baker	69214ea671	Pass make_guest whne we autogen a user ID	2016-02-02 14:42:31 +00:00
Erik Johnston	b023995538	WARN if we get a topo token instead of stream.	2016-02-02 14:11:14 +00:00
Erik Johnston	854ca32f10	Comments	2016-02-01 16:52:27 +00:00
Erik Johnston	89b40b225c	Order things correctly	2016-02-01 16:32:46 +00:00
Erik Johnston	4bf448be25	Switch over /events to use per room caches	2016-02-01 16:26:51 +00:00
Erik Johnston	fa48020a52	Move state calculations from rest to handler	2016-02-01 15:59:40 +00:00
Mark Haines	6927d0e091	Add missing param to the log line	2016-01-29 15:01:26 +00:00
Mark Haines	47374a33fc	Merge remote-tracking branch 'origin/develop' into markjh/3pid	2016-01-29 14:15:12 +00:00
Mark Haines	0fcafbece8	Add config option for setting the trusted id servers, disabling checking the ID server in integration tests	2016-01-29 14:12:26 +00:00
Erik Johnston	ea320d3464	Don't work out unread_notifs_for_room_id unless needed	2016-01-29 13:34:48 +00:00
Erik Johnston	571a566399	Change load limit params	2016-01-28 14:11:16 +00:00
Erik Johnston	3c6518ddbf	Amalgamate incremental and full sync for user	2016-01-28 14:03:48 +00:00
Erik Johnston	4e7948b47a	Allow paginating backwards from stream token	2016-01-28 11:52:34 +00:00
Erik Johnston	61eaa6ec64	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sync	2016-01-28 10:50:57 +00:00
Richard van der Hoff	5cba88ea7c	Make it possible to paginate forwards from stream tokens ... In order that we can fill the gap after a /sync, make it possible to paginate forwards from a stream token.	2016-01-27 17:42:45 +00:00
Erik Johnston	aca3193efb	Use the same path for incremental with gap or without gap	2016-01-27 17:33:27 +00:00
Erik Johnston	b97f6626b6	Add cache to room stream	2016-01-27 17:33:26 +00:00
Richard van der Hoff	d6d60b4d6c	Federation: drop events which cause SynapseErrors ... ... rather than rejecting any attempt to federate channels which contain such events.	2016-01-27 17:02:10 +00:00
Erik Johnston	c887c4cbd5	Merge pull request #524 from matrix-org/erikj/sync ... Move some sync logic from rest to handlers pacakege	2016-01-25 16:58:39 +00:00
Erik Johnston	dc2647cd3d	PEP8	2016-01-25 15:48:54 +00:00
Erik Johnston	d59c58bc95	Remove weird stuff	2016-01-25 13:38:53 +00:00
Erik Johnston	4021f95261	Move logic from rest/ to handlers/	2016-01-25 10:10:44 +00:00
Erik Johnston	7959e8b764	Underscores are allowed in user ids	2016-01-22 14:59:49 +00:00
Erik Johnston	0e07f2e15d	Only fetch events for rooms and receipts	2016-01-21 16:10:37 +00:00
Erik Johnston	b088291f14	Don't explode when given a unicode username in /register/	2016-01-20 15:40:25 +00:00
Daniel Wagner-Hall	da417aa56d	Allow non-guests to peek on rooms using /events	2016-01-20 15:34:07 +00:00
Erik Johnston	af30140621	Merge pull request #506 from matrix-org/erikj/push_fast ... Only compute unread notifications for rooms we send down stream	2016-01-19 17:31:10 +00:00
Erik Johnston	ac2842ff1e	Only compute unread notifications for rooms we send down stream	2016-01-19 17:19:53 +00:00
Erik Johnston	892ee473d9	Don't use form of get_state_for_events with None state_key	2016-01-19 17:14:46 +00:00
Erik Johnston	5a7d1ecffc	Add regex cache. Only caculate push actions for users that have sent read receipts, and are on that server	2016-01-19 16:01:05 +00:00
Erik Johnston	b8518ffe65	Use all_ephemeral_by_room in incremental_sync_with_gap_for_room	2016-01-19 14:26:58 +00:00
Erik Johnston	3adcc4c86a	Return highlight_count in /sync	2016-01-19 11:35:50 +00:00
Erik Johnston	63485b3029	Re-enable urnead notifications	2016-01-18 14:48:30 +00:00
Erik Johnston	cc66a9a5e3	Allow filtering events for multiple users at once	2016-01-18 14:43:50 +00:00
Daniel Wagner-Hall	ac5a4477ad	Require unbanning before other membership changes	2016-01-15 16:27:26 +00:00
Daniel Wagner-Hall	b5ce4f0427	Remove unused parameters	2016-01-15 13:54:03 +00:00
David Baker	5819b7a78c	M_INVALID_USERNAME to be consistent with the parameter name	2016-01-15 10:06:34 +00:00
David Baker	3f8db3d597	Add specific error code for invalid user names.	2016-01-14 17:21:04 +00:00
Richard van der Hoff	2978053d16	Merge branch 'release-v0.12.1' into develop	2016-01-14 15:04:08 +00:00
Erik Johnston	bce602eb4e	Use logger not logging	2016-01-14 09:56:26 +00:00
Erik Johnston	2655d61d70	Don't change signature. Return empty list	2016-01-13 17:43:39 +00:00
Erik Johnston	fcb05b4c82	Temporarily disable notification branch	2016-01-13 17:39:58 +00:00
Richard van der Hoff	49f33f6438	Add 'event' result to 'context' endpoint ... ... because the context isn't much use without the event.	2016-01-13 16:42:14 +00:00
Daniel Wagner-Hall	93afb40cd4	Skip, rather than erroring, invalid guest requests ... Erroring causes problems when people make illegal requests, because they don't know what limit parameter they should pass. This is definitely buggy. It leaks message counts for rooms people don't have permission to see, via tokens. But apparently we already consciously decided to allow that as a team, so this preserves that behaviour.	2016-01-13 16:41:42 +00:00
Erik Johnston	72ba26679b	Merge pull request #480 from matrix-org/erikj/guest_event_tightloop ... Dont fire user_joined_room when guest hits /events	2016-01-13 11:00:50 +00:00
Erik Johnston	70dfe4dc96	Don't include old left rooms	2016-01-12 15:01:56 +00:00
Erik Johnston	fd5c28dc52	Dont fire user_joined_room when guest hits /events ... Firing the 'user_joined_room' signal everytime a guest hits /events causes all presence for that room to be returned in the stream. This may sound helpful, but causes clients to tightloop calling /events. In general, guest users should get the initial presence from (room) intial sync and so we don't require presence to sbsequently come down the event stream.	2016-01-12 11:04:06 +00:00
David Baker	c232780081	Merge pull request #456 from matrix-org/store_event_actions ... Send unread notification counts	2016-01-08 14:47:15 +00:00
Erik Johnston	fcbe63eaad	Use logger not logging	2016-01-07 15:28:17 +00:00
Matthew Hodgson	6c28ac260c	copyrights	2016-01-07 04:26:29 +00:00
David Baker	09dc9854cd	comma style	2016-01-06 17:44:10 +00:00
David Baker	442fcc02f7	Merge remote-tracking branch 'origin/develop' into store_event_actions	2016-01-06 17:28:55 +00:00
Mark Haines	4cec90a260	Pass whether the user was a guest to some of the event streams	2016-01-06 16:54:57 +00:00
Mark Haines	392773ccb2	Guest users must be joined to a room to see it in /sync	2016-01-06 16:44:13 +00:00
David Baker	c79f221192	Add is_guest flag to users db to track whether a user is a guest user or not. Use this so we can run _filter_events_for_client when calculating event_push_actions.	2016-01-06 11:38:09 +00:00
David Baker	eb03625626	Merge remote-tracking branch 'origin/develop' into store_event_actions	2016-01-05 18:39:50 +00:00
Daniel Wagner-Hall	2ef6de928d	Skip, rather than erroring, invalid guest requests ... Erroring causes problems when people make illegal requests, because they don't know what limit parameter they should pass. This is definitely buggy. It leaks message counts for rooms people don't have permission to see, via tokens. But apparently we already consciously decided to allow that as a team, so this preserves that behaviour.	2016-01-05 18:12:37 +00:00
Daniel Wagner-Hall	cfd07aafff	Allow guests to upgrade their accounts	2016-01-05 18:01:18 +00:00
Erik Johnston	acb19068d0	Return /sync when something under the 'leave' key has changed	2016-01-05 14:49:06 +00:00
Erik Johnston	c3ea36304b	Use named args	2016-01-05 12:57:45 +00:00
Erik Johnston	1b5642604b	Support inviting 3pids in /createRoom	2016-01-05 11:56:21 +00:00
David Baker	d74c6ace24	comma	2016-01-04 15:32:00 +00:00
David Baker	f1b67730fa	Add unread_notif_count in incremental_sync_with_gap	2016-01-04 14:50:36 +00:00
David Baker	c914d67cda	Rename event-actions to event_push_actions as per PR request	2016-01-04 14:05:37 +00:00
David Baker	928c575c6f	Merge remote-tracking branch 'origin/develop' into store_event_actions	2016-01-04 13:39:51 +00:00
David Baker	3051c9d002	Address minor PR issues	2016-01-04 13:39:29 +00:00
Mark Haines	517fb9a023	Move the doc string to the public facing method	2015-12-22 18:53:47 +00:00
Mark Haines	9ac417fa88	Add a cache for initialSync responses that expires after 5 minutes	2015-12-22 18:27:56 +00:00
David Baker	d2a92c6bde	Fix merge fail with anon access stuff	2015-12-22 18:25:04 +00:00
David Baker	140a50f641	Merge remote-tracking branch 'origin/develop' into store_event_actions	2015-12-22 17:23:35 +00:00
David Baker	5645d9747b	Add some comments to areas that could be optimised.	2015-12-22 17:19:22 +00:00
Mark Haines	0ee0138325	Include the list of bad room ids in the error	2015-12-22 15:49:32 +00:00
Mark Haines	251aafccca	Use a list comprehension	2015-12-22 14:03:24 +00:00
Mark Haines	cdd04f7055	Hook up read receipts and typing notifications for guest access	2015-12-22 11:59:55 +00:00
Mark Haines	542ab0f886	Merge branch 'develop' into markjh/guest_access	2015-12-22 11:49:12 +00:00
Mark Haines	c3fff251a9	Allow guest access to /sync	2015-12-22 11:21:03 +00:00
Mark Haines	45a9e0ae0c	Allow guest access if the user provides a list of rooms in the filter	2015-12-22 10:25:46 +00:00
Daniel Wagner-Hall	7f3148865c	Return room avatar URLs in /publicRooms ... Spec: https://github.com/matrix-org/matrix-doc/pull/244 Tests: https://github.com/matrix-org/sytest/pull/121	2015-12-21 19:38:04 +00:00
David Baker	c061b47c57	Merge remote-tracking branch 'origin/develop' into store_event_actions	2015-12-21 15:30:26 +00:00
David Baker	f73f154ec2	Only run pushers for users on this hs!	2015-12-21 15:28:54 +00:00
David Baker	091c545c4f	pep8	2015-12-21 10:14:57 +00:00
Matthew Hodgson	c8ea2d5b1f	Merge pull request #450 from matrix-org/matthew/no-identicons ... Matthew/no identicons	2015-12-18 18:14:06 +00:00
David Baker	413d0d6a24	Make unread notification count sending work: put the correct count in incremental syncs too, where necessary, and fix silly bugs like only select the event actions for that user...	2015-12-18 17:47:00 +00:00
David Baker	0a2d73fd60	Merge branch 'release-v0.12.0' into develop	2015-12-18 10:07:48 +00:00
David Baker	ce4999268a	Fix typo that broke registration on the mobile clients	2015-12-18 10:07:28 +00:00
Matthew Hodgson	64374bda5b	fix indentation level	2015-12-17 23:04:53 +00:00
Matthew Hodgson	772ad4f715	stop generating default identicons. reverts most of 582019f870 and solves vector-web/vector-im#346	2015-12-17 23:04:20 +00:00
Daniel Wagner-Hall	bdacee476d	Add display_name to 3pid invite in m.room.member invites	2015-12-17 18:55:08 +01:00
Daniel Wagner-Hall	8c5f252edb	Strip address and such out of 3pid invites ... We're not meant to leak that into the graph	2015-12-17 18:09:51 +01:00
David Baker	42ad49f5b7	still very WIP, but now sends unread_notifications_count in the room object on sync (only actually corrrect in a full sync: hardcoded to 0 in incremental syncs).	2015-12-16 18:42:09 +00:00
Daniel Wagner-Hall	0311612ce9	Give the IS a bunch more 3pid invite context ... This allows it to form richer emails	2015-12-16 13:05:32 +00:00
Mark Haines	4fab578b43	Merge branch 'release-v0.12.0' into develop	2015-12-16 11:18:45 +00:00
Mark Haines	dbe7892e03	Fix a race between started/stopped stream	2015-12-14 15:09:41 +00:00
Mark Haines	15e9885197	Merge branch 'release-v0.12.0' into develop	2015-12-14 14:46:55 +00:00
Mark Haines	deeebbfcb7	Merge branch 'release-v0.12.0' into develop	2015-12-12 14:21:49 +00:00
Mark Haines	1ee7280c4c	Do the /sync in parallel accross the rooms like /initialSync does	2015-12-11 16:48:20 +00:00
Erik Johnston	cde49d3d2b	Merge pull request #435 from matrix-org/erikj/search ... Include approximate count of search results	2015-12-11 16:27:38 +00:00
Erik Johnston	d9a5c56930	Include approximate count of search results	2015-12-11 11:40:23 +00:00
Mark Haines	7d6b313312	Add caches for whether a room has been forgotten by a user	2015-12-10 17:49:34 +00:00
David Baker	a84a693327	Having consulted The Erikle, this should go at the end of on_receive_pdu, otherwise it will be triggered whenever we backfill too.	2015-12-10 17:18:46 +00:00
Paul "LeoNerd" Evans	99afb4b750	Ensure that the event that gets persisted is the one that was signed	2015-12-10 17:08:21 +00:00
David Baker	21f135ba76	Very first cut of calculating actions for events as they come in. Doesn't store them yet. Not very efficient.	2015-12-10 16:26:08 +00:00
Erik Johnston	7c2ff8c889	Merge pull request #405 from matrix-org/erikj/search-ts ... Change the result dict to be a list in /search response	2015-12-08 16:15:27 +00:00
Mark Haines	660dee94af	Only include the archived rooms if a include_leave flag in set in the filter	2015-12-04 17:32:09 +00:00
Mark Haines	b29d2fd7f8	Merge pull request #419 from matrix-org/markjh/reuse_captcha_client ... Reuse the captcha client rather than creating a new one for each request	2015-12-03 17:00:59 +00:00
Daniel Wagner-Hall	edfcb83473	Flatten devices into a dict, not a list	2015-12-03 16:19:21 +00:00
Mark Haines	478b4e3ed4	Reuse the captcha client rather than creating a new one for each request	2015-12-03 13:48:55 +00:00
Daniel Wagner-Hall	e880164c59	Merge pull request #418 from matrix-org/daniel/whois ... Merge pull request #418 from matrix-org/daniel/whois	2015-12-03 12:18:01 +00:00
Daniel Wagner-Hall	526bc33e02	Fix implementation of /admin/whois	2015-12-02 17:29:47 +00:00
Mark Haines	491f3d16dc	Make state updates in the C+S API idempotent	2015-12-02 15:50:50 +00:00
Mark Haines	58d0927767	Merge pull request #410 from matrix-org/markjh/edu_frequency ... Only fire user_joined_room if the user has actually joined.	2015-12-02 13:17:15 +00:00
Mark Haines	c2c70f7daf	Use the context returned by _handle_new_event	2015-12-02 12:01:24 +00:00
Mark Haines	37b2d69bbc	Reuse a single http client, rather than creating new ones	2015-12-02 11:36:02 +00:00
Mark Haines	dede14f689	Merge branch 'develop' into markjh/edu_frequency	2015-12-02 10:57:51 +00:00
Mark Haines	5eb4d13aaa	Fix typo in collect_presencelike_data	2015-12-02 10:50:58 +00:00
Mark Haines	c30cdb0d68	Add comments	2015-12-02 10:49:35 +00:00
Mark Haines	2a0ec3b89d	Merge branch 'develop' into markjh/edu_frequency ... Conflicts: synapse/handlers/federation.py synapse/handlers/room.py	2015-12-02 10:40:22 +00:00
Mark Haines	9fbd504b4e	Merge pull request #408 from matrix-org/markjh/distributor_facade ... Wrap calls to distributor.fire in appropriately named functions	2015-12-02 09:44:56 +00:00
Erik Johnston	9670f226e3	Merge pull request #406 from matrix-org/erikj/search ... Search: Don't disregard grouping info in pagination tokens	2015-12-02 09:13:20 +00:00
Mark Haines	a9526831a4	Wrap calls to distributor.fire in appropriately named functions so that static analysis can work out want is calling what	2015-12-01 20:53:04 +00:00
Mark Haines	ed0f79bdc5	Only fire user_joined_room if the membership has changed	2015-12-01 19:46:15 +00:00
Mark Haines	f73ea0bda2	Merge branch 'develop' into markjh/edu_frequency	2015-12-01 19:15:27 +00:00
Mark Haines	95f30ecd1f	Add API for setting account_data globaly or on a per room basis	2015-12-01 18:41:32 +00:00
Erik Johnston	27c5e1b374	Search: Don't disregard grouping info in pagination tokens	2015-12-01 16:47:18 +00:00
Mark Haines	af96c6f4d3	Merge pull request #404 from matrix-org/markjh/trivial_rename ... Rename presence_handler.send_invite	2015-12-01 16:11:03 +00:00
Mark Haines	3d3da2b460	Only fire user_joined_room on the distributor if the user has actually joined the room	2015-12-01 16:03:08 +00:00
Mark Haines	31069ecf6a	Rename presence_handler.send_invite to presence_handler.send_presence_invite to distinguish it from normal invites	2015-12-01 15:59:45 +00:00
Erik Johnston	71578e2bf2	Change the result tict to be a list	2015-12-01 14:48:35 +00:00
Erik Johnston	da7dd58641	Tidy up a bit	2015-12-01 11:06:40 +00:00
Erik Johnston	4dcaa42b6d	Allow paginating search ordered by recents	2015-11-30 17:45:31 +00:00
Erik Johnston	76936f43ae	Return words to highlight in search results	2015-11-27 16:40:42 +00:00
Daniel Wagner-Hall	924d85a75e	Merge pull request #375 from matrix-org/daniel/guestroominitialsync ... Clean up room initialSync for guest users	2015-11-23 16:10:49 +00:00
Mark Haines	c6a15f5026	Merge pull request #385 from matrix-org/daniel/forgetrooms ... Allow users to forget rooms	2015-11-20 18:07:26 +00:00
Erik Johnston	6b95a79724	Add option to include the current room state	2015-11-20 14:16:42 +00:00
Erik Johnston	506874cca9	Optionally include historic profile info	2015-11-20 11:39:44 +00:00
Paul "LeoNerd" Evans	1cfda3d2d8	Merge branch 'develop' into daniel/forgetrooms	2015-11-19 16:53:13 +00:00
Mark Haines	7a802ec0ff	Merge pull request #386 from matrix-org/markjh/rename_pud_to_account_data ... s/private_user_data/account_data/	2015-11-19 15:21:35 +00:00
Daniel Wagner-Hall	248cfd5eb3	Take a boolean not a list of lambdas	2015-11-19 15:16:25 +00:00
Daniel Wagner-Hall	9da4c5340d	Simplify code	2015-11-19 10:07:21 -05:00
Daniel Wagner-Hall	bed7889703	Apply forgetting properly to historical events	2015-11-18 18:11:12 -05:00
Mark Haines	1c960fbb80	s/private_user_data/account_data/	2015-11-18 15:31:04 +00:00
Daniel Wagner-Hall	ba26eb3d5d	Allow users to forget rooms	2015-11-17 17:17:30 -05:00
Steven Hammerton	f5e25c5f35	Merge branch 'develop' into sh-cas-auth-via-homeserver	2015-11-17 10:55:41 +00:00
Daniel Wagner-Hall	641420c5e0	Clean up room initialSync for guest users	2015-11-13 15:44:57 +00:00
Richard van der Hoff	fddedd51d9	Fix a few race conditions in the state calculation ... Be a bit more careful about how we calculate the state to be returned by /sync. In a few places, it was possible for /sync to return slightly later state than that represented by the next_batch token and the timeline. In particular, the following cases were susceptible: * On a full state sync, for an active room * During a per-room incremental sync with a timeline gap * When the user has just joined a room. (Refactor check_joined_room to make it less magical) Also, use store.get_state_for_events() (and thus the existing stategroups) to calculate the state corresponding to a particular sync position, rather than state_handler.compute_event_context(), which recalculates from first principles (and tends to miss some state). Merged from PR https://github.com/matrix-org/synapse/pull/372	2015-11-13 10:39:09 +00:00
Richard van der Hoff	5ab4b0afe8	Make handlers.sync return a state dictionary, instead of an event list. ... Basically this moves the process of flattening the existing dictionary into a list up to rest.client.*, instead of doing it in handlers.sync. This simplifies a bit of the code in handlers.sync, but it is also going to be somewhat beneficial in the next stage of my hacking on SPEC-254. Merged from PR #371	2015-11-13 10:35:01 +00:00
Richard van der Hoff	5dea4d37d1	Update some comments ... Add a couple of type annotations, docstrings, and other comments, in the interest of keeping track of what types I have. Merged from pull request #370.	2015-11-13 10:31:15 +00:00
Erik Johnston	c0b3554401	Fix missing profile data in federation joins ... There was a regression where we stopped including profile data in initial joins for rooms joined over federation.	2015-11-12 16:19:55 +00:00
Daniel Wagner-Hall	06bfd0a3c0	Merge pull request #367 from matrix-org/daniel/readafterleave ... Merge pull request #367 from matrix-org/daniel/readafterleave Tweak guest access permissions	2015-11-12 15:22:02 +00:00
Daniel Wagner-Hall	0d08670f61	Merge pull request #360 from matrix-org/daniel/guestroominitialsync ... Merge pull request #360 from matrix-org/daniel/guestroominitialsync Allow guest access to room initialSync	2015-11-12 15:19:55 +00:00
Daniel Wagner-Hall	fb7e260a20	Tweak guest access permissions ... * Allow world_readable rooms to be read by guests who have joined and left * Allow regular users to access world_readable rooms	2015-11-12 15:02:00 +00:00
Daniel Wagner-Hall	50f1afbd5b	Consider joined guest users as joined users ... Otherwise they're inconveniently allowed to write events to the room but not to read them from the room.	2015-11-12 13:37:07 +00:00
Daniel Wagner-Hall	e93d550b79	Allow guests to access room context API	2015-11-11 17:49:44 +00:00
Daniel Wagner-Hall	f15ba926cc	Allow guest access to room initialSync	2015-11-11 17:13:24 +00:00
Steven Hammerton	2b779af10f	Minor review fixes	2015-11-11 11:21:43 +00:00
Steven Hammerton	dd2eb49385	Share more code between macaroon validation	2015-11-11 11:12:35 +00:00
Daniel Wagner-Hall	38d82edf0e	Allow guest users to join and message rooms	2015-11-10 16:57:13 +00:00
Daniel Wagner-Hall	82e8a2d763	Merge pull request #356 from matrix-org/daniel/3pidyetagain ... Get display name from identity server, not client	2015-11-10 12:44:17 +00:00
Richard van der Hoff	c7db2068c8	Don't fiddle with results returned by event sources ... Overwriting hashes returned by other methods is poor form. Fixes: SYN-516	2015-11-09 18:09:46 +00:00
Daniel Wagner-Hall	0d63dc3ec9	Get display name from identity server, not client	2015-11-09 17:26:43 +00:00
Mark Haines	c4135d85e1	SYN-513: Include updates for rooms that have had all their tags deleted	2015-11-09 14:53:08 +00:00
Steven Hammerton	fece2f5c77	Merge branch 'develop' into sh-cas-auth-via-homeserver	2015-11-05 20:59:45 +00:00
Erik Johnston	6be1b4b113	Merge pull request #350 from matrix-org/erikj/search ... Implement pagination, order by and groups in search	2015-11-05 17:52:32 +00:00
Erik Johnston	66d36b8e41	Be explicit about what we're doing	2015-11-05 17:26:19 +00:00
Erik Johnston	2aa98ff3bc	Remove redundant test	2015-11-05 17:25:50 +00:00
Erik Johnston	5ee070d21f	Increment by one, not five	2015-11-05 17:25:33 +00:00
Daniel Wagner-Hall	2cebe53545	Exchange 3pid invites for m.room.member invites	2015-11-05 16:43:19 +00:00
Erik Johnston	1ad6222ebf	COMMENTS	2015-11-05 16:29:16 +00:00
Erik Johnston	729ea933ea	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search	2015-11-05 15:43:52 +00:00
Erik Johnston	7301e05122	Implement basic pagination for search results	2015-11-05 15:04:08 +00:00
Daniel Wagner-Hall	ca2f90742d	Open up /events to anonymous users for room events only ... Squash-merge of PR #345 from daniel/anonymousevents	2015-11-05 14:32:26 +00:00
Steven Hammerton	414a4a71b4	Allow hs to do CAS login completely and issue the client with a login token that can be redeemed for the usual successful login response	2015-11-05 14:06:48 +00:00
Erik Johnston	05c326d445	Implement order and group by	2015-11-04 17:57:44 +00:00
Daniel Wagner-Hall	4e62ffdb21	Merge branch 'develop' of github.com:matrix-org/synapse into develop	2015-11-04 17:31:01 +00:00
Daniel Wagner-Hall	f522f50a08	Allow guests to register and call /events?room_id= ... This follows the same flows-based flow as regular registration, but as the only implemented flow has no requirements, it auto-succeeds. In the future, other flows (e.g. captcha) may be required, so clients should treat this like the regular registration flow choices.	2015-11-04 17:29:07 +00:00
Mark Haines	33b3e04049	Merge branch 'develop' into daniel/removesomelies ... Conflicts: synapse/notifier.py	2015-11-04 16:01:00 +00:00
Mark Haines	c452dabc3d	Remove the LockManager class because it wasn't being used	2015-11-04 14:08:15 +00:00
Mark Haines	a3bfef35fd	Merge branch 'develop' into markjh/v2_sync_receipts ... Conflicts: synapse/handlers/sync.py	2015-11-03 17:31:17 +00:00
Mark Haines	2657140c58	Include read receipts in v2 sync	2015-11-02 17:54:04 +00:00
Mark Haines	57be722c46	Include room tags in v2 /sync	2015-11-02 16:23:15 +00:00
Daniel Wagner-Hall	771ca56c88	Remove more unused parameters	2015-11-02 15:31:57 +00:00
Mark Haines	ddd8566f41	Store room tag content and return the content in the m.tag event	2015-11-02 15:11:31 +00:00
Daniel Wagner-Hall	192241cf2a	Remove unused arguments and code	2015-11-02 15:10:59 +00:00
Mark Haines	0e36756383	Merge branch 'develop' into markjh/room_tags	2015-11-02 10:57:00 +00:00
Mark Haines	79b65f3875	Include tags in v1 room initial sync	2015-10-30 16:28:19 +00:00
Mark Haines	fdf73c6855	Include room tags v1 /initialSync	2015-10-30 16:22:32 +00:00
Mark Haines	d58edd98e9	Update the other place check_joined_room is called	2015-10-30 11:15:37 +00:00
Mark Haines	5cf22f0596	Don't mark newly joined room timelines as limited in an incremental sync	2015-10-29 19:58:51 +00:00
Erik Johnston	f6e6f3d87a	Make search API honour limit set in filter	2015-10-29 16:17:47 +00:00
Mark Haines	f40b0ed5e1	Inform the client of new room tags using v1 /events	2015-10-29 15:21:09 +00:00
Erik Johnston	5d80dad99e	Merge pull request #336 from matrix-org/erikj/search ... Optionally return event contexts with search results	2015-10-28 18:39:40 +00:00
Erik Johnston	e83c4b8e3e	Merge pull request #334 from matrix-org/erikj/context_api ... Add room context api	2015-10-28 18:26:01 +00:00
Erik Johnston	a2e5f7f3d8	Optionally return event contexts with search results	2015-10-28 18:25:11 +00:00
Erik Johnston	56dbcd1524	Docs	2015-10-28 14:05:50 +00:00
Erik Johnston	5cb298c934	Add room context api	2015-10-28 13:45:56 +00:00
Richard van der Hoff	c79c4f9b14	Implement full_state incremental sync ... A hopefully-complete implementation of the full_state incremental sync, as specced at https://github.com/matrix-org/matrix-doc/pull/133. This actually turns out to be a relatively simple modification to the initial sync implementation.	2015-10-26 18:47:18 +00:00
Erik Johnston	259d10f0e4	Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into develop	2015-10-23 11:11:56 +01:00
Erik Johnston	2980136d75	Rename	2015-10-22 16:19:53 +01:00
Erik Johnston	61547106f5	Fix receipts for room initial sync	2015-10-22 16:17:23 +01:00
Erik Johnston	232beb3a3c	Use namedtuple as return value	2015-10-22 15:02:35 +01:00
Erik Johnston	8a98f0dc5b	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search	2015-10-22 13:16:35 +01:00
Mark Haines	5201c66108	Merge branch 'develop' into markjh/v2_sync_typing ... Conflicts: synapse/handlers/sync.py	2015-10-21 15:48:34 +01:00
Mark Haines	e94ffd89d6	Merge pull request #316 from matrix-org/markjh/v2_sync_archived ... Add rooms that the user has left under archived in v2 sync.	2015-10-21 15:46:41 +01:00
Mark Haines	d63a0ca34b	Doc string for the SyncHandler.typing_by_room method	2015-10-21 15:45:37 +01:00
Mark Haines	e3d75f564a	Include banned rooms in the archived section of v2 sync	2015-10-21 11:15:48 +01:00
Erik Johnston	5c41224a89	Filter room ids before hitting the database	2015-10-21 10:09:26 +01:00
Erik Johnston	c8baada94a	Filter search results	2015-10-21 10:08:53 +01:00
Mark Haines	7be06680ed	Include typing events in initial v2 sync	2015-10-20 16:36:20 +01:00
Daniel Wagner-Hall	137fafce4e	Allow rejecting invites ... This is done by using the same /leave flow as you would use if you had already accepted the invite and wanted to leave.	2015-10-20 11:58:58 +01:00
Mark Haines	51d03e65b2	Fix pep8	2015-10-19 17:48:58 +01:00
Mark Haines	68b7fc3e2b	Add rooms that the user has left under archived in v2 sync.	2015-10-19 17:26:18 +01:00
Erik Johnston	e0bf0258ee	Merge pull request #307 from matrix-org/erikj/search ... Add basic search API	2015-10-19 13:37:15 +01:00
Mark Haines	b19b9535f6	Merge pull request #310 from matrix-org/markjh/bcrypt_rounds ... Add config for how many bcrypt rounds to use for password hashes	2015-10-16 17:05:21 +01:00
Erik Johnston	33646eb000	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search	2015-10-16 15:35:35 +01:00
Erik Johnston	380f148db7	Remove unused import	2015-10-16 15:32:56 +01:00
Daniel Wagner-Hall	e5acc8a47b	Merge pull request #302 from matrix-org/daniel/3pidinvites ... Implement third party identifier invites	2015-10-16 15:23:30 +01:00
Erik Johnston	d4b5621e0a	Remove duplicate _filter_events_for_client	2015-10-16 15:19:52 +01:00
Erik Johnston	23ed7dc0e7	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search	2015-10-16 15:18:42 +01:00
Daniel Wagner-Hall	b8dd5b1a2d	Verify third party ID server certificates	2015-10-16 14:54:54 +01:00
Erik Johnston	366af6b73a	Amalgamate _filter_events_for_client	2015-10-16 14:52:48 +01:00
Mark Haines	f2f031fd57	Add config for how many bcrypt rounds to use for password hashes ... By default we leave it at the default value of 12. But now we can reduce it for preparing users for loadtests or running integration tests.	2015-10-16 14:52:08 +01:00
Erik Johnston	b62da463e1	docstring	2015-10-16 11:52:16 +01:00
Erik Johnston	bcfb653816	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search	2015-10-15 16:37:32 +01:00
Daniel Wagner-Hall	6ffbcf45c6	Use non-placeholder name for endpoint	2015-10-15 13:12:52 +01:00
Daniel Wagner-Hall	643b5fcdc8	Look for keys on the right objects	2015-10-15 13:10:30 +01:00
Daniel Wagner-Hall	f38df51e8d	Merge branch 'develop' into daniel/3pidinvites	2015-10-15 11:51:55 +01:00
Mark Haines	a059760954	Merge pull request #305 from matrix-org/markjh/v2_sync_api ... Update the v2 sync API to work as specified in the current spec.	2015-10-14 13:56:23 +01:00
Mark Haines	c185c1c413	Fix v2 sync polling	2015-10-14 13:16:53 +01:00
Erik Johnston	8c9df8774e	Make 'keys' optional	2015-10-14 10:35:50 +01:00
Erik Johnston	1d9e109820	More TODO markers	2015-10-14 09:49:00 +01:00
Erik Johnston	d25b0f65ea	Add TODO markers	2015-10-14 09:46:31 +01:00
Erik Johnston	858634e1d0	Remove unused room_id arg	2015-10-14 09:31:20 +01:00
Daniel Wagner-Hall	0c38e8637f	Remove unnecessary class-wrapping	2015-10-13 18:00:38 +01:00
Daniel Wagner-Hall	14edea1aff	Move logic into handler	2015-10-13 17:47:58 +01:00
Daniel Wagner-Hall	bb407cd624	Re-add accidentally removed code	2015-10-13 17:19:26 +01:00
Daniel Wagner-Hall	17dffef5ec	Move event contents into third_party_layout field	2015-10-13 15:48:12 +01:00
Erik Johnston	3e2a1297b5	Remove constraints in preperation of using filters	2015-10-13 15:22:14 +01:00
Mark Haines	cacf0688c6	Add a get_invites_for_user method to the storage to find out the rooms a user is invited to	2015-10-13 14:08:38 +01:00
Daniel Wagner-Hall	32a453d7ba	Merge branch 'develop' into daniel/3pidinvites	2015-10-13 13:32:43 +01:00
Mark Haines	54414221e4	Include invites in incremental sync	2015-10-13 11:43:12 +01:00
Mark Haines	ab9cf73258	Include invited rooms in the initial sync	2015-10-13 11:03:48 +01:00
Erik Johnston	30c2783d2f	Search left rooms too	2015-10-13 10:36:36 +01:00
Mark Haines	f96b480670	Merge branch 'develop' into markjh/v2_sync_api	2015-10-13 10:33:00 +01:00
Mark Haines	956509dfec	Start spliting out the rooms into joined and invited in v2 sync	2015-10-13 10:24:51 +01:00
Mark Haines	586beb8318	Update the filters to match the latest spec. ... Apply the filter the 'timeline' and 'ephemeral' keys of rooms. Apply the filter to the 'presence' key of a sync response.	2015-10-12 16:54:58 +01:00
Erik Johnston	ca53ad7425	Filter events to only thsoe that the user is allowed to see	2015-10-12 15:52:55 +01:00
Erik Johnston	f6fde343a1	Merge remote-tracking branch 'origin/develop' into erikj/search	2015-10-12 15:06:18 +01:00
Erik Johnston	927004e349	Remove unused room_id parameter	2015-10-12 15:06:14 +01:00
Mark Haines	54cb509d64	Merge pull request #296 from matrix-org/markjh/eventstream_presence ... Split the sections of EventStreamHandler.get_stream that handle presence	2015-10-12 14:48:09 +01:00
Mark Haines	885301486c	Merge pull request #297 from matrix-org/markjh/presence_races ... Fix some races in the synapse presence handler caused by not yielding…	2015-10-12 14:47:53 +01:00
Erik Johnston	ae72e247fa	PEP8	2015-10-12 10:50:46 +01:00
Erik Johnston	61561b9df7	Keep FTS indexes up to date. Only search through rooms currently joined	2015-10-12 10:49:53 +01:00
Steven Hammerton	22112f8d14	Formatting changes	2015-10-10 10:49:42 +01:00
Steven Hammerton	c33f5c1a24	Provide ability to login using CAS	2015-10-10 10:49:42 +01:00
Mark Haines	1a46daf621	Merge branch 'markjh/presence_races' into markjh/v2_sync_api	2015-10-09 20:02:30 +01:00
Mark Haines	987803781e	Fix some races in the synapse presence handler caused by not yielding on deferreds	2015-10-09 19:59:50 +01:00
Mark Haines	af7b214476	Merge branch 'markjh/eventstream_presence' into markjh/v2_sync_api	2015-10-09 19:18:09 +01:00
Mark Haines	1b9802a0d9	Split the sections of EventStreamHandler.get_stream that handle presence ... into separate functions. This makes the code a bit easier to read, and means that we can reuse the logic when implementing the v2 sync API.	2015-10-09 19:13:08 +01:00
Erik Johnston	c85c912562	Add basic full text search impl.	2015-10-09 15:48:31 +01:00
Mark Haines	dc72021748	Add a flag to initial sync to indicate we want rooms that the user has left	2015-10-08 17:26:23 +01:00
Mark Haines	dfef2b41aa	Update the v2 room sync format to match the current v2 spec	2015-10-08 15:17:43 +01:00
Daniel Wagner-Hall	61ee72517c	Remove merge thinko	2015-10-06 10:16:15 -05:00
Daniel Wagner-Hall	d4bb28c59b	Revert "Revert "Merge pull request #283 from matrix-org/erikj/atomic_join_federation"" ... This reverts commit 34d26d3687.	2015-10-06 09:58:21 -05:00
Daniel Wagner-Hall	c05b5ef7b0	Merge branch 'develop' into daniel/3pidinvites	2015-10-06 08:10:34 -05:00
Daniel Wagner-Hall	34d26d3687	Revert "Merge pull request #283 from matrix-org/erikj/atomic_join_federation" ... This reverts commit 5879edbb09, reversing changes made to b43930d4c9.	2015-10-05 19:10:47 -05:00
Mark Haines	471555b3a8	Move the rooms out into a room_map mapping from room_id to room.	2015-10-05 16:39:36 +01:00
Daniel Wagner-Hall	58e6a58eb7	Merge branch 'develop' into daniel/3pidinvites	2015-10-05 10:33:41 -05:00
Erik Johnston	49ebd472fa	Explicitly add Create event as auth event	2015-10-02 13:22:36 +01:00
Erik Johnston	40017a9a11	Add 'trusted_private_chat' to room creation presets	2015-10-02 11:22:56 +01:00
Erik Johnston	a086b7aa00	Merge pull request #275 from matrix-org/erikj/invite_state ... Bundle in some room state in invites.	2015-10-02 11:15:43 +01:00
Erik Johnston	9c311dfce5	Also bundle in sender	2015-10-02 11:04:23 +01:00
Erik Johnston	d5e081c7ae	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable	2015-10-02 10:33:49 +01:00
Erik Johnston	5879edbb09	Merge pull request #283 from matrix-org/erikj/atomic_join_federation ... Atomically persist events when joining a room over federation/	2015-10-02 09:18:44 +01:00
Mark Haines	f31014b18f	Start updating the sync API to match the specification	2015-10-01 17:53:07 +01:00
Daniel Wagner-Hall	5b3e9713dd	Implement third party identifier invites	2015-10-01 17:49:52 +01:00
Erik Johnston	0ec78b360c	Merge pull request #287 from matrix-org/erikj/canonical_alias ... Set m.room.canonical_alias on room creation.	2015-09-30 17:14:55 +01:00
Erik Johnston	ecd0c0dfc5	Remove double indentation	2015-09-30 16:46:24 +01:00
Erik Johnston	83892d0d30	Comment	2015-09-30 16:41:48 +01:00
Erik Johnston	9d39615b7d	Rename var	2015-09-30 16:37:59 +01:00
Mark Haines	301141515a	Merge pull request #288 from matrix-org/markjh/unused_definitions ... Remove some of the unused definitions from synapse	2015-09-28 14:22:44 +01:00
Erik Johnston	a14665bde7	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/invite_state	2015-09-25 11:38:28 +01:00
Mark Haines	57338a9768	synapse/handlers/room.py:_should_invite_join was unused	2015-09-23 10:26:45 +01:00
Mark Haines	60728c8c9e	synapse/handlers/federation.py:_handle_auth_events was unused	2015-09-23 10:25:26 +01:00
Erik Johnston	257fa1c53e	Set m.room.canonical_alias on room creation.	2015-09-23 10:07:31 +01:00
Erik Johnston	dc6094b908	Merge pull request #271 from matrix-org/erikj/default_history ... Change default history visibility for private rooms	2015-09-23 09:21:00 +01:00
Mark Haines	ee2d722f0f	Merge pull request #276 from matrix-org/markjh/history_for_rooms_that_have_been_left ... SPEC-216: Allow users to view the history of rooms that they have left.	2015-09-21 14:38:13 +01:00
Mark Haines	49c0a0b5c4	Clarify that room_initial_sync returns a python dict	2015-09-21 14:21:03 +01:00
Mark Haines	95c304e3f9	Fix doc string to point at the right class	2015-09-21 14:18:47 +01:00
Mark Haines	0c16285989	Add explicit "elif event.membership == Membership.LEAVE" for clarity	2015-09-21 14:17:16 +01:00
Mark Haines	1e101ed4a4	Clamp the "to" token for /rooms/{roomId}/messages to when the user left ... the room. There isn't a way for the client to learn a valid "to" token for a room that they have left in the C-S API but that doesn't stop a client making one up.	2015-09-21 14:13:10 +01:00
Erik Johnston	c34ffd2736	Fix getting an event for a room the server forgot it was in	2015-09-17 10:26:03 +01:00
Erik Johnston	54e688277a	Also persist state	2015-09-17 10:26:03 +01:00
Erik Johnston	3a01901d6c	Capture err	2015-09-17 10:26:03 +01:00
Erik Johnston	744e7d2790	Also handle state	2015-09-17 10:26:03 +01:00
Erik Johnston	a3e332af19	Don't bail out of joining if we encounter a rejected event	2015-09-17 10:26:03 +01:00
Erik Johnston	4678055173	Refactor do_invite_join	2015-09-17 10:24:51 +01:00
Erik Johnston	d59acb8c5b	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable	2015-09-14 18:05:31 +01:00
Mark Haines	e2054ce21a	Allow users to GET individual state events for rooms that they have left	2015-09-10 15:06:47 +01:00
Erik Johnston	49ae42bbe1	Bundle in some room state in the unsigned bit of the invite when sending to invited servers	2015-09-10 14:25:54 +01:00
Mark Haines	09cb5c7d33	Allow users that have left a room to get the messages that happend in the room before they left	2015-09-09 17:31:09 +01:00
Mark Haines	3c166a24c5	Remove undocumented and unimplemented 'feedback' parameter from the Client-Server API	2015-09-09 16:05:09 +01:00
Mark Haines	bc8b25eb56	Allow users that have left the room to view the member list from the point they left	2015-09-09 15:42:16 +01:00
Mark Haines	1d579df664	Allow rooms/{roomId}/state for a room that has been left	2015-09-09 14:12:24 +01:00
Mark Haines	89ae0166de	Allow room initialSync for users that have left the room, returning a snapshot of how the room was when they left it	2015-09-09 13:25:22 +01:00
Daniel Wagner-Hall	81a93ddcc8	Allow configuration to ignore invalid SSL certs ... This will be useful for sytest, and sytest only, hence the aggressive config key name.	2015-09-09 12:02:07 +01:00
Erik Johnston	e530208e68	Change default history visibility for private rooms	2015-09-09 09:57:49 +01:00
Mark Haines	dd42bb78d0	Include rooms that a user has left in an initialSync. Include the state and messages at the point they left the room	2015-09-08 18:16:09 +01:00
Daniel Wagner-Hall	77580addc3	Merge pull request #262 from matrix-org/redactyoself ... Allow users to redact their own events	2015-09-02 10:02:36 +01:00
Erik Johnston	a88e16152f	Add flag which disables federation of the room	2015-09-01 15:47:30 +01:00
Daniel Wagner-Hall	b143641b20	Merge pull request #258 from matrix-org/slowtestsmakemesad ... Swap out bcrypt for md5 in tests	2015-08-28 15:42:25 +01:00
Daniel Wagner-Hall	4d1ea40008	Merge branch 'develop' into redactyoself ... Conflicts: synapse/handlers/_base.py	2015-08-28 15:35:39 +01:00
Daniel Wagner-Hall	8256a8ece7	Allow users to redact their own events	2015-08-28 15:31:49 +01:00
Mark Haines	a7122692d9	Merge branch 'release-v0.10.0' into develop ... Conflicts: synapse/handlers/auth.py synapse/python_dependencies.py synapse/rest/client/v1/login.py	2015-08-28 11:15:27 +01:00
Daniel Wagner-Hall	86fac9c95e	Remove unused import	2015-08-26 16:03:17 +01:00
Daniel Wagner-Hall	3063383547	Swap out bcrypt for md5 in tests ... This reduces our ~8 second sequential test time down to ~7 seconds	2015-08-26 15:59:32 +01:00
Daniel Wagner-Hall	d3c0e48859	Merge erikj/user_dedup to develop	2015-08-26 13:42:45 +01:00
Erik Johnston	da51acf0e7	Remove needless existence checks	2015-08-26 11:08:23 +01:00
Erik Johnston	f4d552589e	Don't loop over all rooms ever in typing.get_new_events_for_user	2015-08-26 10:51:08 +01:00
Daniel Wagner-Hall	825f0875bc	Fix up one more reference	2015-08-25 16:37:37 +01:00
Daniel Wagner-Hall	a0b181bd17	Remove completely unused concepts from codebase ... Removes device_id and ClientInfo device_id is never actually written, and the matrix.org DB has no non-null entries for it. Right now, it's just cluttering up code. This doesn't remove the columns from the database, because that's fiddly.	2015-08-25 16:23:06 +01:00
Erik Johnston	51c53369a3	Do auth checks *before* persisting the event	2015-08-24 16:38:20 +01:00
Erik Johnston	f8f3d72e2b	Don't make pushers handle presence/typing events	2015-08-24 16:19:43 +01:00
Erik Johnston	fd5ad0f00e	Doc string	2015-08-21 11:45:43 +01:00
Erik Johnston	745b72660a	Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop	2015-08-21 11:39:38 +01:00
Erik Johnston	42f12ad92f	When logging in fetch user by user_id case insensitively, *unless* there are multiple case insensitive matches, in which case require the exact user_id	2015-08-21 11:38:44 +01:00
Erik Johnston	aa3c9c7bd0	Don't allow people to register user ids which only differ by case to an existing one	2015-08-21 10:57:47 +01:00
Erik Johnston	3e9ee62db0	Add missing param in store.get_state_groups invocation	2015-08-21 09:15:13 +01:00
Daniel Wagner-Hall	c7788685b0	Fix bad merge	2015-08-20 17:43:12 +01:00
Daniel Wagner-Hall	8c74bd8960	Fix indentation	2015-08-20 17:26:52 +01:00
Daniel Wagner-Hall	ea570ffaeb	Fix flake8 warnings	2015-08-20 17:22:41 +01:00
Daniel Wagner-Hall	d5a825edee	Merge branch 'auth' into refresh ... Conflicts: synapse/handlers/register.py	2015-08-20 17:13:33 +01:00
Daniel Wagner-Hall	225c244aba	Remove incorrect whitespace	2015-08-20 17:10:10 +01:00
Daniel Wagner-Hall	ce2a7ed6e4	Merge branch 'develop' into auth	2015-08-20 16:28:36 +01:00
Daniel Wagner-Hall	e8cf77fa49	Merge branch 'develop' into refresh ... Conflicts: synapse/rest/client/v1/login.py	2015-08-20 16:25:40 +01:00
Daniel Wagner-Hall	cecbd636e9	/tokenrefresh POST endpoint ... This allows refresh tokens to be exchanged for (access_token, refresh_token). It also starts issuing them on login, though no clients currently interpret them.	2015-08-20 16:21:35 +01:00
Erik Johnston	c141d47a28	Merge pull request #235 from matrix-org/erikj/room_avatars ... Add m.room.avatar to default power levels.	2015-08-20 16:07:49 +01:00
David Baker	ca0d28ef34	Another use of check_password that got missed in the yield fix	2015-08-20 15:35:14 +01:00
Erik Johnston	9b63def388	Add m.room.avatar to default power levels. Change default required power levels of such events to 50	2015-08-20 14:35:40 +01:00
Daniel Wagner-Hall	617501dd2a	Move token generation to auth handler ... I prefer the auth handler to worry about all auth, and register to call into it as needed, than to smatter auth logic between the two.	2015-08-20 11:35:56 +01:00
Erik Johnston	cbd053bb8f	Merge pull request #233 from matrix-org/erikj/canonical_alias ... Add server side support for canonical aliases	2015-08-20 11:26:09 +01:00
Daniel Wagner-Hall	ade5342752	Merge branch 'auth' into refresh	2015-08-20 11:03:47 +01:00
Mark Haines	a0b8e5f2fe	Merge pull request #211 from matrix-org/email_in_use ... Changes for unique emails	2015-08-20 10:04:04 +01:00
Erik Johnston	aadb2238c9	Check that the canonical room alias actually points to the room	2015-08-20 09:55:04 +01:00
Daniel Wagner-Hall	f9e7493ac2	Merge branch 'develop' into auth	2015-08-19 15:20:09 +01:00
Daniel Wagner-Hall	70e265e695	Re-add whitespace around caveat operators	2015-08-19 14:30:31 +01:00
Erik Johnston	daa01842f8	Don't get apservice interested rooms in RoomHandler.get_joined_rooms_for_users	2015-08-19 13:46:03 +01:00
Erik Johnston	d7272f8d9d	Add canonical alias to the default power levels	2015-08-19 12:03:09 +01:00
Erik Johnston	40da1f200d	Remove an access token log line	2015-08-19 09:41:07 +01:00
Erik Johnston	abc6986a24	Fix regression where we incorrectly responded with a 200 to /login	2015-08-19 09:31:11 +01:00
Daniel Wagner-Hall	ce832c38d4	Remove padding space around caveat operators	2015-08-18 17:39:26 +01:00
Erik Johnston	38a965b816	Merge pull request #227 from matrix-org/erikj/receipts_take2 ... Re-enable receipts API.	2015-08-18 16:30:04 +01:00
Daniel Wagner-Hall	3e6fdfda00	Fix some formatting to use tuples	2015-08-18 15:18:50 +01:00
Daniel Wagner-Hall	1469141023	Merge branch 'develop' into auth	2015-08-18 14:43:44 +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	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	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
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	1a9510bb84	Implement a batched presence_handler.get_state and use it	2015-08-17 10:40:23 +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	129ee4e149	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts_take2	2015-08-13 17:28:43 +01:00
Erik Johnston	9f7f228ec2	Remove pointless map	2015-08-13 17:20:59 +01:00
Erik Johnston	7e77a82c5f	Re-enable receipts	2015-08-13 16:58:10 +01:00
Erik Johnston	7b0e797080	Fix _filter_events_for_client	2015-08-12 17:05:24 +01:00
Daniel Wagner-Hall	5ce903e2f7	Merge password checking implementations	2015-08-12 16:09:19 +01:00
Erik Johnston	a7eeb34c64	Simplify staggered deferred lists	2015-08-12 16:02:05 +01:00
Erik Johnston	f7e2f981ea	Use list comprehension instead of filter	2015-08-12 16:01:10 +01:00
Daniel Wagner-Hall	415c2f0549	Simplify LoginHander and AuthHandler ... * Merge LoginHandler -> AuthHandler * Add a bunch of documentation * Improve some naming * Remove unused branches I will start merging the actual logic of the two handlers shortly	2015-08-12 15:49:37 +01:00
Erik Johnston	dc8399ee00	Remove debug loggers	2015-08-11 11:30:59 +01:00
Erik Johnston	1b994a97dd	Fix application of ACLs	2015-08-11 10:41:40 +01:00
Erik Johnston	ffdb8c3828	Don't be too enthusiatic with defer.gatherResults	2015-08-07 18:13:48 +01:00
Erik Johnston	07507643cb	Use dictionary cache to do group -> state fetching	2015-08-05 15:11:42 +01:00
David Baker	c77048e12f	Add endpoint that proxies ID server request token and errors if the given email is in use on this Home Server.	2015-08-04 14:37:09 +01:00
Erik Johnston	2e35a733cc	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/acl_perf	2015-08-04 13:00:52 +01:00
Erik Johnston	4d6cb8814e	Speed up event filtering (for ACL) logic	2015-08-04 09:32:23 +01:00
David Baker	28d07a02e4	Add vector.im as trusted ID server	2015-08-03 15:31:21 +01:00
Kegan Dougal	a4d62ba36a	Fix v2_alpha registration. Add unit tests. ... V2 Registration forced everyone (including ASes) to create a password for a user, when ASes should be able to omit passwords. Also unbreak AS registration in general which checked too early if the given username was claimed by an AS; it was checked before knowing if the AS was the one doing the registration! Add unit tests for AS reg, user reg and disabled_registration flag.	2015-07-28 17:34:12 +01:00
Matrix	4e2e67fd50	Disable receipts for now	2015-07-22 16:13:46 +01:00
Matrix	4cab2cfa34	Don't do any database hits in receipt handling if from_key == to_key	2015-07-18 19:07:12 +01:00
Erik Johnston	b6d4a4c6d8	Merge pull request #199 from matrix-org/erikj/receipts ... Implement read receipts.	2015-07-16 18:18:36 +01:00
Erik Johnston	d155b318d2	Merge pull request #203 from matrix-org/erikj/room_creation_presets ... Implement presets at room creation	2015-07-16 18:18:11 +01:00
Erik Johnston	c456d17daf	Implement specifying custom initial state for /createRoom	2015-07-16 15:25:29 +01:00
David Baker	4da05fa0ae	Add back in support for remembering parameters submitted to a user-interactive auth call.	2015-07-15 19:28:57 +01:00
Erik Johnston	baa55fb69e	Merge pull request #193 from matrix-org/erikj/bulk_persist_event ... Add bulk insert events API	2015-07-14 10:49:24 +01:00
Erik Johnston	002a44ac1a	s/everyone_ops/original_invitees_have_ops/	2015-07-14 10:37:42 +01:00
Erik Johnston	b49a30a972	Capitalize contants	2015-07-14 10:20:31 +01:00
Erik Johnston	4624d6035e	Docs	2015-07-14 10:19:07 +01:00
Erik Johnston	d5cc794598	Implement presets at room creation	2015-07-13 16:56:08 +01:00
Erik Johnston	5989637f37	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts	2015-07-13 13:50:57 +01:00
Erik Johnston	e5991af629	Comments	2015-07-13 13:30:43 +01:00
Erik Johnston	532fcc997a	Merge pull request #196 from matrix-org/erikj/room_history ... Add ability to restrict room history.	2015-07-10 13:47:04 +01:00
Erik Johnston	b5f0d73ea3	Add comment	2015-07-09 17:09:26 +01:00
Erik Johnston	f0979afdb0	Remove spurious comment	2015-07-09 16:02:07 +01:00
Erik Johnston	c2d08ca62a	Integer timestamps	2015-07-09 13:15:34 +01:00
Erik Johnston	1af188209a	Change format of receipts to allow inclusion of data	2015-07-09 11:39:30 +01:00
Erik Johnston	af812b68dd	Add a cache to fetching of receipt streams	2015-07-08 15:35:00 +01:00
Erik Johnston	d85ce8d89b	Split receipt events up into one per room	2015-07-08 11:36:05 +01:00
Muthu Subramanian	f53bae0c19	code beautify	2015-07-08 16:05:46 +05:30
Muthu Subramanian	81682d0f82	Integrate SAML2 basic authentication - uses pysaml2	2015-07-08 15:36:54 +05:30
Erik Johnston	87311d1b8c	Hook up receipts to v1 initialSync	2015-07-08 11:02:04 +01:00
Erik Johnston	ca041d5526	Wire together receipts and the notifer/federation	2015-07-07 15:25:30 +01:00
Erik Johnston	716e426933	Fix various typos	2015-07-07 10:55:31 +01:00
Erik Johnston	1a3255b507	Add m.room.history_visibility to newly created rooms' m.room.power_levels	2015-07-06 13:25:35 +01:00
Erik Johnston	fb47c3cfbe	Rename key and values for m.room.history_visibility. Support 'invited' value	2015-07-06 13:05:52 +01:00
Erik Johnston	c3e2600c67	Filter and redact events that the other server doesn't have permission to see during backfill	2015-07-03 17:52:57 +01:00
Erik Johnston	400894616d	Respect m.room.history_visibility in v2_alpha sync API	2015-07-03 14:51:01 +01:00
Erik Johnston	41938afed8	Make v1 initial syncs respect room history ACL	2015-07-02 17:12:35 +01:00
Erik Johnston	1a60545626	Add basic impl for room history ACL on GET /messages client API	2015-07-02 16:20:10 +01:00
Erik Johnston	bd1236c0ee	Consolidate duplicate code in notifier	2015-07-02 11:46:05 +01:00
Erik Johnston	0862fed2a8	Add basic ReceiptHandler	2015-07-01 17:19:31 +01:00
Erik Johnston	5130d80d79	Add bulk insert events API	2015-06-25 17:29:34 +01:00
Erik Johnston	9bf61ef97b	Merge pull request #189 from matrix-org/erikj/room_init_sync ... Improve room init sync speed.	2015-06-19 11:36:06 +01:00
Kegan Dougal	d88e20cdb9	Fix bug where synapse was sending AS user queries incorrectly. ... Bug introduced in 92b20713d7 which reversed the comparison when checking if a user existed in the users table. Added UTs to prevent this happening again.	2015-06-17 17:26:03 +01:00
Erik Johnston	eceb554a2f	Use another deferred list	2015-06-16 17:12:27 +01:00
Erik Johnston	b849a64f8d	Use DeferredList	2015-06-16 17:03:24 +01:00
Erik Johnston	0460406298	Don't do unecessary db ops in presence.get_state	2015-06-16 16:59:38 +01:00
Erik Johnston	8047fd2434	Merge pull request #176 from matrix-org/erikj/backfill_auth ... Improve backfill.	2015-06-03 17:25:37 +01:00
Erik Johnston	3bbd0d0e09	Merge pull request #180 from matrix-org/erikj/prev_state_context ... Don't needlessly compute prev_state	2015-06-03 17:20:56 +01:00
Erik Johnston	55bf90b9e4	Don't needlessly compute prev_state	2015-06-03 16:44:24 +01:00
Erik Johnston	1c3d844e73	Don't needlessly compute context	2015-06-03 16:41:51 +01:00
Erik Johnston	09e23334de	Add a timeout	2015-06-02 11:00:37 +01:00
Erik Johnston	02410e9239	Handle the fact we might be missing auth events	2015-06-02 10:58:35 +01:00
Erik Johnston	e552b78d50	Add some logging	2015-06-02 10:28:14 +01:00
Erik Johnston	fde0da6f19	Correctly look up auth_events	2015-06-02 10:19:38 +01:00
Erik Johnston	3f04a08a0c	Don't process events we've already processed. Remember to process state events	2015-06-02 10:11:32 +01:00
Erik Johnston	4bbfbf898e	Correctly pass in auth_events	2015-06-01 17:02:23 +01:00
Mark Haines	784aaa53df	Merge branch 'develop' into markjh/SYT-8-recaptcha ... Conflicts: synapse/handlers/auth.py	2015-05-29 13:49:44 +01:00
Mark Haines	d94590ed48	Add config for setting the recaptcha verify api endpoint, so we can test it in sytest	2015-05-29 12:11:40 +01:00
Erik Johnston	afbd3b2fc4	SYN-395: Fix CAPTCHA, don't double decode json	2015-05-28 18:05:00 +01:00
Mark Haines	d9f60e8dc8	Merge pull request #163 from matrix-org/markjh/presence_list_cache ... Add a cache for the presence list	2015-05-22 17:02:23 +01:00
Mark Haines	1a9a9abcc7	Add a cache for getting the presence list for a user	2015-05-22 16:11:17 +01:00
Erik Johnston	74b7de83ec	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/backfill_fixes	2015-05-22 16:10:42 +01:00
Mark Haines	36317f3dad	Merge pull request #156 from matrix-org/erikj/join_perf ... Make joining #matrix:matrix.org over federation quicker	2015-05-22 16:09:54 +01:00
Mark Haines	49a2c10279	Merge pull request #157 from matrix-org/markjh/presence_performance ... Improve presence performance in loadtest	2015-05-22 16:04:40 +01:00
Mark Haines	106a3051b8	Remove spurious TODO comment	2015-05-22 15:53:03 +01:00
Mark Haines	c8135f808b	Remove unused import	2015-05-22 14:45:46 +01:00
Mark Haines	f43544eecc	Make the appservice use 'users_in_room' rather than get_room_members since it is cached	2015-05-22 11:01:28 +01:00
Erik Johnston	4429e720ae	Merge branch 'master' of github.com:matrix-org/synapse into develop	2015-05-22 10:33:00 +01:00
Mark Haines	53447e9cd3	Add caches for things requested by the pushers	2015-05-21 16:41:39 +01:00
Mark Haines	7ae8afb7ef	Removed unused 'is_visible' method	2015-05-20 14:48:11 +01:00
Mark Haines	e01b825cc9	Clean up the presence_list checking logic a bit	2015-05-20 13:21:59 +01:00
Erik Johnston	20814fabdd	Actually fetch state for new backwards extremeties when backfilling.	2015-05-20 11:59:02 +01:00
Erik Johnston	7223129916	Don't apply new room join hack if depth > 5	2015-05-19 14:16:08 +01:00
Erik Johnston	5e7883ec19	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf	2015-05-19 10:50:43 +01:00
Mark Haines	e4c65b338d	Speed up the get_pagination_rows as well	2015-05-18 18:21:06 +01:00
Erik Johnston	ef910a0358	Do work in parellel when joining a room	2015-05-18 17:17:04 +01:00
Mark Haines	591c4bf223	Cache the most recent serial for each room	2015-05-18 16:21:51 +01:00
Mark Haines	e1150cac4b	Move updating the serial and state of the presence cache into a single function	2015-05-18 15:46:37 +01:00
Mark Haines	880fb46de0	Merge branch 'notifier_performance' into markjh/presence_performance	2015-05-18 14:33:58 +01:00
Mark Haines	0b0033c40b	Merge branch 'develop' into notifier_performance	2015-05-18 13:50:01 +01:00
Mark Haines	755def8083	Add more doc string, reduce C+P boilerplate for getting room list	2015-05-18 13:46:47 +01:00
Mark Haines	415b158ce2	More whitespace	2015-05-15 11:09:47 +01:00
Mark Haines	0a4330cd5d	Add some missed argument types, cleanup the whitespace a bit	2015-05-14 17:48:12 +01:00
Mark Haines	47ec693e29	More doc-strings	2015-05-14 17:07:02 +01:00
Mark Haines	c5d1b4986b	Remove unused arguments and doc PresenceHandler.push_update_to_clients	2015-05-14 14:59:31 +01:00
David Baker	67800f7626	Treat setting your display name to the empty string as removing it (SYN-186).	2015-05-14 14:19:59 +01:00
David Baker	92e1c8983d	Disallow whitespace in aliases here too	2015-05-14 13:21:55 +01:00
David Baker	0c894e1ebd	Throw error when creating room if alias contains whitespace #SYN-335	2015-05-14 13:11:28 +01:00
Mark Haines	899d4675dd	Merge branch 'notifier_unify' into notifier_performance	2015-05-14 11:36:44 +01:00
Mark Haines	3edd2d5c93	Fix v2 sync, update the last_notified_ms only if there was an active listener	2015-05-14 11:25:30 +01:00
Mark Haines	63878c0379	Don't bother checking for updates if the stream token hasn't advanced for a user	2015-05-13 13:42:21 +01:00
Erik Johnston	80fd2b574c	Don't talk to yourself when backfilling	2015-05-12 16:19:46 +01:00
Mark Haines	d7b3ac46f8	Revert "Improvement to performance of presence event stream handling"	2015-05-12 15:44:21 +01:00
Mark Haines	c167cbc9fd	Merge pull request #147 from matrix-org/presence-performance ... Improvement to performance of presence event stream handling	2015-05-12 15:24:54 +01:00
Mark Haines	a6fb2aa2a5	Merge pull request #144 from matrix-org/erikj/logging_context ... Preserving logging contexts	2015-05-12 15:23:50 +01:00
Erik Johnston	07a1223156	s/backfil/backfill/	2015-05-12 14:09:54 +01:00
Erik Johnston	0d31ad5101	Typos everywhere	2015-05-12 14:02:01 +01:00
Erik Johnston	a0dfffb33c	And another typo.	2015-05-12 14:00:31 +01:00
Erik Johnston	6e5ac4a28f	Err, gatherResults doesn't take a dict...	2015-05-12 13:58:14 +01:00
Erik Johnston	95dedb866f	Unwrap defer.gatherResults failures	2015-05-12 13:14:29 +01:00
Erik Johnston	367382b575	Handle the case where the other side is unreachable when backfilling	2015-05-12 10:35:45 +01:00
Erik Johnston	4df11b5039	Make get_current_token accept a direction parameter, which tells whether the source whether we want a token for going 'forwards' or 'backwards'	2015-05-12 10:28:10 +01:00
Erik Johnston	84e6b4001f	Initial hack at wiring together pagination and backfill	2015-05-11 18:01:31 +01:00
Erik Johnston	2236ef6c92	Fix up leak. Add warnings.	2015-05-08 19:53:34 +01:00
Erik Johnston	4ac1941592	PEP8	2015-05-08 16:33:01 +01:00
Erik Johnston	476899295f	Change the way we do logging contexts so that they survive divergences	2015-05-08 16:32:18 +01:00
Paul "LeoNerd" Evans	45543028bb	Use the presence cachemap ordering to early-abort the iteration loop	2015-05-07 22:40:10 +01:00
Paul "LeoNerd" Evans	f683b5de47	Store presence cachemap in an ordered dict, so that the newer serials will be at the end	2015-05-07 21:27:53 +01:00
Mark Haines	dfa98f911b	revert accidental bcrypt gensalt round reduction from loadtesting	2015-05-07 17:45:42 +01:00
Mark Haines	ef8e8ebd91	pynacl-0.3.0 was released so we can finally start using it directly from pypi	2015-05-07 16:46:51 +01:00
Erik Johnston	2d386d7038	That wasn't a deferred	2015-05-01 14:41:25 +01:00
Erik Johnston	4ac2823b3c	Remove inlineCallbacks from non-generator	2015-05-01 14:41:25 +01:00
Erik Johnston	42c12c04f6	Remove some run_on_reactors	2015-05-01 14:41:25 +01:00
David Baker	92b20713d7	More missed get_user_by_id API changes	2015-05-01 13:45:54 +01:00
Erik Johnston	da4ed08739	One too many lens	2015-05-01 13:29:38 +01:00
Erik Johnston	9060dc6b59	Change public room list to use defer.gatherResults	2015-05-01 13:28:36 +01:00
David Baker	1fae1b3166	This api now no longer returns an array	2015-05-01 13:26:41 +01:00
Erik Johnston	1d7702833d	Make simple query rather than long one and then throw away half the results	2015-04-30 10:16:12 +01:00
Erik Johnston	a6e62cf6d0	Fix off by one in presence token handling	2015-04-29 17:37:11 +01:00
David Baker	9927170787	Accept camelcase + underscores in binding too	2015-04-29 15:57:09 +01:00
David Baker	109c8aafd2	Fix includes	2015-04-29 15:45:44 +01:00
David Baker	b7788f80a3	Accept both camelcase and underscore threepid creds for transition	2015-04-29 15:41:29 +01:00
Erik Johnston	1783c7ca92	Ensure we never miss any presence updates	2015-04-28 17:24:24 +01:00
Erik Johnston	0126ef7f3c	Fix typo	2015-04-28 17:23:53 +01:00
Erik Johnston	d98edb548a	Ensure the serial returned by presence is always an integer	2015-04-28 17:20:32 +01:00
Erik Johnston	327ca883ec	Merge branch 'develop' of github.com:matrix-org/synapse into postgres	2015-04-28 13:39:42 +01:00
Mark Haines	9182f87664	Merge pull request #126 from matrix-org/csauth ... Client / Server Auth Refactor	2015-04-28 11:00:27 +01:00
Paul "LeoNerd" Evans	38432d8c25	Merge branch 'develop' into invite_power_level	2015-04-27 17:09:25 +01:00
Erik Johnston	6f8e2d517e	Merge branch 'develop' of github.com:matrix-org/synapse into postgres	2015-04-27 14:41:40 +01:00
David Baker	412ece18e7	Add commentage.	2015-04-27 14:08:45 +01:00
David Baker	1bac74b9ae	Change to https for ID server communication	2015-04-24 14:48:49 +01:00
David Baker	a218619626	Use underscores instead of camelcase for id server stuff	2015-04-24 11:27:38 +01:00
David Baker	f7a79a37be	pep8	2015-04-24 09:42:37 +01:00
David Baker	6532b6e607	Merge branch 'develop' into csauth ... Conflicts: synapse/http/server.py	2015-04-24 09:37:54 +01:00
Paul "LeoNerd" Evans	e1e5e53127	Remove users from the remote_offline_serials list (and clean up empty elements) when they go online again	2015-04-23 19:01:37 +01:00
Paul "LeoNerd" Evans	b3bda8a75f	Don't let the remote offline serial list grow arbitrarily large	2015-04-23 18:40:47 +01:00
Paul "LeoNerd" Evans	8a785c3006	Store a list of the presence serial number at which remote users went offline, so that when we delete them from the cachemap, we can still synthesize OFFLINE events for them (SYN-261)	2015-04-23 18:40:19 +01:00
Paul "LeoNerd" Evans	191f7f09ce	Generate presence event-stream JSON structures directly	2015-04-23 18:27:25 +01:00
David Baker	0eb61a3d16	Remove ultimately unused feature of saving params from the first call in the session: it's probably too open to abuse.	2015-04-23 14:44:12 +01:00
Paul "LeoNerd" Evans	48b6ee2b67	Create an 'invite' powerlevel when making new rooms	2015-04-21 21:07:35 +01:00
Mark Haines	24d21887ed	SYN-350: Don't ratelimit the individual events generated during room creation	2015-04-21 14:14:19 +01:00
David Baker	8db6832db8	Password reset, finally.	2015-04-17 19:53:47 +01:00
David Baker	4eea5cf6c2	pep8	2015-04-17 16:46:45 +01:00
David Baker	f96ab9d18d	make add3pid servlet work	2015-04-17 16:44:49 +01:00
David Baker	cb03fafdf1	Merge branch 'develop' into csauth	2015-04-17 13:51:10 +01:00
David Baker	83b554437e	Need to yield the username check, otherwise very very weird things happen.	2015-04-17 12:57:25 +01:00
Erik Johnston	6ba2e3df4e	Merge branch 'develop' of github.com:matrix-org/synapse into postgres	2015-04-17 11:22:31 +01:00
David Baker	4cd5fb13a3	Oops, left debugging in.	2015-04-16 20:03:13 +01:00
David Baker	ea1776f556	Return user ID in use error straight away	2015-04-16 19:56:44 +01:00
Erik Johnston	e1c0970c11	PEP8	2015-04-16 11:18:45 +01:00
Paul "LeoNerd" Evans	f2cf37518b	Filter typing nofication events to only those rooms the requesting user is a member of (SYN-328)	2015-04-15 23:34:16 +01:00
Paul "LeoNerd" Evans	0268d40281	Have TypingNotificationEventSource.get_new_events_for_user() return a deferred, for consistency and extensibility	2015-04-15 23:09:35 +01:00
David Baker	766bd8e880	Dummy login so we can do the first POST request to get login flows without it just succeeding	2015-04-15 17:14:25 +01:00
David Baker	a19b739909	Regstration with email in v2	2015-04-15 15:50:38 +01:00
Erik Johnston	d5ff9effcf	Don't wait on federation_handler.handle_new_event	2015-04-15 15:05:57 +01:00
Erik Johnston	e845434028	Remove run_on_reactor()s	2015-04-15 15:05:45 +01:00
Erik Johnston	bc6cef823f	Do more parellelization for initialSync	2015-04-15 14:21:59 +01:00
Erik Johnston	1ec6fa98c9	Parellelize initial sync	2015-04-15 14:17:16 +01:00
Erik Johnston	a43b40449b	Merge branch 'develop' of github.com:matrix-org/synapse into mysql	2015-04-08 16:46:56 +01:00
Erik Johnston	19234cc6c3	typo	2015-04-08 14:10:06 +01:00
Erik Johnston	e8f1521605	Don't yield on notifying all listeners	2015-04-08 14:08:30 +01:00
Erik Johnston	4fe95094d1	Merge branch 'develop' of github.com:matrix-org/synapse into mysql	2015-04-07 18:05:39 +01:00
David Baker	e9c908ebc0	Completely replace fallback auth for C/S V2: ... * Now only the auth part goes to fallback, not the whole operation * Auth fallback is a normal API endpoint, not a static page * Params like the recaptcha pubkey can just live in the config Involves a little engineering on JsonResource so its servlets aren't always forced to return JSON. I should document this more, in fact I'll do that now.	2015-04-01 15:05:30 +01:00
Kegan Dougal	813e54bd5b	Fix more AS sender ID thinkos. ... Specifically, the ASes own user ID wasn't being treated as 'exclusive' so a human could nab it. Also, the HS would needlessly send user queries to the AS for its own user ID.	2015-04-01 14:05:24 +01:00
Kegan Dougal	d33ae65efc	Remove more reg/unreg methods. Read config not database for cache.	2015-03-31 11:00:00 +01:00
David Baker	9f642a93ec	pep8	2015-03-31 09:50:44 +01:00
David Baker	59bf16eddc	New registration for C/S API v2. Only ReCAPTCHA working currently.	2015-03-30 18:13:10 +01:00
David Baker	a32e876ef4	Delete pushers when changing password	2015-03-26 13:40:16 +00:00
Kegan Dougal	4edcbcee3b	Merge branch 'develop' into application-services-txn-reliability ... Conflicts: synapse/storage/__init__.py	2015-03-26 10:07:59 +00:00
Erik Johnston	0e8f5095c7	Fix unicode database support	2015-03-25 17:15:20 +00:00
Paul "LeoNerd" Evans	ed008e85a8	Reduce activity timer granularity to avoid too many quick updates (SYN-247)	2015-03-23 17:25:50 +00:00
Erik Johnston	9a7f496298	Sanitize RoomMemberStore	2015-03-23 15:29:04 +00:00
David Baker	78adccfaf4	pep8 / pyflakes	2015-03-23 14:23:51 +00:00
David Baker	d98660a60d	Implement password changing (finally) along with a start on making client/server auth more general.	2015-03-23 14:20:28 +00:00
Erik Johnston	278149f533	Sanitize TransactionStore	2015-03-23 13:43:21 +00:00
Erik Johnston	ed4d44d833	Merge pull request #109 from matrix-org/default_registration ... Disable registration by default. Add script to register new users.	2015-03-18 11:38:52 +00:00
Erik Johnston	f88db7ac0b	Factor out user id validation checks	2015-03-18 11:34:18 +00:00
Erik Johnston	bb24609158	Clean out event_forward_extremities table when the server rejoins the room	2015-03-18 11:19:47 +00:00
Erik Johnston	cd2539ab2a	Merge pull request #110 from matrix-org/fix_ban ... Fix ban	2015-03-16 15:36:52 +00:00
Kegan Dougal	f0d6f724a2	Set the service ID as soon as it is known.	2015-03-16 15:24:32 +00:00
Erik Johnston	857810d2dd	Revert incorrect changes to where we send events	2015-03-16 15:12:47 +00:00
Erik Johnston	c2c9471cba	Don't block waiting on waking up all the listeners when sending an event.	2015-03-16 13:16:37 +00:00
Erik Johnston	b2e6ee5b43	Remove concept of context.auth_events, instead use context.current_state	2015-03-16 13:06:23 +00:00
Kegan Dougal	835e01fc70	Minor PR comment tweaks.	2015-03-16 10:16:59 +00:00
Kegan Dougal	f9232c7917	Merge branch 'develop' into application-services-txn-reliability ... Conflicts: synapse/storage/appservice.py	2015-03-16 10:09:15 +00:00
Erik Johnston	758d114cbc	Send all membership events to the remote homeserver	2015-03-16 00:27:59 +00:00
Paul "LeoNerd" Evans	128cf2daf7	Appease pep8	2015-03-12 16:24:51 +00:00
Paul "LeoNerd" Evans	b0cf867319	Use _ instead of . as a metric namespacing separator, for Prometheus	2015-03-12 16:24:51 +00:00
Paul "LeoNerd" Evans	59c448f074	Add a scalar gauge metric on the size of the presence user cachemap	2015-03-12 16:24:50 +00:00
Kegan Dougal	21fd84dcb8	Use seconds; start gluing in the AS scheduler into the AS handler.	2015-03-09 17:01:19 +00:00
Erik Johnston	8e28db5cc9	Change room handlers get_rooms_for_user to get_joined_rooms_for_user. This uses the a storage api that is cached.	2015-03-09 16:43:09 +00:00
Erik Johnston	9ccccd4874	When setting display name more graciously handle failures to update room state.	2015-03-06 16:24:05 +00:00
Erik Johnston	130df8fb01	Add some randomness to the user specified timeout on event streams to mitigate against thundering herds problems	2015-03-06 10:25:36 +00:00
Kegsay	8ad024ea80	Merge pull request #93 from matrix-org/application-services-exclusive ... Application services exclusive flag support	2015-03-02 14:56:32 +00:00
Erik Johnston	0a036944bd	Merge branch 'develop' of github.com:matrix-org/synapse into batched_get_pdu	2015-03-02 13:53:30 +00:00
Kegan Dougal	58ff066064	Implement exclusive namespace checks.	2015-02-27 13:51:41 +00:00
Kegan Dougal	dcec7175dc	Finish impl to get new events for AS. ASes should now be able to poll /events	2015-02-26 16:23:01 +00:00
Kegan Dougal	2d20466f9a	Add stub functions and work out execution flow to implement AS event stream polling.	2015-02-25 15:00:59 +00:00
David Baker	443ba4eecc	%s for strings otherwise you end up sending 'u"foo"'	2015-02-24 15:00:12 +00:00
Erik Johnston	e25e0f4da9	Merge branch 'develop' of github.com:matrix-org/synapse into batched_get_pdu	2015-02-23 14:36:00 +00:00
Erik Johnston	db215b7e00	Implement and use new batched get missing pdu	2015-02-23 13:58:02 +00:00
Erik Johnston	2bafeca270	Add missing comma so that it generates a dict and not a set	2015-02-20 14:08:42 +00:00
Erik Johnston	0ac2a79faa	Initial stab at implementing a batched get_missing_pdus request	2015-02-19 17:24:14 +00:00
Erik Johnston	fa6c93bd26	Merge branch 'consumeErrors' of github.com:matrix-org/synapse into develop	2015-02-17 15:18:17 +00:00
Erik Johnston	47281f8fa4	Change some debug logging to info	2015-02-17 13:14:11 +00:00
Erik Johnston	c2b1dbd84c	We do want to consumeError	2015-02-17 11:11:11 +00:00
Erik Johnston	72a4de2ce6	Use consumeErrors=True on all DeferredLists. ... This is so that the DeferredLists actually consume the error instead of propogating down the non-existent errback chain. This should reduce the number of unhandled errors we are seeing.	2015-02-17 10:07:01 +00:00
Erik Johnston	8a59915d7d	Merge branch 'hotfixes-v0.7.0f' of github.com:matrix-org/synapse into develop	2015-02-16 09:47:22 +00:00
Erik Johnston	b99a33f283	resolve_events expect lists, not dicts	2015-02-15 20:20:51 +00:00
Erik Johnston	650dc7f0f9	Merge branch 'master' of github.com:matrix-org/synapse into develop	2015-02-13 15:46:42 +00:00
Erik Johnston	b11a6e1c3c	Fix wrong variable name	2015-02-13 15:37:18 +00:00
Mark Haines	0d872f5aa6	Merge pull request #50 from matrix-org/application-services ... Application Services	2015-02-13 15:06:14 +00:00
Erik Johnston	e441c10a73	pyflakes	2015-02-13 14:23:39 +00:00
Erik Johnston	8c652a2b5f	When we see a difference in current state, actually use state conflict resolution algorithm	2015-02-13 14:20:05 +00:00
Paul "LeoNerd" Evans	93d07c87dc	Reindent code to be less human-readable to keep pep8 from complaining	2015-02-12 19:19:37 +00:00
Paul "LeoNerd" Evans	5f6e6530d0	Appease pyflakes	2015-02-12 19:15:23 +00:00
Paul "LeoNerd" Evans	29805213d1	Can now remove the FIXME too	2015-02-12 19:13:21 +00:00
Paul "LeoNerd" Evans	860b1b4841	Only attempt to fetch presence state of JOINed members in room initialSync (SYN-202)	2015-02-12 19:13:21 +00:00
Erik Johnston	76935078d1	Remove more debug logging	2015-02-11 16:51:22 +00:00
Erik Johnston	ed877d6585	Remove debug logging	2015-02-11 16:50:46 +00:00
Erik Johnston	ddb816cf60	Don't unfreeze when using FreezeEvent.get_dict, as we are using a JSONEncoder that understands FrozenDict	2015-02-11 15:44:28 +00:00
Kegan Dougal	fd40d992ad	PEP8-ify	2015-02-11 10:41:33 +00:00
Kegan Dougal	c7783d6fee	Notify ASes for events sent by other users in a room which an AS user is a part of.	2015-02-11 10:36:08 +00:00
Kegan Dougal	9978c5c103	Merge branch 'develop' into application-services	2015-02-11 10:03:24 +00:00
Mark Haines	84a769cdb7	Fix code-style	2015-02-10 17:58:36 +00:00
Mark Haines	b085fac735	Code-style fixes	2015-02-10 16:30:48 +00:00
Erik Johnston	b90d377af4	Merge branch 'release-v0.6.2' of github.com:matrix-org/synapse into develop	2015-02-10 10:33:35 +00:00
Erik Johnston	d94f682a4c	During room intial sync, only calculate current state once.	2015-02-09 17:41:29 +00:00
Kegan Dougal	53557fc532	Merge branch 'develop' into application-services	2015-02-09 15:20:56 +00:00
Kegan Dougal	f7cac2f7b6	Fix bugs so lazy room joining works as intended.	2015-02-09 15:01:28 +00:00
Kegan Dougal	ac3183caaa	Register a user account for the AS when the AS registers. Add 'sender' column to AS table.	2015-02-09 12:03:37 +00:00
Matthew Hodgson	37b6b880ef	don't give up if we can't create default avatars during tests	2015-02-07 21:24:08 +00:00
Matthew Hodgson	582019f870	...and here's the actual impl. git fail.	2015-02-07 13:32:14 +00:00
Kegan Dougal	73a680b2a8	Add errcodes for appservice registrations.	2015-02-06 17:10:04 +00:00
Mark Haines	20db147ef3	SYN-258: get_recent_events_for_room only accepts stream tokens, convert the topological token to a stream token before passing it to get_recent_events_for_room	2015-02-06 16:01:04 +00:00
Mark Haines	55a186485c	SYN-258: get_recent_events_for_room only accepts stream tokens, convert the topological token to a stream token before passing it to get_recent_events_for_room	2015-02-06 15:58:40 +00:00
Erik Johnston	cc0532a4bf	Explicitly list the RejectedReasons that we can prove	2015-02-06 15:16:26 +00:00
Erik Johnston	e890ce223c	Don't query auth if the only difference is events that were rejected due to auth.	2015-02-06 14:16:50 +00:00
Erik Johnston	c78b5fb1f1	Make seen_ids a set	2015-02-06 13:52:16 +00:00
Kegan Dougal	0995810273	Pyflakes: unused variable.	2015-02-06 11:45:19 +00:00
Kegan Dougal	c3ae8def75	Grant ASes the ability to delete aliases in their own namespace.	2015-02-06 11:32:07 +00:00
Kegan Dougal	e426df8e10	Grant ASes the ability to create alias in their own namespace. ... Add a new errcode type M_EXCLUSIVE when users try to create aliases inside AS namespaces, and when ASes try to create aliases outside their own namespace.	2015-02-06 10:57:14 +00:00
Erik Johnston	3737329d9b	Handle the fact the list.remove raises if element doesn't exist	2015-02-06 10:53:18 +00:00
Kegan Dougal	0227618d3c	Add m.login.application_service registration procedure. ... This allows known application services to register any user ID under their own user namespace(s).	2015-02-05 17:29:27 +00:00
Kegan Dougal	11e6b3d18b	Dependency inject ApplicationServiceApi when creating ApplicationServicesHandler.	2015-02-05 17:04:59 +00:00
Kegan Dougal	cab4c73088	Prevent user IDs in AS namespaces being created/deleted by humans.	2015-02-05 16:46:56 +00:00
Kegan Dougal	e9484d6a95	Prevent aliases in AS namespaces being created/deleted by users. Check with ASes when queried for room aliases via federation.	2015-02-05 16:29:56 +00:00
Kegan Dougal	951690e54d	Merge branch 'develop' into application-services	2015-02-05 14:28:03 +00:00
Kegan Dougal	c71456117d	Fix user query checks. HS>AS pushing now works.	2015-02-05 14:17:08 +00:00
Erik Johnston	8f5b858a1b	Merge branch 'develop' of github.com:matrix-org/synapse into federation_client_retries	2015-02-05 13:50:28 +00:00
Erik Johnston	e1515c3e91	Pass through list of room hosts from room alias query to federation so that it can retry against different room hosts	2015-02-05 13:44:42 +00:00
Kegan Dougal	51d63ac329	Glue AS work to general event notifications. Add more exception handling when poking ASes.	2015-02-05 13:19:46 +00:00
Erik Johnston	26a041541b	SYN-202: Log as WARN the 404 'Presence information not visible' errors instead of as ERROR since they were spamming the logs	2015-02-05 13:17:05 +00:00
Kegan Dougal	b932600653	Add unknown room alias check. Call it from directory_handler.get_association	2015-02-05 11:47:11 +00:00
Kegan Dougal	f0c730252f	Add unknown user ID check. Use store.get_aliases_for_room(room_id) when searching for services by alias.	2015-02-05 11:25:32 +00:00
Kegan Dougal	27091f146a	Add hs_token column and generate a different token f.e application service.	2015-02-05 10:08:12 +00:00
Kegan Dougal	a1a4960baf	Impl push_bulk function	2015-02-05 09:43:22 +00:00
Kegan Dougal	96d4bf9012	Modify API for SimpleHttpClient.get_json and update usages. ... Previously, this would only return the HTTP body as JSON, and discard other response information (e.g. the HTTP response code). This has now been changed to throw a CodeMessageException on a non-2xx response, with the response code and body, which can then be parsed as JSON. Affected modules include: - Registration/Login (when using an email for IS auth)	2015-02-04 17:07:31 +00:00
Kegan Dougal	aa8cce58bf	Add query_user/alias APIs.	2015-02-04 16:44:53 +00:00
Erik Johnston	d45e2302ed	Merge branch 'signature_failures' of github.com:matrix-org/synapse into federation_client_retries	2015-02-04 16:30:15 +00:00
Erik Johnston	ae46f10fc5	Apply sanity to the transport client interface. Convert 'make_join' and 'send_join' to accept iterables of destinations	2015-02-04 16:28:12 +00:00
Erik Johnston	95e2d2d36d	When returning lists of servers from alias lookups, put the current server first in the list	2015-02-04 15:02:23 +00:00
Erik Johnston	650e32d455	Change context.auth_events to what the auth_events would be bases on context.current_state, rather than based on the auth_events from the event.	2015-02-04 14:06:46 +00:00
Kegan Dougal	525a218b2b	Begin to add unit tests for appservice glue and regex testing.	2015-02-04 12:24:20 +00:00
Kegan Dougal	17753f0c20	Add stub ApplicationServiceApi and glue it with the handler.	2015-02-04 11:19:18 +00:00
Erik Johnston	c0462dbf15	Rearrange persist_event so that do all the queries that need to be done before returning early if we have already persisted that event.	2015-02-04 10:16:51 +00:00
Erik Johnston	7dd1c5c542	Neaten the handling of state and auth_chain up a bit	2015-02-03 16:12:04 +00:00
Kegan Dougal	94a5db9f4d	Add appservice package and move ApplicationService into it.	2015-02-03 14:44:16 +00:00
Erik Johnston	6efd4d1649	Don't completely die if get auth_chain or querying auth_chain requests fail	2015-02-03 13:57:54 +00:00
Erik Johnston	77a076bd25	Set combinations is | and not +	2015-02-03 13:35:17 +00:00
Kegan Dougal	f2c039bfb9	Implement restricted namespace checks. Begin fleshing out the main hook for notifying application services.	2015-02-03 13:29:27 +00:00
Erik Johnston	fed29251d7	Spelling	2015-02-03 13:23:58 +00:00
Kegan Dougal	a060b47b13	Add namespace constants. Add restrict_to option to limit namespace checks.	2015-02-03 13:17:28 +00:00
Kegan Dougal	197f3ea4ba	Implement regex checks for app services. ... Expose handler.get_services_for_event which manages the checks for all services.	2015-02-03 11:26:33 +00:00
Erik Johnston	06c34bfbae	Give exception better message	2015-02-03 11:23:44 +00:00
Erik Johnston	4ff2273b30	Add FIXME note.	2015-02-03 11:23:26 +00:00
Erik Johnston	51969f9e5f	Return rejected events if asked for it over federation.	2015-02-03 10:40:14 +00:00
Erik Johnston	e7ca813dd4	Try to ensure we don't persist an event we have already persisted. In persist_event check if we already have the event, if so then update instead of replacing so that we don't cause a bump of the stream_ordering.	2015-02-03 10:39:41 +00:00
Kegan Dougal	1a2de0c5fe	Implement txns for AS (un)registration.	2015-02-02 17:39:41 +00:00
Kegan Dougal	c059c9fea5	Merge branch 'develop' into application-services ... Conflicts: synapse/handlers/__init__.py synapse/storage/__init__.py	2015-02-02 15:57:59 +00:00
Erik Johnston	4c0da49d7c	Resign events when we return them via /query_auth/	2015-01-30 22:53:13 +00:00
Mark Haines	0b1cc7cc0b	Return empty list rather than None when there are no emphemeral events for a room	2015-01-30 16:56:13 +00:00
Erik Johnston	2cd29dbdd9	Fix bug where accepting invite over federation didn't work. Add logging.	2015-01-30 16:51:58 +00:00
Erik Johnston	7d897f5bfc	Merge pull request #43 from matrix-org/rejections ... Rejections	2015-01-30 16:11:14 +00:00
Erik Johnston	b724a809c4	Only auth_events with event if event in event.auth_events	2015-01-30 15:57:53 +00:00
Mark Haines	017dfaef4c	Add doc string for __nonzero__ overrides for sync results, raise not implemented if the client attempts to do a gapless sync	2015-01-30 15:52:05 +00:00
Mark Haines	8fe39a0311	Check if the user has joined the room between incremental syncs	2015-01-30 13:38:34 +00:00
Erik Johnston	a70a801184	Fix bug where we superfluously asked for current state. Change API of /query_auth/ so that we don't duplicate events in the response.	2015-01-30 13:34:01 +00:00
Mark Haines	4a67834bc8	Pass client info to the sync_config	2015-01-30 11:50:15 +00:00
Mark Haines	8498d348d8	Fix token formatting	2015-01-30 11:42:09 +00:00
Mark Haines	e97de6d96a	Filter the recent events before applying the limit when doing an initial sync	2015-01-30 11:35:20 +00:00
Mark Haines	22dd1cde2d	Filter the recent events before applying the limit when doing an incremental sync with a gap	2015-01-30 11:32:35 +00:00
Erik Johnston	2ebf795c0a	Merge branch 'develop' of github.com:matrix-org/synapse into rejections ... Conflicts: synapse/storage/__init__.py synapse/storage/schema/delta/v12.sql	2015-01-30 11:10:37 +00:00
Erik Johnston	0c2d245fdf	Update the current state of an event if we update auth events.	2015-01-30 11:08:52 +00:00
Erik Johnston	c1d860870b	Fix regression where we no longer correctly handled the case of gaps in our event graph	2015-01-30 10:48:47 +00:00
Mark Haines	ece828a7b7	Update todo for the filtering on sync	2015-01-29 18:15:24 +00:00
Erik Johnston	78015948a7	Initial implementation of auth conflict resolution	2015-01-29 16:52:33 +00:00
Mark Haines	4ad45f2582	Fix indent	2015-01-29 16:41:49 +00:00
Mark Haines	722b65f461	Move typing notifs to an "emphermal" event list on the room object	2015-01-29 16:41:21 +00:00
Mark Haines	cc42d3f907	Fix check for empty room update	2015-01-29 16:27:38 +00:00
Mark Haines	4d9dd9bdc0	Fix v2 initial sync	2015-01-29 16:23:03 +00:00
Mark Haines	e016f4043b	Use get_room_events_stream to get changes to the rooms if the number of changes is small	2015-01-29 14:40:28 +00:00
Mark Haines	e3e72b8c5c	Remove typing TODO	2015-01-29 03:35:25 +00:00
Mark Haines	3dbce6f4a5	Add typing notifications to sync	2015-01-29 03:33:51 +00:00
Mark Haines	9c61556504	Merge branch 'develop' into client_v2_sync	2015-01-28 17:29:30 +00:00
Mark Haines	26c8fff19e	Merge pull request #36 from matrix-org/device_id_from_access_token ... Extract the device id and token id from the access token when autheniticating users	2015-01-28 17:19:28 +00:00
Mark Haines	388581e087	Extract the id token of the token when authing users, include the token and device_id in the internal meta data for the event along with the transaction id when sending events	2015-01-28 16:58:23 +00:00
Erik Johnston	0ef5bfd6a9	Start implementing auth conflict res	2015-01-28 16:16:53 +00:00
David Baker	6840e7cece	Merge branch 'master' into develop	2015-01-28 16:03:35 +00:00
David Baker	c291a4d522	Merge branch 'develop' into pushers ... Conflicts: synapse/handlers/events.py synapse/server.py	2015-01-28 12:51:05 +00:00
Kegan Dougal	42876969b9	Add basic application_services SQL, and hook up parts of the appservice store to read from it.	2015-01-28 11:59:38 +00:00
David Baker	273b12729b	Reset badge count to zero when last active time is bumped	2015-01-28 11:55:49 +00:00
David Baker	e32ded7b3e	Add matrix.org as a trusted ID server because it's now passed through on ports 80/443 and the web client defaults to that now. Fixes email validation (including signing up with an email address).	2015-01-28 10:09:54 +00:00
Mark Haines	e020574d65	Fix Formatting	2015-01-27 20:19:36 +00:00
Mark Haines	b19cf6a105	Wait for events if the incremental sync is empty and a timeout is given	2015-01-27 20:09:52 +00:00
Kegan Dougal	fbeaeb8689	Log when ASes are registered/unregistered.	2015-01-27 17:34:40 +00:00
Kegan Dougal	ec3719b583	Use ApplicationService when registering.	2015-01-27 17:15:06 +00:00
Kegan Dougal	92171f9dd1	Add stub methods, TODOs and docstrings for application services.	2015-01-27 16:53:59 +00:00
Mark Haines	a56008842b	Start implementing incremental initial sync	2015-01-27 16:24:22 +00:00
David Baker	f7c4daa8f9	Oops, remove debugging	2015-01-27 16:08:47 +00:00
David Baker	5eacaeb4a7	or of course we could just return the deferred	2015-01-27 16:05:23 +00:00
David Baker	eba89f093f	Need a defer.inlineCallbacks here as we yield in it: otherwise nothing in the cb gets executed.	2015-01-27 16:00:07 +00:00
David Baker	1d77969124	Unbreak bad presence merge - don't add these blocks together with an and: they're different things.	2015-01-27 15:58:27 +00:00
Kegan Dougal	51449e0665	Add appservice handler and store. Glue together rest > handler > store.	2015-01-27 15:50:28 +00:00
Mark Haines	436513068d	Start implementing the non-incremental sync portion of the v2 /sync API	2015-01-26 18:53:31 +00:00
Mark Haines	3186c5bdbc	Merge branch 'develop' into client_v2_sync	2015-01-26 16:32:40 +00:00
Mark Haines	7f6f3f9d62	Pass the current time to serialize event, rather than passing an ... HS and getting a clock from it and calling time_msec on the clock. Remove the serialize_event method from the HS since it is no longer needed.	2015-01-26 16:11:28 +00:00
Mark Haines	0cfb4591a7	Add handler for /sync API	2015-01-26 15:46:31 +00:00
Mark Haines	ada711504e	Replace hs.parse_roomalias with RoomAlias.from_string	2015-01-23 13:21:58 +00:00
Mark Haines	1c06c48ce2	Replace hs.parse_roomid with RoomID.from_string	2015-01-23 11:55:12 +00:00
Mark Haines	5759bec43c	Replace hs.parse_userid with UserID.from_string	2015-01-23 11:47:15 +00:00
David Baker	5c6189ea3e	Merge branch 'develop' into pushers ... Conflicts: synapse/rest/__init__.py	2015-01-22 17:46:16 +00:00
Mark Haines	5fed042640	Finish renaming "context" to "room_id" in federation codebase	2015-01-16 19:01:03 +00:00
Mark Haines	2bdee98269	Remove temporary debug logging that was accidentally committed	2015-01-16 19:00:40 +00:00
David Baker	e3e2fc3255	Don't make the pushers' event streams cause people to appear online	2015-01-15 16:17:21 +00:00
Paul "LeoNerd" Evans	c2e7c84e58	Don't try to cancel already-expired timers - SYN-230	2015-01-13 16:58:36 +00:00
Paul "LeoNerd" Evans	02ffbb20d0	Use float rather than integer divisions to turn msec into sec - so timeouts under 1000msec will actually work	2015-01-12 19:09:14 +00:00
Paul "LeoNerd" Evans	67d8305aea	Make typing notification timeouts print a (debug) logging message	2015-01-12 18:22:00 +00:00
Kegan Dougal	b5924cae04	Add raw query param for scrollback.	2015-01-08 14:37:55 +00:00
Kegan Dougal	edb557b2ad	Return the raw federation event rather than adding extra keys for federation data.	2015-01-08 14:28:08 +00:00
Erik Johnston	5940ec993b	Add missing continuation indent.	2015-01-08 13:59:29 +00:00
Kegan Dougal	5720ab59e0	Add 'raw' query parameter to expose the event graph and signatures to savvy clients.	2015-01-08 13:57:40 +00:00
Kegan Dougal	333836ff92	PEP8 and pyflakes warnings	2015-01-07 16:18:12 +00:00
Kegan Dougal	4c68460392	SYN-154: Tweak how the m.room.create check is done. ... Don't perform the check in auth.is_host_in_room but instead do it in _do_join and also assert that there are no m.room.members in the room before doing so.	2015-01-07 16:09:00 +00:00
Kegan Dougal	9cb4f75d53	SYN-154: Better error messages when joining an unknown room by ID. ... The simple fix doesn't work here because room creation also involves unknown room IDs. The check relies on the presence of m.room.create for rooms being created, whereas bogus room IDs have no state events at all.	2015-01-07 15:21:48 +00:00
Erik Johnston	9e5545a6fa	RoomsForUser now has sender instead of user_id	2015-01-06 15:53:50 +00:00
Erik Johnston	8a12df8cf3	Merge branch 'erikj-perf' of github.com:matrix-org/synapse into develop	2015-01-06 14:45:57 +00:00
Erik Johnston	76ec154e95	We don't need the full events for get_rooms_for_user_where_membership_is	2015-01-06 14:37:00 +00:00
Mark Haines	5e23a19204	Merge pull request #28 from matrix-org/erikj-perf ... Database performance improvements.	2015-01-06 13:33:40 +00:00
Mark Haines	adb04b1e57	Update copyright notices	2015-01-06 13:21:39 +00:00
Erik Johnston	f0128f9600	Add RoomMemberStore.get_users_in_room, so that we can get the list of joined users without having to retrieve the full events	2015-01-06 10:55:43 +00:00
Kegan Dougal	67a406a754	Rate limit display names and avatar urls per request rather than per event.	2014-12-19 17:36:33 +00:00
Mark Haines	efd27ff01b	Set a state_key for the topic and room name, otherwise they won't be treated as room state	2014-12-19 15:31:27 +00:00
Mark Haines	f70e622d59	bump_presence_active_time when sending a message event	2014-12-19 14:30:57 +00:00
Mark Haines	a999f0dec3	Don't ratelimit room create events	2014-12-19 14:18:27 +00:00
Mark Haines	1e7f83b91d	Set display name when joining via alias	2014-12-19 12:31:46 +00:00
Mark Haines	5739e6c606	s/user_id/sender/	2014-12-19 11:43:46 +00:00
Mark Haines	041ac476a5	Supply auth_chain along with current state in '/state/', fetch auth events from a remote server if we are missing some of them	2014-12-18 18:47:13 +00:00
Mark Haines	dea5d4b03b	Don't yield on sending the event accross federation.	2014-12-18 11:29:46 +00:00
Erik Johnston	21cab3a7ec	Fix where we pulled in event.state_events from hotfixes branch	2014-12-16 19:16:15 +00:00
Erik Johnston	2215faa361	Merge branch 'hotfixes-v0.5.4a' of github.com:matrix-org/synapse into release-v0.6.0	2014-12-16 19:11:13 +00:00
Erik Johnston	3defd5b3ee	Add FIXME	2014-12-16 19:07:20 +00:00
Erik Johnston	96779d2490	Fix bug where we did not send the full auth chain to people that joined over federation	2014-12-16 18:57:36 +00:00
Erik Johnston	2d7716d4d0	Make error messages slightly more helpful	2014-12-16 18:41:48 +00:00
Mark Haines	56db465047	Merge branch 'release-v0.6.0' into develop	2014-12-16 17:29:49 +00:00
Erik Johnston	f06161a307	Enable rate limiting for all events	2014-12-16 16:10:17 +00:00
Mark Haines	627e4f01d2	Remove send_message since nothing was calling it. Remove Snapshot because only send_message was using it	2014-12-16 16:07:41 +00:00
Mark Haines	c3eae8a88c	Construct the EventContext in the state handler rather than constructing one and then immediately calling state_handler.annotate_context_with_state	2014-12-16 15:59:17 +00:00
Mark Haines	3c7857e49b	clean up coding style a bit	2014-12-16 15:24:03 +00:00
Erik Johnston	3c77d13aa5	Kill off synapse.api.events.*	2014-12-16 11:29:05 +00:00
Erik Johnston	6a1da99fab	Add fixme to raising of AuthError in federation land	2014-12-16 09:35:31 +00:00
Erik Johnston	009e4b5637	User.is_mine is no longer a thing. Use hs.is_mine instead.	2014-12-15 17:17:51 +00:00
Erik Johnston	cf6e5f1dbf	Rename MessageHandler.handle_event. Add a few comments.	2014-12-15 17:01:12 +00:00
Erik Johnston	65cdf4e724	Get current member state from current_state snapshot. Fix leave test.	2014-12-15 15:03:27 +00:00
Erik Johnston	57e0e619f3	Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor ... Conflicts: tests/handlers/test_room.py	2014-12-15 14:45:59 +00:00
Paul "LeoNerd" Evans	20beed9dd4	Still send typing notifications to myself if I'm the only one in the room (it's a lonely life...)	2014-12-15 14:37:12 +00:00
Paul "LeoNerd" Evans	b0bb1756a9	Send list of typing user IDs as 'user_ids' list within 'content', so that m.typing stream events have a toplevel content, for consistency with others	2014-12-12 11:59:46 +00:00
Erik Johnston	63810c777d	Validate message, topic and name event contents	2014-12-12 11:01:09 +00:00
Paul "LeoNerd" Evans	cfb963af03	When users leave rooms mark them as no longer typing in them	2014-12-11 18:33:09 +00:00
Paul "LeoNerd" Evans	f25764943c	Add a 'user_left_room' distributor signal analogous to 'user_joined_room'	2014-12-11 18:27:01 +00:00
Paul "LeoNerd" Evans	5ebc994f84	Actually auth-check to ensure people can only send typing notifications for rooms they're actually in	2014-12-11 18:11:43 +00:00
Paul "LeoNerd" Evans	966c4b2b04	Add a sprinkling of logger.debug() into typing notification handler	2014-12-11 18:00:15 +00:00
Erik Johnston	d3eb12c7b8	Fix federation test	2014-12-11 17:01:27 +00:00
Paul "LeoNerd" Evans	3b2cc26053	Initial hack at unit tests of room typing REST API	2014-12-11 16:03:12 +00:00
Erik Johnston	0b04369238	Fix public room joining by making sure replaces_state never points to itself.	2014-12-11 15:56:06 +00:00
Paul "LeoNerd" Evans	5f49914dee	Avoid cyclic dependency in handler setup	2014-12-10 21:17:48 +00:00
Paul "LeoNerd" Evans	1a75ff5c23	Hook up the event stream to typing notifications	2014-12-10 21:01:49 +00:00
Paul "LeoNerd" Evans	4006d58335	Store serial numbers per room for typing event stream purposes	2014-12-10 20:48:25 +00:00
Paul "LeoNerd" Evans	9eb819e828	First hack at implementing timeouts in typing notification handler	2014-12-10 19:39:01 +00:00
Erik Johnston	4c682143c8	.from_string() no longer takes a HS	2014-12-10 18:00:49 +00:00
Erik Johnston	02e4c18171	Remove dead code	2014-12-10 18:00:36 +00:00
Erik Johnston	b245ee34ed	Add some basic event validation	2014-12-10 17:59:47 +00:00
Erik Johnston	1d2a0040cf	Fix bug where we clobbered old state group values	2014-12-10 15:55:03 +00:00
Erik Johnston	02db7eb209	Fix bug when uploading state with empty state_key	2014-12-10 14:02:48 +00:00
Erik Johnston	aae8a37e63	Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor	2014-12-10 13:18:40 +00:00
Erik Johnston	02db1fd2e7	Fix AttributeError	2014-12-10 12:00:05 +00:00
Erik Johnston	018443cb59	Make depth increase.	2014-12-10 11:59:53 +00:00
Erik Johnston	95aa903ffa	Try and figure out how and why signatures are being changed.	2014-12-10 11:37:47 +00:00
Erik Johnston	008303b245	PEP8	2014-12-09 14:49:11 +00:00
Erik Johnston	5eca288d28	Fix joining from an invite	2014-12-09 14:47:27 +00:00
Erik Johnston	1c8ee06877	Remove unused snapshot	2014-12-09 10:53:34 +00:00
Erik Johnston	4e57943cc5	Remove unused import	2014-12-09 10:51:36 +00:00
Matthew Hodgson	8529fba02d	fix a million stupid bugs and make it actually work	2014-12-08 19:34:51 +00:00
Erik Johnston	609c31e8df	More bug fixes	2014-12-08 17:50:56 +00:00
Erik Johnston	ee3df06183	More bug fixes	2014-12-08 14:50:48 +00:00
Erik Johnston	e8323b9e34	More bug fixes	2014-12-08 10:16:18 +00:00
Erik Johnston	a295a3c691	Fix registration	2014-12-08 09:24:37 +00:00
Erik Johnston	d044121168	Various typos and bug fixes.	2014-12-08 09:08:26 +00:00
Matthew Hodgson	9c43b258ec	actually reset retry schedule if we can successfuly talk to it	2014-12-08 00:17:12 +00:00
Erik Johnston	6630e1b579	Start making more things use EventContext rather than event.*	2014-12-05 16:20:48 +00:00
Erik Johnston	c5c32266d8	Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor	2014-12-04 15:58:24 +00:00
Erik Johnston	c31dba86ec	Convert rest and handlers to use new event structure	2014-12-04 15:50:01 +00:00
Erik Johnston	5d7c9ab789	Begin converting things to use the new Event structure	2014-12-04 11:27:59 +00:00
Paul "LeoNerd" Evans	f5d2514fc0	@log_function on PresenceStream's get_new_events_for_user()	2014-12-03 19:48:14 +00:00
Paul "LeoNerd" Evans	52f1d3c886	Store any incoming presence push in the local cache anyway, even if there's no interested observers (yet *hint*) (SYN-115)	2014-12-03 19:06:24 +00:00
Erik Johnston	75b4329aaa	WIP for new way of managing events.	2014-12-03 16:07:21 +00:00
Erik Johnston	6941a19715	Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor	2014-12-03 11:56:49 +00:00
Paul "LeoNerd" Evans	274d137b00	Extra verbosity on logging of received presence info	2014-12-02 20:51:28 +00:00
Paul "LeoNerd" Evans	307f94dcbe	Squash room_ids list to a set() to remove duplicates - with TODO marker as I have no idea /why/ the dups are happening in the first place	2014-12-02 20:51:12 +00:00
Erik Johnston	9d53228158	Change DomainSpecificString so that it doesn't use a HomeServer object	2014-12-02 10:42:28 +00:00
Erik Johnston	027542e2e5	Fix bugs when joining a remote room that has dodgy event graphs. This should also fix the number of times a HS will trigger a GET /event/	2014-11-27 16:02:26 +00:00
Erik Johnston	0294fba042	on_receive_pdu takes more args	2014-11-27 14:46:33 +00:00
Erik Johnston	07699b5871	Change the way we get missing auth and state events	2014-11-27 14:31:43 +00:00
Erik Johnston	b8849c8cbf	Re-sign events when we return them via federation as a temporary hack to work around the problem where we reconstruct events differently than when they were signed	2014-11-27 13:53:31 +00:00
Erik Johnston	00ab5cd6f2	Attempt to fix bug where we 500d an event stream due to trying to cancel a timer twice	2014-11-26 18:04:33 +00:00
Erik Johnston	858e87ab0d	Add a workaround for bug where some initial join events don't reference creation events in their auth_events	2014-11-26 16:29:03 +00:00
Erik Johnston	6c485c282d	Catch exceptions when trying to add an entry to rooms tables	2014-11-26 16:06:20 +00:00
Erik Johnston	3598c11c8d	Correctly handle the case where we get an event for an unknown room, which turns out we are actually in	2014-11-26 10:41:08 +00:00
Erik Johnston	64fc859dac	Fix bugs in invite/join dances. ... We now do more implement more of the auth on the events so that we don't reject valid events.	2014-11-25 17:59:49 +00:00
Erik Johnston	4bd0ab76c6	We don't always want to Auth get_persisted_pdu	2014-11-24 12:56:17 +00:00
Mark Haines	fd40a80a68	Return 404 M_NOT_FOUND when trying to look up a room alias that doesn't exist	2014-11-21 15:11:48 +00:00
Paul "LeoNerd" Evans	5f19c55731	SYN-58: Allow passing explicit limit=0 to initialSync to request no messages at all; missing still implies default 10	2014-11-20 19:33:45 +00:00
Mark Haines	610c2ea131	Fix pep8 and pyflakes warnings	2014-11-20 18:00:10 +00:00
David Baker	f1c7f8e813	Merge branch 'develop' into http_client_refactor	2014-11-20 17:49:48 +00:00
David Baker	e377d33652	Separate out the matrix http client completely because just about all of its code it now separate from the simple case we need for standard HTTP(S)	2014-11-20 17:41:56 +00:00
Mark Haines	db9ce032a4	Fix pep8 codestyle warnings	2014-11-20 17:26:36 +00:00
Mark Haines	32090aee16	Add a few missing yields, Move deferred lists inside PreserveLoggingContext because they don't interact well with the logging contexts	2014-11-20 16:24:00 +00:00
David Baker	20326054da	Oops, I removed this param.	2014-11-20 15:24:38 +00:00
David Baker	dc60eee50e	Refactor the HTTP clients a little.	2014-11-20 13:53:34 +00:00
Mark Haines	dcb99e4972	SYN-153: Fix formatting of federation error message	2014-11-20 09:58:23 +00:00
Erik Johnston	415ddf59bb	Don't add a 'prev' key to m.room.member messages	2014-11-19 17:59:51 +00:00
Paul "LeoNerd" Evans	03dc63f6c8	Initialise UserPresenceCache instances to always contain a 'presence' key	2014-11-19 17:31:46 +00:00
Mark Haines	8993affdc0	SYN-153: Raise 404 if room alias is not found	2014-11-19 17:14:14 +00:00
Mark Haines	97c7c34f6f	Preserve logging context in a few more places, drop the logging context after it has been stashed to reduce potential for confusion	2014-11-19 16:37:43 +00:00
Mark Haines	54c438d8d3	Remove unused variable	2014-11-18 16:46:12 +00:00
Paul "LeoNerd" Evans	75e95c45a2	Rename message handler's new snapshot_room to room_initial_sync() as that better suits its purpose	2014-11-18 16:02:44 +00:00
Paul "LeoNerd" Evans	e9f587ecba	Merge remote-tracking branch 'origin/develop' into room-initial-sync	2014-11-18 15:48:30 +00:00
Mark Haines	b01dd76be1	SYN-149: Enable auth for events added during room creation since they should pass auth checks	2014-11-18 15:42:53 +00:00
Mark Haines	ae9c2ab165	SYN-149: Send join event immediately after the room create event	2014-11-18 15:29:48 +00:00
Paul "LeoNerd" Evans	33d328d967	Include room members' presence in room initialSync	2014-11-18 15:28:58 +00:00
Paul "LeoNerd" Evans	759db7d7d5	Added ability to .get_state() from the PresenceHandler by returning a complete m.presence event	2014-11-18 15:25:55 +00:00
Paul "LeoNerd" Evans	4c18e08036	Don't expect all _user_cachemap entries to definitely contain a "last_active" key	2014-11-18 15:10:11 +00:00
Mark Haines	a5b88c489e	Split out sending the room alias events from creating the alias so that we can do them in the right point when creating a room	2014-11-18 15:03:13 +00:00
Paul "LeoNerd" Evans	17f977a9de	Include 'messages' snapshot in room initialSync	2014-11-18 14:07:51 +00:00
Paul "LeoNerd" Evans	31a049eb69	Merge branch 'develop' into room-initial-sync ... Conflicts: synapse/handlers/message.py	2014-11-17 16:59:24 +00:00
Mark Haines	cf45e57d9c	SYN-148: Add the alias after creating the room	2014-11-17 16:37:33 +00:00
Mark Haines	2eaf689f71	These lines aren't doing anything	2014-11-17 10:41:35 +00:00
Mark Haines	cb4b6c844a	Merge PDUs and Events into one object	2014-11-14 21:25:02 +00:00
Mark Haines	8c2b5ea7c4	Fix PDU and event signatures	2014-11-14 19:11:04 +00:00
Mark Haines	de1ec90133	Validate signatures on incoming events	2014-11-14 19:11:04 +00:00
Erik Johnston	b2596c660b	Add a few more comments to the federation handler	2014-11-12 16:20:30 +00:00
Erik Johnston	6fea478d2e	Fix bugs with invites/joins across federatiom. ... Both in terms of auth and not trying to fetch missing PDUs for invites, joins etc.	2014-11-12 11:24:11 +00:00
Erik Johnston	61ecb13bf0	PEP8ify	2014-11-11 18:00:13 +00:00
Erik Johnston	37900a92db	Only allow people in a room to look up room state.	2014-11-11 17:55:32 +00:00
Erik Johnston	3db2c0d43e	Rename annotate_state_groups to annotate_event_with_state	2014-11-11 16:58:53 +00:00
Erik Johnston	5ff0bfb81d	Fix bug where we /always/ created a new state group	2014-11-11 14:16:41 +00:00
Paul "LeoNerd" Evans	c23afed39a	Include room membership in room initialSync	2014-11-10 19:34:47 +00:00
Paul "LeoNerd" Evans	1fd8139138	Put room state in room initialSync output - I guess this is right; I really can't find any other tests similar...	2014-11-10 19:29:58 +00:00
Paul "LeoNerd" Evans	269f80bf8e	Have room initialSync return the room's room_id	2014-11-10 19:02:19 +00:00
Erik Johnston	a8e565eca8	Add an EventValidator. Fix bugs in auth ++ storage	2014-11-10 18:25:42 +00:00
Erik Johnston	5d439b127b	PEP8	2014-11-10 13:46:44 +00:00
Erik Johnston	003668cfaa	Add auth to the various server-server APIs	2014-11-10 13:37:24 +00:00
Erik Johnston	6447db063a	Fix backfill to work. Add auth to backfill request	2014-11-10 11:59:51 +00:00
Erik Johnston	65f846ade0	Notify users about invites.	2014-11-10 11:15:02 +00:00
Erik Johnston	07286a73b1	Use current state to get room hosts, rather than querying the database	2014-11-07 16:03:31 +00:00
Erik Johnston	02c3b1c9e2	Add '/event_auth/' federation api	2014-11-07 15:35:53 +00:00
Erik Johnston	d2fb2b8095	Implement invite part of invite join dance	2014-11-07 13:41:00 +00:00
Erik Johnston	3b4dec442d	Return auth chain when handling send_join	2014-11-07 11:22:12 +00:00
Erik Johnston	49948d72f3	Fix joining over federation	2014-11-07 10:53:38 +00:00
Erik Johnston	bf6b72eb55	Start implementing auth chains	2014-11-07 10:53:38 +00:00
Erik Johnston	351c64e99e	Amalgamate all power levels. ... Remove concept of reqired power levels, something similiar can be done using the new power level event.	2014-11-06 16:59:13 +00:00
Erik Johnston	233969bb58	Update to use replaces_state rather than prev_state	2014-11-06 15:25:03 +00:00
Erik Johnston	4317c8e583	Implement new replace_state and changed prev_state ... `prev_state` is now a list of previous state ids, similiar to prev_events. `replace_state` now points to what we think was replaced.	2014-11-06 15:10:55 +00:00
Erik Johnston	96c001e668	Fix auth checks to all use the given old_event_state	2014-11-05 11:07:54 +00:00
Erik Johnston	dfb3d21a6d	Fix room handler tests	2014-11-04 17:12:39 +00:00
Erik Johnston	da4a09f977	Don't bother locking	2014-11-04 16:51:23 +00:00
Erik Johnston	2a49f177fe	On AuthError, raise a FederationError	2014-11-04 15:10:43 +00:00
Erik Johnston	aa76bf39ab	Remove unused imports	2014-11-04 14:14:02 +00:00
Erik Johnston	ad6eacb3e9	Rename PDU fields to match that of events.	2014-11-03 13:06:58 +00:00
Erik Johnston	7249785bcb	Sign events we create.	2014-11-03 11:33:28 +00:00
Erik Johnston	7a07263281	Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization	2014-11-03 10:17:37 +00:00
Erik Johnston	1c6825cc7a	Use python logger, not the twisted logger	2014-11-03 10:16:28 +00:00
Erik Johnston	21fe249d62	Actually don't store any PDUs	2014-10-31 10:47:34 +00:00
Erik Johnston	f2de2d644a	Move the impl of backfill to use events.	2014-10-31 09:59:02 +00:00
Erik Johnston	12ce441e67	Convert event ids to be of the form :example.com	2014-10-30 17:00:11 +00:00
Erik Johnston	da511334d2	Make federation return the old current state, so that we can use it to do auth	2014-10-30 11:53:35 +00:00
Erik Johnston	ef9c4476a0	Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization	2014-10-30 11:18:28 +00:00
Mark Haines	7d709542ca	Fix pep8 warnings	2014-10-30 11:10:17 +00:00
Erik Johnston	e7858b6d7e	Start filling out and using new events tables	2014-10-29 16:59:24 +00:00
Paul "LeoNerd" Evans	b1ee6fd7ed	Fix an off-by-one bug in presence event stream pagination; this might be responsible for any number of bug reports	2014-10-29 16:16:01 +00:00
Paul "LeoNerd" Evans	d6bcffa929	Construct a source-specific 'SourcePaginationConfig' to pass into get_pagination_rows; meaning each source doesn't have to care about its own name any more	2014-10-29 16:16:01 +00:00
Paul "LeoNerd" Evans	c5a25f610a	Remove redundant (and incorrect) presence pagination fetching code	2014-10-29 16:16:01 +00:00
Mark Haines	4841b6d4ba	Remove duplicate join_event from create_room	2014-10-27 16:55:51 +00:00
Erik Johnston	bb4a20174c	Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization ... Conflicts: synapse/federation/transport.py synapse/handlers/message.py	2014-10-27 10:20:44 +00:00
Mark Haines	4be99c2989	Add get_json method to 3pid http client. Better logging for errors in 3pid requests	2014-10-20 14:10:08 +01:00
Erik Johnston	bf8cdda2f5	It doesn't want a dict	2014-10-17 20:10:34 +01:00
Erik Johnston	b3b1961496	Fix bug where people could join private rooms	2014-10-17 19:37:41 +01:00
Erik Johnston	5ffe5ab43f	Use state groups to get current state. Make join dance actually work.	2014-10-17 18:56:42 +01:00
Mark Haines	456017e0ae	SPEC-7: Don't stamp event contents with 'hsob_ts'	2014-10-17 16:55:55 +01:00
Erik Johnston	f71627567b	Finish implementing the new join dance.	2014-10-17 15:04:17 +01:00
Erik Johnston	1116f5330e	Start implementing the invite/join dance. Continue moving auth to use event.state_events	2014-10-16 16:56:51 +01:00
Erik Johnston	e7bc1291a0	Begin making auth use event.old_state_events	2014-10-15 16:06:59 +01:00
Mark Haines	b9cdc443d7	Fix pyflakes errors	2014-10-02 14:37:30 +01:00
Mark Haines	574377636e	Add a keyword argument to get_json to avoid retrying on DNS failures. Rather than passing MatrixHttpClient.RETRY_DNS_LOOKUP_FAILURES as a fake query string parameter	2014-10-02 14:26:13 +01:00
Mark Haines	4f11518934	Split PlainHttpClient into separate clients for talking to Identity servers and talking to Capatcha servers	2014-10-02 14:03:26 +01:00
Erik Johnston	e06adc6d7e	SYN-2: Allow server admins to delete room aliases	2014-09-30 11:31:42 +01:00
Erik Johnston	3ccb17ce59	SYN-48: Implement WHOIS rest servlet	2014-09-29 14:59:52 +01:00
Erik Johnston	37bfe44046	Merge branch 'deletions' of github.com:matrix-org/synapse into develop	2014-09-25 17:02:53 +01:00
Erik Johnston	1ca51c8586	SYN-46: An invite received from fedearation didn't wake up the event stream for the invited user.	2014-09-25 13:01:05 +01:00
Erik Johnston	72eb360f2d	Don't set the room name to be the room alias on room creation if the client didn't supply a name	2014-09-24 16:59:57 +01:00
Erik Johnston	70899d3ab2	Rename deletions to redactions	2014-09-24 15:27:59 +01:00
Erik Johnston	bc250a6afa	SYN-12: Implement auth for deletion by adding a 'delete_level' on the ops levels event ... SYN-12 # comment Auth has been added.	2014-09-23 17:36:24 +01:00
Kegan Dougal	0c4ae63ad5	Implemented /rooms/$roomid/state API.	2014-09-23 15:35:58 +01:00
Kegan Dougal	c707b7d128	SYWEB-3 : Added 'visibility' key to rooms returned via /initialSync	2014-09-17 16:09:07 +01:00
Erik Johnston	b6818fd4d2	SYN-40: When a user updates their displayname or avatar update all their join events for all the rooms they are currently in.	2014-09-17 15:05:14 +01:00
Kegan Dougal	cc83b06cd1	Added support for the HS to send emails. Use it to send password resets. Added email_smtp_server and email_from_address config args. Added emailutils.	2014-09-16 12:36:39 +01:00
Kegan Dougal	5f30a69a9e	Added PasswordResetRestServlet. Hit the IS to confirm the email/user. Need to send email.	2014-09-16 11:22:40 +01:00
Erik Johnston	59516a8bb1	Correctly handle receiving 'missing' Pdus from federation, rather than just discarding them.	2014-09-15 16:40:44 +01:00
Erik Johnston	e639a3516d	Improve logging in federation handler.	2014-09-15 16:24:03 +01:00
Kegan Dougal	14bc4ed59f	Merge branch 'develop' of github.com:matrix-org/synapse into registration-api-changes in preparation for re-merge to develop.	2014-09-15 15:27:58 +01:00
Erik Johnston	5bd9369a62	Correctly handle the 'age' key in events and pdus	2014-09-15 13:26:11 +01:00
Kegan Dougal	285ecaacd0	Split out password/captcha/email logic.	2014-09-15 12:42:36 +01:00
Kegan Dougal	76fe7d4eba	Added num_joined_users key to /publicRooms for each room. Show this information in the webclient.	2014-09-08 12:15:29 -07:00
Erik Johnston	768ff1a850	Fix race in presence handler where we evicted things from cache while handling a key therein	2014-09-08 11:28:50 +02:00
Kegan Dougal	1a298aad9c	Added captcha support on both the HS and web client. ... Merge branch 'captcha' of github.com:matrix-org/synapse into develop	2014-09-05 23:32:51 -07:00
Kegan Dougal	b5749c75d9	Reload captchas when they fail. Cleanup on success.	2014-09-05 23:08:39 -07:00
Kegan Dougal	3ea6f01b4e	80 chars please	2014-09-05 22:55:29 -07:00
Kegan Dougal	37e53513b6	Add config opion for XFF headers when performing ReCaptcha auth.	2014-09-05 22:51:11 -07:00
Kegan Dougal	1829b55bb0	Captchas now work on registration. Missing x-forwarded-for config arg support. Missing reloading a new captcha on the web client / displaying a sensible error message.	2014-09-05 19:18:23 -07:00
Erik Johnston	f47f42090d	Add support for inviting people when you create a room	2014-09-06 01:10:07 +01:00
Erik Johnston	9dd4570b68	Generate m.room.aliases event when the HS creates a room alias	2014-09-05 21:35:56 +01:00
Erik Johnston	95037d8d9d	Change the default power levels to be 0, 50 and 100	2014-09-05 17:13:03 +01:00
Erik Johnston	bcaea74352	Error code must be an integer	2014-09-03 19:19:24 +01:00
Erik Johnston	c9d1ee24ca	Import SynapseError	2014-09-03 19:15:55 +01:00
Erik Johnston	9b18151104	Handle timeouts slightly nicer.	2014-09-03 19:13:41 +01:00
Erik Johnston	5b645f9d34	Don't do auth for change_membership in federation handler, it doesn't work and federation doesn't do auth in general either. Add a hacky timeout when trying to join a remote room.	2014-09-03 19:08:39 +01:00
Erik Johnston	dce6395395	When creating a room and a user supplies a room_alias but no name, use the room_alias as the name.	2014-09-03 18:52:34 +01:00
David Baker	d72ce4da64	Merge branch 'develop' of github.com:matrix-org/synapse into develop ... Conflicts: synapse/http/client.py	2014-09-03 18:25:17 +01:00
David Baker	d6ecbbdf0a	Add support for registering with a threepid to the HS (get credentials from the client and check them against an ID server).	2014-09-03 18:22:27 +01:00
Matthew Hodgson	8a7c1d6a00	fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.	2014-09-03 17:31:57 +01:00
Erik Johnston	30bcbc433a	Fix up directory server to not require uploading room hosts. Update the room hosts table with the current room hosts (if we have them) on GET.	2014-09-03 16:04:27 +01:00
Erik Johnston	e4c40158c5	Snapshot prev_state for generic events	2014-09-03 15:48:51 +01:00
Paul "LeoNerd" Evans	cda31fb755	Kill the state ... ... key from all the Presence messages	2014-09-03 15:37:10 +01:00
Paul "LeoNerd" Evans	dada11dc5f	Bugfix for back-pagination of presence	2014-09-03 15:28:03 +01:00
Kegan Dougal	7fc84c7019	Make retrying requests on DNS failures configurable, and turn off retrying only in directory.get_association	2014-09-03 14:26:52 +01:00
Paul "LeoNerd" Evans	da31b96b55	Implement presence state visibilty limiting when polling eventsource for stream	2014-09-03 13:46:52 +01:00
Kegan Dougal	c54d8df504	Update API docs to use 'presence' key not 'state'. Fixed error messages when setting presence.	2014-09-03 11:45:30 +01:00
Kegan Dougal	65693e9e15	Fixed GET /events/$id to be not broken.	2014-09-03 11:24:45 +01:00
Paul "LeoNerd" Evans	da3e04df8b	Rename the 'do_users_share_a_room' to something slightly less verb-sounding	2014-09-03 10:40:48 +01:00
Paul "LeoNerd" Evans	ddf3ca7ab3	Neater is_presence_visible() code	2014-09-03 10:40:21 +01:00
Mark Haines	c6eafdfbaf	Add copyright notices and fix pyflakes errors	2014-09-03 09:43:11 +01:00
Mark Haines	112c7ea315	Set status message for ratelimit error responses	2014-09-03 09:37:44 +01:00
Mark Haines	30ad0c5674	Merge branch 'ratelimiting' into develop	2014-09-03 09:15:52 +01:00
Mark Haines	683596f91e	Raise LimitExceedError when the ratelimiting is throttling requests	2014-09-03 08:58:48 +01:00
Mark Haines	780548b577	rate limiting for message sending	2014-09-02 18:22:15 +01:00
Mark Haines	c7a7cdf734	Add ratelimiting function to basehandler	2014-09-02 17:57:04 +01:00
Paul "LeoNerd" Evans	d9d6fbb085	Safer handling of incoming presence EDUs that may or maynot contain 'presence' or 'state'	2014-09-02 11:17:43 +01:00
Paul "LeoNerd" Evans	7b56a7a3cb	'continue' to go to the next item in a for loop, not 'break'	2014-09-02 11:15:46 +01:00
Erik Johnston	10e7821461	By default, only room ops can change the name and topic.	2014-09-02 11:11:47 +01:00
Erik Johnston	ed25abe05f	Add message to assertion	2014-09-02 10:58:33 +01:00
Erik Johnston	040d985908	Add support for setting room name and topic when creating rooms	2014-09-02 10:02:14 +01:00
Paul "LeoNerd" Evans	270d302834	Reënable presence visibility permission checking now it's not used on redundant code paths	2014-09-01 22:15:02 +01:00
Paul "LeoNerd" Evans	32fdf8efd6	No need to test is_presence_visible in _start_polling_local because we know it will be by when it's called	2014-09-01 22:15:02 +01:00
Erik Johnston	48142a01dd	Don't set a 'default' key in the creation event	2014-09-01 20:39:43 +01:00
Erik Johnston	6d28560626	Don't put required power levels on permission state events	2014-09-01 20:27:45 +01:00
Erik Johnston	b8ab9f1c0a	Add all the necessary checks to make banning work.	2014-09-01 18:24:56 +01:00
Erik Johnston	3faa2ae78c	Merge branch 'develop' of github.com:matrix-org/synapse into room_config	2014-09-01 18:21:29 +01:00
Paul "LeoNerd" Evans	1c6ab2d759	Bump a user's presence last_active time every time they send a message to a room	2014-09-01 16:16:35 +01:00
Erik Johnston	db7109c43b	Add beginnings of ban support.	2014-09-01 16:15:34 +01:00
Paul "LeoNerd" Evans	fd696f1243	Perform room unit tests with 'local' users actually in the right domain ;)	2014-09-01 15:58:30 +01:00
Paul "LeoNerd" Evans	468d94c920	Rename API-visible 'mtime' presence field to 'last_active'; slightly different semantics	2014-09-01 15:39:50 +01:00
Paul "LeoNerd" Evans	02f4e3b3ff	Rename 'state' presence key to the much more obvious 'presence'; maintain a legacy 'state' copy for now	2014-09-01 14:45:41 +01:00
Erik Johnston	865469f233	Implement power level lists, default power levels and send_evnet_level/add_state_level events.	2014-09-01 14:39:09 +01:00
Erik Johnston	10efca1a74	Merge branch 'develop' of github.com:matrix-org/synapse into room_config	2014-09-01 13:41:44 +01:00
Paul "LeoNerd" Evans	93407cf7cf	Bugfixes on presence pushes on user joining: ... * No need to inform clients of status of remote users; as that will arrive in due course anyway. We don't -have- the state currently, so we'd only send an unknown message * Remember to bump the presence serial for the event source, so the notifiers will wake up and report it	2014-08-29 19:53:33 +01:00
Paul "LeoNerd" Evans	a8e8d1d06c	Renamed get_current_token_part to get_current_key	2014-08-29 19:15:23 +01:00
Paul "LeoNerd" Evans	eec67a675f	Have EventSource's get_new_events_for_user() API work only on keys within that source, not overall eventstream tokens	2014-08-29 19:13:55 +01:00
Paul "LeoNerd" Evans	6797c7f1b1	TypingNotificationEventSource has to return proper tokens, not int 0	2014-08-29 19:00:55 +01:00
Paul "LeoNerd" Evans	4bfdec1eb2	Rename 'events_key' to 'room_key' so it matches the name of the event source	2014-08-29 19:00:55 +01:00
Paul "LeoNerd" Evans	6dd50da54e	Define a new event stream data source for typing notifications (currently null)	2014-08-29 17:39:33 +01:00
Paul "LeoNerd" Evans	20d0db6cfb	Move the *EventSource classes into the handlers they relate to, so it's easier to find the code	2014-08-29 17:10:28 +01:00
Erik Johnston	8e2d4c6da5	Merge branch 'develop' of github.com:matrix-org/synapse into room_config	2014-08-29 14:22:04 +01:00
Erik Johnston	ee06023573	Get the equalities right.	2014-08-29 13:28:06 +01:00
Erik Johnston	47fb286184	Merge branch 'presence_logging' into develop	2014-08-29 12:10:00 +01:00
Erik Johnston	5dd38d579b	Fix a couple of bugs in presence handler related to pushing updatesto the correct user. Fix presence tests.	2014-08-29 12:08:33 +01:00
Erik Johnston	8113eb7c79	Turn of trace_function logging	2014-08-28 18:45:00 +01:00
Erik Johnston	aaf4fd98ee	Only poll remote users if they are in our presence list, rather than in a common room	2014-08-28 18:43:03 +01:00
Mark Haines	722c19d033	Fix FederationHandler to event.origin	2014-08-28 18:32:44 +01:00
Erik Johnston	1b7686329e	Don't query the rooms members table so much by using the new notifier api that allows you to specify room_ids to notify.	2014-08-28 17:43:15 +01:00
Erik Johnston	54d0a75573	Merge branch 'develop' of github.com:matrix-org/synapse into presence_logging ... Conflicts: synapse/handlers/presence.py	2014-08-28 16:52:46 +01:00
Erik Johnston	a8d318cf82	Up timeout to 10 minutes	2014-08-28 16:44:09 +01:00
Paul "LeoNerd" Evans	efc5f3440d	Only send presence "poll"/"unpoll" EDUs when changing from/to zero remotes	2014-08-28 16:43:55 +01:00
Paul "LeoNerd" Evans	c46c806126	Re-enable presence, un-skip presence tests	2014-08-28 16:00:14 +01:00
Erik Johnston	eb3094ed31	And more logging.	2014-08-28 15:58:38 +01:00
Mark Haines	7b079a26a5	Remove get_state_for_room function from federation handler	2014-08-28 15:32:38 +01:00
Erik Johnston	e0ba81344c	Add more logging. Up the event stream timer to 10s	2014-08-28 15:30:42 +01:00
Erik Johnston	b8b52ca09d	Add logging to try and figure out what is going on with the presence stuff	2014-08-28 14:58:51 +01:00