Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update docstring | Erik Johnston | 2016-07-29 | 1 | -0/+6 |
| | |||||
* | Handle the case of missing auth events when joining a room | Erik Johnston | 2016-07-28 | 1 | -4/+23 |
| | |||||
* | Delete e2e keys on device delete | Richard van der Hoff | 2016-07-27 | 1 | -0/+4 |
| | |||||
* | Add `create_requester` function | Richard van der Hoff | 2016-07-26 | 4 | -29/+32 |
| | | | | | Wrap the `Requester` constructor with a function which provides sensible defaults, and use it throughout | ||||
* | Delete refresh tokens when deleting devices | Richard van der Hoff | 2016-07-26 | 1 | -2/+4 |
| | |||||
* | Implement updating devices | Richard van der Hoff | 2016-07-26 | 1 | -0/+24 |
| | | | | You can update the displayname of devices now. | ||||
* | Implement deleting devices | Richard van der Hoff | 2016-07-26 | 2 | -3/+46 |
| | |||||
* | Use get to avoid KeyErrors | David Baker | 2016-07-22 | 1 | -1/+1 |
| | |||||
* | Log the hostname the reCAPTCHA was completed on | David Baker | 2016-07-22 | 1 | -2/+11 |
| | | | | This could be useful information to have in the logs. Also comment about how & why we don't verify the hostname. | ||||
* | make /devices return a list | Richard van der Hoff | 2016-07-21 | 1 | -5/+5 |
| | | | | Turns out I specced this to return a list of devices rather than a dict of them | ||||
* | Fix PEP8 errors | Richard van der Hoff | 2016-07-21 | 1 | -1/+1 |
| | |||||
* | Implement GET /device/{deviceId} | Richard van der Hoff | 2016-07-21 | 1 | -9/+37 |
| | |||||
* | GET /devices endpoint | Richard van der Hoff | 2016-07-20 | 1 | -0/+27 |
| | | | | | | | implement a GET /devices endpoint which lists all of the user's devices. It also returns the last IP where we saw that device, so there is some dancing to fish that out of the user_ips table. | ||||
* | Merge pull request #935 from matrix-org/erikj/backfill_notifs | Erik Johnston | 2016-07-20 | 1 | -5/+6 |
|\ | | | | | Don't notify pusher pool for backfilled events | ||||
| * | Don't notify pusher pool for backfilled events | Erik Johnston | 2016-07-20 | 1 | -5/+6 |
| | | |||||
* | | Merge pull request #933 from matrix-org/rav/type_annotations | Richard van der Hoff | 2016-07-20 | 2 | -0/+8 |
|\ \ | | | | | | | Type annotations | ||||
| * | | Type annotations | Richard van der Hoff | 2016-07-19 | 2 | -0/+8 |
| | | | | | | | | | | | | | | | Add some type annotations to help PyCharm (in particular) to figure out the types of a bunch of things. | ||||
* | | | Merge pull request #932 from matrix-org/rav/register_refactor | David Baker | 2016-07-20 | 1 | -5/+8 |
|\ \ \ | |_|/ |/| | | Further registration refactoring | ||||
| * | | Further registration refactoring | Richard van der Hoff | 2016-07-19 | 1 | -5/+8 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | * `RegistrationHandler.appservice_register` no longer issues an access token: instead it is left for the caller to do it. (There are two of these, one in `synapse/rest/client/v1/register.py`, which now simply calls `AuthHandler.issue_access_token`, and the other in `synapse/rest/client/v2_alpha/register.py`, which is covered below). * In `synapse/rest/client/v2_alpha/register.py`, move the generation of access_tokens into `_create_registration_details`. This means that the normal flow no longer needs to call `AuthHandler.issue_access_token`; the shared-secret flow can tell `RegistrationHandler.register` not to generate a token; and the appservice flow continues to work despite the above change. | ||||
* | | Merge pull request #922 from matrix-org/erikj/file_api2 | Erik Johnston | 2016-07-20 | 1 | -4/+12 |
|\ \ | |/ |/| | Feature: Add filter to /messages. Add 'contains_url' to filter. | ||||
| * | Add filter param to /messages API | Erik Johnston | 2016-07-14 | 1 | -4/+12 |
| | | |||||
* | | Merge pull request #929 from matrix-org/rav/support_deviceid_in_login | Richard van der Hoff | 2016-07-19 | 2 | -8/+82 |
|\ \ | | | | | | | Add device_id support to /login | ||||
| * | | Add device_id support to /login | Richard van der Hoff | 2016-07-18 | 2 | -8/+82 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a 'devices' table to the storage, as well as a 'device_id' column to refresh_tokens. Allow the client to pass a device_id, and initial_device_display_name, to /login. If login is successful, then register the device in the devices table if it wasn't known already. If no device_id was supplied, make one up. Associate the device_id with the access token and refresh token, so that we can get at it again later. Ensure that the device_id is copied from the refresh token to the access_token when the token is refreshed. | ||||
* | | | Summary line | Mark Haines | 2016-07-19 | 1 | -2/+1 |
| | | | |||||
* | | | Update docstring on Handlers. | Mark Haines | 2016-07-19 | 1 | -3/+15 |
|/ / | | | | | | | To indicate it is deprecated. | ||||
* | | Refactor login flow | Richard van der Hoff | 2016-07-18 | 1 | -47/+59 |
| | | | | | | | | | | | | | | | | | | | | Make sure that we have the canonical user_id *before* calling get_login_tuple_for_user_id. Replace login_with_password with a method which just validates the password, and have the caller call get_login_tuple_for_user_id. This brings the password flow into line with the other flows, and will give us a place to register the device_id if necessary. | ||||
* | | Fix a doc-comment | Richard van der Hoff | 2016-07-18 | 1 | -1/+1 |
| | | | | | | | | The `store` in a handler is a generic DataStore, not just an events.StateStore. | ||||
* | | Merge pull request #919 from matrix-org/erikj/auth_fix | Erik Johnston | 2016-07-15 | 1 | -2/+6 |
|\ \ | | | | | | | Various auth.py fixes. | ||||
| * | | Comment | Erik Johnston | 2016-07-15 | 1 | -0/+4 |
| | | | |||||
| * | | Check sender signed event | Erik Johnston | 2016-07-14 | 1 | -2/+2 |
| |/ | |||||
* / | Bug fix: expire invalid access tokens | Negar Fazeli | 2016-07-13 | 2 | -5/+6 |
|/ | |||||
* | Merge branch 'erikj/shared_secret' into erikj/test2 | Erik Johnston | 2016-07-06 | 3 | -17/+34 |
|\ | |||||
| * | Add an admin option to shared secret registration | Erik Johnston | 2016-07-05 | 1 | -1/+3 |
| | | |||||
| * | Merge pull request #904 from ↵ | David Baker | 2016-07-05 | 1 | -14/+27 |
| |\ | | | | | | | | | | | | | matrix-org/dbkr/register_email_no_untrusted_id_server requestToken update | ||||
| | * | requestToken update | David Baker | 2016-06-30 | 1 | -14/+27 |
| | | | | | | | | | | | | | | | | | | Don't send requestToken request to untrusted ID servers Also correct the THREEPID_IN_USE error to add the M_ prefix. This is a backwards incomaptible change, but the only thing using this is the angular client which is now unmaintained, so it's probably better to just do this now. | ||||
| * | | Fix password config | Kent Shikama | 2016-07-05 | 1 | -2/+2 |
| | | | |||||
| * | | Fix pep8 | Kent Shikama | 2016-07-05 | 1 | -1/+2 |
| | | | |||||
| * | | Add pepper to password hashing | Kent Shikama | 2016-07-05 | 1 | -2/+3 |
| | | | | | | | | | | | | Signed-off-by: Kent Shikama <kent@kentshikama.com> | ||||
* | | | Add ReadWriteLock for pagination and history prune | Erik Johnston | 2016-07-05 | 1 | -34/+36 |
| | | | |||||
* | | | Add purge_history API | Erik Johnston | 2016-07-05 | 2 | -1/+14 |
|/ / | |||||
* | | Fix style violations | Kent Shikama | 2016-07-04 | 1 | -1/+2 |
| | | | | | | | | Signed-off-by: Kent Shikama <kent@kentshikama.com> | ||||
* | | Optionally include password hash in createUser endpoint | Kent Shikama | 2016-07-03 | 1 | -2/+2 |
|/ | | | | Signed-off-by: Kent Shikama <kent@kentshikama.com> | ||||
* | Rework ldap integration with ldap3 | Martin Weinelt | 2016-06-22 | 1 | -33/+170 |
| | | | | | | | | | | | | | | | | | | | Use the pure-python ldap3 library, which eliminates the need for a system dependency. Offer both a `search` and `simple_bind` mode, for more sophisticated ldap scenarios. - `search` tries to find a matching DN within the `user_base` while employing the `user_filter`, then tries the bind when a single matching DN was found. - `simple_bind` tries the bind against a specific DN by combining the localpart and `user_base` Offer support for STARTTLS on a plain connection. The configuration was changed to reflect these new possibilities. Signed-off-by: Martin Weinelt <hexa@darmstadt.ccc.de> | ||||
* | Add a comment on why we don't create a profile for upgrading users | Mark Haines | 2016-06-17 | 1 | -0/+1 |
| | |||||
* | Remove registered_users from the distributor. | Mark Haines | 2016-06-17 | 2 | -20/+10 |
| | | | | | | | | | | The only place that was observed was to set the profile. I've made it so that the profile is set within store.register in the same transaction that creates the user. This required some slight changes to the registration code for upgrading guest users, since it previously relied on the distributor swallowing errors if the profile already existed. | ||||
* | Only re-sign our own events | Erik Johnston | 2016-06-17 | 1 | -6/+9 |
| | |||||
* | Fix TypeError in call to bcrypt.hashpw | Salvatore LaMendola | 2016-06-16 | 1 | -1/+1 |
| | | | | | | | | - At the very least, this TypeError caused logins to fail on my own running instance of Synapse, and the simple (explicit) UTF-8 conversion resolved login errors for me. Signed-off-by: Salvatore LaMendola <salvatore.lamendola@gmail.com> | ||||
* | Correctly mark backfilled events as backfilled | Erik Johnston | 2016-06-15 | 1 | -14/+16 |
| | |||||
* | Fix a bug caused by a change in auth_handler function | Negar Fazeli | 2016-06-08 | 1 | -2/+2 |
| | | | | Fix the relevant unit test cases | ||||
* | Pull full state for each room all at once | Erik Johnston | 2016-06-08 | 1 | -16/+16 |
| | |||||
* | Don't hit DB for noop replications queries | Erik Johnston | 2016-06-08 | 1 | -0/+3 |
| | |||||
* | Remove dead code. | Mark Haines | 2016-06-07 | 1 | -13/+0 |
| | | | | | | | | | | | Loading push rules now happens in the datastore, so we can remove the methods that loaded them outside the datastore. The ``waiting_for_join_list`` in federation handler is populated by anything, so can be removed. The ``_get_members_events_txn`` method isn't called from anywhere so can be removed. | ||||
* | .values() returns list of sets | Erik Johnston | 2016-06-06 | 1 | -1/+2 |
| | |||||
* | Fix typos | Erik Johnston | 2016-06-06 | 1 | -32/+36 |
| | |||||
* | Fire after 30s not 8h | Erik Johnston | 2016-06-06 | 1 | -1/+1 |
| | |||||
* | Merge pull request #832 from matrix-org/erikj/presence_coount | Erik Johnston | 2016-06-03 | 1 | -5/+9 |
|\ | | | | | Change def of small delta in presence stream. Add metrics. | ||||
| * | Change metric style | Erik Johnston | 2016-06-03 | 1 | -5/+4 |
| | | |||||
| * | Presence metrics. Change def of small delta | Erik Johnston | 2016-06-03 | 1 | -5/+10 |
| | | |||||
* | | Fix typo | Erik Johnston | 2016-06-03 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #829 from matrix-org/erikj/poke_notifier | Erik Johnston | 2016-06-03 | 1 | -4/+7 |
|\ | | | | | Poke notifier on next reactor tick | ||||
| * | Poke notifier on next reactor tick | Erik Johnston | 2016-06-03 | 1 | -4/+7 |
| | | |||||
* | | Load push rules in storage layer, so that they get cached | Erik Johnston | 2016-06-03 | 1 | -3/+2 |
|/ | |||||
* | Merge remote-tracking branch 'origin/dbkr/email_notif_string_fmt_error' into ↵ | David Baker | 2016-06-02 | 1 | -28/+36 |
|\ | | | | | | | dbkr/email_unsubscribe | ||||
| * | Store the typing users as user_id strings. (#819) | Mark Haines | 2016-06-02 | 1 | -28/+36 |
| | | | | | | Rather than storing them as UserID objects. | ||||
* | | Merge remote-tracking branch 'origin/develop' into dbkr/email_unsubscribe | David Baker | 2016-06-02 | 2 | -550/+716 |
|\| | |||||
| * | Deduplicate presence entries in sync (#818) | Mark Haines | 2016-06-02 | 1 | -0/+3 |
| | | |||||
| * | Allow external processes to mark a user as syncing. (#812) | Mark Haines | 2016-06-02 | 1 | -13/+106 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Add infrastructure to the presence handler to track sync requests in external processes * Expire stale entries for dead external processes * Add an http endpoint for making users as syncing Add some docstrings and comments. * Fixes | ||||
| * | Merge pull request #817 from matrix-org/dbkr/split_out_auth_handler | David Baker | 2016-06-02 | 2 | -3/+1 |
| |\ | | | | | | | Split out the auth handler | ||||
| * \ | Merge pull request #800 from matrix-org/erikj/sync_refactor | Erik Johnston | 2016-06-02 | 1 | -537/+607 |
| |\ \ | | | | | | | | | Refactor SyncHandler | ||||
| | * | | Change short circuit path | Erik Johnston | 2016-05-24 | 1 | -16/+26 |
| | | | | |||||
| | * | | Don't send down all ephemeral events | Erik Johnston | 2016-05-24 | 1 | -1/+3 |
| | | | | |||||
| | * | | Only work out newly_joined_users for incremental sync | Erik Johnston | 2016-05-24 | 1 | -6/+9 |
| | | | | |||||
| | * | | Only include non-offline presence in initial sync | Erik Johnston | 2016-05-24 | 1 | -0/+3 |
| | | | | |||||
| | * | | Spell builder correctly | Erik Johnston | 2016-05-24 | 1 | -63/+63 |
| | | | | |||||
| | * | | Inline function. Make load_filtered_recents private | Erik Johnston | 2016-05-24 | 1 | -17/+7 |
| | | | | |||||
| | * | | Add comments | Erik Johnston | 2016-05-24 | 1 | -7/+105 |
| | | | | |||||
| | * | | Shuffle things room | Erik Johnston | 2016-05-24 | 1 | -37/+33 |
| | | | | |||||
| | * | | Add back concurrently_execute | Erik Johnston | 2016-05-23 | 1 | -25/+9 |
| | | | | |||||
| | * | | Refactor SyncHandler | Erik Johnston | 2016-05-23 | 1 | -497/+481 |
| | | | | |||||
* | | | | Merge branch 'dbkr/split_out_auth_handler' into dbkr/email_unsubscribe | David Baker | 2016-06-02 | 3 | -4/+2 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Split out the auth handler | David Baker | 2016-06-02 | 2 | -3/+1 |
| |/ / | |||||
| * | | Fix room list spidering | David Baker | 2016-06-01 | 1 | -1/+1 |
| | | | |||||
* | | | Email unsubscribing that may in theory, work | David Baker | 2016-06-02 | 1 | -0/+5 |
|/ / | | | | | | | Were it not for that fact that you can't use the base handler in the pusher because it pulls in the world. Comitting while I fix that on a different branch. | ||||
* | | Merge remote-tracking branch 'origin/develop' into dbkr/room_list_spider | David Baker | 2016-06-01 | 3 | -22/+7 |
|\ \ | |||||
| * | | Move the AS handler out of the Handlers object. | Mark Haines | 2016-05-31 | 3 | -22/+7 |
| | | | | | | | | | | | | | | | | | | Access it directly from the homeserver itself. It already wasn't inheriting from BaseHandler storing it on the Handlers object was already somewhat dubious. | ||||
* | | | Add cache to remote room lists | David Baker | 2016-05-31 | 1 | -4/+30 |
| | | | | | | | | | | | | Poll for updates from remote servers, waiting for the poll if there's no cache entry. | ||||
* | | | Basic, un-cached support for secondary_directory_servers | David Baker | 2016-05-31 | 1 | -1/+32 |
|/ / | |||||
* | | Split out the room list handler | David Baker | 2016-05-31 | 1 | -2/+1 |
| | | | | | | | | So I can use it from federation bits without pulling in all the handlers. | ||||
* | | Send down correct error response if user not found | Erik Johnston | 2016-05-27 | 1 | -2/+7 |
| | | |||||
* | | Fix set profile error with Requester. | Negi Fazeli | 2016-05-23 | 1 | -4/+5 |
|/ | | | | | Replace flush_user with delete access token due to function removal Add a new test case for if the user is already registered | ||||
* | Move typing handler out of the Handlers object | Mark Haines | 2016-05-17 | 2 | -20/+15 |
| | |||||
* | Merge remote-tracking branch 'origin/develop' into markjh/liberate_sync_handler | Mark Haines | 2016-05-17 | 1 | -15/+0 |
|\ | |||||
| * | Remove unused get_joined_rooms_for_user | Mark Haines | 2016-05-17 | 1 | -15/+0 |
| | | |||||
| * | Merge branch 'develop' into markjh/member_cleanup | Mark Haines | 2016-05-17 | 5 | -25/+25 |
| |\ | |||||
| | * | Merge pull request #787 from matrix-org/markjh/liberate_presence_handler | Mark Haines | 2016-05-17 | 5 | -25/+25 |
| | |\ | | | | | | | | | Move the presence handler out of the Handlers object | ||||
* | | | | Move SyncHandler out of the Handlers object | Mark Haines | 2016-05-16 | 2 | -7/+5 |
| | | | | |||||
* | | | | Merge branch 'markjh/liberate_presence_handler' into ↵ | Mark Haines | 2016-05-16 | 5 | -25/+25 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | markjh/liberate_sync_handler | ||||
| * | | Don't inherit PresenceHandler from BaseHandler, remove references to self.hs ↵ | Mark Haines | 2016-05-16 | 1 | -19/+21 |
| | | | | | | | | | | | | from presence handler | ||||
| * | | Move the presence handler out of the Handlers object | Mark Haines | 2016-05-16 | 5 | -7/+5 |
| | | | |||||
* | | | Remove get_joined_rooms_for_user from RoomMemberHandler | Mark Haines | 2016-05-16 | 3 | -11/+4 |
| | | | |||||
* | | | Replaces calls to fetch_room_distributions_into with get_joined_hosts_for_room | Mark Haines | 2016-05-16 | 3 | -67/+27 |
| |/ |/| | |||||
* | | Spell "domain" correctly | Mark Haines | 2016-05-16 | 3 | -8/+8 |
|/ | | | | s/domian/domain/g | ||||
* | Merge pull request #741 from negzi/create_user_with_expiry | Erik Johnston | 2016-05-13 | 2 | -2/+55 |
|\ | | | | | Create user with expiry | ||||
| * | Create user with expiry | Negi Fazeli | 2016-05-13 | 2 | -2/+55 |
| | | | | | | | | | | | | - Add unittests for client, api and handler Signed-off-by: Negar Fazeli <negar.fazeli@ericsson.com> | ||||
* | | missed a spot | Mark Haines | 2016-05-12 | 1 | -1/+1 |
| | | |||||
* | | move filter_events_for_client out of base handler | Mark Haines | 2016-05-11 | 5 | -204/+29 |
| | | |||||
* | | Shuffle when we get the signing_key attribute. | Mark Haines | 2016-05-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | Wait until we sign a message to get the signing key from the homeserver config. This means that the message handler can be created without having a signing key in the config which means that separate processes like the pusher that don't send messages and don't need to sign them can still access the handlers. | ||||
* | | Merge pull request #775 from matrix-org/erikj/password_hash | Erik Johnston | 2016-05-11 | 1 | -1/+4 |
|\ \ | | | | | | | Correctly handle NULL password hashes from the database | ||||
| * | | Correctly handle NULL password hashes from the database | Erik Johnston | 2016-05-11 | 1 | -1/+4 |
| |/ | |||||
* | | Fix typo | Mark Haines | 2016-05-11 | 1 | -1/+1 |
| | | |||||
* | | Move _create_new_client_event and handle_new_client_event out of base handler | Mark Haines | 2016-05-11 | 4 | -204/+214 |
|/ | |||||
* | Merge pull request #759 from matrix-org/dbkr/email_notifs | Matthew Hodgson | 2016-05-10 | 5 | -12/+12 |
|\ | | | | | Send email notifications for missed messages | ||||
| * | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs | David Baker | 2016-05-10 | 3 | -16/+10 |
| |\ | |||||
| * \ | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs | David Baker | 2016-04-29 | 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 | ||||
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user | Erik Johnston | 2016-05-09 | 3 | -15/+9 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Add and use get_domian_from_id | Erik Johnston | 2016-05-09 | 3 | -15/+9 |
| | | | | |||||
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user | Erik Johnston | 2016-05-09 | 1 | -1/+1 |
|\| | | | |||||
| * | | | Reduce database inserts when sending transactions | Erik Johnston | 2016-05-06 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Add bulk fetch storage API | Erik Johnston | 2016-05-05 | 2 | -8/+4 |
| | | | |||||
* | | | Implement basic ignore user | Erik Johnston | 2016-05-04 | 2 | -6/+42 |
|/ / | |||||
* / | fix typo | Matthew Hodgson | 2016-04-28 | 1 | -1/+1 |
|/ | |||||
* | 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 |
| | | |