| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Add a replication stream for direct to device messages | Mark Haines | 2016-08-31 | 1 | -2/+8 |
| | | |||||
| * | Merge remote-tracking branch 'origin/develop' into markjh/direct_to_device | Mark Haines | 2016-08-26 | 1 | -1/+1 |
| |\ | |||||
| | * | Move ThirdPartyEntityKind into api.constants so the expectation becomes that ↵ | Paul "LeoNerd" Evans | 2016-08-25 | 1 | -1/+1 |
| | | | | | | | | | the value is significant | ||||
| * | | Merge branch 'develop' into markjh/direct_to_device | Mark Haines | 2016-08-25 | 2 | -4/+21 |
| |\| | |||||
| | * | Merge pull request #1041 from matrix-org/paul/third-party-lookup | Paul Evans | 2016-08-25 | 1 | -2/+20 |
| | |\ | | | | | | | Extend 3PE lookup APIs for metadata query | ||||
| | | * | Move static knowledge of protocol metadata into AS handler; cache the result | Paul "LeoNerd" Evans | 2016-08-24 | 1 | -20/+1 |
| | | | | |||||
| | | * | Declare 'gitter' known protocol, with user lookup | Paul "LeoNerd" Evans | 2016-08-24 | 1 | -0/+3 |
| | | | | |||||
| | | * | Initial hack at the 3PN protocols metadata lookup API | Paul "LeoNerd" Evans | 2016-08-24 | 1 | -0/+34 |
| | | | | |||||
| | | * | Move 3PU/3PL lookup APIs into /thirdparty containing entity | Paul "LeoNerd" Evans | 2016-08-24 | 1 | -2/+2 |
| | | | | |||||
| | * | | Preserve some logcontexts | Erik Johnston | 2016-08-24 | 1 | -2/+1 |
| | |/ | |||||
| * | | Add some TODOs | Mark Haines | 2016-08-25 | 1 | -0/+4 |
| | | | |||||
| * | | Fix the deduplication of incoming direct-to-device messages | Mark Haines | 2016-08-25 | 1 | -1/+12 |
| | | | |||||
| * | | Add store-and-forward direct-to-device messaging | Mark Haines | 2016-08-25 | 2 | -3/+75 |
| |/ | |||||
| * | Pass through user-supplied content in /join/$room_id | Kegan Dougal | 2016-08-23 | 1 | -0/+1 |
| | | | | | | | | It was always intended to allow custom keys on the join event, but this has at some point been lost. Restore it. If the user specifies keys like "avatar_url" then they will be clobbered. | ||||
| * | Merge branch 'develop' into dbkr/notifications_api | Matthew Hodgson | 2016-08-20 | 1 | -0/+78 |
| |\ | |||||
| | * | Avoid so much copypasta between 3PU and 3PL query by unifying around a ↵ | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -2/+7 |
| | | | | | | | | | ThirdPartyEntityKind enumeration | ||||
| | * | Authenticate 3PE lookup requests | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -0/+6 |
| | | | |||||
| | * | Copypasta the 3PU support code to also do 3PL | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -0/+20 |
| | | | |||||
| | * | Remove TODO note about request fields being strings - they're always strings | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -2/+0 |
| | | | |||||
| | * | Merge remote-tracking branch 'origin/develop' into paul/thirdpartylookup | Paul "LeoNerd" Evans | 2016-08-18 | 9 | -5/+89 |
| | |\ | |||||
| | * | | Ensure that 3PU lookup request fields actually get passed in | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -1/+5 |
| | | | | |||||
| | * | | Thread 3PU lookup through as far as the AS API object; which currently noöps it | Paul "LeoNerd" Evans | 2016-08-17 | 1 | -2/+9 |
| | | | | |||||
| | * | | Initial empty implementation that just registers an API endpoint handler | Paul "LeoNerd" Evans | 2016-08-17 | 1 | -0/+38 |
| | | | | |||||
| * | | | Use tuple comparison | David Baker | 2016-08-18 | 1 | -4/+3 |
| | | | | | | | | | | | | | Hopefully easier to read | ||||
| * | | | Merge remote-tracking branch 'origin/develop' into dbkr/notifications_api | David Baker | 2016-08-18 | 10 | -6/+90 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Make synchrotron accept /events | Erik Johnston | 2016-08-12 | 1 | -5/+4 |
| | | | | |||||
| | * | | Dont invoke get_handlers fromClientV1RestServlet | Erik Johnston | 2016-08-12 | 9 | -1/+86 |
| | |/ | | | | | | | | | | | hs.get_handlers() can not be invoked from split out processes. Moving the invocations down a level means that we can slowly split out individual servlets. | ||||
| | * | Don't change status_msg on /sync | Will Hunt | 2016-08-10 | 1 | -1/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/develop' into dbkr/notifications_api | David Baker | 2016-08-11 | 16 | -380/+800 |
| |\| | |||||
| | * | Merge pull request #995 from matrix-org/rav/clean_up_cas_login | David Baker | 2016-08-09 | 1 | -125/+33 |
| | |\ | | | | | | | Clean up CAS login code | ||||
| | | * | Clean up CAS login code | Richard van der Hoff | 2016-08-08 | 1 | -125/+33 |
| | | | | | | | | | | | | | | | | | | | | | | Remove some apparently unused code. Clean up parse_cas_response, mostly to catch the exception if the CAS response isn't valid XML. | ||||
| | * | | Fix CAS login | Richard van der Hoff | 2016-08-08 | 1 | -0/+1 |
| | |/ | | | | | | | Attempting to log in with CAS was giving a 500 error. | ||||
| | * | Merge branch 'rav/null_default_device_displayname' into develop | Richard van der Hoff | 2016-08-03 | 1 | -3/+1 |
| | |\ | |||||
| | | * | Default device_display_name to null | Richard van der Hoff | 2016-08-03 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | It turns out that it's more useful to return a null device display name (and let clients decide how to handle it: eg, falling back to device_id) than using a constant string like "unknown device". | ||||
| | * | | Merge branch 'develop' into rav/refactor_device_query | Mark Haines | 2016-08-03 | 1 | -9/+7 |
| | |\| | |||||
| | | * | Fix adding emails on registration | David Baker | 2016-07-29 | 1 | -9/+7 |
| | | | | | | | | | | | | | Synapse was not adding email addresses to accounts registered with an email address, due to too many different variables called 'result'. Rename both of them. Also remove the defer.returnValue() with no params because that's not a thing. | ||||
| | * | | Move e2e query logic into a handler | Richard van der Hoff | 2016-08-01 | 1 | -39/+7 |
| | |/ | |||||
| | * | Add r0.1.0 to the "supported versions" list | Richard van der Hoff | 2016-07-28 | 1 | -0/+1 |
| | | | |||||
| | * | Add r0.2.0 to the "supported versions" list | Richard van der Hoff | 2016-07-28 | 1 | -1/+4 |
| | | | |||||
| | * | key upload tweaks | Richard van der Hoff | 2016-07-27 | 1 | -7/+5 |
| | | | | | | | | | | | | | | | 1. Add v2_alpha URL back in, since things seem to be using it. 2. Don't reject the request if the device_id in the upload request fails to match that in the access_token. | ||||
| | * | Delete e2e keys on device delete | Richard van der Hoff | 2016-07-27 | 1 | -4/+9 |
| | | | |||||
| | * | Make the device id on e2e key upload optional | Richard van der Hoff | 2016-07-26 | 1 | -12/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | We should now be able to get our device_id from the access_token, so the device_id on the upload request is optional. Where it is supplied, we should check that it matches. For active access_tokens without an associated device_id, we ought to register the device in the devices table. Also update the table on upgrade so that all of the existing e2e keys are associated with real devices. | ||||
| | * | Add `create_requester` function | Richard van der Hoff | 2016-07-26 | 1 | -6/+4 |
| | | | | | | | | | | | Wrap the `Requester` constructor with a function which provides sensible defaults, and use it throughout | ||||
| | * | Implement updating devices | Richard van der Hoff | 2016-07-26 | 1 | -7/+17 |
| | | | | | | | | | You can update the displayname of devices now. | ||||
| | * | Implement deleting devices | Richard van der Hoff | 2016-07-26 | 3 | -8/+29 |
| | | | |||||
| | * | Merge pull request #943 from matrix-org/rav/get_device_api | David Baker | 2016-07-21 | 1 | -0/+25 |
| | |\ | | | | | | | Implement GET /device/{deviceId} | ||||
| | | * | Implement GET /device/{deviceId} | Richard van der Hoff | 2016-07-21 | 1 | -0/+25 |
| | | | | |||||
| | * | | Merge pull request #942 from matrix-org/rav/fix_register_deviceid | David Baker | 2016-07-21 | 1 | -11/+10 |
| | |\ \ | | |/ | |/| | Preserve device_id from first call to /register | ||||
| | | * | Preserve device_id from first call to /register | Richard van der Hoff | 2016-07-21 | 1 | -11/+10 |
| | | | | | | | | | | | | | | | | device_id may only be passed in the first call to /register, so make sure we fish it out of the register `params` rather than the body of the final call. | ||||
| | * | | Merge branch 'develop' into rav/get_devices_api | Richard van der Hoff | 2016-07-20 | 1 | -15/+39 |
| | |\| | | | | | | | | | | (pick up PR #938 in the hope of fixing the UTs) | ||||
| | | * | Register a device_id in the /v2/register flow. | Richard van der Hoff | 2016-07-20 | 1 | -15/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This doesn't cover *all* of the registration flows, but it does cover the most common ones: in particular: shared_secret registration, appservice registration, and normal user/pass registration. Pull device_id from the registration parameters. Register the device in the devices table. Associate the device with the returned access and refresh tokens. Profit. | ||||
| | * | | GET /devices endpoint | Richard van der Hoff | 2016-07-20 | 2 | -4/+60 |
| | |/ | | | | | | | | | | | | | 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 #933 from matrix-org/rav/type_annotations | Richard van der Hoff | 2016-07-20 | 3 | -0/+17 |
| | |\ | | | | | | | Type annotations | ||||
| | | * | Type annotations | Richard van der Hoff | 2016-07-19 | 3 | -0/+17 |
| | | | | | | | | | | | | | | | | 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 | 2 | -14/+40 |
| | |\ \ | | | | | | | | | Further registration refactoring | ||||
| | | * | | Further registration refactoring | Richard van der Hoff | 2016-07-19 | 2 | -14/+40 |
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * `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 | -1/+10 |
| | |\ \ | | |/ | |/| | Feature: Add filter to /messages. Add 'contains_url' to filter. | ||||
| | | * | Add filter param to /messages API | Erik Johnston | 2016-07-14 | 1 | -1/+10 |
| | | | | |||||
| | * | | Merge pull request #931 from matrix-org/rav/refactor_register | David Baker | 2016-07-19 | 1 | -78/+102 |
| | |\ \ | | | | | | | | | rest/client/v2_alpha/register.py: Refactor flow somewhat. | ||||
| | | * | | Don't bind email unless threepid contains expected fields | Richard van der Hoff | 2016-07-19 | 1 | -28/+25 |
| | | | | | |||||
| | | * | | rest/client/v2_alpha/register.py: Refactor flow somewhat. | Richard van der Hoff | 2016-07-19 | 1 | -75/+102 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is meant to be an *almost* non-functional change, with the exception that it fixes what looks a lot like a bug in that it only calls `auth_handler.add_threepid` and `add_pusher` once instead of three times. The idea is to move the generation of the `access_token` out of `registration_handler.register`, because `access_token`s now require a device_id, and we only want to generate a device_id once registration has been successful. | ||||
| | * | | | Add device_id support to /login | Richard van der Hoff | 2016-07-18 | 2 | -6/+43 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| | * | | Merge pull request #928 from matrix-org/rav/refactor_login | Richard van der Hoff | 2016-07-18 | 1 | -18/+23 |
| | |\ \ | | | | | | | | | Refactor login flow | ||||
| | | * | | Refactor login flow | Richard van der Hoff | 2016-07-18 | 1 | -18/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| | * | | | Use body.get to check for 'user' | Will Hunt | 2016-07-16 | 1 | -2/+1 |
| | | | | | |||||
| | * | | | Fall back to 'username' if 'user' is not given for appservice reg. | Will Hunt | 2016-07-16 | 1 | -3/+5 |
| | |/ / | |||||
| | * | | Merge pull request #921 from matrix-org/erikj/account_deactivate | Erik Johnston | 2016-07-14 | 1 | -0/+44 |
| | |\ \ | | | | | | | | | Feature: Add an /account/deactivate endpoint | ||||
| | | * | | Add hs object | Erik Johnston | 2016-07-14 | 1 | -0/+1 |
| | | | | | |||||
| | | * | | Only accept password auth | Erik Johnston | 2016-07-14 | 1 | -12/+0 |
| | | | | | |||||
| | | * | | Add an /account/deactivate endpoint | Erik Johnston | 2016-07-14 | 1 | -0/+55 |
| | | |/ | |||||
| | * | | Merge pull request #918 from negzi/bugfix_for_token_expiry | Erik Johnston | 2016-07-14 | 1 | -1/+1 |
| | |\ \ | | |/ | |/| | Bug fix: expire invalid access tokens | ||||
| | | * | Bug fix: expire invalid access tokens | Negar Fazeli | 2016-07-13 | 1 | -1/+1 |
| | | | | |||||
| | * | | be more pythonic | David Baker | 2016-07-12 | 1 | -1/+1 |
| | | | | |||||
| | * | | on_OPTIONS isn't neccessary | David Baker | 2016-07-12 | 2 | -10/+1 |
| | | | | |||||
| | * | | Remove other debug logging | David Baker | 2016-07-12 | 1 | -2/+0 |
| | | | | |||||
| | * | | Separate out requestTokens to separate handlers | David Baker | 2016-07-11 | 2 | -65/+93 |
| | | | | |||||
| | * | | Oops, remove debug logging | David Baker | 2016-07-11 | 1 | -4/+0 |
| | | | | |||||
| | * | | Implement https://github.com/matrix-org/matrix-doc/pull/346/files | David Baker | 2016-07-08 | 1 | -0/+59 |
| | |/ | |||||
| | * | Add rest servlet. Fix SQL. | Erik Johnston | 2016-07-06 | 1 | -0/+1 |
| | | | |||||
| | * | Merge branch 'erikj/shared_secret' into erikj/test2 | Erik Johnston | 2016-07-06 | 1 | -4/+16 |
| | |\ | |||||
| | | * | Check that there are no null bytes in user and passsword | Erik Johnston | 2016-07-06 | 1 | -0/+6 |
| | | | | |||||
| | | * | Add null separator to hmac | Erik Johnston | 2016-07-06 | 1 | -0/+2 |
| | | | | |||||
| | | * | Add an admin option to shared secret registration | Erik Johnston | 2016-07-05 | 1 | -0/+1 |
| | | | | |||||
| | | * | Protect password when registering using shared secret | Erik Johnston | 2016-07-05 | 1 | -4/+7 |
| | | | | |||||
| | * | | Add purge_history API | Erik Johnston | 2016-07-05 | 1 | -0/+18 |
| | |/ | |||||
| | * | Fix style violations | Kent Shikama | 2016-07-04 | 1 | -1/+2 |
| | | | | | | | | | Signed-off-by: Kent Shikama <kent@kentshikama.com> | ||||
| | * | Use .get() instead of [] to access password_hash | Kent Shikama | 2016-07-04 | 1 | -1/+1 |
| | | | |||||
| | * | Optionally include password hash in createUser endpoint | Kent Shikama | 2016-07-03 | 1 | -1/+3 |
| | | | | | | | | | Signed-off-by: Kent Shikama <kent@kentshikama.com> | ||||
| | * | Feature: Add deactivate account admin API | Erik Johnston | 2016-06-30 | 1 | -0/+26 |
| | | | | | | | | | | | | | | | | | | | | | Allows server admins to "deactivate" accounts, which: - Revokes all access tokens - Removes all threepids - Removes password The API is a POST to `/admin/deactivate/<user_id>` | ||||
| | * | Implement purge_media_cache admin API | Erik Johnston | 2016-06-29 | 1 | -0/+32 |
| | | | |||||
| | * | Remove redundant exception log in /events | Erik Johnston | 2016-06-09 | 1 | -24/+21 |
| | | | |||||
| | * | Don't make rooms visibile by default | Erik Johnston | 2016-06-08 | 1 | -2/+0 |
| | | | |||||
| | * | Log user that is making /publicRooms calls | Erik Johnston | 2016-06-08 | 1 | -0/+7 |
| | | | |||||
| | * | Load push rules in storage layer, so that they get cached | Erik Johnston | 2016-06-03 | 1 | -4/+2 |
| | | | |||||
| | * | Working unsubscribe links going straight to the HS | David Baker | 2016-06-02 | 1 | -1/+3 |
| | | | | | | | | | and authed by macaroons that let you delete pushers and nothing else | ||||
| | * | Merge branch 'dbkr/split_out_auth_handler' into dbkr/email_unsubscribe | David Baker | 2016-06-02 | 5 | -10/+11 |
| | |\ | |||||
| | | * | Split out the auth handler | David Baker | 2016-06-02 | 5 | -10/+11 |
| | | | | |||||
| | * | | WIP on unsubscribing email notifs without logging in | David Baker | 2016-06-01 | 1 | -1/+54 |
| | |/ | |||||
| | * | Basic, un-cached support for secondary_directory_servers | David Baker | 2016-05-31 | 1 | -1/+2 |
| | | | |||||
| | * | Split out the room list handler | David Baker | 2016-05-31 | 1 | -1/+1 |
| | | | | | | | | | So I can use it from federation bits without pulling in all the handlers. | ||||
| * | | Include the ts the notif was received at | David Baker | 2016-05-24 | 1 | -0/+1 |
| | | | |||||
| * | | Actually make the 'read' flag correct | David Baker | 2016-05-23 | 1 | -4/+3 |
| | | | |||||
| * | | Add GET /notifications API | David Baker | 2016-05-23 | 1 | -0/+100 |
| |/ | |||||
| * | Allow clients to specify a server_name to avoid 'No known servers' | Kegan Dougal | 2016-05-19 | 1 | -1/+4 |
| | | | | | Multiple server_names are supported via ?server_name=foo&server_name=bar | ||||
| * | Move typing handler out of the Handlers object | Mark Haines | 2016-05-17 | 1 | -4/+3 |
| | | |||||
| * | Move SyncHandler out of the Handlers object | Mark Haines | 2016-05-16 | 1 | -2/+1 |
| | | |||||
| * | Move the presence handler out of the Handlers object | Mark Haines | 2016-05-16 | 4 | -9/+17 |
| | | |||||
| * | Create user with expiry | Negi Fazeli | 2016-05-13 | 1 | -0/+71 |
| | | | | | | | - Add unittests for client, api and handler Signed-off-by: Negar Fazeli <negar.fazeli@ericsson.com> | ||||
| * | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs | David Baker | 2016-05-10 | 2 | -0/+155 |
| |\ | |||||
| | * | Rename openid/token to openid/request_token | Mark Haines | 2016-05-05 | 1 | -2/+2 |
| | | | |||||
| | * | Add an openidish mechanism for proving to third parties that you own a given ↵ | Mark Haines | 2016-05-05 | 1 | -0/+96 |
| | | | | | | | | | user_id | ||||
| | * | Add timestamp and auto incrementing ID | Erik Johnston | 2016-05-04 | 1 | -0/+2 |
| | | | |||||
| | * | Move event_id to path | Erik Johnston | 2016-05-04 | 1 | -4/+2 |
| | | | |||||
| | * | Add /report endpoint | Erik Johnston | 2016-05-04 | 1 | -0/+59 |
| | | | |||||
| * | | More consistent config naming | David Baker | 2016-05-10 | 1 | -1/+1 |
| | | | |||||
| * | | Add config option to not send email notifs for new users | David Baker | 2016-05-10 | 1 | -1/+4 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs | David Baker | 2016-04-29 | 1 | -0/+1 |
| |\| | |||||
| | * | Fix password reset | David Baker | 2016-04-29 | 1 | -0/+1 |
| | | | | | | | | | Default requester to None, otherwise it isn't defined when resetting using email auth | ||||
| * | | Add an email pusher for new users | David Baker | 2016-04-29 | 1 | -0/+26 |
| |/ | | | | If they registered with an email address and email notifs are enabled on the HS | ||||
| * | Make pyjwt dependency optional | Erik Johnston | 2016-04-25 | 1 | -5/+7 |
| | | |||||
| * | Merge pull request #687 from nikriek/jwt-fix | Erik Johnston | 2016-04-21 | 1 | -3/+6 |
| |\ | | | | | Fix issues with JWT login | ||||
| | * | Fix issues with JWT login | Niklas Riekenbrauck | 2016-04-21 | 1 | -3/+6 |
| | | | |||||
| * | | Make v2_alpha reg follow the AS API specification | Kegan Dougal | 2016-04-14 | 1 | -0/+5 |
| | | | | | | | | | | | | | The spec is clear the key should be 'user' not 'username' and this is indeed the case for v1. This is not true for v2_alpha though, which is what this commit is fixing. | ||||
| * | | Make the /set part mandatory | David Baker | 2016-04-12 | 1 | -1/+1 |
| | | | |||||
| * | | Mis-named function | David Baker | 2016-04-12 | 1 | -1/+1 |
| | | | |||||
| * | | Split into separate servlet classes | David Baker | 2016-04-12 | 1 | -11/+16 |
| | | | |||||
| * | | Add get endpoint for pushers | David Baker | 2016-04-11 | 1 | -1/+34 |
| |/ | | | | As per https://github.com/matrix-org/matrix-doc/pull/308 | ||||
| * | Use google style doc strings. | Mark Haines | 2016-04-01 | 1 | -36/+43 |
| | | | | | | | | 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. | ||||
| * | Remove spurious comment | Erik Johnston | 2016-03-30 | 1 | -1/+0 |
| | | |||||
| * | Require user to have left room to forget room | Erik Johnston | 2016-03-30 | 1 | -0/+38 |
| | | | | | | This dramatically simplifies the forget API code - in particular it no longer generates a leave event. | ||||
| * | Add JWT support | Niklas Riekenbrauck | 2016-03-29 | 1 | -0/+53 |
| | | |||||
| * | Deduplicate identical /sync requests | Mark Haines | 2016-03-24 | 1 | -0/+3 |
| | | |||||
| * | Add published room list edit API | Erik Johnston | 2016-03-21 | 1 | -0/+42 |
| | | |||||
| * | Merge pull request #652 from matrix-org/erikj/delete_alias | Erik Johnston | 2016-03-18 | 1 | -1/+2 |
| |\ | | | | | Update aliases event after deletion | ||||
| | * | Update aliases event after deletion | Erik Johnston | 2016-03-17 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | 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. | ||||
| * | | remove debug logging | David Baker | 2016-03-16 | 1 | -3/+0 |
| | | | |||||
| * | | Unused import | David Baker | 2016-03-16 | 1 | -1/+0 |
| | | | |||||
| * | | Make registration idempotent, part 2: be idempotent if the client specifies ↵ | David Baker | 2016-03-16 | 1 | -5/+17 |
| |/ | | | | a username. | ||||
| * | take extra return val from check_auth in account too | David Baker | 2016-03-16 | 1 | -1/+1 |
| | | |||||
| * | pep8 & remove debug logging | David Baker | 2016-03-16 | 1 | -4/+5 |
| | | |||||
| * | Make registration idempotent: if you specify the same session, make it give ↵ | David Baker | 2016-03-16 | 1 | -1/+26 |
| | | | | | 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. | ||||
| * | Hook up adding a pusher to the notifier for replication. | Mark Haines | 2016-03-15 | 1 | -0/+6 |
| | | |||||
| * | Fix regression where synapse checked whether push rules were valid JSON ↵ | Mark Haines | 2016-03-14 | 1 | -2/+2 |
| | | | | | before the compatibility hack that handled clients sending invalid JSON | ||||
| * | Merge pull request #642 from matrix-org/erikj/logout | Erik Johnston | 2016-03-11 | 1 | -0/+72 |
| |\ | | | | | Implement logout | ||||
| | * | Implement logout | Erik Johnston | 2016-03-11 | 1 | -0/+72 |
| | | | |||||
| * | | Use parse_json_object_from_request to parse JSON out of request bodies | Mark Haines | 2016-03-11 | 7 | -71/+29 |
| |/ | |||||
| * | Fix cache invalidation so deleting access tokens (which we did when changing ↵ | David Baker | 2016-03-11 | 1 | -1/+1 |
| | | | | | password) actually takes effect without HS restart. Reinstate the code to avoid logging out the session that changed the password, removed in 415c2f05491ce65a4fc34326519754cd1edd9c54 | ||||
| * | Register endpoint returns refresh_token | blide | 2016-03-10 | 1 | -5/+8 |
| | | | | | Guest registration still doesn't return refresh_token | ||||
| * | Add a parse_json_object function | Mark Haines | 2016-03-09 | 10 | -116/+32 |
| | | | | | | to deduplicate all the copy+pasted _parse_json functions. Also document the parse_.* functions. | ||||
| * | Fix relative imports so they work in both py3 and py27 | Mark Haines | 2016-03-08 | 6 | -6/+6 |
| | | |||||
| * | Use syntax that works on both py2.7 and py3 | Mark Haines | 2016-03-07 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'develop' into markjh/pushrule_stream | Mark Haines | 2016-03-04 | 3 | -10/+11 |
| |\ | |||||
| | * | Merge pull request #614 from matrix-org/erikj/alias_delete | Erik Johnston | 2016-03-04 | 1 | -3/+0 |
| | |\ | | | | | | | Allow alias creators to delete aliases | ||||
| | | * | Allow alias creators to delete aliases | Erik Johnston | 2016-03-01 | 1 | -3/+0 |
| | | | | |||||
| | * | | Pass whole requester to ratelimiting | Daniel Wagner-Hall | 2016-03-03 | 3 | -7/+11 |
| | |/ | | | | | | | This will enable more detailed decisions | ||||
| * | | Hook up the push rules stream to account_data in /sync | Mark Haines | 2016-03-04 | 1 | -1/+1 |
| | | | |||||
| * | | Move the code for formatting push rules into a separate function | Mark Haines | 2016-03-03 | 1 | -86/+4 |
| | | | |||||
| * | | Hook up the push rules to the notifier | Mark Haines | 2016-03-03 | 1 | -15/+29 |
| |/ | |||||
| * | Add support for changing the actions for default rules | Mark Haines | 2016-02-26 | 1 | -4/+27 |
| | | | | | | | See matrix-org/matrix-doc#283 Works by adding dummy rules to the push rules table with a negative priority class and then using those rules to clobber the default rule actions when adding the default rules in ``list_with_base_rules`` | ||||
| * | Fix to appease the PEP8 dragon | Gergely Polonkai | 2016-02-26 | 1 | -1/+3 |
| | | |||||
| * | Add error codes for malformed/bad JSON in /login | Gergely Polonkai | 2016-02-26 | 1 | -2/+2 |
| | | | | | Signed-off-by: Gergely Polonkai <gergely@polonkaieu> | ||||
| * | Make sure we return a JSON object when returning the values of specif… | Mark Haines | 2016-02-25 | 1 | -1/+3 |
| | | | | | …ic keys from a push rule | ||||
| * | Remove unused get_rule_attr method | Mark Haines | 2016-02-24 | 1 | -8/+0 |
| | | |||||
| * | Ignore invalid POST bodies when joining rooms | Daniel Wagner-Hall | 2016-02-24 | 1 | -2/+12 |
| | | |||||
| * | Allow third_party_signed to be specified on /join | Daniel Wagner-Hall | 2016-02-23 | 1 | -0/+4 |
| | | |||||
| * | Merge pull request #582 from matrix-org/erikj/presence | Erik Johnston | 2016-02-19 | 4 | -28/+35 |
| |\ | | | | | Rewrite presence for performance. | ||||
| | * | "You are not..." | Erik Johnston | 2016-02-18 | 1 | -1/+1 |
| | | | |||||
| | * | Initial cut | Erik Johnston | 2016-02-17 | 4 | -28/+35 |
| | | | |||||
| * | | Remove dead code for setting device specific rules. | Mark Haines | 2016-02-18 | 2 | -88/+8 |
| | | | | | | | | | | | | | It wasn't possible to hit the code from the API because of a typo in parsing the request path. Since no-one was using the feature we might as well remove the dead code. | ||||
| * | | Merge branch 'develop' into daniel/roomcleanupincremental | Daniel Wagner-Hall | 2016-02-17 | 2 | -2/+2 |
| |\| | | | | | | | | | Conflicts: synapse/rest/client/v1/room.py | ||||
| | * | client/v1/room: include event_id in response to state event PUT, in ↵ | Patrik Oldsberg | 2016-02-17 | 1 | -2/+2 |
| | | | | | | | | | | | | | accordance with the spec Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com> | ||||
| | * | Fix typo in request validation for adding push rules. | Mark Haines | 2016-02-16 | 1 | -1/+1 |
| | | | |||||
| | * | Simplify room creation code | Daniel Wagner-Hall | 2016-02-15 | 1 | -15/+3 |
| | | | |||||
| * | | Some cleanup | Daniel Wagner-Hall | 2016-02-17 | 1 | -3/+3 |
| | | | | | | | | | | | 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... :( | ||||
| * | | Branch off member and non member sends | Daniel Wagner-Hall | 2016-02-15 | 1 | -5/+16 |
| | | | | | | | | | Unclean, needs tidy-up, but works | ||||
| * | | Simplify room creation code | Daniel Wagner-Hall | 2016-02-15 | 1 | -15/+3 |
| | | | |||||
| * | | Reuse update_membership from /join | Daniel Wagner-Hall | 2016-02-15 | 1 | -16/+5 |
| | | | |||||
| * | | Merge implementation of /join by alias or ID | Daniel Wagner-Hall | 2016-02-15 | 1 | -37/+31 |
| | | | | | | | | | | | 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 | -1/+1 |
| |/ | | | | | | 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 | 1 | -13/+55 |
| | | | | | | | 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 | 1 | -55/+13 |
| | | | | | | | | | | | | | | 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. | ||||
| * | Catch the exceptions thrown by twisted when you write to a closed connection | Mark Haines | 2016-02-12 | 2 | -6/+9 |
| | | |||||
| * | Add some paranoia logging | Erik Johnston | 2016-02-11 | 1 | -0/+10 |
| | | |||||
| * | Revert "Reject additional path segments" | Daniel Wagner-Hall | 2016-02-09 | 3 | -6/+6 |
| | | | | | | | This reverts commit 1d19a5ec0fff73af9cee8c21118020b31be47379. iOS Console is apparently relying on these paths. | ||||
| * | Merge pull request #564 from matrix-org/erikj/logcontext | Erik Johnston | 2016-02-08 | 2 | -4/+4 |
| |\ | | | | | Fix up logcontexts | ||||
| | * | Fix up logcontexts | Erik Johnston | 2016-02-08 | 2 | -4/+4 |
| | | | |||||
| * | | Reject additional path segments | Daniel Wagner-Hall | 2016-02-08 | 3 | -6/+6 |
| |/ | |||||
| * | Merge pull request #557 from matrix-org/dbkr/profile_dont_return_null | David Baker | 2016-02-04 | 1 | -6/+17 |
| |\ | | | | | Omit keys rather then returning null in profile API | ||||
| | * | No braces here | David Baker | 2016-02-03 | 1 | -1/+1 |
| | | | |||||
| | * | Don't return null if profile display name / avatar url isn't set: omit them ↵ | David Baker | 2016-02-03 | 1 | -6/+17 |
| | | | | | | | | | instead | ||||
| * | | Remove old log line | Erik Johnston | 2016-02-03 | 1 | -2/+0 |
| |/ | |||||
| * | Rename config field to reflect yaml name | Daniel Wagner-Hall | 2016-02-03 | 2 | -3/+3 |
| | | |||||
| * | Fix flake8 warnings for new flake8 | Daniel Wagner-Hall | 2016-02-02 | 5 | -8/+8 |
| | | |||||
| * | Merge pull request #545 from matrix-org/erikj/sync | Erik Johnston | 2016-02-02 | 1 | -75/+0 |
| |\ | | | | | Move /sync state calculations from rest to handler | ||||
| | * | Move state calculations from rest to handler | Erik Johnston | 2016-02-01 | 1 | -75/+0 |
| | | | |||||
| * | | Pull guest access token out of the auth session params, otherwise it will ↵ | David Baker | 2016-02-01 | 1 | -0/+1 |
| |/ | | | | break if you open the email on a different device. | ||||
| * | Allow three_pid_creds as well as threePidCreds in /account/3pid | Mark Haines | 2016-01-29 | 1 | -2/+3 |
| | | |||||
| * | Fix adding push rules relative to other rules | Mark Haines | 2016-01-27 | 1 | -5/+10 |
| | | |||||
| * | Merge pull request #528 from matrix-org/markjh/missing_yield | Mark Haines | 2016-01-25 | 1 | -2/+2 |
| |\ | | | | | Add missing yield in push_rules set enabled | ||||
| | * | Add missing yield in push_rules set enabled | Mark Haines | 2016-01-25 | 1 | -2/+2 |
| | | | |||||
| * | | Move logic from rest/ to handlers/ | Erik Johnston | 2016-01-25 | 1 | -34/+23 |
| |/ | |||||
| * | Sanitize filters | Erik Johnston | 2016-01-22 | 2 | -13/+13 |
| | | |||||
| * | Fix change_password | Erik Johnston | 2016-01-20 | 1 | -3/+2 |
| | | |||||
| * | Whine if we give a from param to /sync | Erik Johnston | 2016-01-20 | 1 | -0/+7 |
| | | |||||
| * | Allow non-guests to peek on rooms using /events | Daniel Wagner-Hall | 2016-01-20 | 2 | -4/+3 |
| | | |||||
| * | Only compute unread notifications for rooms we send down stream | Erik Johnston | 2016-01-19 | 1 | -2/+1 |
| | | |||||
| * | Return highlight_count in /sync | Erik Johnston | 2016-01-19 | 1 | -0/+1 |
| | | |||||
| * | Take a deepcopy of push rules before mutating them | Erik Johnston | 2016-01-19 | 1 | -1/+3 |
| | | |||||
| * | Use static for const dicts | Erik Johnston | 2016-01-18 | 1 | -1/+7 |
| | | |||||
| * | Remove internal ids | Erik Johnston | 2016-01-18 | 1 | -0/+4 |
| | | |||||
| * | Require unbanning before other membership changes | Daniel Wagner-Hall | 2016-01-15 | 1 | -39/+12 |
| | | |||||
| * | Merge branch 'release-v0.12.1' into develop | Richard van der Hoff | 2016-01-14 | 1 | -0/+6 |
| |\ | |||||
| | * | Add 'event' result to 'context' endpoint | Richard van der Hoff | 2016-01-13 | 1 | -0/+6 |
| | | | | | | | | | ... because the context isn't much use without the event. | ||||
| * | | Fix enabling & disabling push rules | David Baker | 2016-01-14 | 1 | -1/+1 |
| | | | |||||
| * | | Rename 'user_name' to 'user_id' in push to make it consistent with the rest ↵ | Mark Haines | 2016-01-13 | 2 | -7/+7 |
| | | | | | | | | | of the code | ||||
| * | | Merge pull request #478 from matrix-org/daniel/userobject | Daniel Wagner-Hall | 2016-01-11 | 17 | -123/+154 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a User object I'm sick of passing around more and more things as tuple items around the whole world, and needing to edit every call site every time there is more information about a user. So pass them around together as an object. This object has incredibly poorly named fields because we have a convention that `user` indicates a UserID object, and `user_id` indicates a string. I tried to clean up the whole repo to fix this, but gave up. So instead, I introduce a second convention. A user_object is a User, and a user_id_object is a UserId. I may have cried a little bit. | ||||
| | * | | Introduce a Requester object | Daniel Wagner-Hall | 2016-01-11 | 17 | -123/+154 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This tracks data about the entity which made the request. This is instead of passing around a tuple, which requires call-site modifications every time a new piece of optional context is passed around. I tried to introduce a User object. I gave up. | ||||
| * | | | Merge pull request #456 from matrix-org/store_event_actions | David Baker | 2016-01-08 | 2 | -1/+5 |
| |\ \ \ | |/ / |/| | | Send unread notification counts | ||||
| | * | | Merge remote-tracking branch 'origin/develop' into store_event_actions | David Baker | 2016-01-06 | 1 | -6/+1 |
| | |\ \ | |||||
| | * | | | Add is_guest flag to users db to track whether a user is a guest user or ↵ | David Baker | 2016-01-06 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | not. Use this so we can run _filter_events_for_client when calculating event_push_actions. | ||||
| | * | | | Merge remote-tracking branch 'origin/develop' into store_event_actions | David Baker | 2016-01-05 | 1 | -3/+9 |
| | |\ \ \ | |||||
| | * | | | | Only joined rooms have unread_notif_count | David Baker | 2016-01-04 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Merge remote-tracking branch 'origin/develop' into store_event_actions | David Baker | 2016-01-04 | 1 | -1/+1 |
| | |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | | Merge remote-tracking branch 'origin/develop' into store_event_actions | David Baker | 2015-12-22 | 1 | -1/+9 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge remote-tracking branch 'origin/develop' into store_event_actions | David Baker | 2015-12-21 | 2 | -7/+22 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | still very WIP, but now sends unread_notifications_count in the room object ↵ | David Baker | 2015-12-16 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on sync (only actually corrrect in a full sync: hardcoded to 0 in incremental syncs). | ||||
| * | | | | | | | copyrights | Matthew Hodgson | 2016-01-07 | 27 | -27/+27 |
| | | | | | | | | |||||
| * | | | | | | | Add /_matrix/versions to report supported versions | Daniel Wagner-Hall | 2016-01-06 | 1 | -0/+36 |
| | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | | Guest users must be joined to a room to see it in /sync | Mark Haines | 2016-01-06 | 1 | -6/+1 |
| | |_|_|_|/ |/| | | | | |||||
| * | | | | | Allow guests to upgrade their accounts | Daniel Wagner-Hall | 2016-01-05 | 1 | -3/+9 |
| | |_|_|/ |/| | | | |||||
| * | | | | Expose /login under r0 | Richard van der Hoff | 2016-01-02 | 1 | -1/+1 |
| | |_|/ |/| | | | | | | | | The spec says /login should be available at r0 and 'unstable', so make it so. | ||||
| * | | | Allow guest access if the user provides a list of rooms in the filter | Mark Haines | 2015-12-22 | 1 | -1/+9 |
| | |/ |/| | |||||
| * | | Remove accidentally committed debug logging | Mark Haines | 2015-12-21 | 1 | -1/+0 |
| | | | |||||
| * | | Fix spacing | Mark Haines | 2015-12-14 | 1 | -1/+1 |
| | | | |||||
| * | | Fix logging to lie less | Mark Haines | 2015-12-14 | 1 | -2/+9 |
| | | | |||||
| * | | Add commentary for fix in PR#442 | Mark Haines | 2015-12-14 | 1 | -0/+6 |
| | | | |||||
| * | | Combine the prev content tests | Mark Haines | 2015-12-14 | 1 | -14/+12 |
| | | | |||||
| * | | Check whether prev_content or prev_sender is set before trying to rollback state | Mark Haines | 2015-12-14 | 1 | -8/+13 |
| | | | |||||
| * | | Missing yield | Mark Haines | 2015-12-10 | 1 | -1/+1 |
| |/ | |||||
| * | Allow filter JSON object in the filter query parameter in /sync | Mark Haines | 2015-12-09 | 1 | -9/+21 |
| | | | | | Documented by matrix-org/matrix-doc#224 | ||||
| * | Actually host r0 and unstable prefixes | Daniel Wagner-Hall | 2015-12-08 | 2 | -66/+0 |
| | | |||||
| * | also do more structured logging | David Baker | 2015-12-07 | 1 | -0/+1 |
| | | |||||
| * | pep8 | David Baker | 2015-12-07 | 1 | -0/+1 |
| | | |||||
| * | Add logging to pushers API to log the body of the request | David Baker | 2015-12-07 | 1 | -0/+4 |
| | | |||||
| * | Take object not bool | Daniel Wagner-Hall | 2015-12-07 | 1 | -0/+5 |
| | | | | | | | Allows bool as legacy fallback See https://github.com/matrix-org/matrix-doc/pull/212 | ||||
| * | Merge pull request #415 from matrix-org/daniel/endpoints | Daniel Wagner-Hall | 2015-12-03 | 6 | -35/+11 |
| |\ | | | | | Merge pull request #415 from matrix-org/daniel/endpoints | ||||
| | * | Update endpoints to reflect current spec | Daniel Wagner-Hall | 2015-12-02 | 6 | -35/+11 |
| | | | |||||
| * | | Fix implementation of /admin/whois | Daniel Wagner-Hall | 2015-12-02 | 1 | -1/+1 |
| |/ | |||||
| * | Reuse a single http client, rather than creating new ones | Mark Haines | 2015-12-02 | 1 | -5/+2 |
| | | |||||
| * | Add API for setting account_data globaly or on a per room basis | Mark Haines | 2015-12-01 | 3 | -0/+119 |
| | | |||||
 |
index : matrix/thirdparty/synapse.git | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summary refs log tree commit diff |