Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs | David Baker | 2016-05-10 | 3 | -16/+10 |
|\ | |||||
| * | Add and use get_domian_from_id | Erik Johnston | 2016-05-09 | 3 | -15/+9 |
| | | |||||
| * | Reduce database inserts when sending transactions | Erik Johnston | 2016-05-06 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs | David Baker | 2016-04-29 | 1 | -1/+1 |
|\| | |||||
| * | fix typo | Matthew Hodgson | 2016-04-28 | 1 | -1/+1 |
| | | |||||
* | | Run filter_events_for_client | David Baker | 2016-04-27 | 5 | -12/+12 |
|/ | | | | so we don't accidentally mail out events people shouldn't see | ||||
* | Simplify _check_password | Erik Johnston | 2016-04-15 | 1 | -5/+9 |
| | |||||
* | Fix check_password rather than inverting the meaning of ↵ | Mark Haines | 2016-04-14 | 1 | -9/+12 |
| | | | | _check_local_password (#730) | ||||
* | Fix login to error for nonexistent users | David Baker | 2016-04-14 | 1 | -1/+1 |
| | | | | Fixes SYN-680 | ||||
* | Merge pull request #718 from matrix-org/erikj/public_room_list | Erik Johnston | 2016-04-13 | 1 | -5/+8 |
|\ | | | | | Don't return empty public rooms | ||||
| * | Don't return empty public rooms | Erik Johnston | 2016-04-12 | 1 | -5/+8 |
| | | |||||
* | | Don't auto log failed auth checks | Erik Johnston | 2016-04-13 | 2 | -9/+31 |
|/ | |||||
* | More comments | Erik Johnston | 2016-04-12 | 1 | -0/+9 |
| | |||||
* | More comments | Erik Johnston | 2016-04-12 | 1 | -0/+6 |
| | |||||
* | Don't append to unused list | Erik Johnston | 2016-04-12 | 1 | -4/+0 |
| | |||||
* | Add back backfilled parameter that was removed | Erik Johnston | 2016-04-12 | 1 | -1/+3 |
| | |||||
* | Add comment | Erik Johnston | 2016-04-12 | 1 | -0/+1 |
| | |||||
* | Check if we've already backfilled events | Erik Johnston | 2016-04-12 | 1 | -7/+20 |
| | |||||
* | Merge pull request #705 from matrix-org/dbkr/pushers_use_event_actions | David Baker | 2016-04-11 | 3 | -6/+32 |
|\ | | | | | Change pushers to use the event_actions table | ||||
| * | Add comments on min_stream_id | David Baker | 2016-04-07 | 1 | -0/+1 |
| | | | | | | | | saying that the min stream id won't be completely accurate all the time | ||||
| * | Merge remote-tracking branch 'origin/develop' into ↵ | David Baker | 2016-04-07 | 3 | -12/+49 |
| |\ | | | | | | | | | | dbkr/pushers_use_event_actions | ||||
| * | | Send badge count pushes. | David Baker | 2016-04-07 | 1 | -4/+17 |
| | | | | | | | | | | | | Also fix bugs with retrying. | ||||
| * | | Make pushers use the event_push_actions table instead of listening on an ↵ | David Baker | 2016-04-06 | 2 | -2/+14 |
| | | | | | | | | | | | | | | | | | | | | | event stream & running the rules again. Sytest passes, but remaining to do: * Make badges work again * Remove old, unused code | ||||
* | | | Merge pull request #707 from matrix-org/markjh/remove_changed_presencelike_data | Erik Johnston | 2016-04-08 | 1 | -15/+0 |
|\ \ \ | | | | | | | | | changed_presencelike_data isn't observed anywhere so can be removed | ||||
| * | | | changed_presencelike_data isn't observed anywhere in synapse so can be removed | Mark Haines | 2016-04-08 | 1 | -15/+0 |
| | | | | |||||
* | | | | Remove some unused functions (#711) | Mark Haines | 2016-04-08 | 2 | -42/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove some unused functions * get_room_events_stream is only used in tests * is_exclusive_room might actually be something we want | ||||
* | | | | Move all the wrapper functions for distributor.fire | Mark Haines | 2016-04-08 | 4 | -38/+3 |
|/ / / | | | | | | | | | | | | | | | | | | | Move the functions inside the distributor and import them where needed. This reduces duplication and makes it possible for flake8 to detect when the functions aren't used in a given file. | ||||
* | | | Merge pull request #708 from matrix-org/markjh/remove_collect_presencelike_data | Mark Haines | 2016-04-08 | 2 | -37/+1 |
|\ \ \ | | | | | | | | | Call profile handler get_displayname directly | ||||
| * | | | Call profile handler get_displayname directly rather than using ↵ | Mark Haines | 2016-04-07 | 2 | -37/+1 |
| | | | | | | | | | | | | | | | | collect_presencelike_data | ||||
* | | | | Merge pull request #701 from DoubleMalt/ldap-auth | Erik Johnston | 2016-04-07 | 1 | -9/+77 |
|\ \ \ \ | |/ / / |/| | | | Add LDAP authentication | ||||
| * | | | fix check for failed authentication | Christoph Witzany | 2016-04-06 | 1 | -2/+4 |
| | | | | |||||
| * | | | remove line | Christoph Witzany | 2016-04-06 | 1 | -1/+0 |
| | | | | |||||
| * | | | make tests for ldap more specific to not be fooled by Mocks | Christoph Witzany | 2016-04-06 | 1 | -3/+3 |
| | | | | |||||
| * | | | output ldap version for info and to pacify pep8 | Christoph Witzany | 2016-04-06 | 1 | -0/+2 |
| | | | | |||||
| * | | | conditionally import ldap | Christoph Witzany | 2016-04-06 | 1 | -2/+5 |
| | | | | |||||
| * | | | fix pep8 | Christoph Witzany | 2016-04-06 | 1 | -2/+1 |
| | | | | |||||
| * | | | fix exception handling | Christoph Witzany | 2016-04-06 | 1 | -2/+2 |
| | | | | |||||
| * | | | code style | Christoph Witzany | 2016-04-06 | 1 | -6/+13 |
| | | | | |||||
| * | | | add tls property and twist my head around twisted | Christoph Witzany | 2016-04-06 | 1 | -15/+29 |
| | | | | |||||
| * | | | move LDAP authentication to AuthenticationHandler | Christoph Witzany | 2016-04-06 | 1 | -6/+48 |
| | | | | |||||
* | | | | Merge pull request #700 from matrix-org/erikj/deduplicate_joins | Erik Johnston | 2016-04-07 | 1 | -0/+31 |
|\ \ \ \ | |_|_|/ |/| | | | Deduplicate membership changes | ||||
| * | | | Deduplicate joins | Erik Johnston | 2016-04-07 | 1 | -0/+31 |
| | | | | |||||
* | | | | Set profile information when joining rooms remotely | Erik Johnston | 2016-04-07 | 1 | -0/+5 |
|/ / / | |||||
* / / | Let users see their own leave events | Richard van der Hoff | 2016-04-06 | 1 | -11/+40 |
|/ / | | | | | | | | | | | | | ... otherwise clients get confused. Fixes https://matrix.org/jira/browse/SYN-662, https://github.com/vector-im/vector-web/issues/368 | ||||
* | | Merge pull request #693 from matrix-org/erikj/backfill_self | Erik Johnston | 2016-04-05 | 1 | -1/+4 |
|\ \ | |/ |/| | Don't backfill from self | ||||
| * | Don't backfill from self | Erik Johnston | 2016-04-05 | 1 | -1/+4 |
| | | |||||
* | | Merge pull request #691 from matrix-org/erikj/member | Erik Johnston | 2016-04-05 | 2 | -15/+37 |
|\ \ | | | | | | | Fix stuck invites | ||||
| * | | Fix stuck invites | Erik Johnston | 2016-04-05 | 2 | -15/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | If rejecting a remote invite fails with an error response don't fail the entire request; instead mark the invite as locally rejected. This fixes the bug where users can get stuck invites which they can neither accept nor reject. | ||||
* | | | Merge pull request #690 from matrix-org/erikj/member | Erik Johnston | 2016-04-05 | 1 | -1/+4 |
|\| | | | | | | | | Store invites in a separate table. | ||||
| * | | Docs and indents | Erik Johnston | 2016-04-04 | 1 | -1/+4 |
| | | | |||||
| * | | Store invites in a separate table. | Erik Johnston | 2016-04-04 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #689 from matrix-org/erikj/member | Erik Johnston | 2016-04-04 | 3 | -149/+169 |
|\| | | | | | | | | Do checks for memberships before creating events | ||||
| * | | Use computed prev event ids | Erik Johnston | 2016-04-01 | 3 | -13/+25 |
| | | | |||||
| * | | Remove state hack from _create_new_client_event | Erik Johnston | 2016-04-01 | 1 | -43/+0 |
| | | | |||||
| * | | Do checks for memberships before creating events | Erik Johnston | 2016-04-01 | 1 | -93/+144 |
| | | | |||||
* | | | Merge pull request #686 from matrix-org/markjh/doc_strings | Mark Haines | 2016-04-01 | 5 | -72/+101 |
|\ \ \ | |/ / |/| | | Use google style doc strings. | ||||
| * | | Use google style doc strings. | Mark Haines | 2016-04-01 | 5 | -72/+101 |
| | | | | | | | | | | | | | | | | | | | | | pycharm supports them so there is no need to use the other format. Might as well convert the existing strings to reduce the risk of people accidentally cargo culting the wrong doc string format. | ||||
* | | | Add concurrently_execute function | Erik Johnston | 2016-04-01 | 3 | -74/+51 |
| | | | |||||
* | | | Filter rooms list before chunking | Erik Johnston | 2016-04-01 | 1 | -6/+12 |
| | | | |||||
* | | | Remove outlier parameter from compute_event_context | Mark Haines | 2016-03-31 | 2 | -9/+5 |
|/ / | | | | | | | Use event.internal_metadata.is_outlier instead. | ||||
* | | Merge pull request #680 from matrix-org/markjh/remove_is_new_state | Mark Haines | 2016-03-31 | 1 | -16/+4 |
|\ \ | | | | | | | Remove the is_new_state argument to persist event. | ||||
| * | | Remove the is_new_state argument to persist event. | Mark Haines | 2016-03-31 | 1 | -16/+4 |
| |/ | | | | | | | | | | | | | | | | | Move the checks for whether an event is new state inside persist event itself. This was harder than expected because there wasn't enough information passed to persist event to correctly handle invites from remote servers for new rooms. | ||||
* / | Split out RoomMemberHandler | Erik Johnston | 2016-03-31 | 3 | -603/+651 |
|/ | |||||
* | Line length | Erik Johnston | 2016-03-31 | 1 | -1/+3 |
| | |||||
* | Only forget room if you were in the room | Erik Johnston | 2016-03-30 | 1 | -1/+2 |
| | |||||
* | Require user to have left room to forget room | Erik Johnston | 2016-03-30 | 1 | -6/+16 |
| | | | | | This dramatically simplifies the forget API code - in particular it no longer generates a leave event. | ||||
* | Add a response cache for getting the public room list | Mark Haines | 2016-03-24 | 1 | -1/+11 |
| | |||||
* | Deduplicate identical /sync requests | Mark Haines | 2016-03-24 | 1 | -1/+15 |
| | |||||
* | Ensure all old public rooms have aliases | Erik Johnston | 2016-03-23 | 1 | -4/+5 |
| | |||||
* | Ensure published rooms have public join rules | Erik Johnston | 2016-03-23 | 1 | -0/+7 |
| | |||||
* | Comment | Erik Johnston | 2016-03-23 | 1 | -0/+3 |
| | |||||
* | Don't require alias in public room list. | Erik Johnston | 2016-03-23 | 1 | -14/+13 |
| | | | | | | | Rooms now no longer require an alias to be published. Also, changes the way we pull out state of each room to not require fetching all state events. | ||||
* | Merge pull request #657 from matrix-org/erikj/roomlist | Erik Johnston | 2016-03-22 | 1 | -0/+22 |
|\ | | | | | Add published room list edit API | ||||
| * | Doc string | Erik Johnston | 2016-03-22 | 1 | -0/+6 |
| | | |||||
| * | an invalide is something else... | Matthew Hodgson | 2016-03-22 | 1 | -1/+1 |
| | | |||||
| * | Add published room list edit API | Erik Johnston | 2016-03-21 | 1 | -0/+16 |
| | | |||||
* | | Remove unused backfilled parameter from persist_event | Mark Haines | 2016-03-21 | 1 | -23/+15 |
| | | |||||
* | | remove unused current_state variable from on_receive_pdu | Mark Haines | 2016-03-21 | 1 | -2/+0 |
|/ | |||||
* | Merge pull request #652 from matrix-org/erikj/delete_alias | Erik Johnston | 2016-03-18 | 1 | -6/+47 |
|\ | | | | | Update aliases event after deletion | ||||
| * | Check canonical alias event exists | Erik Johnston | 2016-03-17 | 1 | -1/+2 |
| | | |||||
| * | Update aliases event after deletion | Erik Johnston | 2016-03-17 | 1 | -6/+46 |
| | | | | | | | | | | | | | | | | Attempt to update the appropriate `m.room.aliases` event after deleting an alias. This may fail due to the deleter not being in the room. Will also check if the canonical alias of the event is set to the deleted alias, and if so will attempt to delete it. | ||||
* | | Merge pull request #650 from matrix-org/dbkr/register_idempotent_with_username | David Baker | 2016-03-17 | 2 | -1/+25 |
|\ \ | | | | | | | Make registration idempotent, part 2 | ||||
| * | | Make registration idempotent, part 2: be idempotent if the client specifies ↵ | David Baker | 2016-03-16 | 2 | -1/+25 |
| |/ | | | | | | | a username. | ||||
* | | Remove another unused function from presence | Mark Haines | 2016-03-17 | 1 | -4/+0 |
| | | |||||
* | | Remove dead code left over from presence changes | Mark Haines | 2016-03-17 | 2 | -74/+0 |
|/ | |||||
* | pep8 | David Baker | 2016-03-16 | 1 | -1/+2 |
| | |||||
* | time_msec() | David Baker | 2016-03-16 | 1 | -1/+1 |
| | |||||
* | string with symbols is a bit too symboly. | David Baker | 2016-03-16 | 1 | -1/+1 |
| | |||||
* | Replace other time.time(). | David Baker | 2016-03-16 | 1 | -2/+1 |
| | |||||
* | Use hs get_clock instead of time.time() | David Baker | 2016-03-16 | 1 | -2/+2 |
| | |||||
* | pep8 & remove debug logging | David Baker | 2016-03-16 | 1 | -1/+1 |
| | |||||
* | Make registration idempotent: if you specify the same session, make it give ↵ | David Baker | 2016-03-16 | 1 | -12/+48 |
| | | | | you an access token for the user that was registered on previous uses of that session. Tweak the UI auth layer to not delete sessions when their auth has completed and hence expire themn so they don't hang around until server restart. Allow server-side data to be associated with UI auth sessions. | ||||
* | Remove needless PreserveLoggingContext | Erik Johnston | 2016-03-15 | 1 | -5/+4 |
| | |||||
* | Persist rejection of invites over federation | Erik Johnston | 2016-03-15 | 1 | -1/+17 |
| | |||||
* | Add config to create guest account on 3pid invite | Erik Johnston | 2016-03-14 | 1 | -25/+32 |
| | | | | | | | | | | | | | Currently, when a 3pid invite request is sent to an identity server, it includes a provisioned guest access token. This allows the link in the, say, invite email to include the guest access token ensuring that the same account is used each time the link is clicked. This flow has a number of flaws, including when using different servers or servers that have guest access disabled. For now, we keep this implementation but hide it behind a config option until a better flow is implemented. | ||||
* | Make select more sensible when dseleting access tokens, rename pusher ↵ | David Baker | 2016-03-11 | 1 | -1/+1 |
| | | | | deletion to match access token deletion and make exception arg optional. | ||||
* | Delete old, unused methods and rename new one to just be ↵ | David Baker | 2016-03-11 | 1 | -1/+1 |
| | | | | `user_delete_access_tokens` with an `except_token_ids` argument doing what it says on the tin. | ||||
* | Dear PyCharm, please indent sensibly for me. Thx. | David Baker | 2016-03-11 | 1 | -2/+2 |
| | |||||
* | Fix cache invalidation so deleting access tokens (which we did when changing ↵ | David Baker | 2016-03-11 | 1 | -4/+9 |
| | | | | password) actually takes effect without HS restart. Reinstate the code to avoid logging out the session that changed the password, removed in 415c2f05491ce65a4fc34326519754cd1edd9c54 | ||||
* | Store appservice ID on register | Daniel Wagner-Hall | 2016-03-10 | 1 | -1/+4 |
| | |||||
* | Merge pull request #631 from matrix-org/markjh/py3v1 | Mark Haines | 2016-03-08 | 2 | -2/+2 |
|\ | | | | | Use syntax that's valid on both py2.7 and py3 | ||||
| * | Use syntax that works on both py2.7 and py3 | Mark Haines | 2016-03-07 | 2 | -2/+2 |
| | | |||||
* | | Send the user ID matching the guest access token, since there is no Matrix ↵ | David Baker | 2016-03-07 | 1 | -0/+5 |
|/ | | | | API to discover what user ID an access token is for. | ||||
* | Merge pull request #626 from matrix-org/erikj/visibility | Erik Johnston | 2016-03-07 | 1 | -0/+26 |
|\ | | | | | Send history visibility on boundary changes | ||||
| * | Send history visibility on boundary changes | Erik Johnston | 2016-03-04 | 1 | -0/+26 |
| | | |||||
* | | Merge pull request #618 from matrix-org/markjh/pushrule_stream | Mark Haines | 2016-03-04 | 2 | -2/+24 |
|\ \ | | | | | | | Add a stream for push rule updates | ||||
| * | | Merge branch 'develop' into markjh/pushrule_stream | Mark Haines | 2016-03-04 | 10 | -80/+162 |
| |\| | |||||
| * | | Hook up the push rules stream to account_data in /sync | Mark Haines | 2016-03-04 | 1 | -0/+22 |
| | | | |||||
| * | | Hook up the push rules to the notifier | Mark Haines | 2016-03-03 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #625 from matrix-org/erikj/kick_ban_sync | Erik Johnston | 2016-03-04 | 1 | -3/+9 |
|\ \ \ | | | | | | | | | Always include kicks and bans in full /sync | ||||
| * | | | Always include kicks and bans in full /sync | Erik Johnston | 2016-03-04 | 1 | -3/+9 |
| | |/ | |/| | |||||
* | | | Spelling | Erik Johnston | 2016-03-04 | 1 | -1/+1 |
| | | | |||||
* | | | Add profile information to invites | Erik Johnston | 2016-03-04 | 1 | -2/+15 |
|/ / | |||||
* | | Merge pull request #598 from Rugvip/invite-state | Erik Johnston | 2016-03-04 | 1 | -6/+2 |
|\ \ | | | | | | | config,handlers/_base: added homeserver config for what state is included in a room invite | ||||
| * | | config,handlers/_base: added homeserver config for what state is included in ↵ | Patrik Oldsberg | 2016-03-04 | 1 | -6/+2 |
| | | | | | | | | | | | | | | | | | | a room invite Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com> | ||||
* | | | Merge pull request #596 from Rugvip/create | Erik Johnston | 2016-03-04 | 1 | -0/+6 |
|\ \ \ | |/ / |/| | | handlers/_base: don't allow room create event to be changed | ||||
| * | | handlers/_base: don't allow room create event to be changed | Patrik Oldsberg | 2016-02-23 | 1 | -0/+6 |
| | | | | | | | | | | | | Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com> | ||||
* | | | Merge pull request #610 from Rugvip/unique-user | Erik Johnston | 2016-03-04 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | handlers/register: make sure another user id is generated when a collision occurs | ||||
| * | | | handlers/register: make sure another user id is generated when a collision ↵ | Patrik Oldsberg | 2016-02-29 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | occurs Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com> | ||||
* | | | | Merge pull request #623 from matrix-org/rav/fix_createroom_race | Richard van der Hoff | 2016-03-04 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Make sure we add all invited members before returning from createRoom | ||||
| * | | | | Make sure we add all invited members before returning from createRoom | Richard van der Hoff | 2016-03-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | add a missing yield. | ||||
* | | | | | Merge pull request #614 from matrix-org/erikj/alias_delete | Erik Johnston | 2016-03-04 | 1 | -6/+21 |
|\ \ \ \ \ | | | | | | | | | | | | | Allow alias creators to delete aliases | ||||
| * | | | | | Allow alias creators to delete aliases | Erik Johnston | 2016-03-01 | 1 | -6/+21 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge remote-tracking branch 'origin/develop' into rav/SYN-642 | Richard van der Hoff | 2016-03-03 | 7 | -57/+85 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge pull request #621 from matrix-org/daniel/ratelimiting | Daniel Wagner-Hall | 2016-03-03 | 6 | -56/+84 |
| |\ \ \ \ | | | | | | | | | | | | | Pass whole requester to ratelimiting | ||||
| | * | | | | Pass whole requester to ratelimiting | Daniel Wagner-Hall | 2016-03-03 | 6 | -56/+84 |
| | | | | | | | | | | | | | | | | | | | | | | | | This will enable more detailed decisions | ||||
| * | | | | | Stop using checkpw as it seems to have vanished from bcrypt. Use ↵ | David Baker | 2016-03-02 | 1 | -1/+1 |
| |/ / / / | | | | | | | | | | | | | | | | `bcrypt.hashpw(password, hashed) == hashed` as per the bcrypt README. | ||||
* | | | | | Merge branch 'develop' into rav/SYN-642 | Richard van der Hoff | 2016-03-03 | 3 | -2/+37 |
|\| | | | | |||||
| * | | | | Merge pull request #612 from matrix-org/erikj/cache_size | Erik Johnston | 2016-03-02 | 2 | -2/+4 |
| |\ \ \ \ | | |_|_|/ | |/| | | | Add environment variable SYNAPSE_CACHE_FACTOR, default it to 0.1 | ||||
| | * | | | Add enviroment variable SYNAPSE_CACHE_FACTOR, default it to 0.1 | Erik Johnston | 2016-03-01 | 2 | -2/+4 |
| | |/ / | |||||
| * / / | Add a /replication API for extracting the updates that happened on | Mark Haines | 2016-03-01 | 2 | -0/+33 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | synapse This is necessary for replicating the data in synapse to be visible to a separate service because presence and typing notifications aren't stored in a database so won't be visible to another process. This API can be used to either get the raw data by requesting the tables themselves or to just receive notifications for updates by following the streams meta-stream. Returns updates for each table requested a JSON array of arrays with a row for each row in the table. Each table is prefixed by a header row with the: name of the table, current stream_id position for the table, number of rows, number of columns and the names of the columns. This is followed by the rows that have been added to the server since the requester last asked. The API has a timeout and is hooked up to the notifier so that a slave can long poll for updates. | ||||
* | | | Fix typo | Richard van der Hoff | 2016-03-03 | 1 | -1/+1 |
| | | | |||||
* | | | Move arg default to the start of the function | Richard van der Hoff | 2016-03-02 | 1 | -2/+3 |
| | | | | | | | | | | | | Also don't overwrite the list that gets passed in. | ||||
* | | | fix pyflakes quibble | Richard van der Hoff | 2016-03-02 | 1 | -1/+2 |
| | | | |||||
* | | | Address review comments | Richard van der Hoff | 2016-03-02 | 2 | -8/+17 |
| | | | |||||
* | | | Fix pyflakes warning | Richard van der Hoff | 2016-03-01 | 1 | -1/+1 |
| | | | |||||
* | | | Handle rejections of invites from local users locally | Richard van der Hoff | 2016-03-01 | 2 | -8/+31 |
|/ / | | | | | | | | | Slightly hacky fix to SYN-642, which avoids the federation codepath when trying to reject invites from local users. | ||||
* | | Send the invier's member event in room invite state so the invitee has their ↵ | David Baker | 2016-02-25 | 1 | -1/+7 |
| | | | | | | | | display name and avatar. | ||||
* | | Generate guest access token on 3pid invites | Daniel Wagner-Hall | 2016-02-24 | 2 | -0/+23 |
| | | | | | | | | | | | | | | | | | | This means that following the same link across multiple sessions or devices can re-use the same guest account. Note that this is somewhat of an abuse vector; we can't throw up captchas on this flow, so this is a way of registering ephemeral accounts for spam, whose sign-up we don't rate limit. | ||||
* | | Check presence token interval is less than 100, rather than the token itself | Erik Johnston | 2016-02-23 | 1 | -4/+4 |
| | | |||||
* | | Merge pull request #602 from matrix-org/erikj/presence | Erik Johnston | 2016-02-23 | 1 | -19/+45 |
|\ \ | | | | | | | Change the way we figure out presence updates for small deltas | ||||
| * | | Handle get_all_entities_changed returning None | Erik Johnston | 2016-02-23 | 1 | -0/+3 |
| | | | |||||
| * | | Add comments | Erik Johnston | 2016-02-23 | 1 | -0/+4 |
| | | | |||||
| * | | Change the way we figure out presence updates for small deltas | Erik Johnston | 2016-02-23 | 1 | -17/+36 |
| | | | |||||
* | | | Allow third_party_signed to be specified on /join | Daniel Wagner-Hall | 2016-02-23 | 2 | -29/+131 |
| | | | |||||
* | | | Merge pull request #600 from matrix-org/erikj/presence | Erik Johnston | 2016-02-23 | 1 | -26/+30 |
|\| | | | | | | | | Measure PresenceEventSource.get_new_events | ||||
| * | | Don't include defer.returnValue in Measure block | Erik Johnston | 2016-02-23 | 1 | -9/+12 |
| | | | |||||
| * | | Measure PresenceEventSource.get_new_events | Erik Johnston | 2016-02-23 | 1 | -34/+35 |
| | | | |||||
* | | | handlers/sync: style fix, line too long | Patrik Oldsberg | 2016-02-23 | 1 | -1/+5 |
| | | | | | | | | | | | | Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com> | ||||
* | | | Pick up currently_active across federation | Erik Johnston | 2016-02-23 | 1 | -0/+1 |
| | | | |||||
* | | | handlers/sync: fix SyncResult not counting account_data change when ↵ | Patrik Oldsberg | 2016-02-23 | 1 | -1/+1 |
| |/ |/| | | | | | | | | | | | | | converting to bool This fixes account_data events not triggering an immediate /sync response Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com> | ||||
* | | Merge pull request #587 from matrix-org/rav/guest_access_after_room_join | Richard van der Hoff | 2016-02-22 | 2 | -15/+40 |
|\ \ | |/ |/| | Allow guest users access to messages in rooms they have joined | ||||
| * | address review comments | Richard van der Hoff | 2016-02-22 | 1 | -7/+2 |
| | | | | | | | | drop commented-out special casing for historyvisibility event s/he/they/ for users | ||||
| * | Interpret unknown visibilities the same as shared | Richard van der Hoff | 2016-02-19 | 1 | -11/+13 |
| | | |||||
| * | Merge branch 'develop' into rav/guest_access_after_room_join | Richard van der Hoff | 2016-02-19 | 9 | -1348/+1160 |
| |\ | |||||
| * | | Allow guest users access to messages in rooms they have joined | Richard van der Hoff | 2016-02-19 | 2 | -13/+41 |
| | | | | | | | | | | | | | | | | | | | | | There should be no difference between guest users and non-guest users in terms of access to messages. Define the semantics of the is_peeking argument to filter_events_for_clients (slightly) better; interpret it appropriately, and set it correctly from /sync. | ||||
* | | | Remove superfluous call to get_state_at when we already have an event for ↵ | Erik Johnston | 2016-02-22 | 1 | -4/+12 |
| | | | | | | | | | | | | that stream position | ||||
* | | | Correctly filter states | Erik Johnston | 2016-02-19 | 1 | -2/+2 |
| | | | |||||
* | | | Only send presence updates to remote hosts if user is ours | Erik Johnston | 2016-02-19 | 1 | -2/+10 |
| | | | |||||
* | | | Add Measures to presence | Erik Johnston | 2016-02-19 | 1 | -57/+62 |
| |/ |/| | |||||
* | | Add presence metric | Erik Johnston | 2016-02-19 | 1 | -0/+3 |
| | | |||||
* | | Remove spurious extra metrics | Erik Johnston | 2016-02-19 | 1 | -1/+0 |
| | | |||||
* | | Merge pull request #586 from matrix-org/erikj/presence | Erik Johnston | 2016-02-19 | 1 | -6/+26 |
|\ \ | | | | | | | Fix presence `currently_active`. Add presence metrics. | ||||
| * | | Don't set currently_active for remote presence | Erik Johnston | 2016-02-19 | 1 | -6/+12 |
| | | | |||||
| * | | More metrics | Erik Johnston | 2016-02-19 | 1 | -0/+6 |
| | | | |||||
| * | | Add presence metrics | Erik Johnston | 2016-02-19 | 1 | -0/+8 |
| | | | |||||
* | | | Merge pull request #582 from matrix-org/erikj/presence | Erik Johnston | 2016-02-19 | 5 | -1028/+784 |
|\| | | | | | | | | Rewrite presence for performance. | ||||
| * | | Remove invalid arg. | Erik Johnston | 2016-02-18 | 1 | -1/+0 |
| | | | |||||
| * | | Add unit test | Erik Johnston | 2016-02-18 | 1 | -93/+187 |
| | | | |||||
| * | | Add stuff pulled from the DB to the cache | Erik Johnston | 2016-02-18 | 1 | -2/+4 |
| | | | |||||
| * | | PEP8 | Erik Johnston | 2016-02-18 | 1 | -2/+2 |
| | | | |||||
| * | | Prefix TS fields with _ts | Erik Johnston | 2016-02-18 | 1 | -27/+27 |
| | | | |||||
| * | | Remove status_msg when going offline. Don't offline -> online if you send a ↵ | Erik Johnston | 2016-02-18 | 1 | -5/+15 |
| | | | | | | | | | | | | message | ||||
| * | | Check presence state is a valid one | Erik Johnston | 2016-02-18 | 1 | -0/+6 |
| | | | |||||
| * | | Move if statement | Erik Johnston | 2016-02-18 | 1 | -8/+8 |
| | | | |||||
| * | | Comment | Erik Johnston | 2016-02-18 | 1 | -0/+2 |
| | | | |||||
| * | | Remove spurious comment | Erik Johnston | 2016-02-17 | 1 | -1/+0 |
| | | | |||||
| * | | Initial cut | Erik Johnston | 2016-02-17 | 5 | -1050/+694 |
| |/ | |||||
* | | Merge pull request #573 from matrix-org/erikj/sync_fix | Erik Johnston | 2016-02-18 | 1 | -5/+12 |
|\ \ | | | | | | | Mitigate against incorrect old state in /sync. | ||||
| * | | Mitigate against incorrect old state in /sync. | Erik Johnston | 2016-02-12 | 1 | -5/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | There have been reports from the field that servers occasionally have incorrect notions of what the old state of a room is. This proves problematic as /sync relies on a correct old state. This patch makes /sync specifically include in the 'state' key any current state events that haven't been correctly included. | ||||
* | | | Review comments | Daniel Wagner-Hall | 2016-02-18 | 3 | -7/+7 |
| | | | |||||
* | | | Some cleanup | Daniel Wagner-Hall | 2016-02-17 | 1 | -66/+58 |
| | | | | | | | | | | | | | | | I'm not particularly happy with the "action" switching, but there's no convenient way to defer the work that needs to happen after it, so... :( | ||||
* | | | Respond to federated invite with non-empty context | Daniel Wagner-Hall | 2016-02-17 | 2 | -42/+61 |
| | | | | | | | | | | | | | | | | | | | | | Currently, we magically perform an extra database hit to find the inviter, and use this to guess where we should send the event. Instead, fill in a valid context, so that other callers relying on the context actually have one. | ||||
* | | | Some cleanup, some TODOs, more to do | Daniel Wagner-Hall | 2016-02-16 | 1 | -68/+60 |
| | | | |||||
* | | | Some cleanup | Daniel Wagner-Hall | 2016-02-16 | 2 | -23/+30 |
| | | | |||||
* | | | Tidy? up room creation event sending | Daniel Wagner-Hall | 2016-02-16 | 1 | -63/+72 |
| | | | |||||
* | | | Add comment | Daniel Wagner-Hall | 2016-02-16 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'develop' into daniel/roomcleanupincremental | Daniel Wagner-Hall | 2016-02-16 | 1 | -3/+3 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: synapse/handlers/room.py | ||||
| * | | Simplify room creation code | Daniel Wagner-Hall | 2016-02-15 | 1 | -40/+28 |
| | | | |||||
* | | | Branch off member and non member sends | Daniel Wagner-Hall | 2016-02-15 | 4 | -69/+83 |
| | | | | | | | | | | | | Unclean, needs tidy-up, but works | ||||
* | | | Simplify room creation code | Daniel Wagner-Hall | 2016-02-15 | 1 | -37/+25 |
| | | | |||||
* | | | Use update_membership for profile updates | Daniel Wagner-Hall | 2016-02-15 | 2 | -20/+12 |
| | | | |||||
* | | | Use update_membership to kick guests | Daniel Wagner-Hall | 2016-02-15 | 2 | -16/+19 |
| | | | |||||
* | | | Reuse update_membership from /join | Daniel Wagner-Hall | 2016-02-15 | 1 | -3/+9 |
| | | | |||||
* | | | Inline _do_local_membership_update | Daniel Wagner-Hall | 2016-02-15 | 1 | -18/+7 |
| | | | |||||
* | | | Inline _do_join as it now only has one caller | Daniel Wagner-Hall | 2016-02-15 | 1 | -48/+47 |
| | | | | | | | | | | | | | | | | | | Also, consistently apply rate limiting. Again, ugly, but a step in the right direction. | ||||
* | | | Merge implementation of /join by alias or ID | Daniel Wagner-Hall | 2016-02-15 | 3 | -33/+32 |
| | | | | | | | | | | | | | | | This code is kind of rough (passing the remote servers down a long chain), but is a step towards improvement. | ||||
* | | | Merge some room joining codepaths | Daniel Wagner-Hall | 2016-02-15 | 1 | -4/+10 |
|/ / | | | | | | | | | | | Force joining by alias to go through the send_membership_event checks, rather than bypassing them straight into _do_join. This is the first of many stages of cleanup. | ||||
* | | Revert "Merge two of the room join codepaths" | Daniel Wagner-Hall | 2016-02-12 | 2 | -44/+11 |
| | | | | | | | | | | | | This reverts commit cf81375b94c4763766440471e632fc4b103450ab. It subtly violates a guest joining auth check | ||||
* | | Merge two of the room join codepaths | Daniel Wagner-Hall | 2016-02-12 | 2 | -11/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | There's at least one more to merge in. Side-effects: * Stop reporting None as displayname and avatar_url in some cases * Joining a room by alias populates guest-ness in join event * Remove unspec'd PUT version of /join/<room_id_or_alias> which has not been called on matrix.org according to logs * Stop recording access_token_id on /join/room_id - currently we don't record it on /join/room_alias; I can try to thread it through at some point. | ||||
* | | Enforce user_id exclusivity for AS registrations | Daniel Wagner-Hall | 2016-02-11 | 1 | -5/+12 |
|/ | | | | | This whole set of checks is kind of an ugly mess, which I may clean up at some point, but for now let's be correct. | ||||
* | Return events in correct order for /events | Erik Johnston | 2016-02-11 | 1 | -0/+1 |
| | |||||
* | Use _simple_select_many for _get_state_group_for_events | Erik Johnston | 2016-02-10 | 1 | -1/+1 |
| | |||||
* | Only calculate initial sync for 10 rooms at a time | Erik Johnston | 2016-02-10 | 1 | -24/+29 |
| | | | | This helps to ensure we don't completely starve other requests. | ||||
* | Atomically persit push actions when we persist the event | Erik Johnston | 2016-02-09 | 2 | -11/+11 |
| | |||||
* | Pass in current state to push action handler | Erik Johnston | 2016-02-09 | 1 | -18/+13 |
| | |||||
* | Remove dead code | Erik Johnston | 2016-02-09 | 1 | -12/+0 |
| | |||||
* | Don't load all ephemeral state for a room on every sync | Erik Johnston | 2016-02-09 | 1 | -14/+6 |
| | |||||
* | Fix unit tests | Erik Johnston | 2016-02-09 | 1 | -1/+4 |
| | |||||
* | Measure some /sync related things | Erik Johnston | 2016-02-09 | 2 | -150/+162 |
| | |||||
* | Fix up logcontexts | Erik Johnston | 2016-02-08 | 7 | -87/+57 |
| | |||||
* | Allocate guest user IDs numericcally | Daniel Wagner-Hall | 2016-02-05 | 1 | -19/+36 |
| | | | | | | | | | The current random IDs are ugly and confusing when presented in UIs. This makes them prettier and easier to read. Also, disable non-automated registration of numeric IDs so that we don't need to worry so much about people carving out our automated address space and us needing to keep retrying ID registration. | ||||
* | Merge pull request #555 from matrix-org/erikj/logcontext | Erik Johnston | 2016-02-03 | 1 | -0/+10 |
|\ | | | | | Allowing tagging log contexts | ||||
| * | Allowing tagging log contexts | Erik Johnston | 2016-02-03 | 1 | -0/+10 |
| | | |||||
* | | Merge pull request #554 from matrix-org/erikj/event_push | Erik Johnston | 2016-02-03 | 1 | -4/+2 |
|\ \ | | | | | | | Change event_push_actions_rm_tokens schema | ||||
| * | | Change event_push_actions_rm_tokens schema | Erik Johnston | 2016-02-03 | 1 | -4/+2 |
| |/ | |||||
* | | PEP8 | Erik Johnston | 2016-02-03 | 1 | -1/+1 |
| | | |||||
* | | Remove unused method | Erik Johnston | 2016-02-03 | 1 | -8/+0 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2016-02-03 | 7 | -77/+117 |
|\| | | | | | | | erikj/public_room_fix | ||||
| * | Fix flake8 warnings for new flake8 | Daniel Wagner-Hall | 2016-02-02 | 6 | -7/+7 |
| | | |||||
| * | s/get_room_changes_for_user/get_membership_changes_for_user/ | Erik Johnston | 2016-02-02 | 2 | -2/+2 |
| | | |||||
| * | Merge pull request #545 from matrix-org/erikj/sync | Erik Johnston | 2016-02-02 | 1 | -66/+99 |
| |\ | | | | | | | Move /sync state calculations from rest to handler | ||||
| | * | Comments | Erik Johnston | 2016-02-01 | 1 | -5/+6 |
| | | | |||||
| | * | Move state calculations from rest to handler | Erik Johnston | 2016-02-01 | 1 | -66/+98 |
| | | | |||||
| * | | Pass make_guest whne we autogen a user ID | David Baker | 2016-02-02 | 1 | -1/+3 |
| | | | |||||
| * | | WARN if we get a topo token instead of stream. | Erik Johnston | 2016-02-02 | 1 | -1/+6 |
| | | | |||||
* | | | Change the way we do public room list fetching | Erik Johnston | 2016-02-02 | 1 | -23/+63 |
|/ / | |||||
* | | Order things correctly | Erik Johnston | 2016-02-01 | 1 | -1/+1 |
| | | |||||
* | | Switch over /events to use per room caches | Erik Johnston | 2016-02-01 | 1 | -5/+20 |
|/ | |||||
* | Add missing param to the log line | Mark Haines | 2016-01-29 | 1 | -1/+2 |
| | |||||
* | Merge remote-tracking branch 'origin/develop' into markjh/3pid | Mark Haines | 2016-01-29 | 2 | -253/+187 |
|\ | |||||
| * | Don't work out unread_notifs_for_room_id unless needed | Erik Johnston | 2016-01-29 | 1 | -11/+12 |
| | | |||||
| * | Change load limit params | Erik Johnston | 2016-01-28 | 1 | -2/+2 |
| | | |||||
| * | Amalgamate incremental and full sync for user | Erik Johnston | 2016-01-28 | 1 | -40/+16 |
| | | |||||
| * | Allow paginating backwards from stream token | Erik Johnston | 2016-01-28 | 1 | -6/+9 |
| | | |||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sync | Erik Johnston | 2016-01-28 | 1 | -22/+21 |
| |\ | |||||
| * | | Use the same path for incremental with gap or without gap | Erik Johnston | 2016-01-27 | 1 | -208/+144 |
| | | | |||||
| * | | Add cache to room stream | Erik Johnston | 2016-01-27 | 1 | -12/+30 |
| | | | |||||
* | | | Add config option for setting the trusted id servers, disabling checking the ↵ | Mark Haines | 2016-01-29 | 1 | -8/+17 |
| |/ |/| | | | | | ID server in integration tests | ||||
* | | Make it possible to paginate forwards from stream tokens | Richard van der Hoff | 2016-01-27 | 1 | -22/+21 |
|/ | | | | | In order that we can fill the gap after a /sync, make it possible to paginate forwards from a stream token. | ||||
* | Federation: drop events which cause SynapseErrors | Richard van der Hoff | 2016-01-27 | 1 | -1/+7 |
| | | | | | ... rather than rejecting any attempt to federate channels which contain such events. | ||||
* | Merge pull request #524 from matrix-org/erikj/sync | Erik Johnston | 2016-01-25 | 1 | -41/+141 |
|\ | | | | | Move some sync logic from rest to handlers pacakege | ||||
| * | PEP8 | Erik Johnston | 2016-01-25 | 1 | -1/+0 |
| | | |||||
| * | Remove weird stuff | Erik Johnston | 2016-01-25 | 1 | -6/+0 |
| | | |||||
| * | Move logic from rest/ to handlers/ | Erik Johnston | 2016-01-25 | 1 | -41/+148 |
| | | |||||
* | | Underscores are allowed in user ids | Erik Johnston | 2016-01-22 | 1 | -1/+1 |
|/ | |||||
* | Only fetch events for rooms and receipts | Erik Johnston | 2016-01-21 | 1 | -3/+3 |
| | |||||
* | Don't explode when given a unicode username in /register/ | Erik Johnston | 2016-01-20 | 1 | -3/+2 |
| | |||||
* | Allow non-guests to peek on rooms using /events | Daniel Wagner-Hall | 2016-01-20 | 5 | -58/+57 |
| | |||||
* | Merge pull request #506 from matrix-org/erikj/push_fast | Erik Johnston | 2016-01-19 | 1 | -28/+22 |
|\ | | | | | Only compute unread notifications for rooms we send down stream |