2046 Commits

Author	SHA1	Message	Date
Paul "LeoNerd" Evans	d5bf7a4a99	Merge remote-tracking branch 'origin/develop' into paul/thirdpartylookup	2016-08-18 14:21:01 +01:00
Paul "LeoNerd" Evans	f0c73a1e7a	Extend individual list results into the main return list, don't append	2016-08-18 13:53:54 +01:00
Erik Johnston	9da84a9a1e	Make AppserviceHandler stream events from database ... This is for two reasons: 1. Suppresses duplicates correctly, as the notifier doesn't do any duplicate suppression. 2. Makes it easier to connect the AppserviceHandler to the replication stream.	2016-08-18 11:54:41 +01:00
Erik Johnston	320dfe523c	Make notify_interested_services faster	2016-08-17 17:20:50 +01:00
Paul "LeoNerd" Evans	fa87c981e1	Thread 3PU lookup through as far as the AS API object; which currently noöps it	2016-08-17 16:17:28 +01:00
Erik Johnston	62c5245c87	Measure notify_interested_services	2016-08-17 11:12:29 +01:00
Erik Johnston	7c6f4f9427	Merge pull request #1012 from matrix-org/erikj/limit_backfill_uri ... Limit number of extremeties in backfill request	2016-08-16 12:55:42 +01:00
Erik Johnston	2ee1bd124c	Limit number of extremeties in backfill request ... This works around a bug where if we make a backfill request with too many extremeties it causes the request URI to be too long.	2016-08-16 11:34:36 +01:00
Erik Johnston	dc3a00f24f	Refactor user_delete_access_tokens. Invalidate get_user_by_access_token to slaves.	2016-08-15 17:04:39 +01:00
Erik Johnston	75299af4fc	Merge pull request #1009 from matrix-org/erikj/event_split ... Split out /events to synchrotron	2016-08-15 15:39:05 +01:00
Daniel Ehlers	dfaf0fee31	Log the value which is observed in the first place. ... The name 'result' is of bool type and has no len property, resulting in a TypeError. Futhermore in the flow control conn.response is observed and hence should be reported. Signed-off-by: Daniel Ehlers <sargon@toppoint.de>	2016-08-14 16:49:05 +02:00
Daniel Ehlers	e380538b59	Fix AttributeError when bind_dn is not defined. ... In case one does not define bind_dn in ldap configuration, filter attribute is not declared. Since auth code only uses ldap_filter attribute when according LDAP mode is selected, it is safe to only declare the attribute in that case. Signed-off-by: Daniel Ehlers <sargon@toppoint.de>	2016-08-14 16:48:33 +02:00
Erik Johnston	4e1cebd56f	Make synchrotron accept /events	2016-08-12 15:31:44 +01:00
Erik Johnston	448ac6cf0d	Only process one local membership event per room at a time	2016-08-12 09:32:19 +01:00
Erik Johnston	832799dbff	Merge pull request #997 from Half-Shot/develop ... Don't change status_msg on /sync	2016-08-11 14:10:55 +01:00
Erik Johnston	739ea29d1e	Also check if server is in the room	2016-08-10 13:32:23 +01:00
Erik Johnston	7f41bcbeec	Correctly auth /event/ requests	2016-08-10 13:22:20 +01:00
Erik Johnston	11fdfaf03b	Only resign our own events	2016-08-10 13:16:58 +01:00
Will Hunt	2510db3e76	Don't change status_msg on /sync	2016-08-10 12:59:59 +01:00
Richard van der Hoff	79ebfbe7c6	/login: Respond with a 403 when we get an invalid m.login.token	2016-08-09 16:29:28 +01:00
Richard van der Hoff	6fe6a6f029	Fix login with m.login.token ... login with token (as used by CAS auth) was broken by 067596d, such that it always returned a 401.	2016-08-08 16:40:39 +01:00
Erik Johnston	93acf49e9b	Fix backfill auth events	2016-08-05 12:59:04 +01:00
Richard van der Hoff	f131cd9e53	keys/query: Omit device displayname if null ... ... which makes it more consistent with user displaynames.	2016-08-04 10:59:51 +01:00
Richard van der Hoff	68264d7404	Include device name in /keys/query response ... Add an 'unsigned' section which includes the device display name.	2016-08-03 15:42:08 +01:00
Richard van der Hoff	91fa69e029	keys/query: return all users which were asked for ... In the situation where all of a user's devices get deleted, we want to indicate this to a client, so we want to return an empty dictionary, rather than nothing at all.	2016-08-03 15:41:44 +01:00
Richard van der Hoff	530bc862dc	Merge branch 'rav/null_default_device_displayname' into develop	2016-08-03 14:30:32 +01:00
Richard van der Hoff	a6f5cc65d9	PEP8	2016-08-03 14:30:06 +01:00
Richard van der Hoff	a843868fe9	E2eKeysHandler: minor tweaks ... PR feedback	2016-08-03 14:24:33 +01:00
Richard van der Hoff	4fec5e57be	Default device_display_name to null ... It turns out that it's more useful to return a null device display name (and let clients decide how to handle it: eg, falling back to device_id) than using a constant string like "unknown device".	2016-08-03 11:53:00 +01:00
Mark Haines	921f17f938	Merge branch 'develop' into rav/refactor_device_query	2016-08-03 11:12:47 +01:00
Richard van der Hoff	1efee2f52b	E2E keys: Make federation query share code with client query ... Refactor the e2e query handler to separate out the local query, and then make the federation handler use it.	2016-08-02 18:12:00 +01:00
Erik Johnston	7b0f6293f2	Merge pull request #940 from matrix-org/erikj/fed_state_cache ... Cache federation state responses	2016-08-02 15:21:37 +01:00
Richard van der Hoff	986615b0b2	Move e2e query logic into a handler	2016-08-01 18:02:07 +01:00
Paul Evans	18b7eb830b	Merge pull request #958 from matrix-org/paul/SYN-738 ... Forbid non-ASes from registering users whose names begin with '_'	2016-07-29 14:10:45 +01:00
Erik Johnston	c51a52f300	Mention that func will fetch auth events	2016-07-29 11:17:04 +01:00
Erik Johnston	3d13c3a295	Update docstring	2016-07-29 10:45:05 +01:00
Erik Johnston	1e2740caab	Handle the case of missing auth events when joining a room	2016-07-28 16:08:33 +01:00
Paul "LeoNerd" Evans	05f6447301	Forbid non-ASes from registering users whose names begin with '_' (SYN-738)	2016-07-27 17:54:26 +01:00
Richard van der Hoff	d47115ff8b	Delete e2e keys on device delete	2016-07-27 12:24:52 +01:00
Richard van der Hoff	eb359eced4	Add create_requester function ... Wrap the `Requester` constructor with a function which provides sensible defaults, and use it throughout	2016-07-26 16:46:53 +01:00
Richard van der Hoff	8e02494166	Delete refresh tokens when deleting devices	2016-07-26 11:10:37 +01:00
Richard van der Hoff	012b4c1913	Implement updating devices ... You can update the displayname of devices now.	2016-07-26 07:35:48 +01:00
Richard van der Hoff	436bffd15f	Implement deleting devices	2016-07-26 07:35:48 +01:00
David Baker	7ed58bb347	Use get to avoid KeyErrors	2016-07-22 17:18:50 +01:00
David Baker	dad2da7e54	Log the hostname the reCAPTCHA was completed on ... This could be useful information to have in the logs. Also comment about how & why we don't verify the hostname.	2016-07-22 17:00:56 +01:00
Richard van der Hoff	55abbe1850	make /devices return a list ... Turns out I specced this to return a list of devices rather than a dict of them	2016-07-21 15:57:28 +01:00
Richard van der Hoff	1c3c202b96	Fix PEP8 errors	2016-07-21 13:15:15 +01:00
Richard van der Hoff	406f7aa0f6	Implement GET /device/{deviceId}	2016-07-21 12:00:29 +01:00
Erik Johnston	248e6770ca	Cache federation state responses	2016-07-21 10:30:12 +01:00
Richard van der Hoff	bc8f265f0a	GET /devices endpoint ... implement a GET /devices endpoint which lists all of the user's devices. It also returns the last IP where we saw that device, so there is some dancing to fish that out of the user_ips table.	2016-07-20 16:42:32 +01:00
Erik Johnston	aba0b2a39b	Merge pull request #935 from matrix-org/erikj/backfill_notifs ... Don't notify pusher pool for backfilled events	2016-07-20 13:39:16 +01:00
Erik Johnston	57dca35692	Don't notify pusher pool for backfilled events	2016-07-20 13:25:06 +01:00
Richard van der Hoff	c68518dfbb	Merge pull request #933 from matrix-org/rav/type_annotations ... Type annotations	2016-07-20 12:26:32 +01:00
David Baker	e967bc86e7	Merge pull request #932 from matrix-org/rav/register_refactor ... Further registration refactoring	2016-07-20 11:03:33 +01:00
Erik Johnston	1e2a7f18a1	Merge pull request #922 from matrix-org/erikj/file_api2 ... Feature: Add filter to /messages. Add 'contains_url' to filter.	2016-07-20 10:40:48 +01:00
Richard van der Hoff	3413f1e284	Type annotations ... Add some type annotations to help PyCharm (in particular) to figure out the types of a bunch of things.	2016-07-19 18:56:16 +01:00
Richard van der Hoff	40cbffb2d2	Further registration refactoring ... * `RegistrationHandler.appservice_register` no longer issues an access token: instead it is left for the caller to do it. (There are two of these, one in `synapse/rest/client/v1/register.py`, which now simply calls `AuthHandler.issue_access_token`, and the other in `synapse/rest/client/v2_alpha/register.py`, which is covered below). * In `synapse/rest/client/v2_alpha/register.py`, move the generation of access_tokens into `_create_registration_details`. This means that the normal flow no longer needs to call `AuthHandler.issue_access_token`; the shared-secret flow can tell `RegistrationHandler.register` not to generate a token; and the appservice flow continues to work despite the above change.	2016-07-19 18:46:19 +01:00
Richard van der Hoff	9a7a77a22a	Merge pull request #929 from matrix-org/rav/support_deviceid_in_login ... Add device_id support to /login	2016-07-19 15:53:04 +01:00
Mark Haines	c41d52a042	Summary line	2016-07-19 10:28:27 +01:00
Mark Haines	7e554aac86	Update docstring on Handlers. ... To indicate it is deprecated.	2016-07-19 10:20:58 +01:00
Richard van der Hoff	f863a52cea	Add device_id support to /login ... Add a 'devices' table to the storage, as well as a 'device_id' column to refresh_tokens. Allow the client to pass a device_id, and initial_device_display_name, to /login. If login is successful, then register the device in the devices table if it wasn't known already. If no device_id was supplied, make one up. Associate the device_id with the access token and refresh token, so that we can get at it again later. Ensure that the device_id is copied from the refresh token to the access_token when the token is refreshed.	2016-07-18 16:39:44 +01:00
Richard van der Hoff	dcfd71aa4c	Refactor login flow ... Make sure that we have the canonical user_id *before* calling get_login_tuple_for_user_id. Replace login_with_password with a method which just validates the password, and have the caller call get_login_tuple_for_user_id. This brings the password flow into line with the other flows, and will give us a place to register the device_id if necessary.	2016-07-18 15:23:54 +01:00
Richard van der Hoff	6344db659f	Fix a doc-comment ... The `store` in a handler is a generic DataStore, not just an events.StateStore.	2016-07-18 09:48:10 +01:00
Erik Johnston	bd7c51921d	Merge pull request #919 from matrix-org/erikj/auth_fix ... Various auth.py fixes.	2016-07-15 11:38:33 +01:00
Erik Johnston	9e1b43bcbf	Comment	2016-07-15 09:29:54 +01:00
Erik Johnston	ebdafd8114	Check sender signed event	2016-07-14 17:03:24 +01:00
Erik Johnston	a98d215204	Add filter param to /messages API	2016-07-14 16:30:56 +01:00
Negar Fazeli	0136a522b1	Bug fix: expire invalid access tokens	2016-07-13 15:00:37 +02:00
Erik Johnston	a17e7caeb7	Merge branch 'erikj/shared_secret' into erikj/test2	2016-07-06 14:46:31 +01:00
Erik Johnston	651faee698	Add an admin option to shared secret registration	2016-07-05 17:30:22 +01:00
Erik Johnston	8f8798bc0d	Add ReadWriteLock for pagination and history prune	2016-07-05 15:30:25 +01:00
David Baker	ef535178ff	Merge pull request #904 from matrix-org/dbkr/register_email_no_untrusted_id_server ... requestToken update	2016-07-05 15:13:34 +01:00
Kent Shikama	14362bf359	Fix password config	2016-07-05 19:12:53 +09:00
Kent Shikama	1ee2584307	Fix pep8	2016-07-05 19:01:00 +09:00
Erik Johnston	2d21d43c34	Add purge_history API	2016-07-05 10:28:51 +01:00
Kent Shikama	8bdaf5f7af	Add pepper to password hashing ... Signed-off-by: Kent Shikama <kent@kentshikama.com>	2016-07-05 02:13:52 +09:00
Kent Shikama	bb069079bb	Fix style violations ... Signed-off-by: Kent Shikama <kent@kentshikama.com>	2016-07-04 22:07:11 +09:00
Kent Shikama	fc8007dbec	Optionally include password hash in createUser endpoint ... Signed-off-by: Kent Shikama <kent@kentshikama.com>	2016-07-03 15:08:15 +09:00
David Baker	be8be535f7	requestToken update ... Don't send requestToken request to untrusted ID servers Also correct the THREEPID_IN_USE error to add the M_ prefix. This is a backwards incomaptible change, but the only thing using this is the angular client which is now unmaintained, so it's probably better to just do this now.	2016-06-30 17:51:28 +01:00
Martin Weinelt	0a32208e5d	Rework ldap integration with ldap3 ... Use the pure-python ldap3 library, which eliminates the need for a system dependency. Offer both a `search` and `simple_bind` mode, for more sophisticated ldap scenarios. - `search` tries to find a matching DN within the `user_base` while employing the `user_filter`, then tries the bind when a single matching DN was found. - `simple_bind` tries the bind against a specific DN by combining the localpart and `user_base` Offer support for STARTTLS on a plain connection. The configuration was changed to reflect these new possibilities. Signed-off-by: Martin Weinelt <hexa@darmstadt.ccc.de>	2016-06-22 17:51:59 +02:00
Mark Haines	0c13d45522	Add a comment on why we don't create a profile for upgrading users	2016-06-17 19:18:53 +01:00
Mark Haines	9f1800fba8	Remove registered_users from the distributor. ... The only place that was observed was to set the profile. I've made it so that the profile is set within store.register in the same transaction that creates the user. This required some slight changes to the registration code for upgrading guest users, since it previously relied on the distributor swallowing errors if the profile already existed.	2016-06-17 19:14:16 +01:00
Erik Johnston	2884712ca7	Only re-sign our own events	2016-06-17 14:47:33 +01:00
Salvatore LaMendola	ed5f43a55a	Fix TypeError in call to bcrypt.hashpw ... - At the very least, this TypeError caused logins to fail on my own running instance of Synapse, and the simple (explicit) UTF-8 conversion resolved login errors for me. Signed-off-by: Salvatore LaMendola <salvatore.lamendola@gmail.com>	2016-06-16 00:43:42 -04:00
Erik Johnston	b31c49d676	Correctly mark backfilled events as backfilled	2016-06-15 10:59:08 +01:00
Negar Fazeli	6e7dc7c7dd	Fix a bug caused by a change in auth_handler function ... Fix the relevant unit test cases	2016-06-08 23:22:39 +02:00
Erik Johnston	81c07a32fd	Pull full state for each room all at once	2016-06-08 15:51:49 +01:00
Erik Johnston	1a815fb04f	Don't hit DB for noop replications queries	2016-06-08 11:33:30 +01:00
Mark Haines	0b2158719c	Remove dead code. ... Loading push rules now happens in the datastore, so we can remove the methods that loaded them outside the datastore. The ``waiting_for_join_list`` in federation handler is populated by anything, so can be removed. The ``_get_members_events_txn`` method isn't called from anywhere so can be removed.	2016-06-07 15:07:11 +01:00
Erik Johnston	216a05b3e3	.values() returns list of sets	2016-06-06 16:00:09 +01:00
Erik Johnston	96dc600579	Fix typos	2016-06-06 15:44:41 +01:00
Erik Johnston	377eb480ca	Fire after 30s not 8h	2016-06-06 15:14:21 +01:00
Erik Johnston	51773bcbaf	Merge pull request #832 from matrix-org/erikj/presence_coount ... Change def of small delta in presence stream. Add metrics.	2016-06-03 14:57:00 +01:00
Erik Johnston	ab116bdb0c	Fix typo	2016-06-03 14:03:42 +01:00
Erik Johnston	4ce84a1acd	Change metric style	2016-06-03 13:49:16 +01:00
Erik Johnston	a7ff5a1770	Presence metrics. Change def of small delta	2016-06-03 13:40:55 +01:00
Erik Johnston	4982b28868	Merge pull request #829 from matrix-org/erikj/poke_notifier ... Poke notifier on next reactor tick	2016-06-03 11:52:10 +01:00
Erik Johnston	4c04222fa5	Poke notifier on next reactor tick	2016-06-03 11:24:16 +01:00
Erik Johnston	6a0afa582a	Load push rules in storage layer, so that they get cached	2016-06-03 11:10:00 +01:00
David Baker	c71177f285	Merge remote-tracking branch 'origin/dbkr/email_notif_string_fmt_error' into dbkr/email_unsubscribe	2016-06-02 17:20:56 +01:00
Mark Haines	56d15a0530	Store the typing users as user_id strings. (#819) ... Rather than storing them as UserID objects.	2016-06-02 16:28:54 +01:00
David Baker	812b5de0fe	Merge remote-tracking branch 'origin/develop' into dbkr/email_unsubscribe	2016-06-02 15:33:28 +01:00
Mark Haines	661a540dd1	Deduplicate presence entries in sync (#818)	2016-06-02 15:20:28 +01:00
Mark Haines	70599ce925	Allow external processes to mark a user as syncing. (#812) ... * Add infrastructure to the presence handler to track sync requests in external processes * Expire stale entries for dead external processes * Add an http endpoint for making users as syncing Add some docstrings and comments. * Fixes	2016-06-02 15:20:15 +01:00
David Baker	fb2193cc63	Merge pull request #817 from matrix-org/dbkr/split_out_auth_handler ... Split out the auth handler	2016-06-02 14:31:35 +01:00
Erik Johnston	02ac463dbf	Merge pull request #800 from matrix-org/erikj/sync_refactor ... Refactor SyncHandler	2016-06-02 14:02:13 +01:00
David Baker	3a3fb2f6f9	Merge branch 'dbkr/split_out_auth_handler' into dbkr/email_unsubscribe	2016-06-02 13:35:25 +01:00
David Baker	4a10510cd5	Split out the auth handler	2016-06-02 13:31:45 +01:00
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