Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Actually call get_room_state | Erik Johnston | 2016-08-03 | 1 | -0/+4 |
| | |||||
* | Fix syntax error | Erik Johnston | 2016-08-03 | 1 | -1/+8 |
| | |||||
* | Comment | Erik Johnston | 2016-08-03 | 1 | -0/+14 |
| | |||||
* | Add /state_ids federation API | Erik Johnston | 2016-08-03 | 4 | -3/+125 |
| | | | | | The new API only returns the event_ids for the state, as most requesters will already have the vast majority of the events already. | ||||
* | Don't double wrap 200 | Erik Johnston | 2016-08-02 | 1 | -2/+2 |
| | |||||
* | Fix response cache | Erik Johnston | 2016-08-02 | 1 | -1/+1 |
| | |||||
* | Merge pull request #940 from matrix-org/erikj/fed_state_cache | Erik Johnston | 2016-08-02 | 5 | -32/+60 |
|\ | | | | | Cache federation state responses | ||||
| * | Cache federation state responses | Erik Johnston | 2016-07-21 | 5 | -32/+60 |
| | | |||||
* | | Merge pull request #967 from matrix-org/erikj/fed_reader | Erik Johnston | 2016-08-02 | 7 | -18/+342 |
|\ \ | | | | | | | Split out the federation reading portions into a separate. | ||||
| * \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader | Erik Johnston | 2016-08-02 | 3 | -3/+23 |
| |\ \ | |||||
| * \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader | Erik Johnston | 2016-07-29 | 1 | -4/+31 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader | Erik Johnston | 2016-07-29 | 37 | -295/+929 |
| |\ \ \ \ | |||||
| * | | | | | Add destination retry to slave store | Erik Johnston | 2016-07-28 | 2 | -0/+32 |
| | | | | | | |||||
| * | | | | | Add slace storage functions for public room list | Erik Johnston | 2016-07-28 | 3 | -0/+48 |
| | | | | | | |||||
| * | | | | | Add get_auth_chain to slave store | Erik Johnston | 2016-07-28 | 1 | -0/+4 |
| | | | | | | |||||
| * | | | | | Add more key storage funcs into slave store | Erik Johnston | 2016-07-28 | 2 | -24/+26 |
| | | | | | | |||||
| * | | | | | Split out a FederationReader process | Erik Johnston | 2016-07-21 | 4 | -0/+238 |
| | | | | | | |||||
* | | | | | | Merge branch 'develop' into dbkr/fix_add_email_on_register | Mark Haines | 2016-08-02 | 3 | -3/+23 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Ignore AlreadyCalled errors on timer cancel | Erik Johnston | 2016-07-31 | 2 | -3/+16 |
| | | | | | | |||||
| * | | | | | Merge pull request #958 from matrix-org/paul/SYN-738 | Paul Evans | 2016-07-29 | 1 | -0/+7 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | Forbid non-ASes from registering users whose names begin with '_' | ||||
| | * | | | | Forbid non-ASes from registering users whose names begin with '_' (SYN-738) | Paul "LeoNerd" Evans | 2016-07-27 | 1 | -0/+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. | ||||
* | | | | | Merge pull request #964 from matrix-org/erikj/fed_join_fix | Erik Johnston | 2016-07-29 | 1 | -4/+31 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Handle the case of missing auth events when joining a room | ||||
| * | | | | Mention that func will fetch auth events | Erik Johnston | 2016-07-29 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | 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 |
| | | | | | |||||
* | | | | | Fix SQL to supply arguments in the same order | Mark Haines | 2016-07-29 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Create separate methods for getting messages to push | Mark Haines | 2016-07-28 | 4 | -51/+163 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for the email and http pushers rather than trying to make a single method that will work with their conflicting requirements. The http pusher needs to get the messages in ascending stream order, and doesn't want to miss a message. The email pusher needs to get the messages in descending timestamp order, and doesn't mind if it misses messages. | ||||
* | | | | | Comment get_unread_push_actions_for_user_in_range function | Kegan Dougal | 2016-07-28 | 1 | -2/+26 |
| | | | | | |||||
* | | | | | Merge branch 'release-v0.17.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-07-28 | 1 | -1/+1 |
|\| | | | | |||||
| * | | | | Merge branch 'erikj/key_client_fix' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2016-07-28 | 1 | -3/+9 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | release-v0.17.0 | ||||
| * | | | | | Bump version and changelog | Erik Johnston | 2016-07-28 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0 | Erik Johnston | 2016-07-28 | 7 | -14/+85 |
| |\ \ \ \ \ | |||||
| * | | | | | | Bump CHANGES and version | Erik Johnston | 2016-07-27 | 1 | -1/+1 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #962 from matrix-org/markjh/retry | Mark Haines | 2016-07-28 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix retry utils to check if the exception is a subclass of CME | ||||
| * | | | | | | Fix retry utils to check if the exception is a subclass of CME | Mark Haines | 2016-07-28 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #941 from matrix-org/erikj/key_client_fix | Erik Johnston | 2016-07-28 | 1 | -3/+9 |
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | Send the correct host header when fetching keys | ||||
| * | | | | Cache getPeer | Erik Johnston | 2016-07-21 | 1 | -2/+5 |
| | | | | | |||||
| * | | | | Set host not path | Erik Johnston | 2016-07-21 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Send the correct host header when fetching keys | Erik Johnston | 2016-07-21 | 1 | -3/+6 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #961 from matrix-org/dbkr/fix_push_invite_name | Erik Johnston | 2016-07-28 | 1 | -1/+4 |
|\ \ \ \ | | | | | | | | | | | Don't include name of room for invites in push | ||||
| * | | | | Don't include name of room for invites in push | David Baker | 2016-07-28 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | Avoids insane pushes like, "Bob invited you to invite from Bob" | ||||
* | | | | | Merge pull request #960 from matrix-org/rav/support_r0.2 | Richard van der Hoff | 2016-07-28 | 1 | -1/+5 |
|\ \ \ \ \ | |/ / / / |/| | | | | Add r0.2.0 to the "supported versions" list | ||||
| * | | | | 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 |
| | | | | | |||||
* | | | | | Typo | David Baker | 2016-07-28 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #956 from matrix-org/rav/check_device_id_on_key_upload | Richard van der Hoff | 2016-07-27 | 4 | -11/+75 |
|\ \ \ \ | |_|/ / |/| | | | Make the device id on e2e key upload optional | ||||
| * | | | 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. | ||||
| * | | | SQL syntax fix | Richard van der Hoff | 2016-07-27 | 1 | -1/+1 |
| | | | | |||||
| * | | | Delete e2e keys on device delete | Richard van der Hoff | 2016-07-27 | 3 | -4/+28 |
| | | | | |||||
| * | | | Make the device id on e2e key upload optional | Richard van der Hoff | 2016-07-26 | 2 | -12/+54 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | Merge branch 'develop' into markjh/verify | Mark Haines | 2016-07-27 | 2 | -3/+11 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/crypto/keyring.py | ||||
| * \ \ \ | Merge pull request #955 from matrix-org/markjh/only_from2 | Mark Haines | 2016-07-27 | 1 | -2/+9 |
| |\ \ \ \ | | | | | | | | | | | | | Add a couple more checks to the keyring | ||||
| | * | | | | Add a couple more checks to the keyring | Mark Haines | 2016-07-26 | 1 | -2/+9 |
| | | | | | | |||||
| * | | | | | Merge pull request #954 from matrix-org/markjh/even_more_fixes | Mark Haines | 2016-07-27 | 2 | -9/+11 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | Fix a couple of bugs in the transaction and keyring code | ||||
| | * | | | | Fix a couple of bugs in the transaction and keyring code | Mark Haines | 2016-07-26 | 2 | -9/+11 |
| | |/ / / | |||||
* | / / / | Clean up verify_json_objects_for_server | Mark Haines | 2016-07-27 | 1 | -68/+75 |
|/ / / / | |||||
* | | | | Merge pull request #952 from matrix-org/markjh/more_fixes | Mark Haines | 2016-07-26 | 1 | -0/+4 |
|\ \ \ \ | |/ / / |/| | | | Check if the user is banned when handling 3pid invites | ||||
| * | | | Check if the user is banned when handling 3pid invites | Mark Haines | 2016-07-26 | 1 | -0/+4 |
| | | | | |||||
* | | | | Add `create_requester` function | Richard van der Hoff | 2016-07-26 | 7 | -49/+79 |
|/ / / | | | | | | | | | | | | | Wrap the `Requester` constructor with a function which provides sensible defaults, and use it throughout | ||||
* | | | Fix typo | Richard van der Hoff | 2016-07-26 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'develop' into rav/delete_refreshtoken_on_delete_device | Richard van der Hoff | 2016-07-26 | 2 | -55/+113 |
|\ \ \ | |||||
| * \ \ | Merge pull request #951 from matrix-org/rav/flake8 | Richard van der Hoff | 2016-07-26 | 1 | -5/+3 |
| |\ \ \ | | | | | | | | | | | Fix flake8 noise | ||||
| | * | | | Fix flake8 violation | Richard van der Hoff | 2016-07-26 | 1 | -5/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Apparently flake8 v3 puts the error on a different line to v2. Easiest way to make sure that happens is by putting the whole statement on one line :) | ||||
| * | | | | Merge pull request #948 from matrix-org/markjh/auth_fixes | Mark Haines | 2016-07-26 | 1 | -50/+110 |
| |\ \ \ \ | | |/ / / | |/| | | | Don't add rejections to the state_group, persist all rejections | ||||
| | * | | | Fix how push_actions are redacted. | Mark Haines | 2016-07-26 | 1 | -8/+10 |
| | | | | | |||||
| | * | | | Don't add rejected events if we've seen them befrore. Add some comments to ↵ | Mark Haines | 2016-07-26 | 1 | -5/+48 |
| | | | | | | | | | | | | | | | | | | | | explain what the code is doing mechanically | ||||
| | * | | | Only update the events and event_json tables for rejected events | Mark Haines | 2016-07-25 | 2 | -52/+63 |
| | | | | | |||||
| | * | | | Don't add the events to forward extremities if the event is rejected | Mark Haines | 2016-07-25 | 1 | -3/+6 |
| | | | | | |||||
| | * | | | Don't add rejections to the state_group, persist all rejections | Mark Haines | 2016-07-25 | 2 | -5/+6 |
| | | | | | |||||
* | | | | | Delete refresh tokens when deleting devices | Richard van der Hoff | 2016-07-26 | 2 | -15/+49 |
|/ / / / | |||||
* | | | | Merge pull request #949 from matrix-org/rav/update_devices | David Baker | 2016-07-26 | 10 | -22/+213 |
|\ \ \ \ | | | | | | | | | | | Implement updates and deletes for devices | ||||
| * | | | | Implement updating devices | Richard van der Hoff | 2016-07-26 | 3 | -8/+67 |
| | | | | | | | | | | | | | | | | | | | | You can update the displayname of devices now. | ||||
| * | | | | Implement deleting devices | Richard van der Hoff | 2016-07-26 | 9 | -15/+146 |
| | | | | | |||||
| * | | | | Log when adding listeners | Richard van der Hoff | 2016-07-25 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | typo | Matthew Hodgson | 2016-07-26 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #946 from matrix-org/dbkr/log_recaptcha_hostname | David Baker | 2016-07-25 | 1 | -2/+11 |
|\ \ \ \ | |/ / / |/| | | | Log the hostname the reCAPTCHA was completed on | ||||
| * | | | 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. | ||||
* | | | | fix: defer.returnValue takes one argument | Mark Haines | 2016-07-25 | 1 | -1/+1 |
| | | | | |||||
* | | | | background updates: fix assert again | Richard van der Hoff | 2016-07-25 | 1 | -1/+1 |
| | | | | |||||
* | | | | background updates: Fix assertion to do something | Richard van der Hoff | 2016-07-25 | 1 | -2/+2 |
| | | | | |||||
* | | | | Fix background_update tests | Richard van der Hoff | 2016-07-25 | 1 | -7/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | A bit of a cleanup for background_updates, and make sure that the real background updates have run before we start the unit tests, so that they don't interfere with the tests. | ||||
* | | | | PEP8 | Richard van der Hoff | 2016-07-22 | 1 | -1/+0 |
| | | | | |||||
* | | | | Create index on user_ips in the background | Richard van der Hoff | 2016-07-22 | 3 | -12/+80 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | user_ips is kinda big, so really we want to add the index in the background once we're running. Replace the schema delta with one which will do that. I've done this in a way that's reasonably easy to reuse as there a few other indexes I need, and I don't suppose they will be the last. | ||||
* | / | 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 | ||||
* | | Merge pull request #943 from matrix-org/rav/get_device_api | David Baker | 2016-07-21 | 2 | -9/+62 |
|\ \ | | | | | | | Implement GET /device/{deviceId} | ||||
| * | | Fix PEP8 errors | Richard van der Hoff | 2016-07-21 | 1 | -1/+1 |
| | | | |||||
| * | | Implement GET /device/{deviceId} | Richard van der Hoff | 2016-07-21 | 2 | -9/+62 |
| | | | |||||
* | | | 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. | ||||
* | | storage/client_ips: remove some dead code | Richard van der Hoff | 2016-07-21 | 1 | -3/+0 |
| | | |||||
* | | Merge branch 'develop' into rav/get_devices_api | Richard van der Hoff | 2016-07-20 | 4 | -22/+67 |
|\| | | | | | | | (pick up PR #938 in the hope of fixing the UTs) | ||||
| * | Merge pull request #938 from matrix-org/rav/add_device_id_to_client_ips | Richard van der Hoff | 2016-07-20 | 2 | -7/+25 |
| |\ | | | | | | | Record device_id in client_ips | ||||
| | * | Record device_id in client_ips | Richard van der Hoff | 2016-07-20 | 2 | -7/+25 |
| | | | | | | | | | | | | | | | Record the device_id when we add a client ip; it's somewhat redundant as we could get it via the access_token, but it will make querying rather easier. | ||||
| * | | Don't explode if we have no snapshots yet | Erik Johnston | 2016-07-20 | 1 | -0/+3 |
| | | | |||||
| * | | Merge pull request #937 from matrix-org/rav/register_device_on_register | David Baker | 2016-07-20 | 1 | -15/+39 |
| |\ \ | | |/ | |/| | Register a device_id in the /v2/register flow. | ||||
| | * | 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 | 7 | -5/+198 |
|/ / | | | | | | | | | | | | | 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. | ||||
* / | More doc-comments | Richard van der Hoff | 2016-07-20 | 2 | -10/+14 |
|/ | | | | Fix some more comments on some things | ||||
* | Merge pull request #936 from matrix-org/erikj/log_rss | Erik Johnston | 2016-07-20 | 4 | -1/+50 |
|\ | | | | | Add metrics for psutil derived memory usage | ||||
| * | Add metrics for psutil derived memory usage | Erik Johnston | 2016-07-20 | 4 | -1/+50 |
| | | |||||
* | | 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 | 6 | -0/+46 |
|\ \ | | | | | | | Type annotations | ||||
| * | | Type annotations | Richard van der Hoff | 2016-07-19 | 6 | -0/+46 |
| | | | | | | | | | | | | | | | 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 | 4 | -21/+52 |
|\ \ \ | |_|/ |/| | | Further registration refactoring | ||||
| * | | Further registration refactoring | Richard van der Hoff | 2016-07-19 | 4 | -21/+52 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | * `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 | 6 | -9/+239 |
|\ \ | |/ |/| | Feature: Add filter to /messages. Add 'contains_url' to filter. | ||||
| * | Comment | Erik Johnston | 2016-07-20 | 1 | -0/+4 |
| | | |||||
| * | Add filter param to /messages API | Erik Johnston | 2016-07-14 | 2 | -5/+22 |
| | | |||||
| * | Add support for filters in paginate_room_events | Erik Johnston | 2016-07-14 | 1 | -1/+51 |
| | | |||||
| * | Add 'contains_url' to filter | Erik Johnston | 2016-07-14 | 1 | -3/+20 |
| | | |||||
| * | Add sender and contains_url field to events table | Erik Johnston | 2016-07-14 | 2 | -0/+142 |
| | | |||||
* | | 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. | ||||
* | | | Merge pull request #929 from matrix-org/rav/support_deviceid_in_login | Richard van der Hoff | 2016-07-19 | 10 | -24/+265 |
|\ \ \ | |/ / |/| | | Add device_id support to /login | ||||
| * | | schema fix | Richard van der Hoff | 2016-07-19 | 1 | -1/+1 |
| | | | | | | | | | | | | device_id should be text, not bigint. | ||||
| * | | Add device_id support to /login | Richard van der Hoff | 2016-07-18 | 10 | -24/+265 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | Merge pull request #928 from matrix-org/rav/refactor_login | Richard van der Hoff | 2016-07-18 | 2 | -65/+82 |
|\ \ | | | | | | | Refactor login flow | ||||
| * | | Refactor login flow | Richard van der Hoff | 2016-07-18 | 2 | -65/+82 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | Merge pull request #924 from matrix-org/erikj/purge_history | Erik Johnston | 2016-07-18 | 1 | -19/+15 |
|\ \ \ | | | | | | | | | Fix /purge_history bug | ||||
| * | | | Fix /purge_history bug | Erik Johnston | 2016-07-15 | 1 | -19/+15 |
| | | | | | | | | | | | | | | | | This was caused by trying to insert duplicate backward extremeties | ||||
* | | | | Merge pull request #925 from matrix-org/markjh/auth_fix | Mark Haines | 2016-07-18 | 1 | -0/+5 |
|\ \ \ \ | | | | | | | | | | | Fix 500 ISE when sending alias event without a state_key | ||||
| * | | | | Fix 500 ISE when sending alias event without a state_key | Mark Haines | 2016-07-15 | 1 | -0/+5 |
| | | | | | |||||
* | | | | | Merge pull request #927 from Half-Shot/develop | Erik Johnston | 2016-07-18 | 1 | -5/+6 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Fall back to 'username' if 'user' is not given for appservice registration. | ||||
| * | | | | 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 |
| |/ / / | |||||
* / / / | 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 #923 from matrix-org/erikj/purge_history | Erik Johnston | 2016-07-15 | 2 | -2/+13 |
|\| | | | | | | | | Various purge_history fixes | ||||
| * | | Pull out min stream_ordering from ex_outlier_stream | Erik Johnston | 2016-07-15 | 1 | -1/+2 |
| | | | |||||
| * | | event_backwards_extremeties may not be empty | Erik Johnston | 2016-07-15 | 1 | -1/+11 |
| | | | |||||
* | | | Merge pull request #919 from matrix-org/erikj/auth_fix | Erik Johnston | 2016-07-15 | 3 | -5/+35 |
|\ \ \ | |/ / |/| | | Various auth.py fixes. | ||||
| * | | Comment | Erik Johnston | 2016-07-15 | 2 | -0/+6 |
| | | | |||||
| * | | Check sender signed event | Erik Johnston | 2016-07-14 | 3 | -6/+12 |
| | | | |||||
| * | | Check if alias event's state_key matches sender's domain | Erik Johnston | 2016-07-13 | 1 | -0/+11 |
| | | | |||||
| * | | Check creation event's room_id domain matches sender's | Erik Johnston | 2016-07-13 | 1 | -0/+7 |
| | | | |||||
* | | | 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 | 4 | -6/+10 |
|\ \ \ | |/ / |/| | | Bug fix: expire invalid access tokens | ||||
| * | | Bug fix: expire invalid access tokens | Negar Fazeli | 2016-07-13 | 4 | -6/+10 |
| |/ | |||||
* | | Merge pull request #915 from matrix-org/dbkr/more_requesttokens | David Baker | 2016-07-13 | 3 | -30/+103 |
|\ \ | |/ |/| | Add requestToken endpoints | ||||
| * | 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 | 2 | -0/+60 |
| | | |||||
* | | Add a comment explaining allow_none | Mark Haines | 2016-07-08 | 1 | -0/+2 |
| | | |||||
* | | Ensure that the guest user is in the database when upgrading accounts | Mark Haines | 2016-07-08 | 1 | -0/+13 |
|/ | |||||
* | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-07-08 | 5 | -9/+25 |
|\ | |||||
| * | Merge branch 'hotfixes-v0.16.1' v0.16.1-r1 | Erik Johnston | 2016-07-08 | 2 | -6/+11 |
| |\ | |||||
| | * | Bump version and changelog | Erik Johnston | 2016-07-07 | 1 | -1/+1 |
| | | | |||||
| | * | Fix bug where we did not correctly explode when multiple user_ids were set ↵ | Erik Johnston | 2016-07-07 | 1 | -5/+10 |
| | | | | | | | | | | | | in macaroon | ||||
| * | | Merge pull request #886 from matrix-org/markjh/async_commit | Mark Haines | 2016-06-29 | 3 | -3/+14 |
| |\ \ | | | | | | | | | Optionally make committing to postgres asynchronous. | ||||
| | * | | Optionally make committing to postgres asynchronous. | Mark Haines | 2016-06-20 | 3 | -3/+14 |
| | | | | | | | | | | | | | | | | | | | | Useful when running tests when you don't care whether the server will lose data that it claims that it has committed. | ||||
* | | | | Comment | Erik Johnston | 2016-07-07 | 1 | -0/+3 |
| | | | | |||||
* | | | | Return 400 rather than 500 | Erik Johnston | 2016-07-07 | 1 | -1/+4 |
| | | | | |||||
* | | | | Add rest servlet. Fix SQL. | Erik Johnston | 2016-07-06 | 2 | -5/+5 |
| | | | | |||||
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/test2 | Erik Johnston | 2016-07-06 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #909 from matrix-org/erikj/shared_secret | Erik Johnston | 2016-07-06 | 3 | -28/+48 |
| |\ \ \ \ | | | | | | | | | | | | | Add an admin option to shared secret registration (breaks backwards compat) | ||||
| * | | | | | Update password config comment | Kent Shikama | 2016-07-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kent Shikama <kent@kentshikama.com> | ||||
* | | | | | | Merge branch 'erikj/shared_secret' into erikj/test2 | Erik Johnston | 2016-07-06 | 9 | -105/+187 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | 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 |
| | | | | | | |||||
| * | | | | | Remove spurious txn | Erik Johnston | 2016-07-05 | 1 | -9/+0 |
| | | | | | | |||||
| * | | | | | Fix for postgres | Erik Johnston | 2016-07-05 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Add an admin option to shared secret registration | Erik Johnston | 2016-07-05 | 3 | -24/+42 |
| | | | | | | |||||
| * | | | | | Protect password when registering using shared secret | Erik Johnston | 2016-07-05 | 1 | -4/+7 |
| |/ / / / | |||||
| * | | | | Merge pull request #904 from ↵ | David Baker | 2016-07-05 | 2 | -15/+29 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/dbkr/register_email_no_untrusted_id_server requestToken update | ||||
| | * | | | | requestToken update | David Baker | 2016-06-30 | 2 | -15/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | | Merge pull request #906 from matrix-org/markjh/faster_events_around | Mark Haines | 2016-07-05 | 2 | -60/+102 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Use a query that postgresql optimises better for get_events_around | ||||
| | * | | | | | Fix typo | Mark Haines | 2016-07-05 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Make get_events_around more efficient on sqlite3 | Mark Haines | 2016-07-05 | 1 | -13/+49 |
| | | | | | | | |||||
| | * | | | | | Use true/false for boolean parameter inclusive to avoid potential for sqli, ↵ | Mark Haines | 2016-07-05 | 2 | -5/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | and possibly make the code clearer | ||||
| | * | | | | | Use different SQL for postgres and sqlite3 for when using multicolumn indexes | Mark Haines | 2016-07-04 | 2 | -59/+59 |
| | | | | | | | |||||
| | * | | | | | Use a query that postgresql optimises better for get_events_around | Mark Haines | 2016-07-04 | 1 | -12/+16 |
| | |/ / / / | |||||
| * | | | | | Remove default password pepper string | Kent Shikama | 2016-07-05 | 1 | -2/+1 |
| | | | | | | |||||
| * | | | | | Fix password config | Kent Shikama | 2016-07-05 | 2 | -3/+3 |
| | | | | | | |||||
| * | | | | | Fix pep8 | Kent Shikama | 2016-07-05 | 2 | -2/+3 |
| | | | | | | |||||
| * | | | | | Add comment to prompt changing of pepper | Kent Shikama | 2016-07-05 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Add pepper to password hashing | Kent Shikama | 2016-07-05 | 2 | -3/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kent Shikama <kent@kentshikama.com> | ||||
* | | | | | | Add ReadWriteLock for pagination and history prune | Erik Johnston | 2016-07-05 | 2 | -36/+38 |
| | | | | | | |||||
* | | | | | | Add ReadWriteLock | Erik Johnston | 2016-07-05 | 1 | -0/+82 |
| | | | | | | |||||
* | | | | | | Add purge_history API | Erik Johnston | 2016-07-05 | 4 | -1/+38 |
| | | | | | | |||||
* | | | | | | Add storage function to purge history for a room | Erik Johnston | 2016-07-04 | 1 | -0/+140 |
|/ / / / / | |||||
* | | | | | Fix style violations | Kent Shikama | 2016-07-04 | 2 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | 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 | 2 | -3/+5 |
|/ / / / | | | | | | | | | | | | | Signed-off-by: Kent Shikama <kent@kentshikama.com> | ||||
* | | | | Feature: Add deactivate account admin API | Erik Johnston | 2016-06-30 | 3 | -0/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>` | ||||
* | | | | Remove race | Erik Johnston | 2016-06-29 | 1 | -11/+0 |
| | | | | |||||
* | | | | Implement purge_media_cache admin API | Erik Johnston | 2016-06-29 | 5 | -20/+130 |
| | | | | |||||
* | | | | Track approximate last access time for remote media | Erik Johnston | 2016-06-29 | 4 | -1/+71 |
| | | | | |||||
* | | | | Merge pull request #894 from matrix-org/dbkr/push_room_naming | David Baker | 2016-06-28 | 6 | -80/+26 |
|\ \ \ \ | | | | | | | | | | | Use similar naming we use in email notifs for push | ||||
| * | | | | even more pep8 | David Baker | 2016-06-24 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | more pep8 | David Baker | 2016-06-24 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | pep8 | David Baker | 2016-06-24 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Use similar naming we use in email notifs for push | David Baker | 2016-06-24 | 6 | -79/+26 |
| | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/vector-im/vector-web/issues/1654 | ||||
* | | | | | remove vector.im from default secondary DS list | Matthew Hodgson | 2016-06-27 | 1 | -1/+0 |
|/ / / / | |||||
* | | | | Merge branch 'master' into develop | Mark Haines | 2016-06-23 | 2 | -27/+152 |
|\| | | | |||||
| * | | | Merge pull request #889 from matrix-org/markjh/synctl_workers | Mark Haines | 2016-06-21 | 1 | -27/+151 |
| |\ \ \ | | |_|/ | |/| | | Optionally start or stop workers in synctl. | ||||
| | * | | Optionally start or stop workers in synctl. | Mark Haines | 2016-06-21 | 1 | -27/+151 |
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optionally start or stop an individual worker by passing -w with the path to the worker config. Optionally start or stop every worker and the main synapse by passing -a with a path to a directory containing worker configs. The "-w" is intended to be used to bounce individual workers proceses. THe "-a" is intended for when you want to restart all the workers simultaneuously, for example when performing database upgrades. | ||||
| * | | Merge branch 'release-v0.16.1' of github.com:matrix-org/synapse v0.16.1 | Erik Johnston | 2016-06-20 | 33 | -504/+545 |
| |\ \ | |||||
| * | | | point to the CAPTCHA docs | Matthew Hodgson | 2016-06-12 | 1 | -0/+1 |
| | | | | |||||
* | | | | Actually we need to order these properly | David Baker | 2016-06-22 | 1 | -2/+12 |
| | | | | | | | | | | | | | | | | otherwise we'll end up returning the wrong 20 | ||||
* | | | | Style | David Baker | 2016-06-22 | 1 | -1/+1 |
| | | | | |||||
* | | | | Put most recent 20 messages in notif | David Baker | 2016-06-22 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | Fixes https://github.com/vector-im/vector-web/issues/1648 | ||||
* | | | | Rework ldap integration with ldap3 | Martin Weinelt | 2016-06-22 | 3 | -60/+248 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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> | ||||
* | | | | Merge pull request #888 from matrix-org/markjh/content_repo | Mark Haines | 2016-06-21 | 3 | -132/+3 |
|\ \ \ \ | | | | | | | | | | | Remove the legacy v0 content upload API. | ||||
| * | | | | Remove the legacy v0 content upload API. | Mark Haines | 2016-06-21 | 3 | -132/+3 |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | The existing content can still be downloaded. The last upload to the matrix.org server was in January 2015, so it is probably safe to remove the upload API. | ||||
* | | | | Merge pull request #879 from matrix-org/erikj/linearize_fed_server | Erik Johnston | 2016-06-20 | 2 | -67/+78 |
|\ \ \ \ | |_|_|/ |/| | | | Linearize some federation endpoints based on (origin, room_id) | ||||
| * | | | Linearize some federation endpoints based on (origin, room_id) | Erik Johnston | 2016-06-17 | 2 | -67/+78 |
| |/ / | |||||
* | | | Bump version and changelog | Erik Johnston | 2016-06-20 | 1 | -1/+1 |
| | | | |||||
* | | | Add the create_profile method back since the tests use it | Mark Haines | 2016-06-17 | 1 | -0/+6 |
| | | | |||||
* | | | 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 | 5 | -33/+24 |
|/ / | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | Merge pull request #878 from matrix-org/erikj/ujson | Erik Johnston | 2016-06-17 | 1 | -1/+1 |
|\ \ | | | | | | | Disable responding with canonical json for federation | ||||
| * | | Disable responding with canonical json for federation | Erik Johnston | 2016-06-17 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #877 from matrix-org/erikj/frozen_default | Erik Johnston | 2016-06-17 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Turn use_frozen_events off by default | ||||
| * | | | Turn use_frozen_events off by default | Erik Johnston | 2016-06-17 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #876 from matrix-org/erikj/sign_own | Erik Johnston | 2016-06-17 | 2 | -12/+18 |
|\ \ \ | | | | | | | | | Only re-sign our own events | ||||
| * | | | Only re-sign our own events | Erik Johnston | 2016-06-17 | 2 | -12/+18 |
| |/ / | |||||
* | | | Fix ``KeyError: 'msgtype'``. Use ``.get`` | Mark Haines | 2016-06-17 | 1 | -14/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a key error where the mailer tried to get the ``msgtype`` of an event that was missing a ``msgtype``. ``` File "synapse/push/mailer.py", line 264, in get_notif_vars File "synapse/push/mailer.py", line 285, in get_message_vars File ".../frozendict/__init__.py", line 10, in __getitem__ return self.__dict[key] KeyError: 'msgtype' ``` | ||||
* | | | Fix setting gc thresholds in the workers | Mark Haines | 2016-06-17 | 2 | -2/+4 |
|/ / | |||||
* | | Use worker_ prefixes for worker config, use existing support for multiple ↵ | Mark Haines | 2016-06-16 | 5 | -79/+33 |
| | | | | | | | | config files | ||||
* | | Access the event_cache_size directly from the server object. | Mark Haines | 2016-06-16 | 5 | -21/+10 |
| | | | | | | | | | | This means that the workers can override the event_cache_size directly without clobbering the value in the main synapse config. | ||||
* | | Access replication_url from the worker config directly | Mark Haines | 2016-06-16 | 3 | -8/+6 |
| | | |||||
* | | Comment on what's going on in clobber_with_worker_config | Mark Haines | 2016-06-16 | 1 | -1/+12 |
| | | |||||
* | | Merge remote-tracking branch 'origin/develop' into markjh/worker_config | Mark Haines | 2016-06-16 | 10 | -61/+112 |
|\ \ | |||||
| * \ | Merge pull request #873 from vt0r/bugfix/bcrypt-utf8-encode | Erik Johnston | 2016-06-16 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Fix TypeError in call to bcrypt.hashpw | ||||
| | * | | 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> | ||||
| * | | | Line lengths | Erik Johnston | 2016-06-15 | 1 | -3/+3 |
| | | | | |||||
| * | | | Handle floats as img widths | Erik Johnston | 2016-06-15 | 1 | -1/+1 |
| | | | | |||||
| * | | | Handle og props with not content | Erik Johnston | 2016-06-15 | 1 | -1/+2 |
| |/ / | |||||
| * | | Bump version and changelog | Erik Johnston | 2016-06-15 | 1 | -1/+1 |
| | | | |||||
| * | | Linearize fetching of gaps on incoming events | Erik Johnston | 2016-06-15 | 4 | -37/+58 |
| | | | | | | | | | | | | | | | This potentially stops the server from doing multiple requests for the same data. | ||||
| * | | Merge pull request #870 from matrix-org/rav/work_around_tls_bug | Richard van der Hoff | 2016-06-15 | 1 | -2/+26 |
| |\ \ | | | | | | | | | Work around TLS bug in twisted | ||||
| | * | | Work around TLS bug in twisted | Richard van der Hoff | 2016-06-15 | 1 | -2/+26 |
| | |/ | | | | | | | | | | | | | | | | Wrap up twisted's FileBodyProducer to work around https://twistedmatrix.com/trac/ticket/8473. Hopefully this fixes https://matrix.org/jira/browse/SYN-700. | ||||
| * | | Correctly mark backfilled events as backfilled | Erik Johnston | 2016-06-15 | 1 | -14/+16 |
| | | | |||||
| * | | Merge pull request #868 from matrix-org/erikj/invalid_id | Erik Johnston | 2016-06-14 | 1 | -1/+4 |
| |\ \ | | | | | | | | | Make get_domain_from_id throw SynapseError on invalid ID | ||||
| | * | | Make get_domain_from_id throw SynapseError on invalid ID | Erik Johnston | 2016-06-14 | 1 | -1/+4 |
| | | | | |||||
* | | | | Add worker config module | Mark Haines | 2016-06-16 | 1 | -0/+71 |
| | | | | |||||
* | | | | Inline the synchrotron and pusher configs into the main config | Mark Haines | 2016-06-16 | 5 | -291/+154 |
|/ / / | |||||
* | | | Merge pull request #863 from matrix-org/markjh/load_config | Mark Haines | 2016-06-10 | 2 | -45/+105 |
|\ \ \ | |/ / |/| | | Add function to load config without generating it | ||||
| * | | Add function to load config without generating it | Mark Haines | 2016-06-09 | 2 | -45/+105 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renames ``load_config`` to ``load_or_generate_config`` Adds a method called ``load_config`` that just loads the config. The main synapse.app.homeserver will continue to use ``load_or_generate_config`` to retain backwards compat. However new worker processes can use ``load_config`` to load the config avoiding some of the cruft needed to generate the config. As the new ``load_config`` method is expected to be used by new configs it removes support for the legacy commandline overrides that ``load_or_generate_config`` supports |