9822 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Richard van der Hoff	da1010c83a	support custom login types for validating users ... Wire the custom login type support from password providers into the UI-auth user-validation flows.	2017-12-05 09:43:30 +00:00
Richard van der Hoff	cc58e177f3	Merge pull request #2728 from matrix-org/rav/validate_user_via_ui_auth ... Factor out a validate_user_via_ui_auth method	2017-12-05 09:42:46 +00:00
Richard van der Hoff	d7ea8c4800	Factor out a validate_user_via_ui_auth method ... Collect together all the places that validate a logged-in user via UI auth.	2017-12-05 09:42:30 +00:00
Richard van der Hoff	aa6ecf0984	Merge pull request #2727 from matrix-org/rav/refactor_ui_auth_return ... Refactor UI auth implementation	2017-12-05 09:40:38 +00:00
Richard van der Hoff	d5f9fb06b0	Refactor UI auth implementation ... Instead of returning False when auth is incomplete, throw an exception which can be caught with a wrapper.	2017-12-05 09:40:05 +00:00
Matthew Hodgson	c22e73293a	speed up the rate of initial spam for users	2017-12-04 18:05:28 +00:00
Matthew Hodgson	b11dca2025	better doc	2017-12-04 17:51:33 +00:00
Matthew Hodgson	7b86c1fdcd	try make tests work a bit more...	2017-12-04 17:10:03 +00:00
Richard van der Hoff	58ebdb037c	Merge pull request #2716 from matrix-org/rav/federation_client_post ... federation_client script: Support for posting content	2017-12-04 17:04:08 +00:00
Matthew Hodgson	95f8a713dc	erik told me to	2017-12-04 16:56:25 +00:00
Matthew Hodgson	74e0cc74ce	fix pep8 and tests	2017-12-04 15:11:38 +00:00
Matthew Hodgson	1bd40ca73e	switch to a simpler 'search_all_users' button as per review feedback	2017-12-04 14:58:39 +00:00
Matthew Hodgson	f397153dfc	Merge branch 'develop' into matthew/search-all-local-users	2017-11-30 01:51:38 +00:00
Matthew Hodgson	5406392f8b	specify default user_directory_include_pattern	2017-11-30 01:45:34 +00:00
Matthew Hodgson	f61e107f63	remove null constraint on user_dir.room_id	2017-11-30 01:43:50 +00:00
Matthew Hodgson	4b1fceb913	fix alternation operator for FTS4 - how did this ever work!?	2017-11-30 01:34:03 +00:00
Matthew Hodgson	a4bb133b68	fix thinkos galore	2017-11-30 01:17:15 +00:00
Matthew Hodgson	cd3697e8b7	kick the user_directory index when new users register	2017-11-29 18:33:34 +00:00
Matthew Hodgson	3241c7aac3	untested WIP but might actually work	2017-11-29 18:27:05 +00:00
Richard van der Hoff	624c46eb06	Merge pull request #2721 from matrix-org/rav/get_user_by_access_token_comments ... Improve comments on get_user_by_access_token	2017-11-29 17:57:06 +00:00
Richard van der Hoff	7a48a6b63e	Merge pull request #2722 from matrix-org/rav/delete_device_on_logout ... Delete devices and pushers on logouts etc	2017-11-29 17:56:46 +00:00
Matthew Hodgson	47d99a20d5	Add user_directory_include_pattern config param to expand search results to additional users ... Initial commit; this doesn't work yet - the LIKE filtering seems too aggressive. It also needs _do_initial_spam to be aware of prepopulating the whole user_directory_search table with all users... ...and it needs a handle_user_signup() or something to be added so that new signups get incrementally added to the table too. Committing it here as a WIP	2017-11-29 16:46:45 +00:00
Richard van der Hoff	ad7e570d07	Delete devices in various logout situations ... Make sure that we delete devices whenever a user is logged out due to any of the following situations: * /logout * /logout_all * change password * deactivate account (by the user or by an admin) * invalidate access token from a dynamic module Fixes #2672.	2017-11-29 16:44:35 +00:00
Richard van der Hoff	ae31f8ce45	Move set_password into its own handler ... Non-functional refactoring to move set_password. This means that we'll be able to properly deactivate devices and access tokens without introducing a dependency loop.	2017-11-29 16:44:35 +00:00
Richard van der Hoff	7ca5c68233	Move deactivate_account into its own handler ... Non-functional refactoring to move deactivate_account. This means that we'll be able to properly deactivate devices and access tokens without introducing a dependency loop.	2017-11-29 16:44:35 +00:00
Richard van der Hoff	2c6d63922a	Remove pushers when deleting access tokens ... Whenever an access token is invalidated, we should remove the associated pushers.	2017-11-29 16:44:35 +00:00
Richard van der Hoff	97d1a1dc01	Merge pull request #2718 from matrix-org/rav/notify_logcontexts ... Clear logcontext before starting fed txn queue runner	2017-11-29 16:01:46 +00:00
Richard van der Hoff	8b45de90a4	Merge pull request #2719 from matrix-org/rav/handle_missing_hashes ... Fix 500 when joining matrix-dev	2017-11-29 16:01:33 +00:00
Richard van der Hoff	7303ed65e1	Fix 500 when joining matrix-dev ... matrix-dev has an event (`$/6ANj/9QWQyd71N6DpRQPf+SDUu11+HVMeKSpMzBCwM:zemos.net`) which has no `hashes` member. Check for missing `hashes` element in events.	2017-11-29 16:00:46 +00:00
Richard van der Hoff	da562bd6a1	Improve comments on get_user_by_access_token ... because I have to reverse-engineer this every time.	2017-11-29 15:52:41 +00:00
Richard van der Hoff	d4fb4f7c52	Clear logcontext before starting fed txn queue runner ... These processes take a long time compared to the request, so there is lots of "Entering|Restoring dead context" in the logs. Let's try to shut it up a bit.	2017-11-28 15:26:14 +00:00
Erik Johnston	dfbc45302e	PEP8	2017-11-28 15:23:26 +00:00
Erik Johnston	c4c1d170af	Fix wrong avatars when inviting multiple users when creating room ... We reused the `content` dictionary between invite requests, which meant they could end up reusing the profile info for a previous user	2017-11-28 15:19:15 +00:00
Richard van der Hoff	fd04968f32	federation_client script: Support for posting content	2017-11-28 11:59:24 +00:00
Luke Barnard	c2a1194424	Merge pull request #2715 from matrix-org/luke/group-guest-access ... Allow guest access to group APIs for reading	2017-11-28 11:58:54 +00:00
Luke Barnard	ab1b2d0ff2	Allow guest access to group APIs for reading	2017-11-28 11:23:00 +00:00
Richard van der Hoff	5a4da5bf78	Merge pull request #2697 from matrix-org/rav/fix_urlcache_index_error ... Fix error on sqlite 3.7	2017-11-27 12:25:48 +00:00
Richard van der Hoff	84b31a3e7a	Merge pull request #2713 from matrix-org/rav/no_upsert_forever ... Avoid retrying forever on IntegrityError	2017-11-27 12:19:35 +00:00
Richard van der Hoff	df6c72ede3	Merge pull request #2711 from matrix-org/rav/fix_dns_errhandler ... Fix error handling on dns lookup	2017-11-27 12:19:18 +00:00
Richard van der Hoff	04bb79f139	Merge pull request #2710 from matrix-org/rav/remove_dead_code ... Tiny code cleanups	2017-11-27 12:15:44 +00:00
Richard van der Hoff	e828a7380a	Merge pull request #2708 from matrix-org/rav/replication_logcontext_leaks ... Fix some logcontext leaks in replication resource	2017-11-27 12:15:33 +00:00
Richard van der Hoff	7ef22a41a3	Merge pull request #2707 from matrix-org/rav/fix_urlpreview ... Fix OPTIONS on preview_url	2017-11-27 12:15:14 +00:00
Richard van der Hoff	96387bd26f	Merge pull request #2705 from matrix-org/rav/improve_tracebacks ... Improve tracebacks on exceptions	2017-11-27 12:07:52 +00:00
Richard van der Hoff	6be01f599b	Improve tracebacks on exceptions ... Use failure.Failure to recover our failure, which will give us a useful stacktrace, unlike the rethrown exception.	2017-11-27 12:05:58 +00:00
Richard van der Hoff	63ccaa5873	Avoid retrying forever on IntegrityError	2017-11-27 12:00:07 +00:00
Richard van der Hoff	8b38096a89	Fix error handling on dns lookup ... pass the right arguments to the errback handler Fixes "TypeError('eb() takes exactly 2 arguments (1 given)',)"	2017-11-24 16:47:48 +00:00
Richard van der Hoff	795b0849f3	Add a comment which might save some confusion	2017-11-24 00:34:56 +00:00
Richard van der Hoff	7f14f0ae38	Remove dead sync_callback ... This is never used; let's remove it to stop confusing things.	2017-11-24 00:32:04 +00:00
Richard van der Hoff	0edf085b68	Fix some logcontext leaks in replication resource ... The @measure_func annotations rely on the wrapped function respecting the logcontext rules. Add the necessary yields to make this work.	2017-11-23 23:19:43 +00:00
Richard van der Hoff	8132a6b7ac	Fix OPTIONS on preview_url ... Fixes #2706	2017-11-23 17:52:31 +00:00