Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Store ActionGenerator in HomeServer | Erik Johnston | 2017-05-19 | 2 | -5/+3 |
| | |||||
* | Faster push rule calculation via push specific cache | Erik Johnston | 2017-05-17 | 1 | -2/+3 |
| | | | | | We add a push rule specific cache that ensures that we can reuse calculated push rules appropriately when a user join/leaves. | ||||
* | Merge pull request #2228 from matrix-org/erikj/speed_up_get_hosts | Erik Johnston | 2017-05-16 | 1 | -1/+2 |
|\ | | | | | Speed up get_joined_hosts | ||||
| * | Speed up get_joined_hosts | Erik Johnston | 2017-05-16 | 1 | -1/+2 |
| | | |||||
* | | Make presence use cached users/hosts in room | Erik Johnston | 2017-05-16 | 1 | -3/+3 |
|/ | |||||
* | Modify condition on empty localpart | Luke Barnard | 2017-05-10 | 1 | -1/+1 |
| | |||||
* | Modify register/available to be GET with query param | Luke Barnard | 2017-05-10 | 1 | -0/+7 |
| | | | | | | | - GET is now the method for register/available - a query parameter "username" is now used Also, empty usernames are now handled with an error message on registration or via register/available: `User ID cannot be empty` | ||||
* | Merge pull request #2208 from matrix-org/erikj/ratelimit_overrid | Erik Johnston | 2017-05-10 | 4 | -18/+36 |
|\ | | | | | Add per user ratelimiting overrides | ||||
| * | Add per user ratelimiting overrides | Erik Johnston | 2017-05-10 | 4 | -18/+36 |
| | | |||||
* | | Replace some instances of preserve_context_over_deferred | Richard van der Hoff | 2017-05-09 | 1 | -3/+3 |
| | | |||||
* | | Do some logging when one-time-keys get claimed | Richard van der Hoff | 2017-05-09 | 1 | -0/+10 |
| | | | | | | | | | | might help us figure out if https://github.com/vector-im/riot-web/issues/3868 has happened. | ||||
* | | Allow clients to upload one-time-keys with new sigs | Richard van der Hoff | 2017-05-09 | 1 | -13/+57 |
|/ | | | | | | | When a client retries a key upload, don't give an error if the signature has changed (but the key is the same). Fixes https://github.com/vector-im/riot-android/issues/1208, hopefully. | ||||
* | Merge pull request #2190 from matrix-org/erikj/mark_remote_as_back_more | Erik Johnston | 2017-05-05 | 1 | -7/+0 |
|\ | | | | | Always mark remotes as up if we receive a signed request from them | ||||
| * | Remove redundant reset of destination timers | Erik Johnston | 2017-05-05 | 1 | -7/+0 |
| | | |||||
* | | Comment | Erik Johnston | 2017-05-05 | 1 | -0/+6 |
| | | |||||
* | | Add comment and TODO | Erik Johnston | 2017-05-05 | 1 | -0/+6 |
| | | |||||
* | | Handle exceptions thrown in handling remote device list updates | Erik Johnston | 2017-05-05 | 1 | -1/+16 |
|/ | |||||
* | Merge pull request #2147 from matrix-org/dbkr/http_request_propagate_error | David Baker | 2017-05-03 | 1 | -1/+10 |
|\ | | | | | Propagate errors sensibly from proxied IS requests | ||||
| * | Revert accidental commit | David Baker | 2017-04-26 | 1 | -4/+4 |
| | | |||||
| * | Merge remote-tracking branch 'origin/develop' into ↵ | David Baker | 2017-04-26 | 2 | -34/+23 |
| |\ | | | | | | | | | | dbkr/http_request_propagate_error | ||||
| * | | Use CodeMessageException subclass instead | David Baker | 2017-04-25 | 1 | -10/+19 |
| | | | | | | | | | | | | | | | Parse json errors from get_json client methods and throw special errors. | ||||
| * | | Merge remote-tracking branch 'origin/develop' into ↵ | David Baker | 2017-04-21 | 1 | -0/+64 |
| |\ \ | | | | | | | | | | | | | dbkr/http_request_propagate_error | ||||
| * | | | Propagate errors sensibly from proxied IS requests | David Baker | 2017-04-21 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | When we're proxying Matrix endpoints, parse out Matrix error responses and turn them into SynapseErrors so they can be propagated sensibly upstream. | ||||
* | | | | Merge pull request #2170 from matrix-org/erikj/fed_hole_state | Erik Johnston | 2017-05-03 | 1 | -21/+12 |
|\ \ \ \ | | | | | | | | | | | Don't fetch state for missing events that we fetched | ||||
| * | | | | Merge together redundant calculations/logging | Erik Johnston | 2017-05-03 | 1 | -9/+2 |
| | | | | | |||||
| * | | | | Fixup | Erik Johnston | 2017-04-28 | 1 | -10/+4 |
| | | | | | |||||
| * | | | | Remove unncessary call in _get_missing_events_for_pdu | Erik Johnston | 2017-04-28 | 1 | -13/+11 |
| | | | | | |||||
| * | | | | Don't fetch state for missing events that we fetched | Erik Johnston | 2017-04-28 | 1 | -0/+6 |
| | | | | | |||||
* | | | | | Add more granular event send metrics | Erik Johnston | 2017-05-02 | 2 | -2/+9 |
|/ / / / | |||||
* | | | | Merge pull request #2163 from matrix-org/erikj/fix_invite_state | Erik Johnston | 2017-04-27 | 1 | -6/+3 |
|\ \ \ \ | | | | | | | | | | | Fix invite state to always include all events | ||||
| * | | | | Fix invite state to always include all events | Erik Johnston | 2017-04-26 | 1 | -6/+3 |
| | |_|/ | |/| | | |||||
* | | | | Typo | Erik Johnston | 2017-04-27 | 1 | -1/+1 |
| | | | | |||||
* | | | | Add some extra logging for edge cases of federation | Erik Johnston | 2017-04-27 | 1 | -2/+22 |
|/ / / | |||||
* | | | Remove redundant try/except clauses | Richard van der Hoff | 2017-04-21 | 1 | -23/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `except SynapseError` clauses were pointless because the wrapped functions would never throw a `SynapseError` (they either throw a `CodeMessageException` or a `RuntimeError`). The `except CodeMessageException` is now also pointless because the caller treats all exceptions equally, so we may as well just throw the `CodeMessageException`. | ||||
* | | | Broaden the conditions for locally_rejecting invites | Richard van der Hoff | 2017-04-21 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic for marking invites as locally rejected was all well and good, but didn't happen when the remote server returned a 500, or wasn't reachable, or had no DNS, or whatever. Just expand the except clause to catch everything. Fixes https://github.com/matrix-org/synapse/issues/761. | ||||
* | | | Remove redundant function | Richard van der Hoff | 2017-04-21 | 1 | -10/+5 |
| |/ |/| | | | | | | | inline `reject_remote_invite`, which only existed to make tracing the callflow more difficult. | ||||
* | | m.read_marker -> m.fully_read (#2128) | Luke Barnard | 2017-04-18 | 1 | -4/+4 |
| | | | | | | | | | | | | Also: - change the REST endpoint to have a "S" on the end (so it's now /read_markers) - change the content of the m.read_up_to event to have the key "event_id" instead of "marker". | ||||
* | | Merge pull request #2120 from matrix-org/luke/read-markers | Luke Barnard | 2017-04-13 | 1 | -0/+64 |
|\ \ | |/ |/| | Implement Read Marker API | ||||
| * | Simplify is_event_after logic | Luke Barnard | 2017-04-12 | 1 | -2/+3 |
| | | |||||
| * | Only notify user, not entire room | Luke Barnard | 2017-04-12 | 1 | -3/+1 |
| | | |||||
| * | Remove comment, simplify null-guard | Luke Barnard | 2017-04-12 | 1 | -4/+1 |
| | | |||||
| * | Handle no previous RM | Luke Barnard | 2017-04-12 | 1 | -1/+4 |
| | | |||||
| * | flake8 | Luke Barnard | 2017-04-11 | 1 | -1/+0 |
| | | |||||
| * | Refactor event ordering check to events store | Luke Barnard | 2017-04-11 | 1 | -28/+4 |
| | | |||||
| * | Copyright | Luke Barnard | 2017-04-11 | 1 | -1/+1 |
| | | |||||
| * | flake8 | Luke Barnard | 2017-04-11 | 1 | -2/+1 |
| | | |||||
| * | Finish implementing RM endpoint | Luke Barnard | 2017-04-11 | 1 | -39/+48 |
| | | | | | | | | | | - This change causes a 405 to be sent if "m.read_marker" is set via /account_data - This also fixes-up the RM endpoint so that it actually Works. | ||||
| * | Initial commit of RM server-side impl | lukebarnard | 2017-04-11 | 1 | -0/+82 |
| | | | | | | | | (See https://docs.google.com/document/d/1UWqdS-e1sdwkLDUY0wA4gZyIkRp-ekjsLZ8k6g_Zvso/edit#heading=h.lndohpg8at5u) | ||||
* | | Merge pull request #2115 from matrix-org/erikj/dedupe_federation_repl | Erik Johnston | 2017-04-12 | 1 | -67/+76 |
|\ \ | | | | | | | Reduce federation replication traffic | ||||
| * | | Reuse get_interested_parties | Erik Johnston | 2017-04-12 | 1 | -16/+5 |
| | | | |||||
| * | | Move get_interested_parties | Erik Johnston | 2017-04-11 | 1 | -35/+34 |
| | | | |||||
| * | | Comments | Erik Johnston | 2017-04-11 | 1 | -2/+3 |
| | | | |||||
| * | | Move get_interested_remotes back to presence handler | Erik Johnston | 2017-04-11 | 1 | -3/+49 |
| | | | |||||
| * | | Reduce federation presence replication traffic | Erik Johnston | 2017-04-10 | 1 | -40/+14 |
| |/ | | | | | | | | | | | | | | | This is mainly done by moving the calculation of where to send presence updates from the presence handler to the transaction queue, so we only need to send the presence event (and not the destinations) across the replication connection. Before we were duplicating by sending the full state across once per destination. | ||||
* | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2017-04-11 | 1 | -4/+4 |
|\ \ | |/ |/| | |||||
| * | When we do an invite rejection, save the signed leave event to the db | Richard van der Hoff | 2017-04-07 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | During a rejection of an invite received over federation, we ask a remote server to make us a `leave` event, then sign it, then send that with `send_leave`. We were saving the *unsigned* version of the event (which has a different event id to the signed version) to our db (and sending it to the clients), whereas other servers in the room will have seen the *signed* version. We're not aware of any actual problems that caused, except that it makes the database confusing to look at and generally leaves the room in a weird state. | ||||
* | | Merge pull request #2103 from matrix-org/erikj/no-double-encode | Erik Johnston | 2017-04-07 | 1 | -3/+1 |
|\ \ | | | | | | | Don't double encode replication data | ||||
| * | | Don't double json encode typing replication data | Erik Johnston | 2017-04-05 | 1 | -3/+1 |
| | | | |||||
* | | | Use iteritems | Erik Johnston | 2017-04-06 | 1 | -2/+2 |
|/ / | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2017-04-04 | 2 | -28/+33 |
|\ \ | | | | | | | | | | erikj/repl_tcp_server | ||||
| * \ | Merge pull request #2095 from matrix-org/rav/cull_log_preserves | Richard van der Hoff | 2017-04-03 | 2 | -25/+20 |
| |\ \ | | |/ | |/| | Cull spurious PreserveLoggingContexts | ||||
| | * | Remove spurious yield | Richard van der Hoff | 2017-04-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | In `MessageHandler`, remove `yield` on call to `Notifier.on_new_room_event`: it doesn't return anything anyway. | ||||
| | * | Remove more spurious `PreserveLoggingContext`s | Richard van der Hoff | 2017-04-03 | 1 | -24/+19 |
| | | | | | | | | | | | | | | | Remove `PreserveLoggingContext` around calls to `Notifier.on_new_room_event`; there is no problem if the logcontext is set when calling it. | ||||
| * | | Accept join events from all servers | Richard van der Hoff | 2017-04-03 | 1 | -3/+13 |
| |/ | | | | | | | | | | | | | Make sure that we accept join events from any server, rather than just the origin server, to make the federation join dance work correctly. (Fixes #1893). | ||||
* | | Add a timestamp to USER_SYNC command | Erik Johnston | 2017-03-31 | 1 | -7/+7 |
| | | | | | | | | This timestamp is used to indicate when the user last sync'd | ||||
* | | Fix up presence | Erik Johnston | 2017-03-31 | 1 | -1/+3 |
| | | |||||
* | | Remove user from process_presence when stops syncing | Erik Johnston | 2017-03-30 | 1 | -0/+1 |
| | | |||||
* | | Add functions to presence to support remote syncs | Erik Johnston | 2017-03-30 | 1 | -0/+66 |
| | | | | | | | | | | | | | | The TCP replication protocol streams deltas of who has started or stopped syncing. This is different from the HTTP API which periodically sends the full list of users who are syncing. This commit adds support for the new TCP style of sending deltas. | ||||
* | | Add new storage functions for new replication | Erik Johnston | 2017-03-30 | 1 | -0/+3 |
|/ | | | | | The new replication protocol will keep all the streams separate, rather than muxing multiple streams into one. | ||||
* | Cache hosts in room | Erik Johnston | 2017-03-24 | 1 | -2/+1 |
| | |||||
* | Merge pull request #2050 from matrix-org/rav/federation_backoff | Richard van der Hoff | 2017-03-23 | 3 | -22/+17 |
|\ | | | | | push federation retry limiter down to matrixfederationclient | ||||
| * | Ignore backoff history for invites, aliases, and roomdirs | Richard van der Hoff | 2017-03-23 | 2 | -2/+5 |
| | | | | | | | | | | Add a param to the federation client which lets us ignore historical backoff data for federation queries, and set it for a handful of operations. | ||||
| * | push federation retry limiter down to matrixfederationclient | Richard van der Hoff | 2017-03-23 | 1 | -20/+12 |
| | | | | | | | | | | rather than having to instrument everywhere we make a federation call, make the MatrixFederationHttpClient manage the retry limiter. | ||||
* | | Add a missing yield in device key upload | Richard van der Hoff | 2017-03-23 | 1 | -1/+1 |
|/ | | | | | (this would only very very rarely actually be a useful thing, so the main problem was the logcontext leak...) | ||||
* | Merge pull request #2027 from matrix-org/rav/logcontext_leaks | Richard van der Hoff | 2017-03-20 | 1 | -2/+3 |
|\ | | | | | A few fixes to logcontext things | ||||
| * | Stop preserve_fn leaking context into the reactor | Richard van der Hoff | 2017-03-18 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | Fix a bug in ``logcontext.preserve_fn`` which made it leak context into the reactor, and add a test for it. Also, get rid of ``logcontext.reset_context_after_deferred``, which tried to do the same thing but had its own, different, set of bugs. | ||||
* | | Refactoring and cleanups | Richard van der Hoff | 2017-03-17 | 1 | -0/+10 |
|/ | | | | | | | | | | | | A few non-functional changes: * A bunch of docstrings to document types * Split `EventsStore._persist_events_txn` up a bit. Hopefully it's a bit more readable. * Rephrase `EventFederationStore._update_min_depth_for_room_txn` to avoid mind-bending conditional. * Rephrase rejected/outlier conditional in `_update_outliers_txn` to avoid mind-bending conditional. | ||||
* | Merge pull request #2016 from matrix-org/rav/queue_pdus_during_join | Richard van der Hoff | 2017-03-17 | 1 | -24/+44 |
|\ | | | | | Queue up federation PDUs while a room join is in progress | ||||
| * | Queue up federation PDUs while a room join is in progress | Richard van der Hoff | 2017-03-15 | 1 | -24/+44 |
| | | | | | | | | | | | | | | This just takes the existing `room_queues` logic and moves it out to `on_receive_pdu` instead of `_process_received_pdu`, which ensures that we don't start trying to fetch prev_events and whathaveyou until the join has completed. | ||||
* | | Comments | Erik Johnston | 2017-03-16 | 1 | -2/+2 |
| | | |||||
* | | Comment | Erik Johnston | 2017-03-16 | 1 | -3/+8 |
| | | |||||
* | | Don't recreate so many sets | Erik Johnston | 2017-03-16 | 5 | -34/+28 |
| | | |||||
* | | Implement no op for room stream in sync | Erik Johnston | 2017-03-16 | 1 | -4/+47 |
| | | |||||
* | | Merge pull request #2014 from Half-Shot/hs/fix-appservice-presence | Erik Johnston | 2017-03-15 | 1 | -1/+4 |
|\ \ | | | | | | | Add fallback to last_active_ts if it beats the last sync time on a presence timeout. | ||||
| * | | Add a great comment to handle_timeout for active vs sync times. | Will Hunt | 2017-03-15 | 1 | -0/+2 |
| | | | |||||
| * | | Add fallback to last_active_ts if it beats the last sync time. | Will Hunt | 2017-03-15 | 1 | -1/+2 |
| | | | |||||
* | | | Cache set of users whose presence the other user should see | Erik Johnston | 2017-03-15 | 1 | -13/+27 |
| | | | |||||
* | | | Comment | Erik Johnston | 2017-03-15 | 1 | -0/+3 |
| | | | |||||
* | | | Format presence events on the edges instead of reformatting them multiple times | Erik Johnston | 2017-03-15 | 3 | -23/+32 |
|/ / | |||||
* | | Merge pull request #1994 from matrix-org/dbkr/msisdn_signin_2 | Erik Johnston | 2017-03-15 | 2 | -8/+61 |
|\ \ | | | | | | | Phone number registration / login support v2 | ||||
| * | | Support registration / login with phone number | David Baker | 2017-03-13 | 2 | -8/+61 |
| |/ | | | | | | | Changes from https://github.com/matrix-org/synapse/pull/1971 | ||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2017-03-14 | 4 | -66/+239 |
|\ \ | | | | | | | | | | erikj/public_list_speed | ||||
| * | | Implement _simple_delete_many_txn, use it to delete devices | Luke Barnard | 2017-03-13 | 1 | -0/+34 |
| |/ | | | | | | | | | | | (But this doesn't implement the same for deleting access tokens or e2e keys. Also respond to code review. | ||||
| * | Merge remote-tracking branch 'origin/develop' into rav/refactor_received_pdu | Richard van der Hoff | 2017-03-13 | 3 | -64/+11 |
| |\ | |||||
| | * | Revert "Support registration & login with phone number" | Erik Johnston | 2017-03-13 | 2 | -61/+8 |
| | | | |||||
| * | | Move FederationServer._handle_new_pdu to FederationHandler | Richard van der Hoff | 2017-03-09 | 1 | -5/+197 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unfortunately this significantly increases the size of the already-rather-big FederationHandler, but the code fits more naturally here, and it paves the way for the tighter integration that I need between handling incoming PDUs and doing the join dance. Other than renaming the existing `FederationHandler.on_receive_pdu` to `_process_received_pdu` to make way for it, this just consists of the move, and replacing `self.handler` with `self` and `self` with `self.replication_layer`. | ||||
* | | | Comments | Erik Johnston | 2017-03-13 | 1 | -0/+12 |
| | | | |||||
* | | | Assume rooms likely haven't changed | Erik Johnston | 2017-03-13 | 1 | -8/+11 |
| | | | |||||
* | | | Get current state by using current_state_events table | Erik Johnston | 2017-03-10 | 2 | -19/+30 |
| |/ |/| | |||||
* | | Noop repated delete device inbox calls from /sync | Erik Johnston | 2017-03-10 | 1 | -3/+3 |
|/ | |||||
* | Merge pull request #1971 from matrix-org/dbkr/msisdn_signin | David Baker | 2017-03-09 | 2 | -8/+61 |
|\ | | | | | Support registration & login with phone number | ||||
| * | Fix log line | David Baker | 2017-03-08 | 1 | -1/+1 |
| | | |||||
| * | Factor out msisdn canonicalisation | David Baker | 2017-03-08 | 1 | -1/+1 |
| | | | | | | | | Plus a couple of other minor fixes | ||||
| * | Fix pep8 | David Baker | 2017-03-08 | 1 | -1/+1 |
| | | |||||
| * | Just return the deferred straight off | David Baker | 2017-03-01 | 1 | -4/+2 |
| | | | | | | | | | | defer.returnValue doth not maketh a generator: it would need a yield to be a generator, and this doesn't need a yield. | ||||
| * | Merge remote-tracking branch 'origin/develop' into dbkr/msisdn_signin | David Baker | 2017-03-01 | 5 | -14/+39 |
| |\ | |||||
| * | | WIP support for msisdn 3pid proxy methods | David Baker | 2017-02-14 | 2 | -6/+61 |
| | | | |||||
* | | | Don't keep around old stream IDs forever | Erik Johnston | 2017-03-03 | 1 | -2/+9 |
| | | | |||||
* | | | Spelling | Erik Johnston | 2017-03-03 | 1 | -2/+2 |
| | | | |||||
* | | | Fix device list update to not constantly resync | Erik Johnston | 2017-03-01 | 1 | -46/+115 |
| |/ |/| | |||||
* | | Pop with default value to stop throwing | Erik Johnston | 2017-02-28 | 1 | -1/+1 |
| | | |||||
* | | Pop rather than del from dict | Erik Johnston | 2017-02-27 | 1 | -1/+1 |
| | | |||||
* | | Remove unused param | Erik Johnston | 2017-02-20 | 1 | -1/+1 |
| | | |||||
* | | Fix /context/ visibiltiy rules | Erik Johnston | 2017-02-20 | 1 | -1/+4 |
| | | |||||
* | | Merge pull request #1922 from matrix-org/dbkr/allow_forget_for_ban | David Baker | 2017-02-17 | 1 | -1/+3 |
|\ \ | | | | | | | Allow forgetting rooms you're banned from | ||||
| * | | Allow forgetting rooms you're banned from | David Baker | 2017-02-15 | 1 | -1/+3 |
| | | | |||||
* | | | Fix bugs in the /keys/changes api | Richard van der Hoff | 2017-02-14 | 1 | -9/+29 |
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * `get_forward_extremeties_for_room` takes a numeric `stream_ordering`. We were passing a `RoomStreamToken`, which meant that it returned the *current* extremities, rather than those corresponding to the `from_token`. However: * `get_state_ids_for_events` required a second ('types') parameter; this meant that a `TypeError` was thrown and we ended up acting as though there was *no* prev state. * `get_state_ids_for_events` actually returns a map from event_id to state dictionary - just looking up the state keys in it again meant that we acted as though there was no prev state. We now check if each member's state has changed since *any* of the extremities. Also add/fix some comments. | ||||
* / | Cache get_presence storage | Erik Johnston | 2017-02-13 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #1784 from morteza-araby/user-admin | Erik Johnston | 2017-02-06 | 1 | -1/+43 |
|\ | | | | | Administration functionalities | ||||
| * | admin,storage: added more administrator functionalities | Morteza Araby | 2017-02-02 | 1 | -1/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | administrators can now: - Set displayname of users - Update user avatars - Search for users by user_id - Browse all users in a paginated API - Reset user passwords - Deactivate users Helpers for doing paginated queries has also been added to storage Signed-off-by: Morteza Araby <morteza.araby@ericsson.com> | ||||
* | | Measure new device list stuff | Erik Johnston | 2017-02-02 | 2 | -1/+6 |
| | | |||||
* | | Use new get_users_who_share_room_with_user | Erik Johnston | 2017-02-02 | 1 | -11/+13 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2017-02-02 | 2 | -29/+16 |
|\ \ | | | | | | | | | | erikj/device_list_fixes | ||||
| * \ | Merge pull request #1876 from matrix-org/erikj/shared_member_store | Erik Johnston | 2017-02-02 | 2 | -29/+16 |
| |\ \ | | |/ | |/| | Make presence.get_new_events a bit faster | ||||
| | * | Make presence.get_new_events a bit faster | Erik Johnston | 2017-02-02 | 2 | -29/+16 |
| | | | | | | | | | | | | We do this by caching the set of users a user shares rooms with. | ||||
* | | | Use stream_ordering_to_exterm for /keys/changes | Erik Johnston | 2017-02-02 | 1 | -9/+9 |
|/ / | |||||
* / | Fix email push in pusher worker | Erik Johnston | 2017-02-02 | 2 | -40/+50 |
|/ | | | | | | This was broken when device list updates were implemented, as Mailer could no longer instantiate an AuthHandler due to a dependency on federation sending. | ||||
* | Doc args | Erik Johnston | 2017-02-01 | 1 | -0/+7 |
| | |||||
* | Include newly joined users in /keys/changes API | Erik Johnston | 2017-02-01 | 1 | -4/+35 |
| | |||||
* | Wake sync up for device changes | Erik Johnston | 2017-02-01 | 1 | -1/+2 |
| | |||||
* | Implement /keys/changes | Erik Johnston | 2017-02-01 | 1 | -0/+16 |
| | |||||
* | Merge pull request #1862 from matrix-org/erikj/presence_update | Erik Johnston | 2017-01-31 | 1 | -3/+3 |
|\ | | | | | Use DB cache of joined users for presence | ||||
| * | Use DB cache of joined users for presence | Erik Johnston | 2017-01-30 | 1 | -3/+3 |
| | | |||||
* | | Fix unit tests | Erik Johnston | 2017-01-30 | 1 | -1/+1 |
| | | |||||
* | | Noop device key changes if they're the same | Erik Johnston | 2017-01-30 | 1 | -4/+5 |
|/ | |||||
* | Use get_users_in_room and declare it iterable | Erik Johnston | 2017-01-30 | 1 | -1/+1 |
| | |||||
* | Merge pull request #1857 from matrix-org/erikj/device_list_stream | Erik Johnston | 2017-01-30 | 3 | -17/+195 |
|\ | | | | | Implement device lists updates over federation | ||||
| * | Hook device list updates to replication | Erik Johnston | 2017-01-27 | 2 | -26/+25 |
| | | |||||
| * | Better name | Erik Johnston | 2017-01-27 | 1 | -1/+3 |
| | | |||||
| * | Handle users leaving rooms | Erik Johnston | 2017-01-26 | 1 | -1/+16 |
| | | |||||
| * | Add comments | Erik Johnston | 2017-01-26 | 2 | -4/+19 |
| | | |||||
| * | Implement device key caching over federation | Erik Johnston | 2017-01-26 | 2 | -17/+108 |
| | | |||||
| * | Fix up sending of m.device_list_update edus | Erik Johnston | 2017-01-25 | 1 | -0/+1 |
| | | |||||
| * | Add basic implementation of local device list changes | Erik Johnston | 2017-01-25 | 3 | -12/+67 |
| | | |||||
* | | Don't clobber a displayname or avatar_url if provided by an m.room.member event | Paul "LeoNerd" Evans | 2017-01-24 | 1 | -2/+4 |
|/ | |||||
* | Insert delta of current_state_events to be more efficient | Erik Johnston | 2017-01-20 | 1 | -2/+6 |
| | |||||
* | Derive current_state_events from state groups | Erik Johnston | 2017-01-20 | 1 | -1/+0 |
| | |||||
* | Merge pull request #1822 from matrix-org/erikj/statE_logging | Erik Johnston | 2017-01-18 | 1 | -1/+1 |
|\ | | | | | Change resolve_state_groups call site logging to DEBUG | ||||
| * | Change resolve_state_groups call site logging to DEBUG | Erik Johnston | 2017-01-17 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1818 from matrix-org/erikj/state_auth_splitout_split | Erik Johnston | 2017-01-18 | 1 | -2/+2 |
|\ \ | |/ |/| | Optimise state resolution | ||||
| * | Fix couple of federation state bugs | Erik Johnston | 2017-01-17 | 1 | -1/+1 |
| | | |||||
| * | Optimise state resolution | Erik Johnston | 2017-01-17 | 1 | -1/+1 |
| | | |||||
* | | Add missing None check | Erik Johnston | 2017-01-11 | 1 | -5/+6 |
|/ | |||||
* | Merge pull request #1789 from matrix-org/erikj/decouple_presence | Erik Johnston | 2017-01-10 | 1 | -1/+3 |
|\ | | | | | Don't block messages sending on bumping presence | ||||
| * | Comment | Erik Johnston | 2017-01-10 | 1 | -0/+2 |
| | | |||||
| * | Don't block messages sending on bumping presence | Erik Johnston | 2017-01-10 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1787 from matrix-org/erikj/linearize_member | Erik Johnston | 2017-01-10 | 1 | -4/+15 |
|\ \ | | | | | | | Linearize updates to membership via PUT /state/ | ||||
| * | | Linearize updates to membership via PUT /state/ | Erik Johnston | 2017-01-09 | 1 | -4/+15 |
| |/ | |||||
* / | Name linearizer's for better logs | Erik Johnston | 2017-01-09 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'release-v0.18.6' into develop | Mark Haines | 2017-01-06 | 1 | -4/+6 |
|\ | |||||
| * | handlers/room_member: fix guest access check when joining rooms | Patrik Oldsberg | 2017-01-06 | 1 | -4/+6 |
| | | | | | | | | Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com> | ||||
* | | Merge branch 'release-v0.18.6' into develop | Matthew Hodgson | 2017-01-05 | 1 | -0/+1 |
|\| | |||||
| * | Fix case | Matthew Hodgson | 2017-01-05 | 1 | -1/+1 |
| | | |||||
| * | add logging for all the places we call resolve_state_groups. my kingdom for ↵ | Matthew Hodgson | 2017-01-05 | 1 | -0/+1 |
| | | | | | | | | a backtrace that actually works. | ||||
* | | Merge branch 'release-v0.18.6' into develop | Matthew Hodgson | 2017-01-05 | 1 | -0/+4 |
|\| | |||||
| * | Only send events that originate on this server. | Mark Haines | 2017-01-05 | 1 | -0/+4 |
| | | | | | | | | | | | | Or events that are sent via the federation "send_join" API. This should match the behaviour from before v0.18.5 and #1635 landed. | ||||
* | | Fix another comment typo | David Baker | 2016-12-21 | 1 | -1/+1 |
| | | |||||
* | | Add /account/3pid/delete endpoint | David Baker | 2016-12-20 | 1 | -0/+11 |
| | | | | | | | | Also fix a typo in a comment | ||||
* | | fix ability to change password to a non-ascii one | Matthew Hodgson | 2016-12-18 | 1 | -2/+2 |
| | | | | | | | | https://github.com/vector-im/riot-web/issues/2658 | ||||
* | | Cache network room list queries. | Erik Johnston | 2016-12-16 | 1 | -3/+4 |
|/ | |||||
* | Add some logging for syncing to_device events | Richard van der Hoff | 2016-12-15 | 1 | -4/+8 |
| | | | | | Attempt to track down the loss of to_device events (https://github.com/vector-im/riot-web/issues/2711 etc). | ||||
* | Merge pull request #1698 from matrix-org/erikj/room_list | Erik Johnston | 2016-12-15 | 1 | -2/+4 |
|\ | | | | | Fix caching on public room list | ||||
| * | Fix caching on public room list | Erik Johnston | 2016-12-13 | 1 | -2/+4 |
| | | |||||
* | | Comment | Erik Johnston | 2016-12-14 | 1 | -0/+2 |
| | | |||||
* | | Fix /backfill returning events it shouldn't | Erik Johnston | 2016-12-14 | 1 | -2/+3 |
|/ | |||||
* | Merge pull request #1676 from matrix-org/erikj/room_list | Erik Johnston | 2016-12-12 | 2 | -12/+67 |
|\ | | | | | Add new API appservice specific public room list | ||||
| * | Comments | Erik Johnston | 2016-12-07 | 2 | -2/+10 |
| | | |||||
| * | Add new API appservice specific public room list | Erik Johnston | 2016-12-06 | 2 | -11/+58 |
| | | |||||
* | | Merge pull request #1620 from matrix-org/erikj/concurrent_room_access | Erik Johnston | 2016-12-12 | 1 | -27/+33 |
|\ \ | | | | | | | Limit the number of events that can be created on a given room concurrently | ||||
| * | | Comments | Erik Johnston | 2016-11-11 | 1 | -0/+2 |
| | | | |||||
| * | | Limit the number of events that can be created on a given room concurretnly | Erik Johnston | 2016-11-10 | 1 | -27/+31 |
| | | | |||||
* | | | Merge pull request #1686 from matrix-org/rav/fix_federation_key_fails | Richard van der Hoff | 2016-12-12 | 1 | -0/+10 |
|\ \ \ | | | | | | | | | E2E key query: handle federation fails | ||||
| * | | | Remove unused import | Richard van der Hoff | 2016-12-12 | 1 | -1/+0 |
| | | | | |||||
| * | | | E2E key query: handle federation fails | Richard van der Hoff | 2016-12-09 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | Don't fail the whole request if we can't connect to a particular server. | ||||
* | | | | Fix rare notifier bug where listeners dont timeout | Erik Johnston | 2016-12-09 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | There was a race condition that caused the notifier to 'miss' the timeout notification, since there were no other checks for the timeout this caused listeners to get stuck in a loop until something happened. | ||||
* | | | | Fix ignored read-receipts | Richard van der Hoff | 2016-12-08 | 1 | -1/+5 |
|/ / / | | | | | | | | | | | | | Don't ignore read-receipts which arrive in the same EDU as a read-receipt for an old event. | ||||
* | / | Prevent user tokens being used as guest tokens (#1675) | Richard van der Hoff | 2016-12-06 | 1 | -1/+1 |
| |/ |/| | | | | | | | Make sure that a user cannot pretend to be a guest by adding 'guest = True' caveats. | ||||
* | | Merge pull request #653 from matrix-org/erikj/preset_guest_join | Erik Johnston | 2016-12-05 | 1 | -0/+10 |
|\ \ | | | | | | | Enable guest access for private rooms by default | ||||
| * | | Enable guest access for private rooms by default | Erik Johnston | 2016-03-17 | 1 | -0/+10 |
| | | | |||||
* | | | Merge pull request #1649 from matrix-org/dbkr/log_ui_auth_args | Erik Johnston | 2016-12-05 | 1 | -1/+9 |
|\ \ \ | | | | | | | | | Log the args that we have on UI auth completion | ||||
| * | | | Clarify that creds doesn not contain passwords. | David Baker | 2016-11-24 | 1 | -1/+3 |
| | | | | |||||
| * | | | Log the args that we have on UI auth completion | David Baker | 2016-11-24 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | This will be super helpful for debugging if we have more registration woes. | ||||
* | | | | Rip out more refresh_token code | Richard van der Hoff | 2016-11-30 | 1 | -10/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We might as well treat all refresh_tokens as invalid. Just return a 403 from /tokenrefresh, so that we don't have a load of dead, untestable code hanging around. Still TODO: removing the table from the schema. | ||||
* | | | | Merge branch 'develop' into rav/no_more_refresh_tokens | Richard van der Hoff | 2016-11-30 | 2 | -8/+8 |
|\ \ \ \ | |||||
| * | | | | Stop putting a time caveat on access tokens | Richard van der Hoff | 2016-11-29 | 2 | -8/+8 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'time' caveat on the access tokens was something of a lie, since we weren't enforcing it; more pertinently its presence stops us ever adding useful time caveats. Let's move in the right direction by not lying in our caveats. | ||||
* / / / | Stop generating refresh tokens | Richard van der Hoff | 2016-11-28 | 1 | -16/+4 |
|/ / / | | | | | | | | | | | | | | | | | | | Since we're not doing refresh tokens any more, we should start killing off the dead code paths. /tokenrefresh itself is a bit of a thornier subject, since there might be apps out there using it, but we can at least not generate refresh tokens on new logins. | ||||
* | | | Shuffle receipt handler around so that worker apps don't need to load it | Erik Johnston | 2016-11-23 | 3 | -6/+4 |
| | | | |||||
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2016-11-23 | 1 | -9/+22 |
|\ \ \ | | | | | | | | | | | | | erikj/split_out_fed_txn | ||||
| * | | | Return early on /sync code paths if a '*' filter is used | Kegan Dougal | 2016-11-22 | 1 | -9/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is currently very conservative in that it only does this if there is no `since` token. This limits the risk to clients likely to be doing one-off syncs (like bridges), but does mean that normal human clients won't benefit from the time savings here. If the savings are large enough, I would consider generalising this to just check the filter. | ||||
* | | | | Remove explicit calls to send_pdu | Erik Johnston | 2016-11-21 | 1 | -53/+0 |
| | | | | |||||
* | | | | Handle sending events and device messages over federation | Erik Johnston | 2016-11-17 | 1 | -12/+1 |
| | | | | |||||
* | | | | Use new federation_sender DI | Erik Johnston | 2016-11-16 | 5 | -14/+16 |
|/ / / | |||||
* | / | Use external ldap auth pacakge | Erik Johnston | 2016-11-15 | 1 | -0/+2 |
| |/ |/| | |||||
* | | Sample correctly | Erik Johnston | 2016-11-08 | 1 | -1/+3 |
| | | |||||
* | | Limit the number of prev_events of new events | Erik Johnston | 2016-11-08 | 1 | -0/+13 |
| | | |||||
* | | Don't error on non-ascii passwords | David Baker | 2016-11-03 | 1 | -1/+1 |
| | | |||||
* | | Fix infinite typing bug | Erik Johnston | 2016-10-24 | 1 | -2/+10 |
| | | | | | | | | | | | | | | There's a bug somewhere that causes typing notifications to not be timed out properly. By adding a paranoia timer and using correct inequalities notifications should stop being stuck, even if it the root cause hasn't been fixed. | ||||
* | | Fix incredubly slow back pagination query | Erik Johnston | 2016-10-24 | 2 | -4/+7 |
| | | | | | | | | | | | | | | If a client didn't specify a from token when paginating backwards synapse would attempt to query the (global) maximum topological token. This a) doesn't make much sense since they're room specific and b) there are no indices that lets postgres do this efficiently. | ||||
* | | Merge pull request #1175 from ↵ | Luke Barnard | 2016-10-20 | 1 | -0/+6 |
|\ \ | | | | | | | | | | | | | matrix-org/luke/feature-configurable-as-rate-limiting Allow Configurable Rate Limiting Per AS | ||||
| * | | as_user->app_service, less redundant comments, better positioned comments | Luke Barnard | 2016-10-20 | 1 | -6/+3 |
| | | | |||||
| * | | Use real AS object by passing it through the requester | Luke Barnard | 2016-10-20 | 1 | -8/+3 |
| | | | | | | | | | | | | This means synapse does not have to check if the AS is interested, but instead it effectively re-uses what it already knew about the requesting user | ||||
| * | | Allow Configurable Rate Limiting Per AS | Luke Barnard | 2016-10-18 | 1 | -0/+14 |
| | | | | | | | | | | | | This adds a flag loaded from the registration file of an AS that will determine whether or not its users are rate limited (by ratelimit in _base.py). Needed for IRC bridge reasons - see https://github.com/matrix-org/matrix-appservice-irc/issues/240. | ||||
* | | | Merge pull request #1176 from matrix-org/erikj/eager_ratelimit_check | Erik Johnston | 2016-10-19 | 1 | -1/+16 |
|\ \ \ | | | | | | | | | Check whether to ratelimit sooner to avoid work | ||||
| * | | | Comment | Erik Johnston | 2016-10-19 | 1 | -0/+3 |
| | | | | |||||
| * | | | Check whether to ratelimit sooner to avoid work | Erik Johnston | 2016-10-19 | 1 | -1/+13 |
| |/ / | |||||
* / / | Convert emails to lowercase when storing | David Baker | 2016-10-19 | 1 | -0/+12 |
|/ / | | | | | | | And db migration sql to convert existing addresses. | ||||
* | | Merge pull request #1155 from matrix-org/erikj/pluggable_pwd_auth | Erik Johnston | 2016-10-12 | 1 | -295/+39 |
|\ \ | | | | | | | Implement pluggable password auth | ||||
| * | | Implement pluggable password auth | Erik Johnston | 2016-10-03 | 1 | -295/+39 |
| | | | | | | | | | | | | | | | | | | Allows delegating the password auth to an external module. This also moves the LDAP auth to using this system, allowing it to be removed from the synapse tree entirely in the future. | ||||
* | | | Merge pull request #1166 from matrix-org/rav/grandfather_broken_riot_signup | Richard van der Hoff | 2016-10-11 | 1 | -3/+14 |
|\ \ \ | | | | | | | | | Work around email-spamming Riot bug | ||||
| * | | | Work around email-spamming Riot bug | Richard van der Hoff | 2016-10-11 | 1 | -3/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5d9546f9 introduced a change to synapse behaviour, in that failures in the interactive-auth process would return the flows and params data as well as an error code (as specced in https://github.com/matrix-org/matrix-doc/pull/397). That change exposed a bug in Riot which would make it request a new validation token (and send a new email) each time it got a 401 with a `flows` parameter (see https://github.com/vector-im/vector-web/issues/2447 and the fix at https://github.com/matrix-org/matrix-react-sdk/pull/510). To preserve compatibility with broken versions of Riot, grandfather in the old behaviour for the email validation stage. | ||||
* | | | | Merge pull request #1157 from Rugvip/nolimit | Erik Johnston | 2016-10-11 | 7 | -32/+30 |
|\ \ \ \ | |/ / / |/| | | | Remove rate limiting from app service senders and fix get_or_create_user requester | ||||
| * | | | rest/client/v1/register: use the correct requester in createUser | Patrik Oldsberg | 2016-10-06 | 1 | -4/+2 |
| | | | | | | | | | | | | | | | | Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com> | ||||
| * | | | handlers/profile: added admin override for set_displayname and set_avatar_url | Patrik Oldsberg | 2016-10-06 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com> | ||||
| * | | | handers: do not ratelimit app service senders | Patrik Oldsberg | 2016-10-06 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com> | ||||
| * | | | storage/appservice: make appservice methods only relying on the cache ↵ | Patrik Oldsberg | 2016-10-06 | 5 | -23/+17 |
| |/ / | | | | | | | | | | synchronous | ||||
* | | | Merge pull request #1160 from matrix-org/rav/401_on_password_fail | Richard van der Hoff | 2016-10-07 | 1 | -32/+52 |
|\ \ \ | |/ / |/| | | Interactive Auth: Return 401 from for incorrect password | ||||
| * | | Interactive Auth: Return 401 from for incorrect password | Richard van der Hoff | 2016-10-07 | 1 | -32/+52 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This requires a bit of fettling, because I want to return a helpful error message too but we don't want to distinguish between unknown user and invalid password. To avoid hardcoding the error message into 15 places in the code, I've had to refactor a few methods to return None instead of throwing. Fixes https://matrix.org/jira/browse/SYN-744 | ||||
* | | | Restructure ldap authentication | Martin Weinelt | 2016-09-29 | 1 | -87/+192 |
|/ / | | | | | | | | | | | | | | | - properly parse return values of ldap bind() calls - externalize authentication methods - change control flow to be more error-resilient - unbind ldap connections in many places - improve log messages and loglevels | ||||
* | | Move FEDERATION_PING_INTERVAL timer. Update log line | Erik Johnston | 2016-09-23 | 1 | -8/+10 |
| | | |||||
* | | Time out typing over federation | Erik Johnston | 2016-09-23 | 1 | -70/+105 |
| | | |||||
* | | Merge pull request #1136 from matrix-org/erikj/fix_signed_3pid | Erik Johnston | 2016-09-22 | 1 | -6/+9 |
|\ \ | | | | | | | Allow invites via 3pid to bypass sender sig check | ||||
| * | | Add comments | Erik Johnston | 2016-09-22 | 1 | -0/+3 |
| | | | |||||
| * | | Allow invites via 3pid to bypass sender sig check | Erik Johnston | 2016-09-22 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a server sends a third party invite another server may be the one that the inviting user registers with. In this case it is that remote server that will issue an actual invitation, and wants to do it "in the name of" the original invitee. However, the new proper invite will not be signed by the original server, and thus other servers would reject the invite if it was seen as coming from the original user. To fix this, a special case has been added to the auth rules whereby another server can send an invite "in the name of" another server's user, so long as that user had previously issued a third party invite that is now being accepted. | ||||
* | | | Merge pull request #1132 from matrix-org/erikj/initial_sync_split | Erik Johnston | 2016-09-22 | 2 | -378/+446 |
|\ \ \ | |/ / |/| | | Support /initialSync in synchrotron worker | ||||
| * | | Support /initialSync in synchrotron worker | Erik Johnston | 2016-09-21 | 2 | -378/+446 |
| | | | |||||
* | | | Add total_room_count_estimate to /publicRooms | Erik Johnston | 2016-09-21 | 1 | -0/+3 |
|/ / | |||||
* | | Merge pull request #1130 from matrix-org/erikj/fix_pubroom_pag | Erik Johnston | 2016-09-19 | 1 | -12/+25 |
|\ \ | | | | | | | Handle fact that _generate_room_entry may not return a room entry | ||||
| * | | PEP8 | Erik Johnston | 2016-09-17 | 1 | -1/+1 |
| | | | |||||
| * | | Handle fact that _generate_room_entry may not return a room entry | Erik Johnston | 2016-09-17 | 1 | -12/+25 |
| | | | |||||
* | | | Merge pull request #1129 from matrix-org/erikj/fix_pubroom_pag | Erik Johnston | 2016-09-17 | 1 | -110/+123 |
|\| | | | | | | | | Fix and clean up publicRooms pagination | ||||
| * | | Spelling | Erik Johnston | 2016-09-17 | 1 | -1/+1 |
| | | | |||||
| * | | Fix and clean up publicRooms pagination | Erik Johnston | 2016-09-17 | 1 | -110/+123 |
| | | | |||||
* | | | Make public room search case insensitive | David Baker | 2016-09-16 | 1 | -4/+4 |
|/ / | |||||
* | | Comment | Erik Johnston | 2016-09-16 | 1 | -0/+2 |
| | | |||||
* | | Add remote reoom cache | Erik Johnston | 2016-09-16 | 1 | -2/+23 |
| | | |||||
* | | Support filtering remote room lists | Erik Johnston | 2016-09-16 | 1 | -3/+9 |
| | | |||||
* | | Filter remote rooms lists locally | Erik Johnston | 2016-09-16 | 1 | -10/+24 |
| | | |||||
* | | Don't cache searched in /publicRooms | Erik Johnston | 2016-09-16 | 1 | -1/+5 |
| | | |||||
* | | Add very basic filter API to /publicRooms | Erik Johnston | 2016-09-15 | 1 | -5/+18 |
| | | |||||
* | | Change the way we calculate new_limit in /publicRooms and add POST API | Erik Johnston | 2016-09-15 | 1 | -15/+33 |
| | |