| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'release-v0.30.0' into rav/localpart_in_consent_uri | Richard van der Hoff | 2018-05-23 | 1 | -1/+4 |
| |\ | |||||
| | * | Support for putting %(consent_uri)s in messages | Richard van der Hoff | 2018-05-23 | 1 | -1/+4 |
| | | | | | | | | | | | Make it possible to put the URI in the error message and the server notice that get sent by the server | ||||
| * | | Use the localpart in the consent uri | Richard van der Hoff | 2018-05-23 | 1 | -1/+3 |
| |/ | | | | ... because it's shorter. | ||||
| * | custom error code for not leaving server notices room | Richard van der Hoff | 2018-05-22 | 1 | -0/+1 |
| | | |||||
| * | comment typo | David Baker | 2018-05-22 | 1 | -1/+1 |
| | | |||||
| * | Reject attempts to send event before privacy consent is given | Richard van der Hoff | 2018-05-22 | 2 | -1/+89 |
| | | | | | | | Returns an M_CONSENT_NOT_GIVEN error (cf https://github.com/matrix-org/matrix-doc/issues/1252) if consent is not yet given. | ||||
| * | Stub out ServerNoticesSender on the workers | Richard van der Hoff | 2018-05-22 | 2 | -4/+5 |
| | | | | | | ... and have the sync endpoints call it directly rather than obsure indirection via PresenceHandler | ||||
| * | Send users a server notice about consent | Richard van der Hoff | 2018-05-22 | 1 | -1/+9 |
| | | | | | | When a user first syncs, we will send them a server notice asking them to consent to the privacy policy if they have not already done so. | ||||
| * | Merge pull request #3232 from matrix-org/rav/server_notices_room | Richard van der Hoff | 2018-05-18 | 4 | -6/+80 |
| |\ | | | | | Infrastructure for a server notices room | ||||
| | * | Make sure we reject attempts to invite the notices user | Richard van der Hoff | 2018-05-18 | 2 | -0/+15 |
| | | | |||||
| | * | fix missing yield for server_notices_room | Richard van der Hoff | 2018-05-17 | 1 | -3/+4 |
| | | | |||||
| | * | Infrastructure for a server notices room | Richard van der Hoff | 2018-05-17 | 3 | -6/+64 |
| | | | | | | | | | | | | | | | Server Notices use a special room which the user can't dismiss. They are created on demand when some other bit of the code calls send_notice. (This doesn't actually do much yet becuse we don't call send_notice anywhere) | ||||
| * | | Merge pull request #3233 from matrix-org/rav/remove_dead_code | Richard van der Hoff | 2018-05-18 | 1 | -55/+0 |
| |\ \ | | | | | | | Remove unused `update_external_syncs` | ||||
| | * | | Remove unused `update_external_syncs` | Richard van der Hoff | 2018-05-17 | 1 | -55/+0 |
| | |/ | | | | | | | This method isn't used anywhere. Burninate it. | ||||
| * | | Merge pull request #3221 from matrix-org/erikj/purge_token | Erik Johnston | 2018-05-18 | 1 | -6/+6 |
| |\ \ | |/ |/| | Make purge_history operate on tokens | ||||
| | * | Make purge_history operate on tokens | Erik Johnston | 2018-05-15 | 1 | -6/+6 |
| | | | | | | | | | As we're soon going to change how topological_ordering works | ||||
| * | | Move RoomCreationHandler out of synapse.handlers.Handlers | Richard van der Hoff | 2018-05-17 | 2 | -6/+7 |
| |/ | | | | | | | Handlers is deprecated nowadays, so let's move this out before I add a new dependency on it. Also fix the docstrings on create_room. | ||||
| * | Merge pull request #3201 from matrix-org/dbkr/leave_rooms_on_deactivate | David Baker | 2018-05-14 | 1 | -2/+79 |
| |\ | | | | | Part user from rooms on account deactivate | ||||
| | * | Catch failure to part user from room | David Baker | 2018-05-10 | 1 | -7/+13 |
| | | | |||||
| | * | Many docstrings | David Baker | 2018-05-10 | 1 | -0/+24 |
| | | | |||||
| | * | Oops, don't call function passed to run_in_background | David Baker | 2018-05-10 | 1 | -1/+1 |
| | | | |||||
| | * | Prefix internal functions | David Baker | 2018-05-09 | 1 | -7/+7 |
| | | | |||||
| | * | Indent fail | David Baker | 2018-05-09 | 1 | -1/+1 |
| | | | |||||
| | * | Part deactivated users in the background | David Baker | 2018-05-09 | 1 | -1/+34 |
| | | | | | | | | | | | One room at a time so we don't take out the whole server with leave events, and restart at server restart. | ||||
| | * | Part user from rooms on account deactivate | David Baker | 2018-05-08 | 1 | -1/+15 |
| | | | | | | | | | | | | | | | This implements this very crudely: this probably isn't viable because parting a user from all their rooms could take a long time, and if the HS gets restarted in that time the process will be aborted. | ||||
| * | | Merge pull request #3199 from matrix-org/erikj/pagination_sync | Erik Johnston | 2018-05-09 | 1 | -6/+18 |
| |\ \ | | | | | | | Refactor sync APIs to reuse pagination API | ||||
| | * | | Add comment to sync as to why code path is split | Erik Johnston | 2018-05-09 | 1 | -0/+5 |
| | | | | |||||
| | * | | Refactor sync APIs to reuse pagination API | Erik Johnston | 2018-05-09 | 1 | -6/+13 |
| | | | | | | | | | | | | | | | | | | | The sync API often returns events in a topological rather than stream ordering, e.g. when the user joined the room or on initial sync. When this happens we can reuse existing pagination storage functions. | ||||
| * | | | Fix returned token is no longer a tuple | Erik Johnston | 2018-05-09 | 1 | -1/+1 |
| |/ / | |||||
| * / | Refactor get_recent_events_for_room return type | Erik Johnston | 2018-05-09 | 2 | -6/+6 |
| |/ | | | | | | There is no reason to return a tuple of tokens when the last token is always the token passed as an argument. Changing it makes it consistent with other storage APIs | ||||
| * | Merge branch 'release-v0.28.1' into develop | Richard van der Hoff | 2018-05-01 | 1 | -1/+5 |
| |\ | |||||
| | * | Apply some limits to depth to counter abuse | Richard van der Hoff | 2018-05-01 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | * When creating a new event, cap its depth to 2^63 - 1 * When receiving events, reject any without a sensible depth As per https://docs.google.com/document/d/1I3fi2S-XnpO45qrpCsowZv8P8dHcNZ4fsBsbOW7KABI | ||||
| * | | Merge pull request #3143 from matrix-org/rav/remove_redundant_preserve_fn | Richard van der Hoff | 2018-04-30 | 1 | -4/+2 |
| |\ \ | | | | | | | Remove redundant call to preserve_fn | ||||
| | * | | Remove redundant call to preserve_fn | Richard van der Hoff | 2018-04-30 | 1 | -4/+2 |
| | | | | | | | | | | | | | submit_event_for_as doesn't return a deferred anyway, so this is pointless. | ||||
| * | | | Merge pull request #3153 from NotAFile/py3-httplib | Richard van der Hoff | 2018-04-30 | 1 | -3/+3 |
| |\ \ \ | | | | | | | | | move httplib import to six | ||||
| | * | | | move httplib import to six | Adrian Tschira | 2018-04-28 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Merge pull request #3151 from NotAFile/py3-xrange-1 | Richard van der Hoff | 2018-04-30 | 1 | -1/+3 |
| |\ \ \ \ | | | | | | | | | | | Move more xrange to six | ||||
| | * \ \ \ | Merge branch 'develop' into py3-xrange-1 | Richard van der Hoff | 2018-04-30 | 6 | -21/+32 |
| | |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | | Move more xrange to six | Adrian Tschira | 2018-04-28 | 1 | -1/+3 |
| | | |/ / | |/| | | | | | | | | | | | | | | | | | | plus a bonus next() Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
| * | | | | Merge pull request #3150 from NotAFile/py3-listcomp-yield | Richard van der Hoff | 2018-04-30 | 1 | -5/+9 |
| |\ \ \ \ | |_|/ / |/| | | | Don't yield in list comprehensions | ||||
| | * | | | Don't yield in list comprehensions | Adrian Tschira | 2018-04-28 | 1 | -5/+9 |
| | |/ / | | | | | | | | | | | | | | | | I've tried to grep for more of this with no success. Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
| * | | | pep8; remove spurious import | Richard van der Hoff | 2018-04-27 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'origin/develop' into rav/use_run_in_background | Richard van der Hoff | 2018-04-27 | 6 | -74/+112 |
| |\| | | |||||
| | * | | Merge pull request #3142 from matrix-org/rav/reraise | Richard van der Hoff | 2018-04-27 | 2 | -13/+24 |
| | |\ \ | | | | | | | | | reraise exceptions more carefully | ||||
| | | * | | reraise exceptions more carefully | Richard van der Hoff | 2018-04-27 | 2 | -13/+24 |
| | | |/ | | | | | | | | | | | | | | | | | | | We need to be careful (under python 2, at least) that when we reraise an exception after doing some error handling, we actually reraise the original exception rather than anything that might have been raised (and handled) during the error handling. | ||||
| | * | | Merge pull request #3138 from matrix-org/rav/catch_unhandled_exceptions | Richard van der Hoff | 2018-04-27 | 4 | -59/+86 |
| | |\ \ | | | | | | | | | Improve exception handling for background processes | ||||
| | | * | | Improve exception handling for background processes | Richard van der Hoff | 2018-04-27 | 4 | -59/+86 |
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were a bunch of places where we fire off a process to happen in the background, but don't have any exception handling on it - instead relying on the unhandled error being logged when the relevent deferred gets garbage-collected. This is unsatisfactory for a number of reasons: - logging on garbage collection is best-effort and may happen some time after the error, if at all - it can be hard to figure out where the error actually happened. - it is logged as a scary CRITICAL error which (a) I always forget to grep for and (b) it's not really CRITICAL if a background process we don't care about fails. So this is an attempt to add exception handling to everything we fire off into the background. | ||||
| | * / | Add missing consumeErrors | Richard van der Hoff | 2018-04-27 | 1 | -2/+2 |
| | |/ | | | | | | | | | In general we want defer.gatherResults to consumeErrors, rather than having exceptions hanging around and getting logged as CRITICAL unhandled errors. | ||||
| * / | Use run_in_background in preference to preserve_fn | Richard van der Hoff | 2018-04-27 | 6 | -20/+31 |
| |/ | | | | | | While I was going through uses of preserve_fn for other PRs, I converted places which only use the wrapped function once to use run_in_background, to avoid creating the function object. | ||||
| * | Merge pull request #3118 from matrix-org/rav/reject_prev_events | Richard van der Hoff | 2018-04-23 | 1 | -7/+71 |
| |\ | | | | | Reject events which have lots of prev_events | ||||
| | * | Remove spurious param | Richard van der Hoff | 2018-04-23 | 1 | -1/+0 |
| | | | |||||
| | * | accept stupid events over backfill | Richard van der Hoff | 2018-04-20 | 1 | -4/+9 |
| | | | |||||
| | * | Add some comments | Richard van der Hoff | 2018-04-18 | 1 | -3/+12 |
| | | | |||||
| | * | Check events on backfill too | Richard van der Hoff | 2018-04-18 | 1 | -15/+42 |
| | | | |||||
| | * | Reject events which have too many auth_events or prev_events | Richard van der Hoff | 2018-04-18 | 1 | -4/+28 |
| | | | | | | | | | | | ... this should protect us from being dossed by people making silly events (deliberately or otherwise) | ||||
| * | | Merge pull request #3107 from NotAFile/py3-bool-nonzero | Richard van der Hoff | 2018-04-20 | 1 | -0/+7 |
| |\ \ | | | | | | | add __bool__ alias to __nonzero__ methods | ||||
| | * | | add __bool__ alias to __nonzero__ methods | Adrian Tschira | 2018-04-15 | 1 | -0/+7 |
| | |/ | | | | | | | Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
| * | | Merge pull request #3093 from matrix-org/rav/response_cache_wrap | Richard van der Hoff | 2018-04-20 | 2 | -35/+19 |
| |\ \ | | | | | | | Refactor ResponseCache usage | ||||
| | * | | Refactor ResponseCache usage | Richard van der Hoff | 2018-04-12 | 2 | -35/+19 |
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a `.wrap` method to ResponseCache which wraps up the boilerplate of a (get, set) pair, and then use it throughout the codebase. This will be largely non-functional, but does include the following functional changes: * federation_server.on_context_state_request: drops use of _server_linearizer which looked redundant and could cause incorrect cache misses by yielding between the get and the set. * RoomListHandler.get_remote_public_room_list(): fixes logcontext leaks * the wrap function includes some logging. I'm hoping this won't be too noisy on production. | ||||
| * | | Merge pull request #3117 from matrix-org/rav/refactor_have_events | Richard van der Hoff | 2018-04-20 | 1 | -19/+12 |
| |\ \ | | | | | | | Refactor store.have_events | ||||
| | * | | Refactor store.have_events | Richard van der Hoff | 2018-04-20 | 1 | -19/+12 |
| | |/ | | | | | | | | | | | It turns out that most of the time we were calling have_events, we were only using half of the result. Replace have_events with have_seen_events and get_rejection_reasons, so that we can see what's going on a bit more clearly. | ||||
| * / | Avoid creating events with huge numbers of prev_events | Richard van der Hoff | 2018-04-16 | 2 | -38/+53 |
| |/ | | | | | | In most cases, we limit the number of prev_events for a given event to 10 events. This fixes a particular code path which created events with huge numbers of prev_events. | ||||
| * | Merge pull request #3092 from matrix-org/rav/response_cache_metrics | Richard van der Hoff | 2018-04-12 | 2 | -3/+4 |
| |\ | | | | | Add metrics for ResponseCache | ||||
| | * | Add metrics for ResponseCache | Richard van der Hoff | 2018-04-10 | 2 | -3/+4 |
| | | | |||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-04-12 | 1 | -2/+19 |
| |\ \ | | | | | | | | | | erikj/processed_event_lag | ||||
| | * \ | Merge pull request #3088 from matrix-org/erikj/as_parallel | Erik Johnston | 2018-04-12 | 1 | -2/+19 |
| | |\ \ | | | | | | | | | Send events to ASes concurrently | ||||
| | | * | | Send events to ASes concurrently | Erik Johnston | 2018-04-11 | 1 | -2/+19 |
| | | | | | |||||
| * | | | | Set all metrics at the same time | Erik Johnston | 2018-04-12 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | Track last processed event received_ts | Erik Johnston | 2018-04-11 | 1 | -0/+10 |
| | | | | | |||||
| * | | | | Track where event stream processing have gotten up to | Erik Johnston | 2018-04-11 | 1 | -0/+4 |
| |/ / / | |||||
| * | | | Merge pull request #3079 from matrix-org/erikj/limit_concurrent_sends | Erik Johnston | 2018-04-10 | 1 | -49/+55 |
| |\ \ \ | |/ / |/| | | Limit concurrent event sends for a room | ||||
| | * | | Note why we're limiting concurrent event sends | Erik Johnston | 2018-04-10 | 1 | -0/+5 |
| | | | | |||||
| | * | | Limit concurrent event sends for a room | Erik Johnston | 2018-04-09 | 1 | -49/+50 |
| | | | | |||||
| * | | | Merge pull request #2996 from krombel/allow_auto_join_rooms | Richard van der Hoff | 2018-04-10 | 1 | -2/+34 |
| |\ \ \ | |_|/ |/| | | move handling of auto_join_rooms to RegisterHandler | ||||
| | * | | Merge branch 'develop' of into allow_auto_join_rooms | Krombel | 2018-03-28 | 3 | -8/+14 |
| | |\ \ | |||||
| | * | | | move handling of auto_join_rooms to RegisterHandler | Krombel | 2018-03-14 | 1 | -2/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the handling of auto_join_rooms only works when a user registers itself via public register api. Registrations via registration_shared_secret and ModuleApi do not work This auto_joins the users in the registration handler which enables the auto join feature for all 3 registration paths. This is related to issue #2725 Signed-Off-by: Matthias Kesler <krombel@krombel.de> | ||||
| * | | | | Merge pull request #3080 from matrix-org/rav/fix_500_on_rejoin | Richard van der Hoff | 2018-04-09 | 1 | -0/+8 |
| |\ \ \ \ | |_|_|/ |/| | | | Return a 404 rather than a 500 on rejoining empty rooms | ||||
| | * | | | Return a 404 rather than a 500 on rejoining empty rooms | Richard van der Hoff | 2018-04-09 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filter ourselves out of the server list before checking for an empty remote host list, to fix 500 error Fixes #2141 | ||||
| * | | | | Implement group join API | David Baker | 2018-04-06 | 1 | -1/+39 |
| |/ / / | |||||
| * | | | Merge pull request #3045 from matrix-org/dbkr/group_joinable | Luke Barnard | 2018-04-05 | 1 | -0/+3 |
| |\ \ \ | | | | | | | | | Add joinability for groups | ||||
| | * | | | Use join_policy API instead of joinable | Luke Barnard | 2018-04-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The API is now under /groups/$group_id/setting/m.join_policy and expects a JSON blob of the shape ```json { "m.join_policy": { "type": "invite" } } ``` where "invite" could alternatively be "open". | ||||
| | * | | | Add joinability for groups | David Baker | 2018-03-28 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | Adds API to set the 'joinable' flag, and corresponding flag in the table. | ||||
| * | | | | Merge pull request #3000 from NotAFile/change-except-style | Richard van der Hoff | 2018-04-04 | 1 | -3/+3 |
| |\ \ \ \ | | | | | | | | | | | Replace old style error catching with 'as' keyword | ||||
| | * | | | | replace old style error catching with 'as' keyword | NotAFile | 2018-03-15 | 1 | -3/+3 |
| | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | This is both easier to read and compatible with python3 (not that that matters) Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
| * | | | | 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 | ||||
 |
index : matrix/thirdparty/synapse.git | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summary refs log tree commit diff |