Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2531 from matrix-org/dbkr/spamcheck_error_messages | David Baker | 2017-10-12 | 1 | -2/+6 |
|\ | | | | | Allow error strings from spam checker | ||||
| * | fix isinstance | David Baker | 2017-10-11 | 1 | -1/+1 |
| | | |||||
| * | Allow error strings from spam checker | David Baker | 2017-10-11 | 1 | -2/+6 |
| | | |||||
* | | Fix fetching remote summaries | Erik Johnston | 2017-10-11 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #2530 from matrix-org/rav/fix_receipt_logcontext | Richard van der Hoff | 2017-10-11 | 1 | -0/+4 |
|\ \ | | | | | | | fix a logcontext leak in read receipt handling | ||||
| * | | fix a logcontext leak in read receipt handling | Richard van der Hoff | 2017-10-11 | 1 | -0/+4 |
| | | | |||||
* | | | Fix attestations to check correct server name | Erik Johnston | 2017-10-11 | 1 | -10/+20 |
| |/ |/| | |||||
* | | Merge pull request #2466 from matrix-org/erikj/groups_merged | Erik Johnston | 2017-10-11 | 8 | -17/+584 |
|\ \ | | | | | | | Initial Group Implementation | ||||
| * \ | Merge branch 'develop' into erikj/groups_merged | David Baker | 2017-10-02 | 4 | -8/+121 |
| |\ \ | |||||
| * | | | Add remove room API | Erik Johnston | 2017-09-26 | 1 | -0/+1 |
| | | | | |||||
| * | | | Add is_publicised to group summary | Erik Johnston | 2017-09-26 | 1 | -25/+31 |
| | | | | |||||
| * | | | Ensure that creator of group sees group down /sync | Erik Johnston | 2017-09-19 | 2 | -4/+31 |
| | | | | |||||
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/groups_merged | Erik Johnston | 2017-09-19 | 3 | -33/+163 |
| |\ \ \ | |||||
| * | | | | Add user profiles to summary from group server | Erik Johnston | 2017-08-25 | 1 | -0/+23 |
| | | | | | |||||
| * | | | | Fix typos and reinherit | Erik Johnston | 2017-08-25 | 1 | -12/+6 |
| | | | | | |||||
| * | | | | Split out profile handler to fix tests | Erik Johnston | 2017-08-25 | 6 | -13/+16 |
| | | | | | |||||
| * | | | | Add remote profile cache | Erik Johnston | 2017-08-25 | 2 | -5/+93 |
| | | | | | |||||
| * | | | | Fixup | Erik Johnston | 2017-08-11 | 1 | -9/+13 |
| | | | | | |||||
| * | | | | Add bulk group publicised lookup API | Erik Johnston | 2017-08-09 | 1 | -0/+42 |
| | | | | | |||||
| * | | | | Store whether the user wants to publicise their membership of a group | Erik Johnston | 2017-08-08 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | Remove stale TODO comments | Erik Johnston | 2017-08-04 | 1 | -10/+0 |
| | | | | | |||||
| * | | | | Correctly add joins to correct segment | Erik Johnston | 2017-07-24 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #2378 from matrix-org/erikj/group_sync_support | Erik Johnston | 2017-07-21 | 2 | -5/+80 |
| |\ \ \ \ | | | | | | | | | | | | | Add groups to sync stream | ||||
| | * | | | | Add notifier | Erik Johnston | 2017-07-20 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Fix replication. And notify | Erik Johnston | 2017-07-20 | 1 | -4/+16 |
| | | | | | | |||||
| | * | | | | Remember to cast to bool | Erik Johnston | 2017-07-20 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Add groups to sync stream | Erik Johnston | 2017-07-20 | 1 | -1/+63 |
| | | | | | | |||||
| * | | | | | Add update group profile API | Erik Johnston | 2017-07-20 | 1 | -0/+1 |
| |/ / / / | |||||
| * | | | | Comments | Erik Johnston | 2017-07-18 | 1 | -10/+19 |
| | | | | | |||||
| * | | | | Fix typos | Erik Johnston | 2017-07-18 | 1 | -2/+3 |
| | | | | | |||||
| * | | | | Update federation client pokes | Erik Johnston | 2017-07-18 | 1 | -13/+22 |
| | | | | | |||||
| * | | | | Add client apis | Erik Johnston | 2017-07-18 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Comments | Erik Johnston | 2017-07-18 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Use transport client directly | Erik Johnston | 2017-07-18 | 1 | -18/+25 |
| | | | | | |||||
| * | | | | Add local group server support | Erik Johnston | 2017-07-17 | 1 | -0/+278 |
| | | | | | |||||
| * | | | | Merge pull request #2352 from matrix-org/erikj/group_server_split | Erik Johnston | 2017-07-12 | 1 | -8/+10 |
| |\ \ \ \ | | | | | | | | | | | | | Initial Group Server | ||||
| | * | | | | Initial group server implementation | Erik Johnston | 2017-07-10 | 1 | -8/+10 |
| | | | | | | |||||
* | | | | | | Merge pull request #2483 from jeremycline/unfreeze-ujson-dump | Erik Johnston | 2017-10-11 | 1 | -1/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Unfreeze event before serializing with ujson | ||||
| * | | | | | | Unfreeze event before serializing with ujson | Jeremy Cline | 2017-09-30 | 1 | -1/+2 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In newer versions of https://github.com/esnme/ultrajson, ujson does not serialize frozendicts (introduced in esnme/ultrajson@53f85b1). Although the PyPI version is still 1.35, Fedora ships with a build from commit esnme/ultrajson@2f1d487. This causes the serialization to fail if the distribution-provided package is used. This runs the event through the unfreeze utility before serializing it. Thanks to @ignatenkobrain for tracking down the root cause. fixes #2351 Signed-off-by: Jeremy Cline <jeremy@jcline.org> | ||||
* | | | | | | Merge pull request #2490 from matrix-org/erikj/drop_left_room_events | Erik Johnston | 2017-10-10 | 1 | -0/+22 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Ignore incoming events for rooms that we have left | ||||
| * | | | | | Update comments | Erik Johnston | 2017-10-03 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Remove spurious line feed | Erik Johnston | 2017-10-03 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | Ignore incoming events for rooms that we have left | Erik Johnston | 2017-10-03 | 1 | -0/+23 |
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When synapse receives an event for a room its not in over federation, it double checks with the remote server to see if it is in fact in the room. This is done so that if the server has forgotten about the room (usually as a result of the database being dropped) it can recover from it. However, in the presence of state resets in large rooms, this can cause a lot of work for servers that have legitimately left. As a hacky solution that supports both cases we drop incoming events for rooms that we have explicitly left. This means that we no longer support the case of servers having forgotten that they've rejoined a room, but that is sufficiently rare that we're not going to support it for now. | ||||
* | | | | | Fix up deferred handling in federation.py | Richard van der Hoff | 2017-10-06 | 1 | -24/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Avoid preserve_context_over_deferred, which is broken * set consumeErrors=True on defer.gatherResults, to avoid spurious "unhandled failure" erros | ||||
* | | | | | Spam checking: add the invitee to user_may_invite | David Baker | 2017-10-05 | 2 | -6/+8 |
| | | | | | |||||
* | | | | | spam check room publishing | David Baker | 2017-10-04 | 1 | -0/+8 |
| | | | | | |||||
* | | | | | un-double indent | David Baker | 2017-10-04 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Add room creation checks to spam checker | David Baker | 2017-10-04 | 2 | -0/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Lets the spam checker deny attempts to create rooms and add aliases to them. | ||||
* | | | | | pass room id too | David Baker | 2017-10-03 | 2 | -2/+4 |
| | | | | | |||||
* | | | | | Federation was passing strings anyway | David Baker | 2017-10-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | so pass string everywhere | ||||
* | | | | | this shouldn't be debug | David Baker | 2017-10-03 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | better logging | David Baker | 2017-10-03 | 1 | -4/+9 |
| | | | | | |||||
* | | | | | Skip spam check for admin users | David Baker | 2017-10-03 | 1 | -8/+8 |
| | | | | | |||||
* | | | | | Fix param name & lint | David Baker | 2017-10-03 | 1 | -2/+4 |
| | | | | | |||||
* | | | | | Allow spam checker to reject invites too | David Baker | 2017-10-03 | 2 | -6/+18 |
|/ / / / | |||||
* | | | | Fix /joined_members to work with AS users | Erik Johnston | 2017-09-28 | 1 | -11/+25 |
| | | | | |||||
* | | | | Fix bug where /joined_members didn't check user was in room | Erik Johnston | 2017-09-27 | 1 | -0/+31 |
| | | | | |||||
* | | | | Make the spam checker a module | David Baker | 2017-09-26 | 1 | -2/+3 |
| | | | | |||||
* | | | | Refactor to speed up incremental syncs | Erik Johnston | 2017-09-25 | 1 | -5/+18 |
| | | | | |||||
* | | | | Fix device list when rejoining room (#2461) | Erik Johnston | 2017-09-22 | 1 | -2/+14 |
| | | | | |||||
* | | | | Add a config option to block all room invites (#2457) | Richard van der Hoff | 2017-09-19 | 2 | -0/+25 |
| | | | | | | | | | | | | | | | | | | | | - allows sysadmins the ability to lock down their servers so that people can't send their users room invites. | ||||
* | | | | add some comments to on_exchange_third_party_invite_request | Richard van der Hoff | 2017-09-19 | 1 | -0/+11 |
| | | | | |||||
* | | | | PoC for filtering spammy events (#2456) | Richard van der Hoff | 2017-09-19 | 1 | -1/+7 |
| |_|/ |/| | | | | | Demonstration of how you might add some hooks to filter out spammy events. | ||||
* | | | Fix overzealous kicking of guest users (#2453) | Richard van der Hoff | 2017-09-19 | 1 | -1/+1 |
| | | | | | | | | | We should only kick guest users if the guest access event is authorised. | ||||
* | | | Don't filter out current state events from timeline | Erik Johnston | 2017-09-18 | 1 | -0/+7 |
| | | | |||||
* | | | Correctly handle leaving room in /key/changes | Erik Johnston | 2017-09-18 | 1 | -13/+12 |
| | | | |||||
* | | | Fix typo | Erik Johnston | 2017-09-15 | 1 | -1/+1 |
| | | | |||||
* | | | Actually hook leave notifs up | Erik Johnston | 2017-09-14 | 1 | -2/+3 |
| | | | |||||
* | | | Handle joining/leaving rooms in /keys/changes | Erik Johnston | 2017-09-13 | 1 | -1/+38 |
| | | | |||||
* | | | Get left rooms | Erik Johnston | 2017-09-13 | 1 | -3/+32 |
| | | | |||||
* | | | In sync handle device lists for newly joined/left rooms | Erik Johnston | 2017-09-12 | 1 | -2/+10 |
| | | | |||||
* | | | Add left section to /keys/changes | Erik Johnston | 2017-09-08 | 2 | -7/+17 |
| | | | |||||
* | | | Send down device list change notif when member leaves/rejoins room | Erik Johnston | 2017-09-07 | 2 | -13/+53 |
| | | | |||||
* | | | Use less DB for device list handling in sync | Erik Johnston | 2017-07-12 | 1 | -8/+7 |
| |/ |/| | |||||
* | | Don't compute push actions for backfilled events | Erik Johnston | 2017-07-11 | 1 | -1/+1 |
|/ | |||||
* | Fix bug where pusherpool didn't start and broke some rooms | Erik Johnston | 2017-07-06 | 2 | -2/+5 |
| | | | | | | | | Since we didn't instansiate the PusherPool at start time it could fail at run time, which it did for some users. This may or may not fix things for those users, but it should happen at start time and stop the server from starting. | ||||
* | Improve the error handling for bad invites received over federation | Mark Haines | 2017-06-30 | 1 | -2/+17 |
| | |||||
* | Use an ExpiringCache for storing registration sessions | Erik Johnston | 2017-06-29 | 1 | -11/+10 |
| | | | | | This is because pruning them was a significant performance drain on matrix.org | ||||
* | Merge pull request #2307 from matrix-org/erikj/user_ip_batch | Erik Johnston | 2017-06-27 | 1 | -2/+2 |
|\ | | | | | Batch upsert user ips | ||||
| * | Fix up client ips to read from pending data | Erik Johnston | 2017-06-27 | 1 | -2/+2 |
| | | |||||
* | | Remove unused variables | Erik Johnston | 2017-06-26 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2017-06-26 | 4 | -13/+52 |
|\| | | | | | | | erikj/ensure_round_trip | ||||
| * | Make some more params configurable | Erik Johnston | 2017-06-22 | 1 | -5/+8 |
| | | |||||
| * | Typo. ARGH. | Erik Johnston | 2017-06-22 | 1 | -1/+1 |
| | | |||||
| * | Fix thinko in unhandled user spam | Erik Johnston | 2017-06-22 | 1 | -2/+2 |
| | | |||||
| * | Don't work out users who share room with appservice users | Erik Johnston | 2017-06-21 | 1 | -2/+11 |
| | | |||||
| * | Handle all cases of sending membership events | Erik Johnston | 2017-06-19 | 1 | -0/+5 |
| | | |||||
| * | Change to create new room and join other users | Erik Johnston | 2017-06-19 | 1 | -4/+17 |
| | | |||||
| * | Add shutdown room API | Erik Johnston | 2017-06-19 | 2 | -0/+9 |
| | | |||||
* | | Reject local events that don't round trip the DB | Erik Johnston | 2017-06-19 | 1 | -0/+9 |
|/ | |||||
* | Initial worker impl | Erik Johnston | 2017-06-16 | 1 | -6/+13 |
| | |||||
* | Include users who share room with requester in user directory | Erik Johnston | 2017-06-15 | 1 | -2/+2 |
| | |||||
* | Implement updating users who share rooms on the fly | Erik Johnston | 2017-06-15 | 1 | -23/+125 |
| | |||||
* | Implement initial population of users who share rooms table | Erik Johnston | 2017-06-15 | 1 | -2/+76 |
| | |||||
* | Fix user directory insertion due to missing room_id | Erik Johnston | 2017-06-13 | 1 | -3/+7 |
| | |||||
* | Don't assume existance of events when updating user directory | Erik Johnston | 2017-06-13 | 1 | -3/+6 |
| | |||||
* | Merge pull request #2266 from matrix-org/erikj/host_in_room | Erik Johnston | 2017-06-12 | 1 | -3/+3 |
|\ | | | | | Change is_host_joined to use current_state table | ||||
| * | Change is_host_joined to use current_state table | Erik Johnston | 2017-06-09 | 1 | -3/+3 |
| | | | | | | | | | | | | This bypasses a bug where using the state groups to figure out if a host is in a room sometimes errors if the servers isn't in the room. (For example when the server rejected an invite to a remote room) | ||||
* | | Comment | Erik Johnston | 2017-06-09 | 1 | -0/+2 |
| | | |||||
* | | Mark remote invite rejections as outliers | Erik Johnston | 2017-06-09 | 1 | -0/+1 |
|/ | |||||
* | Merge pull request #2258 from matrix-org/erikj/user_dir | Erik Johnston | 2017-06-07 | 1 | -0/+3 |
|\ | | | | | Don't start user_directory handling on workers | ||||
| * | Don't start user_directory handling on workers | Erik Johnston | 2017-06-07 | 1 | -0/+3 |
| | | |||||
* | | Merge pull request #2248 from matrix-org/erikj/state_fixup | Erik Johnston | 2017-06-07 | 1 | -7/+5 |
|\ \ | |/ |/| | Faster cache for get_joined_hosts | ||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_fixup | Erik Johnston | 2017-06-07 | 1 | -0/+429 |
| |\ | |||||
| * | | Fix typing tests | Erik Johnston | 2017-05-26 | 1 | -7/+5 |
| | | | |||||
* | | | Add some logging to user directory | Erik Johnston | 2017-06-07 | 1 | -0/+7 |
| |/ |/| | |||||
* | | Handle profile updates in user directory | Erik Johnston | 2017-06-01 | 1 | -0/+25 |
| | | |||||
* | | Split the table in two | Erik Johnston | 2017-06-01 | 1 | -27/+50 |
| | | |||||
* | | Comments | Erik Johnston | 2017-06-01 | 1 | -3/+3 |
| | | |||||
* | | Check if host is still in room | Erik Johnston | 2017-06-01 | 1 | -0/+11 |
| | | |||||
* | | Fix removing users | Erik Johnston | 2017-06-01 | 1 | -0/+5 |
| | | |||||
* | | Bug fixes and logging | Erik Johnston | 2017-06-01 | 1 | -1/+21 |
| | | | | | | | | | | - Check if room is public when a user joins before adding to user dir - Fix typo of field name "content.join_rules" -> "content.join_rule" | ||||
* | | Comment briefly on how we keep user_directory up to date | Erik Johnston | 2017-05-31 | 1 | -0/+10 |
| | | |||||
* | | Lifts things into separate function | Erik Johnston | 2017-05-31 | 1 | -56/+54 |
| | | |||||
* | | Typos | Erik Johnston | 2017-05-31 | 1 | -8/+8 |
| | | |||||
* | | Fix tests | Erik Johnston | 2017-05-31 | 1 | -2/+2 |
| | | |||||
* | | Pull max id from correct table | Erik Johnston | 2017-05-31 | 1 | -4/+2 |
| | | |||||
* | | Handle the server leaving a public room | Erik Johnston | 2017-05-31 | 1 | -3/+20 |
| | | |||||
* | | Add comments | Erik Johnston | 2017-05-31 | 1 | -41/+120 |
| | | |||||
* | | Add search | Erik Johnston | 2017-05-31 | 1 | -0/+3 |
| | | |||||
* | | Update room column when room becomes unpublic | Erik Johnston | 2017-05-31 | 1 | -2/+21 |
| | | |||||
* | | Add call later | Erik Johnston | 2017-05-31 | 1 | -0/+2 |
| | | |||||
* | | Start later | Erik Johnston | 2017-05-31 | 1 | -1/+4 |
| | | |||||
* | | Don't go round in circles | Erik Johnston | 2017-05-31 | 1 | -4/+2 |
| | | |||||
* | | Add user_directory to database | Erik Johnston | 2017-05-31 | 1 | -0/+218 |
|/ | |||||
* | Merge pull request #2247 from matrix-org/erikj/auth_event | Erik Johnston | 2017-05-24 | 1 | -6/+14 |
|\ | | | | | Only store event_auth for state events | ||||
| * | Only store event_auth for state events | Erik Johnston | 2017-05-24 | 1 | -6/+14 |
| | | |||||
* | | Add count of one time keys to sync stream | Erik Johnston | 2017-05-19 | 1 | -0/+11 |
|/ | |||||
* | 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 |
| | |