Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3049 from matrix-org/rav/use_staticjson | Richard van der Hoff | 2018-04-03 | 1 | -2/+2 |
|\ | | | | | Use static JSONEncoders | ||||
| * | Use static JSONEncoders | Richard van der Hoff | 2018-03-29 | 1 | -2/+2 |
| | | | | | | | | | | using json.dumps with custom options requires us to create a new JSONEncoder on each call. It's more efficient to create one upfront and reuse it. | ||||
* | | Use simplejson throughout | Richard van der Hoff | 2018-03-29 | 1 | -3/+5 |
|/ | | | | Let's use simplejson rather than json, for consistency. | ||||
* | Merge pull request #3034 from matrix-org/rav/fix_key_claim_errors | Richard van der Hoff | 2018-03-28 | 1 | -28/+28 |
|\ | | | | | Fix error when claiming e2e keys from offline servers | ||||
| * | Stringify exceptions for keys/{query,claim} | Richard van der Hoff | 2018-03-27 | 1 | -1/+4 |
| | | | | | | | | | | | | | | Make sure we stringify any exceptions we return from keys/query and keys/claim, to avoid a 'not JSON serializable' error later Fixes #3010 | ||||
| * | factor out exception handling for keys/claim and keys/query | Richard van der Hoff | 2018-03-27 | 1 | -28/+25 |
| | | | | | | | | this stuff is badly c&p'ed | ||||
* | | Also do check inside linearizer | Erik Johnston | 2018-03-27 | 1 | -3/+4 |
| | | |||||
* | | PEP8 | Erik Johnston | 2018-03-26 | 1 | -1/+3 |
| | | |||||
* | | Linearize calls to _generate_user_id | Erik Johnston | 2018-03-26 | 1 | -4/+7 |
|/ | |||||
* | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2018-03-19 | 2 | -4/+4 |
|\ | |||||
| * | Replace ujson with simplejson | Erik Johnston | 2018-03-15 | 2 | -4/+4 |
| | | |||||
* | | Merge pull request #2992 from matrix-org/erikj/implement_member_workre | Erik Johnston | 2018-03-14 | 1 | -0/+102 |
|\ \ | | | | | | | Implement RoomMemberWorkerHandler | ||||
| * | | s/join/joined/ in notify_user_membership_change | Erik Johnston | 2018-03-14 | 1 | -1/+1 |
| | | | |||||
| * | | Split RoomMemberWorkerHandler to separate file | Erik Johnston | 2018-03-14 | 2 | -78/+102 |
| | | | |||||
| * | | Implement RoomMemberWorkerHandler | Erik Johnston | 2018-03-13 | 1 | -0/+78 |
| | | | |||||
* | | | Merge pull request #2989 from matrix-org/erikj/profile_cache_master | Erik Johnston | 2018-03-14 | 1 | -1/+4 |
|\ \ \ | | | | | | | | | Only update remote profile cache on master | ||||
| * | | | Only update remote profile cache on master | Erik Johnston | 2018-03-13 | 1 | -1/+4 |
| | | | | |||||
* | | | | _remote_join and co take a requester | Erik Johnston | 2018-03-13 | 1 | -4/+4 |
| |/ / |/| | | |||||
* | | | Merge pull request #2987 from matrix-org/erikj/split_room_member_handler | Erik Johnston | 2018-03-13 | 1 | -98/+185 |
|\ \ \ | |/ / |/| | | Split RoomMemberHandler into base and master class | ||||
| * | | Add missing param to docstrings | Erik Johnston | 2018-03-13 | 1 | -0/+3 |
| | | | |||||
| * | | Correct import order | Erik Johnston | 2018-03-13 | 1 | -3/+3 |
| | | | |||||
| * | | Move user_*_room distributor stuff to master class | Erik Johnston | 2018-03-13 | 1 | -5/+50 |
| | | | | | | | | | | | | | | | I added yields when calling user_left_room, but they shouldn't matter on the master process as they always return None anyway. | ||||
| * | | Split RoomMemberHandler into base and master class | Erik Johnston | 2018-03-13 | 1 | -96/+135 |
| | | | | | | | | | | | | | | | | | | | | | | | | The intention here is to split the class into the bits that can be done on workers and the bits that have to be done on the master. In future there will also be a class that can be run on the worker, which will delegate work to the master when necessary. | ||||
* | | | Merge pull request #2978 from matrix-org/erikj/refactor_replication_layer | Erik Johnston | 2018-03-13 | 6 | -6/+6 |
|\ \ \ | | | | | | | | | Remove ReplicationLayer and user Client/Server directly | ||||
| * | | | s/replication_client/federation_client/ | Erik Johnston | 2018-03-13 | 6 | -6/+6 |
| | | | | |||||
* | | | | Merge pull request #2981 from matrix-org/erikj/factor_remote_leave | Erik Johnston | 2018-03-13 | 1 | -22/+54 |
|\ \ \ \ | | |/ / | |/| | | Factor out _remote_reject_invite in RoomMember | ||||
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-03-13 | 11 | -31/+49 |
| |\ \ \ | | | | | | | | | | | | | | | | erikj/factor_remote_leave | ||||
| * | | | | Add docstring | Erik Johnston | 2018-03-13 | 1 | -0/+26 |
| | | | | | |||||
| * | | | | Factor out _remote_reject_invite in RoomMember | Erik Johnston | 2018-03-13 | 1 | -22/+28 |
| | | | | | |||||
* | | | | | Merge pull request #2979 from matrix-org/erikj/no_handlers | Erik Johnston | 2018-03-13 | 8 | -12/+7 |
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | Don't build handlers on workers unnecessarily | ||||
| * | | | Split replication layer into two | Erik Johnston | 2018-03-13 | 8 | -12/+7 |
| | | | | |||||
* | | | | Merge pull request #2980 from matrix-org/erikj/rm_priv | Erik Johnston | 2018-03-13 | 1 | -7/+7 |
|\ \ \ \ | | | | | | | | | | | Make RoomMemberHandler functions private that can be | ||||
| * | | | | Make functions private that can be | Erik Johnston | 2018-03-13 | 1 | -7/+7 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #2982 from matrix-org/erikj/fix_extra_users | Erik Johnston | 2018-03-13 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | extra_users is actually a list of UserIDs | ||||
| * | | | | extra_users is actually a list of UserIDs | Erik Johnston | 2018-03-13 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #2983 from matrix-org/erikj/rename_register_3pid | Erik Johnston | 2018-03-13 | 2 | -11/+25 |
|\ \ \ \ | |_|/ / |/| | | | Refactor get_or_register_3pid_guest | ||||
| * | | | Refactor get_or_register_3pid_guest | Erik Johnston | 2018-03-13 | 2 | -11/+25 |
| |/ / | |||||
* / / | Split out edu/query registration to a separate class | Erik Johnston | 2018-03-13 | 8 | -12/+16 |
|/ / | |||||
* | | Add transactional API to history purge | Richard van der Hoff | 2018-03-12 | 1 | -5/+99 |
| | | | | | | | | Make the purge request return quickly, and allow scripts to poll for updates. | ||||
* | | Return an error when doing two purges on a room | Richard van der Hoff | 2018-03-12 | 1 | -3/+14 |
| | | | | | | | | Queuing up purges doesn't sound like a good thing. | ||||
* | | Fix up log message | Erik Johnston | 2018-03-07 | 1 | -1/+1 |
| | | |||||
* | | Fix typo | Erik Johnston | 2018-03-07 | 1 | -2/+2 |
| | | |||||
* | | Fix race in sync when joining room | Erik Johnston | 2018-03-07 | 1 | -28/+75 |
| | | | | | | | | | | | | | | | | | | | | | | The race happens when the user joins a room at the same time as doing a sync. We fetch the current token and then get the rooms the user is in. If the join happens after the current token, but before we get the rooms we end up sending down a partial room entry in the sync. This is fixed by looking at the stream ordering of the membership returned by get_rooms_for_user, and handling the case when that stream ordering is after the current token. | ||||
* | | Merge pull request #2949 from krombel/use_bcrypt_checkpw | Richard van der Hoff | 2018-03-06 | 1 | -2/+4 |
|\ \ | | | | | | | use bcrypt.checkpw | ||||
| * | | use bcrypt.checkpw | Krombel | 2018-03-05 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | in bcrypt 3.1.0 checkpw got introduced (already 2 years ago) This makes use of that with enhancements which might get introduced by that Signed-Off-by: Matthias Kesler <krombel@krombel.de> | ||||
* | | | Merge pull request #2946 from matrix-org/rav/timestamp_to_purge | Richard van der Hoff | 2018-03-06 | 1 | -9/+5 |
|\ \ \ | | | | | | | | | Implement purge_history by timestamp | ||||
| * | | | Provide a means to pass a timestamp to purge_history | Richard van der Hoff | 2018-03-05 | 1 | -9/+5 |
| |/ / | |||||
* / / | Remove ability for AS users to call /events and /sync | Erik Johnston | 2018-03-05 | 2 | -10/+9 |
|/ / | | | | | | | | | | | | | This functionality has been deprecated for a while as well as being broken for a while. Instead of fixing it lets just remove it entirely. See: https://github.com/matrix-org/matrix-doc/issues/1144 | ||||
* | | Add missing yield during 3pid signature checks | Erik Johnston | 2018-03-02 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #2927 from matrix-org/erikj/read_marker_caches | Erik Johnston | 2018-03-01 | 1 | -3/+3 |
|\ \ | | | | | | | Improve caching for read_marker API | ||||
| * | | Improve caching for read_marker API | Erik Johnston | 2018-03-01 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | We add a new storage function to get a paritcular type of room account data. This allows us to prefill the cache when updating that acount data. | ||||
* | | | Move back to hs.is_mine | Erik Johnston | 2018-03-01 | 1 | -7/+6 |
| | | | |||||
* | | | Move RoomMemberHandler out of Handlers | Erik Johnston | 2018-03-01 | 6 | -31/+37 |
|/ / | |||||
* | | Check event auth on the worker | Erik Johnston | 2018-03-01 | 1 | -16/+16 |
| | | |||||
* | | Correctly send ratelimit and extra_users params | Erik Johnston | 2018-03-01 | 1 | -0/+2 |
| | | |||||
* | | Fixup comments | Erik Johnston | 2018-03-01 | 1 | -4/+4 |
| | | |||||
* | | Calculate push actions on worker | Erik Johnston | 2018-02-28 | 1 | -25/+61 |
| | | |||||
* | | Delete from push_actions_staging in federation too | Erik Johnston | 2018-02-20 | 1 | -9/+17 |
| | | |||||
* | | Ensure that we delete staging push actions on errors | Erik Johnston | 2018-02-15 | 1 | -3/+9 |
| | | |||||
* | | Merge pull request #2854 from matrix-org/erikj/event_create_worker | Erik Johnston | 2018-02-13 | 1 | -6/+22 |
|\ \ | | | | | | | Create a worker for event creation | ||||
| * | | Move presence handling into handle_new_client_event | Erik Johnston | 2018-02-07 | 1 | -6/+6 |
| | | | | | | | | | | | | As we want to have it run on the main synapse instance | ||||
| * | | Add replication http endpoint for event sending | Erik Johnston | 2018-02-07 | 1 | -0/+16 |
| | | | |||||
* | | | Merge pull request #2858 from matrix-org/rav/purge_updates | Richard van der Hoff | 2018-02-09 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | delete_local_events for purge_room_history | ||||
| * | | delete_local_events for purge_history | Richard van der Hoff | 2018-02-09 | 1 | -2/+2 |
| | | | | | | | | | | | | Add a flag which makes the purger delete local events | ||||
| * | | rename delete_old_state -> purge_history | Richard van der Hoff | 2018-02-09 | 1 | -1/+1 |
| | | | | | | | | | | | | (beacause it deletes more than state) | ||||
* | | | Remove pointless ratelimit check | Erik Johnston | 2018-02-07 | 1 | -5/+0 |
| | | | | | | | | | | | | | | | | | | The intention was for the check to be called as early as possible in the request, but actually was called just before the main ratelimit check, so was fairly pointless. | ||||
* | | | Merge pull request #2847 from matrix-org/erikj/separate_event_creation | Erik Johnston | 2018-02-06 | 5 | -179/+193 |
|\ \ \ | | | | | | | | | Split event creation into a separate handler | ||||
| * | | | Update copyright | Erik Johnston | 2018-02-06 | 4 | -1/+4 |
| | | | | |||||
| * | | | s/_create_new_client_event/create_new_client_event/ | Erik Johnston | 2018-02-06 | 2 | -8/+8 |
| | | | | |||||
| * | | | Update places where we create events | Erik Johnston | 2018-02-05 | 4 | -29/+26 |
| | | | | |||||
| * | | | Split event creation into a separate handler | Erik Johnston | 2018-02-05 | 1 | -146/+160 |
| | | | | |||||
* | | | | Store state groups separately from events (#2784) | Erik Johnston | 2018-02-06 | 1 | -7/+17 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Split state group persist into seperate storage func * Add per database engine code for state group id gen * Move store_state_group to StateReadStore This allows other workers to use it, and so resolve state. * Hook up store_state_group * Fix tests * Rename _store_mult_state_groups_txn * Rename StateGroupReadStore * Remove redundant _have_persisted_state_group_txn * Update comments * Comment compute_event_context * Set start val for state_group_id_seq ... otherwise we try to recreate old state groups * Update comments * Don't store state for outliers * Update comment * Update docstring as state groups are ints | ||||
* | | | Rename resolve_state_groups -> resolve_state_groups_for_events | Richard van der Hoff | 2018-02-01 | 1 | -6/+5 |
| | | | | | | | | | | | | (to make way for a method that actually just does the state group resolution) | ||||
* | | | add white space line | Neil Johnson | 2018-01-26 | 1 | -0/+1 |
| | | | |||||
* | | | rather than try reconstruct the results object, better to guard against the ↵ | Neil Johnson | 2018-01-26 | 1 | -6/+2 |
| | | | | | | | | | | | | xrange step argument being 0 | ||||
* | | | fix return type, should be a dict | Neil Johnson | 2018-01-25 | 1 | -1/+1 |
| | | | |||||
* | | | fix PEP8 violation | Neil Johnson | 2018-01-25 | 1 | -1/+1 |
| | | | |||||
* | | | remove white space | Neil Johnson | 2018-01-25 | 1 | -1/+0 |
| | | | |||||
* | | | synapse 500s on a call to publicRooms in the case where the number of public ↵ | Neil Johnson | 2018-01-25 | 1 | -0/+5 |
| | | | | | | | | | | | | rooms is zero, the specific cause is due to xrange trying to use a step value of zero, but if the total room number really is zero then it makes sense to just bail and save the extra processing | ||||
* | | | Add federation_domain_whitelist option (#2820) | Matthew Hodgson | 2018-01-22 | 3 | -1/+15 |
| | | | | | | | | | | | | | | | | | | Add federation_domain_whitelist gives a way to restrict which domains your HS is allowed to federate with. useful mainly for gracefully preventing a private but internet-connected HS from trying to federate to the wider public Matrix network | ||||
* | | | rewrite based on PR feedback: | Matthew Hodgson | 2018-01-19 | 1 | -10/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * [ ] split config options into allowed_local_3pids and registrations_require_3pid * [ ] simplify and comment logic for picking registration flows * [ ] fix docstring and move check_3pid_allowed into a new util module * [ ] use check_3pid_allowed everywhere @erikjohnston PTAL | ||||
* | | | fix up v1, and improve errors | Matthew Hodgson | 2018-01-19 | 1 | -1/+12 |
|/ / | |||||
* | | Sanity checking for user ids | Richard van der Hoff | 2018-01-17 | 2 | -8/+19 |
| | | | | | | | | | | | | | | | | Check the user_id passed to a couple of APIs for validity, to avoid "IndexError: list index out of range" exception which looks scary and results in a 500 rather than a more useful error. Fixes #1432, among other things | ||||
* | | Metrics for events processed in appservice and fed sender | Richard van der Hoff | 2018-01-15 | 1 | -0/+7 |
| | | | | | | | | More metrics I wished I'd had | ||||
* | | Merge pull request #2773 from matrix-org/erikj/hash_bg | Erik Johnston | 2018-01-10 | 3 | -10/+18 |
|\ \ | | | | | | | Do bcrypt hashing in a background thread | ||||
| * | | Do bcrypt hashing in a background thread | Erik Johnston | 2018-01-10 | 3 | -10/+18 |
| | | | |||||
* | | | fix order of operations derp and also use `.get` to default to {} | Michael Telatynski | 2018-01-10 | 1 | -2/+3 |
| | | | | | | | | | | | | Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | ||||
* | | | Fix publicised groups API (singular) over federation | Michael Telatynski | 2018-01-10 | 1 | -4/+4 |
| |/ |/| | | | | | | | | | | | which was missing its fed client API, since there is no other API it might as well reuse the bulk one and unwrap it Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | ||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2017-12-07 | 12 | -116/+389 |
|\ \ | | | | | | | | | | erikj/createroom_content | ||||
| * \ | Merge pull request #2723 from matrix-org/matthew/search-all-local-users | Matthew Hodgson | 2017-12-05 | 3 | -16/+78 |
| |\ \ | | | | | | | | | Add all local users to the user_directory and optionally search them | ||||
| | * | | speed up the rate of initial spam for users | Matthew Hodgson | 2017-12-04 | 1 | -11/+12 |
| | | | | |||||
| | * | | fix pep8 and tests | Matthew Hodgson | 2017-12-04 | 2 | -4/+3 |
| | | | | |||||
| | * | | switch to a simpler 'search_all_users' button as per review feedback | Matthew Hodgson | 2017-12-04 | 3 | -6/+6 |
| | | | | |||||
| | * | | Merge branch 'develop' into matthew/search-all-local-users | Matthew Hodgson | 2017-11-30 | 4 | -37/+139 |
| | |\| | |||||
| | * | | fix thinkos galore | Matthew Hodgson | 2017-11-30 | 1 | -4/+6 |
| | | | | |||||
| | * | | kick the user_directory index when new users register | Matthew Hodgson | 2017-11-29 | 1 | -0/+8 |
| | | | | |||||
| | * | | untested WIP but might actually work | Matthew Hodgson | 2017-11-29 | 2 | -4/+56 |
| | | | | |||||
| | * | | Add user_directory_include_pattern config param to expand search results to ↵ | Matthew Hodgson | 2017-11-29 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | support custom login types for validating users | Richard van der Hoff | 2017-12-05 | 1 | -24/+57 |
| | | | | | | | | | | | | | | | | | | | | Wire the custom login type support from password providers into the UI-auth user-validation flows. | ||||
| * | | | Factor out a validate_user_via_ui_auth method | Richard van der Hoff | 2017-12-05 | 1 | -0/+43 |
| | | | | | | | | | | | | | | | | Collect together all the places that validate a logged-in user via UI auth. | ||||
| * | | | Refactor UI auth implementation | Richard van der Hoff | 2017-12-05 | 1 | -17/+29 |
| | |/ | |/| | | | | | | | | | | Instead of returning False when auth is incomplete, throw an exception which can be caught with a wrapper. | ||||
| * | | Delete devices in various logout situations | Richard van der Hoff | 2017-11-29 | 3 | -1/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | Move set_password into its own handler | Richard van der Hoff | 2017-11-29 | 2 | -16/+45 |
| | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | Move deactivate_account into its own handler | Richard van der Hoff | 2017-11-29 | 2 | -16/+44 |
| | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | Remove pushers when deleting access tokens | Richard van der Hoff | 2017-11-29 | 1 | -4/+12 |
| |/ | | | | | | | | | Whenever an access token is invalidated, we should remove the associated pushers. | ||||
| * | Merge pull request #2686 from matrix-org/luke/as-flair | Luke Barnard | 2017-11-17 | 1 | -0/+11 |
| |\ | | | | | | | Add automagical AS Publicised Group(s) | ||||
| | * | Make sure we check AS groups for lookup on bulk | Luke Barnard | 2017-11-16 | 1 | -0/+5 |
| | | | |||||
| | * | Add automagical AS Publicised Group(s) | Luke Barnard | 2017-11-16 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | via registration file "users" namespace: ```YAML ... namespaces: users: - exclusive: true regex: '.*luke.*' group_id: '+all_the_lukes:hsdomain' ... ``` This is part of giving App Services their own groups for matching users. With this, ghost users will be given the appeareance that they are in a group and that they have publicised the fact, but _only_ from the perspective of the `get_publicised_groups_for_user` API. | ||||
| * | | typo | Matthew Hodgson | 2017-11-17 | 1 | -1/+1 |
| | | | |||||
| * | | Fix auth handler #2678 | Jurek | 2017-11-16 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #2675 from matrix-org/rav/remove_broken_logcontext_funcs | Richard van der Hoff | 2017-11-15 | 2 | -4/+4 |
| |\ | | | | | | | Remove preserve_context_over_{fn, deferred} | ||||
| | * | Remove preserve_context_over_{fn, deferred} | Richard van der Hoff | 2017-11-14 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | Both of these functions ae known to leak logcontexts. Replace the remaining calls to them and kill them off. | ||||
| * | | Reshuffle room list request code | Richard van der Hoff | 2017-11-14 | 1 | -27/+24 |
| | | | | | | | | | | | | | | | | | | I'm not entirely sure if this will actually help anything, but it simplifies the code and might give further clues about why room list search requests are blowing out the get_current_state_ids caches. | ||||
| * | | Add a load of logging to the room_list handler | Richard van der Hoff | 2017-11-14 | 1 | -0/+13 |
| |/ | | | | | | | So we can see what it gets up to. | ||||
* | | Copy dict in update_membership too | Erik Johnston | 2017-12-07 | 1 | -0/+4 |
| | | |||||
* | | PEP8 | Erik Johnston | 2017-11-28 | 1 | -1/+1 |
| | | |||||
* | | Fix wrong avatars when inviting multiple users when creating room | Erik Johnston | 2017-11-28 | 1 | -5/+5 |
| | | | | | | We reused the `content` dictionary between invite requests, which meant they could end up reusing the profile info for a previous user | ||||
* | | Fix auth handler #2678 | Jurek | 2017-11-17 | 1 | -1/+1 |
|/ | |||||
* | Revert "Allow upper-case characters in mxids" | Richard van der Hoff | 2017-11-09 | 1 | -3/+3 |
| | | | | This reverts commit b70b64690330c25cbd04c1b2cacf8276b566efc8. | ||||
* | Allow upper-case characters in mxids | Richard van der Hoff | 2017-11-09 | 1 | -3/+3 |
| | | | | Because we're never going to be able to fix this :'( | ||||
* | Have an explicit API to update room config | Erik Johnston | 2017-11-08 | 1 | -0/+1 |
| | |||||
* | Revert "Modify group room association API to allow modification of is_public" | Erik Johnston | 2017-11-08 | 1 | -2/+2 |
| | |||||
* | Merge pull request #2631 from xyzz/fix_appservice_event_backlog | Erik Johnston | 2017-11-08 | 1 | -5/+1 |
|\ | | | | | Fix appservices being backlogged and not receiving new events due to a bug in notify_interested_services | ||||
| * | Remove useless assignment in notify_interested_services | Ilya Zhuravlev | 2017-11-07 | 1 | -1/+0 |
| | | |||||
| * | Fix appservices being backlogged and not receiving new events due to a bug ↵ | Ilya Zhuravlev | 2017-11-02 | 1 | -4/+1 |
| | | | | | | | | in notify_interested_services | ||||
* | | Merge pull request #2649 from matrix-org/rav/fix_delta_on_state_res | Richard van der Hoff | 2017-11-08 | 1 | -20/+46 |
|\ \ | | | | | | | Fix bug in state group storage | ||||
| * | | s/items/iteritems/ | Richard van der Hoff | 2017-11-08 | 1 | -2/+2 |
| | | | |||||
| * | | Update deltas when doing auth resolution | Richard van der Hoff | 2017-11-07 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | Fixes a bug where the persisted state groups were different to those actually being used after auth resolution. | ||||
| * | | factor out _update_context_for_auth_events | Richard van der Hoff | 2017-11-07 | 1 | -20/+42 |
| | | | | | | | | | | | | This is duplicated, so let's factor it out before fixing it | ||||
* | | | Merge pull request #2643 from matrix-org/matthew/user_dir_typos | Matthew Hodgson | 2017-11-07 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | Fix various embarrassing typos around user_directory and add some doc. | ||||
| * | | s/intial/initial/ | Matthew Hodgson | 2017-11-04 | 1 | -2/+2 |
| |/ | |||||
* | | Merge pull request #2636 from farialima/me-master | Erik Johnston | 2017-11-07 | 1 | -13/+8 |
|\ \ | |/ |/| | Fix for #2635: correctly update rooms avatar/display name when modified by admin | ||||
| * | removed unused import flagged by flake8a | Francois Granade | 2017-11-03 | 1 | -1/+0 |
| | | |||||
| * | Fix for issue 2635: correctly update rooms avatar/display name when modified ↵ | Francois Granade | 2017-11-03 | 1 | -12/+8 |
| | | | | | | | | by admin | ||||
* | | Factor _AccountHandler proxy out to ModuleApi | Richard van der Hoff | 2017-11-02 | 1 | -69/+3 |
| | | | | | | | | | | We're going to need to use this from places that aren't password auth, so let's move it to a proper class. | ||||
* | | Merge pull request #2624 from matrix-org/rav/password_provider_notify_logout | David Baker | 2017-11-02 | 1 | -2/+24 |
|\ \ | | | | | | | Notify auth providers on logout | ||||
| * | | Notify auth providers on logout | Richard van der Hoff | 2017-11-01 | 1 | -2/+24 |
| | | | | | | | | | | | | Provide a hook by which auth providers can be notified of logouts. | ||||
* | | | Merge pull request #2623 from matrix-org/rav/callbacks_for_auth_providers | David Baker | 2017-11-02 | 1 | -6/+11 |
|\ \ \ | | | | | | | | | Allow password_auth_providers to return a callback | ||||
| * | | | Fix user-interactive password auth | Richard van der Hoff | 2017-11-01 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | this got broken in the previous commit | ||||
| * | | | Allow password_auth_providers to return a callback | Richard van der Hoff | 2017-11-01 | 1 | -5/+8 |
| |/ / | | | | | | | | | | ... so that they have a way to record access tokens. | ||||
* | | | Merge pull request #2622 from matrix-org/rav/db_access_for_auth_providers | David Baker | 2017-11-02 | 1 | -0/+16 |
|\ \ \ | |/ / |/| | | Let auth providers get to the database | ||||
| * | | Let auth providers get to the database | Richard van der Hoff | 2017-10-31 | 1 | -0/+16 |
| | | | | | | | | | | | | Somewhat open to abuse, but also somewhat unavoidable :/ | ||||
* | | | Merge pull request #2620 from matrix-org/rav/auth_non_password | Richard van der Hoff | 2017-11-01 | 1 | -22/+96 |
|\ \ \ | | | | | | | | | Let password auth providers handle arbitrary login types | ||||
| * | | | Let password auth providers handle arbitrary login types | Richard van der Hoff | 2017-11-01 | 1 | -22/+96 |
| |/ / | | | | | | | | | | | | | Provide a hook where password auth providers can say they know about other login types, and get passed the relevant parameters | ||||
* | | | Merge remote-tracking branch 'origin/develop' into ↵ | David Baker | 2017-11-01 | 3 | -13/+8 |
|\ \ \ | | | | | | | | | | | | | rav/refactor_accesstoken_delete | ||||
| * \ \ | Merge pull request #2615 from matrix-org/rav/break_auth_device_dep | David Baker | 2017-11-01 | 1 | -9/+6 |
| |\ \ \ | | | | | | | | | | | Break dependency of auth_handler on device_handler | ||||
| | * | | | Break dependency of auth_handler on device_handler | Richard van der Hoff | 2017-11-01 | 1 | -9/+6 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm going to need to make the device_handler depend on the auth_handler, so I need to break this dependency to avoid a cycle. It turns out that the auth_handler was only using the device_handler in one place which was an edge case which we can more elegantly handle by throwing an error rather than fixing it up. | ||||
| * | | | Merge pull request #2613 from matrix-org/rav/kill_refresh_tokens | David Baker | 2017-11-01 | 1 | -2/+0 |
| |\ \ \ | | | | | | | | | | | Remove the last vestiges of refresh_tokens | ||||
| | * | | | Remove the last vestiges of refresh_tokens | Richard van der Hoff | 2017-10-31 | 1 | -2/+0 |
| | |/ / | |||||
| * / / | Modify group room association API to allow modification of is_public | Luke Barnard | 2017-10-31 | 1 | -2/+2 |
| |/ / | | | | | | | | | | also includes renamings to make things more consistent. | ||||
* / / | Move access token deletion into auth handler | Richard van der Hoff | 2017-11-01 | 3 | -5/+52 |
|/ / | | | | | | | | | | | | | Also move duplicated deactivation code into the auth handler. I want to add some hooks when we deactivate an access token, so let's bring it all in here so that there's somewhere to put it. | ||||
* | | Refactor some logic from LoginRestServlet into AuthHandler | Richard van der Hoff | 2017-10-31 | 1 | -28/+52 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm going to need some more flexibility in handling login types in password auth providers, so as a first step, move some stuff from LoginRestServlet into AuthHandler. In particular, we pass everything other than SAML, JWT and token logins down to the AuthHandler, which now has responsibility for checking the login type and fishing the password out of the login dictionary, as well as qualifying the user_id if need be. Ideally SAML, JWT and token would go that way too, but there's no real need for it right now and I'm trying to minimise impact. This commit *should* be non-functional. | ||||
* | | Merge pull request #2589 from matrix-org/rav/as_deactivate_account | Richard van der Hoff | 2017-10-27 | 1 | -1/+1 |
|\ \ | | | | | | | Allow ASes to deactivate their own users | ||||
| * | | Allow ASes to deactivate their own users | Richard van der Hoff | 2017-10-27 | 1 | -1/+1 |
| |/ | |||||
* | | Update room_list.py | Erik Johnston | 2017-10-26 | 1 | -1/+1 |
| | | |||||
* | | Do logcontexts outside ResponseCache | Erik Johnston | 2017-10-25 | 2 | -5/+8 |
| | | |||||
* | | Add logging and fix log contexts for publicRooms | Erik Johnston | 2017-10-25 | 1 | -0/+2 |
|/ | |||||
* | replace 'except:' with 'except Exception:' | Richard van der Hoff | 2017-10-23 | 8 | -17/+17 |
| | | | | what could possibly go wrong | ||||
* | Merge pull request #2561 from matrix-org/rav/id_checking | Richard van der Hoff | 2017-10-23 | 1 | -9/+6 |
|\ | | | | | Updates to ID checking | ||||
| * | Allow = in mxids and groupids | Richard van der Hoff | 2017-10-20 | 1 | -3/+2 |
| | | | | | | | | ... because the spec says we should. | ||||
| * | Disallow capital letters in userids | Richard van der Hoff | 2017-10-20 | 1 | -6/+4 |
| | | | | | | | | | | Factor out a common function for checking user ids and group ids, which forbids capitals. | ||||
* | | Remove pointless create() method | Richard van der Hoff | 2017-10-20 | 2 | -3/+3 |
|/ | | | | | It just calls the constructor, so we may as well kill it rather than having random codepaths. | ||||
* | _create_rererouter for get_invited_users_in_group | Luke Barnard | 2017-10-16 | 1 | -17/+2 |
| | |||||
* | Implement GET /groups/$groupId/invited_users | Luke Barnard | 2017-10-16 | 1 | -0/+17 |
| | |||||
* | Log a warning when no profile for invited member | Luke Barnard | 2017-10-16 | 1 | -2/+5 |
| | | | | And return empty profile | ||||
* | Merge pull request #2531 from matrix-org/dbkr/spamcheck_error_messages | David Baker | 2017-10-12 | 1 | -2/+6 |
|\ | | | | | Allow error strings from spam checker | ||||
| * | fix isinstance | David Baker | 2017-10-11 | 1 | -1/+1 |
| | | |||||
| * | Allow error strings from spam checker | David Baker | 2017-10-11 | 1 | -2/+6 |
| | | |||||
* | | Fix fetching remote summaries | Erik Johnston | 2017-10-11 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #2530 from matrix-org/rav/fix_receipt_logcontext | Richard van der Hoff | 2017-10-11 | 1 | -0/+4 |
|\ \ | | | | | | | fix a logcontext leak in read receipt handling | ||||
| * | | fix a logcontext leak in read receipt handling | Richard van der Hoff | 2017-10-11 | 1 | -0/+4 |
| | | | |||||
* | | | Fix attestations to check correct server name | Erik Johnston | 2017-10-11 | 1 | -10/+20 |
| |/ |/| | |||||
* | | Merge pull request #2466 from matrix-org/erikj/groups_merged | Erik Johnston | 2017-10-11 | 8 | -17/+584 |
|\ \ | | | | | | | Initial Group Implementation | ||||
| * \ | Merge branch 'develop' into erikj/groups_merged | David Baker | 2017-10-02 | 4 | -8/+121 |
| |\ \ | |||||
| * | | | Add remove room API | Erik Johnston | 2017-09-26 | 1 | -0/+1 |
| | | | | |||||
| * | | | Add is_publicised to group summary | Erik Johnston | 2017-09-26 | 1 | -25/+31 |
| | | | | |||||
| * | | | Ensure that creator of group sees group down /sync | Erik Johnston | 2017-09-19 | 2 | -4/+31 |
| | | | | |||||
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/groups_merged | Erik Johnston | 2017-09-19 | 3 | -33/+163 |
| |\ \ \ | |||||
| * | | | | Add user profiles to summary from group server | Erik Johnston | 2017-08-25 | 1 | -0/+23 |
| | | | | | |||||
| * | | | | Fix typos and reinherit | Erik Johnston | 2017-08-25 | 1 | -12/+6 |
| | | | | | |||||
| * | | | | Split out profile handler to fix tests | Erik Johnston | 2017-08-25 | 6 | -13/+16 |
| | | | | | |||||
| * | | | | Add remote profile cache | Erik Johnston | 2017-08-25 | 2 | -5/+93 |
| | | | | | |||||
| * | | | | Fixup | Erik Johnston | 2017-08-11 | 1 | -9/+13 |
| | | | | | |||||
| * | | | | Add bulk group publicised lookup API | Erik Johnston | 2017-08-09 | 1 | -0/+42 |
| | | | | | |||||
| * | | | | Store whether the user wants to publicise their membership of a group | Erik Johnston | 2017-08-08 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | Remove stale TODO comments | Erik Johnston | 2017-08-04 | 1 | -10/+0 |
| | | | | | |||||
| * | | | | Correctly add joins to correct segment | Erik Johnston | 2017-07-24 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #2378 from matrix-org/erikj/group_sync_support | Erik Johnston | 2017-07-21 | 2 | -5/+80 |
| |\ \ \ \ | | | | | | | | | | | | | Add groups to sync stream | ||||
| | * | | | | Add notifier | Erik Johnston | 2017-07-20 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Fix replication. And notify | Erik Johnston | 2017-07-20 | 1 | -4/+16 |
| | | | | | | |||||
| | * | | | | Remember to cast to bool | Erik Johnston | 2017-07-20 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Add groups to sync stream | Erik Johnston | 2017-07-20 | 1 | -1/+63 |
| | | | | | | |||||
| * | | | | | Add update group profile API | Erik Johnston | 2017-07-20 | 1 | -0/+1 |
| |/ / / / | |||||
| * | | | | Comments | Erik Johnston | 2017-07-18 | 1 | -10/+19 |
| | | | | | |||||
| * | | | | Fix typos | Erik Johnston | 2017-07-18 | 1 | -2/+3 |
| | | | | | |||||
| * | | | | Update federation client pokes | Erik Johnston | 2017-07-18 | 1 | -13/+22 |
| | | | | | |||||
| * | | | | Add client apis | Erik Johnston | 2017-07-18 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Comments | Erik Johnston | 2017-07-18 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Use transport client directly | Erik Johnston | 2017-07-18 | 1 | -18/+25 |
| | | | | | |||||
| * | | | | Add local group server support | Erik Johnston | 2017-07-17 | 1 | -0/+278 |
| | | | | | |||||
| * | | | | Merge pull request #2352 from matrix-org/erikj/group_server_split | Erik Johnston | 2017-07-12 | 1 | -8/+10 |
| |\ \ \ \ | | | | | | | | | | | | | Initial Group Server | ||||
| | * | | | | Initial group server implementation | Erik Johnston | 2017-07-10 | 1 | -8/+10 |
| | | | | | | |||||
* | | | | | | Merge pull request #2483 from jeremycline/unfreeze-ujson-dump | Erik Johnston | 2017-10-11 | 1 | -1/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Unfreeze event before serializing with ujson | ||||
| * | | | | | | Unfreeze event before serializing with ujson | Jeremy Cline | 2017-09-30 | 1 | -1/+2 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In newer versions of https://github.com/esnme/ultrajson, ujson does not serialize frozendicts (introduced in esnme/ultrajson@53f85b1). Although the PyPI version is still 1.35, Fedora ships with a build from commit esnme/ultrajson@2f1d487. This causes the serialization to fail if the distribution-provided package is used. This runs the event through the unfreeze utility before serializing it. Thanks to @ignatenkobrain for tracking down the root cause. fixes #2351 Signed-off-by: Jeremy Cline <jeremy@jcline.org> | ||||
* | | | | | | Merge pull request #2490 from matrix-org/erikj/drop_left_room_events | Erik Johnston | 2017-10-10 | 1 | -0/+22 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Ignore incoming events for rooms that we have left | ||||
| * | | | | | Update comments | Erik Johnston | 2017-10-03 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Remove spurious line feed | Erik Johnston | 2017-10-03 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | Ignore incoming events for rooms that we have left | Erik Johnston | 2017-10-03 | 1 | -0/+23 |
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When synapse receives an event for a room its not in over federation, it double checks with the remote server to see if it is in fact in the room. This is done so that if the server has forgotten about the room (usually as a result of the database being dropped) it can recover from it. However, in the presence of state resets in large rooms, this can cause a lot of work for servers that have legitimately left. As a hacky solution that supports both cases we drop incoming events for rooms that we have explicitly left. This means that we no longer support the case of servers having forgotten that they've rejoined a room, but that is sufficiently rare that we're not going to support it for now. | ||||
* | | | | | Fix up deferred handling in federation.py | Richard van der Hoff | 2017-10-06 | 1 | -24/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Avoid preserve_context_over_deferred, which is broken * set consumeErrors=True on defer.gatherResults, to avoid spurious "unhandled failure" erros | ||||
* | | | | | Spam checking: add the invitee to user_may_invite | David Baker | 2017-10-05 | 2 | -6/+8 |
| | | | | | |||||
* | | | | | spam check room publishing | David Baker | 2017-10-04 | 1 | -0/+8 |
| | | | | | |||||
* | | | | | un-double indent | David Baker | 2017-10-04 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Add room creation checks to spam checker | David Baker | 2017-10-04 | 2 | -0/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Lets the spam checker deny attempts to create rooms and add aliases to them. | ||||
* | | | | | pass room id too | David Baker | 2017-10-03 | 2 | -2/+4 |
| | | | | | |||||
* | | | | | Federation was passing strings anyway | David Baker | 2017-10-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | so pass string everywhere | ||||
* | | | | | this shouldn't be debug | David Baker | 2017-10-03 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | better logging | David Baker | 2017-10-03 | 1 | -4/+9 |
| | | | | | |||||
* | | | | | Skip spam check for admin users | David Baker | 2017-10-03 | 1 | -8/+8 |
| | | | | | |||||
* | | | | | Fix param name & lint | David Baker | 2017-10-03 | 1 | -2/+4 |
| | | | | | |||||
* | | | | | Allow spam checker to reject invites too | David Baker | 2017-10-03 | 2 | -6/+18 |
|/ / / / | |||||
* | | | | Fix /joined_members to work with AS users | Erik Johnston | 2017-09-28 | 1 | -11/+25 |
| | | | | |||||
* | | | | Fix bug where /joined_members didn't check user was in room | Erik Johnston | 2017-09-27 | 1 | -0/+31 |
| | | | | |||||
* | | | | Make the spam checker a module | David Baker | 2017-09-26 | 1 | -2/+3 |
| | | | | |||||
* | | | | Refactor to speed up incremental syncs | Erik Johnston | 2017-09-25 | 1 | -5/+18 |
| | | | | |||||
* | | | | Fix device list when rejoining room (#2461) | Erik Johnston | 2017-09-22 | 1 | -2/+14 |
| | | | | |||||
* | | | | Add a config option to block all room invites (#2457) | Richard van der Hoff | 2017-09-19 | 2 | -0/+25 |
| | | | | | | | | | | | | | | | | | | | | - allows sysadmins the ability to lock down their servers so that people can't send their users room invites. | ||||
* | | | | add some comments to on_exchange_third_party_invite_request | Richard van der Hoff | 2017-09-19 | 1 | -0/+11 |
| | | | | |||||
* | | | | PoC for filtering spammy events (#2456) | Richard van der Hoff | 2017-09-19 | 1 | -1/+7 |
| |_|/ |/| | | | | | Demonstration of how you might add some hooks to filter out spammy events. | ||||
* | | | Fix overzealous kicking of guest users (#2453) | Richard van der Hoff | 2017-09-19 | 1 | -1/+1 |
| | | | | | | | | | We should only kick guest users if the guest access event is authorised. | ||||
* | | | Don't filter out current state events from timeline | Erik Johnston | 2017-09-18 | 1 | -0/+7 |
| | | | |||||
* | | | Correctly handle leaving room in /key/changes | Erik Johnston | 2017-09-18 | 1 | -13/+12 |
| | | | |||||
* | | | Fix typo | Erik Johnston | 2017-09-15 | 1 | -1/+1 |
| | | | |||||
* | | | Actually hook leave notifs up | Erik Johnston | 2017-09-14 | 1 | -2/+3 |
| | | | |||||
* | | | Handle joining/leaving rooms in /keys/changes | Erik Johnston | 2017-09-13 | 1 | -1/+38 |
| | | | |||||
* | | | Get left rooms | Erik Johnston | 2017-09-13 | 1 | -3/+32 |
| | | | |||||
* | | | In sync handle device lists for newly joined/left rooms | Erik Johnston | 2017-09-12 | 1 | -2/+10 |
| | | | |||||
* | | | Add left section to /keys/changes | Erik Johnston | 2017-09-08 | 2 | -7/+17 |
| | | | |||||
* | | | Send down device list change notif when member leaves/rejoins room | Erik Johnston | 2017-09-07 | 2 | -13/+53 |
| | | | |||||
* | | | Use less DB for device list handling in sync | Erik Johnston | 2017-07-12 | 1 | -8/+7 |
| |/ |/| | |||||
* | | Don't compute push actions for backfilled events | Erik Johnston | 2017-07-11 | 1 | -1/+1 |
|/ | |||||
* | Fix bug where pusherpool didn't start and broke some rooms | Erik Johnston | 2017-07-06 | 2 | -2/+5 |
| | | | | | | | | Since we didn't instansiate the PusherPool at start time it could fail at run time, which it did for some users. This may or may not fix things for those users, but it should happen at start time and stop the server from starting. | ||||
* | Improve the error handling for bad invites received over federation | Mark Haines | 2017-06-30 | 1 | -2/+17 |
| | |||||
* | Use an ExpiringCache for storing registration sessions | Erik Johnston | 2017-06-29 | 1 | -11/+10 |
| | | | | | This is because pruning them was a significant performance drain on matrix.org | ||||
* | Merge pull request #2307 from matrix-org/erikj/user_ip_batch | Erik Johnston | 2017-06-27 | 1 | -2/+2 |
|\ | | | | | Batch upsert user ips | ||||
| * | Fix up client ips to read from pending data | Erik Johnston | 2017-06-27 | 1 | -2/+2 |
| | | |||||
* | | Remove unused variables | Erik Johnston | 2017-06-26 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2017-06-26 | 4 | -13/+52 |
|\| | | | | | | | erikj/ensure_round_trip | ||||
| * | Make some more params configurable | Erik Johnston | 2017-06-22 | 1 | -5/+8 |
| | | |||||
| * | Typo. ARGH. | Erik Johnston | 2017-06-22 | 1 | -1/+1 |
| | | |||||
| * | Fix thinko in unhandled user spam | Erik Johnston | 2017-06-22 | 1 | -2/+2 |
| | |