summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Add /state_ids federation APIErik Johnston2016-08-034-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 200Erik Johnston2016-08-021-2/+2
|
* Fix response cacheErik Johnston2016-08-021-1/+1
|
* Merge pull request #940 from matrix-org/erikj/fed_state_cacheErik Johnston2016-08-025-32/+60
|\ | | | | Cache federation state responses
| * Cache federation state responsesErik Johnston2016-07-215-32/+60
| |
* | Merge pull request #967 from matrix-org/erikj/fed_readerErik Johnston2016-08-027-18/+342
|\ \ | | | | | | Split out the federation reading portions into a separate.
| * \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_readerErik Johnston2016-08-023-3/+23
| |\ \
| * \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_readerErik Johnston2016-07-291-4/+31
| |\ \ \
| * \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_readerErik Johnston2016-07-2937-295/+929
| |\ \ \ \
| * | | | | Add destination retry to slave storeErik Johnston2016-07-282-0/+32
| | | | | |
| * | | | | Add slace storage functions for public room listErik Johnston2016-07-283-0/+48
| | | | | |
| * | | | | Add get_auth_chain to slave storeErik Johnston2016-07-281-0/+4
| | | | | |
| * | | | | Add more key storage funcs into slave storeErik Johnston2016-07-282-24/+26
| | | | | |
| * | | | | Split out a FederationReader processErik Johnston2016-07-214-0/+238
| | | | | |
* | | | | | Merge branch 'develop' into dbkr/fix_add_email_on_registerMark Haines2016-08-023-3/+23
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Ignore AlreadyCalled errors on timer cancelErik Johnston2016-07-312-3/+16
| | | | | |
| * | | | | Merge pull request #958 from matrix-org/paul/SYN-738Paul Evans2016-07-291-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" Evans2016-07-271-0/+7
| | | | | |
* | | | | | Fix adding emails on registrationDavid Baker2016-07-291-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_fixErik Johnston2016-07-291-4/+31
|\ \ \ \ \ | |_|_|/ / |/| | | | Handle the case of missing auth events when joining a room
| * | | | Mention that func will fetch auth eventsErik Johnston2016-07-291-0/+2
| | | | |
| * | | | Update docstringErik Johnston2016-07-291-0/+6
| | | | |
| * | | | Handle the case of missing auth events when joining a roomErik Johnston2016-07-281-4/+23
| | | | |
* | | | | Fix SQL to supply arguments in the same orderMark Haines2016-07-291-1/+1
| | | | |
* | | | | Create separate methods for getting messages to pushMark Haines2016-07-284-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 functionKegan Dougal2016-07-281-2/+26
| | | | |
* | | | | Merge branch 'release-v0.17.0' of github.com:matrix-org/synapse into developErik Johnston2016-07-281-1/+1
|\| | | |
| * | | | Merge branch 'erikj/key_client_fix' of github.com:matrix-org/synapse into ↵Erik Johnston2016-07-281-3/+9
| |\ \ \ \ | | | | | | | | | | | | | | | | | | release-v0.17.0
| * | | | | Bump version and changelogErik Johnston2016-07-281-1/+1
| | | | | |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0Erik Johnston2016-07-287-14/+85
| |\ \ \ \ \
| * | | | | | Bump CHANGES and versionErik Johnston2016-07-271-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #962 from matrix-org/markjh/retryMark Haines2016-07-281-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 CMEMark Haines2016-07-281-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #941 from matrix-org/erikj/key_client_fixErik Johnston2016-07-281-3/+9
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | Send the correct host header when fetching keys
| * | | | Cache getPeerErik Johnston2016-07-211-2/+5
| | | | |
| * | | | Set host not pathErik Johnston2016-07-211-1/+1
| | | | |
| * | | | Send the correct host header when fetching keysErik Johnston2016-07-211-3/+6
| | |_|/ | |/| |
* | | | Merge pull request #961 from matrix-org/dbkr/fix_push_invite_nameErik Johnston2016-07-281-1/+4
|\ \ \ \ | | | | | | | | | | Don't include name of room for invites in push
| * | | | Don't include name of room for invites in pushDavid Baker2016-07-281-1/+4
| | | | | | | | | | | | | | | | | | | | Avoids insane pushes like, "Bob invited you to invite from Bob"
* | | | | Merge pull request #960 from matrix-org/rav/support_r0.2Richard van der Hoff2016-07-281-1/+5
|\ \ \ \ \ | |/ / / / |/| | | | Add r0.2.0 to the "supported versions" list
| * | | | Add r0.1.0 to the "supported versions" listRichard van der Hoff2016-07-281-0/+1
| | | | |
| * | | | Add r0.2.0 to the "supported versions" listRichard van der Hoff2016-07-281-1/+4
| | | | |
* | | | | TypoDavid Baker2016-07-281-1/+1
|/ / / /
* | | | Merge pull request #956 from matrix-org/rav/check_device_id_on_key_uploadRichard van der Hoff2016-07-274-11/+75
|\ \ \ \ | |_|/ / |/| | | Make the device id on e2e key upload optional
| * | | key upload tweaksRichard van der Hoff2016-07-271-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 fixRichard van der Hoff2016-07-271-1/+1
| | | |
| * | | Delete e2e keys on device deleteRichard van der Hoff2016-07-273-4/+28
| | | |
| * | | Make the device id on e2e key upload optionalRichard van der Hoff2016-07-262-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/verifyMark Haines2016-07-272-3/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/crypto/keyring.py
| * \ \ \ Merge pull request #955 from matrix-org/markjh/only_from2Mark Haines2016-07-271-2/+9
| |\ \ \ \ | | | | | | | | | | | | Add a couple more checks to the keyring
| | * | | | Add a couple more checks to the keyringMark Haines2016-07-261-2/+9
| | | | | |
| * | | | | Merge pull request #954 from matrix-org/markjh/even_more_fixesMark Haines2016-07-272-9/+11
| |\ \ \ \ \ | | |/ / / / | |/| | | | Fix a couple of bugs in the transaction and keyring code
| | * | | | Fix a couple of bugs in the transaction and keyring codeMark Haines2016-07-262-9/+11
| | |/ / /
* | / / / Clean up verify_json_objects_for_serverMark Haines2016-07-271-68/+75
|/ / / /
* | | | Merge pull request #952 from matrix-org/markjh/more_fixesMark Haines2016-07-261-0/+4
|\ \ \ \ | |/ / / |/| | | Check if the user is banned when handling 3pid invites
| * | | Check if the user is banned when handling 3pid invitesMark Haines2016-07-261-0/+4
| | | |
* | | | Add `create_requester` functionRichard van der Hoff2016-07-267-49/+79
|/ / / | | | | | | | | | | | | Wrap the `Requester` constructor with a function which provides sensible defaults, and use it throughout
* | | Fix typoRichard van der Hoff2016-07-261-1/+1
| | |
* | | Merge branch 'develop' into rav/delete_refreshtoken_on_delete_deviceRichard van der Hoff2016-07-262-55/+113
|\ \ \
| * \ \ Merge pull request #951 from matrix-org/rav/flake8Richard van der Hoff2016-07-261-5/+3
| |\ \ \ | | | | | | | | | | Fix flake8 noise
| | * | | Fix flake8 violationRichard van der Hoff2016-07-261-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_fixesMark Haines2016-07-261-50/+110
| |\ \ \ \ | | |/ / / | |/| | | Don't add rejections to the state_group, persist all rejections
| | * | | Fix how push_actions are redacted.Mark Haines2016-07-261-8/+10
| | | | |
| | * | | Don't add rejected events if we've seen them befrore. Add some comments to ↵Mark Haines2016-07-261-5/+48
| | | | | | | | | | | | | | | | | | | | explain what the code is doing mechanically
| | * | | Only update the events and event_json tables for rejected eventsMark Haines2016-07-252-52/+63
| | | | |
| | * | | Don't add the events to forward extremities if the event is rejectedMark Haines2016-07-251-3/+6
| | | | |
| | * | | Don't add rejections to the state_group, persist all rejectionsMark Haines2016-07-252-5/+6
| | | | |
* | | | | Delete refresh tokens when deleting devicesRichard van der Hoff2016-07-262-15/+49
|/ / / /
* | | | Merge pull request #949 from matrix-org/rav/update_devicesDavid Baker2016-07-2610-22/+213
|\ \ \ \ | | | | | | | | | | Implement updates and deletes for devices
| * | | | Implement updating devicesRichard van der Hoff2016-07-263-8/+67
| | | | | | | | | | | | | | | | | | | | You can update the displayname of devices now.
| * | | | Implement deleting devicesRichard van der Hoff2016-07-269-15/+146
| | | | |
| * | | | Log when adding listenersRichard van der Hoff2016-07-251-0/+1
| | | | |
* | | | | typoMatthew Hodgson2016-07-261-1/+1
|/ / / /
* | | | Merge pull request #946 from matrix-org/dbkr/log_recaptcha_hostnameDavid Baker2016-07-251-2/+11
|\ \ \ \ | |/ / / |/| | | Log the hostname the reCAPTCHA was completed on
| * | | Use get to avoid KeyErrorsDavid Baker2016-07-221-1/+1
| | | |
| * | | Log the hostname the reCAPTCHA was completed onDavid Baker2016-07-221-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 argumentMark Haines2016-07-251-1/+1
| | | |
* | | | background updates: fix assert againRichard van der Hoff2016-07-251-1/+1
| | | |
* | | | background updates: Fix assertion to do somethingRichard van der Hoff2016-07-251-2/+2
| | | |
* | | | Fix background_update testsRichard van der Hoff2016-07-251-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.
* | | | PEP8Richard van der Hoff2016-07-221-1/+0
| | | |
* | | | Create index on user_ips in the backgroundRichard van der Hoff2016-07-223-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 listRichard van der Hoff2016-07-211-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_apiDavid Baker2016-07-212-9/+62
|\ \ | | | | | | Implement GET /device/{deviceId}
| * | Fix PEP8 errorsRichard van der Hoff2016-07-211-1/+1
| | |
| * | Implement GET /device/{deviceId}Richard van der Hoff2016-07-212-9/+62
| | |
* | | Merge pull request #942 from matrix-org/rav/fix_register_deviceidDavid Baker2016-07-211-11/+10
|\ \ \ | |/ / |/| | Preserve device_id from first call to /register
| * | Preserve device_id from first call to /registerRichard van der Hoff2016-07-211-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 codeRichard van der Hoff2016-07-211-3/+0
| |
* | Merge branch 'develop' into rav/get_devices_apiRichard van der Hoff2016-07-204-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_ipsRichard van der Hoff2016-07-202-7/+25
| |\ | | | | | | Record device_id in client_ips
| | * Record device_id in client_ipsRichard van der Hoff2016-07-202-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 yetErik Johnston2016-07-201-0/+3
| | |
| * | Merge pull request #937 from matrix-org/rav/register_device_on_registerDavid Baker2016-07-201-15/+39
| |\ \ | | |/ | |/| Register a device_id in the /v2/register flow.
| | * Register a device_id in the /v2/register flow.Richard van der Hoff2016-07-201-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 endpointRichard van der Hoff2016-07-207-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-commentsRichard van der Hoff2016-07-202-10/+14
|/ | | | Fix some more comments on some things
* Merge pull request #936 from matrix-org/erikj/log_rssErik Johnston2016-07-204-1/+50
|\ | | | | Add metrics for psutil derived memory usage
| * Add metrics for psutil derived memory usageErik Johnston2016-07-204-1/+50
| |
* | Merge pull request #935 from matrix-org/erikj/backfill_notifsErik Johnston2016-07-201-5/+6
|\ \ | | | | | | Don't notify pusher pool for backfilled events
| * | Don't notify pusher pool for backfilled eventsErik Johnston2016-07-201-5/+6
| |/
* | Merge pull request #933 from matrix-org/rav/type_annotationsRichard van der Hoff2016-07-206-0/+46
|\ \ | | | | | | Type annotations
| * | Type annotationsRichard van der Hoff2016-07-196-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_refactorDavid Baker2016-07-204-21/+52
|\ \ \ | |_|/ |/| | Further registration refactoring
| * | Further registration refactoringRichard van der Hoff2016-07-194-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_api2Erik Johnston2016-07-206-9/+239
|\ \ | |/ |/| Feature: Add filter to /messages. Add 'contains_url' to filter.
| * CommentErik Johnston2016-07-201-0/+4
| |
| * Add filter param to /messages APIErik Johnston2016-07-142-5/+22
| |
| * Add support for filters in paginate_room_eventsErik Johnston2016-07-141-1/+51
| |
| * Add 'contains_url' to filterErik Johnston2016-07-141-3/+20
| |
| * Add sender and contains_url field to events tableErik Johnston2016-07-142-0/+142
| |
* | Merge pull request #931 from matrix-org/rav/refactor_registerDavid Baker2016-07-191-78/+102
|\ \ | | | | | | rest/client/v2_alpha/register.py: Refactor flow somewhat.
| * | Don't bind email unless threepid contains expected fieldsRichard van der Hoff2016-07-191-28/+25
| | |
| * | rest/client/v2_alpha/register.py: Refactor flow somewhat.Richard van der Hoff2016-07-191-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_loginRichard van der Hoff2016-07-1910-24/+265
|\ \ \ | |/ / |/| | Add device_id support to /login
| * | schema fixRichard van der Hoff2016-07-191-1/+1
| | | | | | | | | | | | device_id should be text, not bigint.
| * | Add device_id support to /loginRichard van der Hoff2016-07-1810-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 lineMark Haines2016-07-191-2/+1
| | |
* | | Update docstring on Handlers.Mark Haines2016-07-191-3/+15
|/ / | | | | | | To indicate it is deprecated.
* | Merge pull request #928 from matrix-org/rav/refactor_loginRichard van der Hoff2016-07-182-65/+82
|\ \ | | | | | | Refactor login flow
| * | Refactor login flowRichard van der Hoff2016-07-182-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_historyErik Johnston2016-07-181-19/+15
|\ \ \ | | | | | | | | Fix /purge_history bug
| * | | Fix /purge_history bugErik Johnston2016-07-151-19/+15
| | | | | | | | | | | | | | | | This was caused by trying to insert duplicate backward extremeties
* | | | Merge pull request #925 from matrix-org/markjh/auth_fixMark Haines2016-07-181-0/+5
|\ \ \ \ | | | | | | | | | | Fix 500 ISE when sending alias event without a state_key
| * | | | Fix 500 ISE when sending alias event without a state_keyMark Haines2016-07-151-0/+5
| | | | |
* | | | | Merge pull request #927 from Half-Shot/developErik Johnston2016-07-181-5/+6
|\ \ \ \ \ | |_|_|/ / |/| | | | Fall back to 'username' if 'user' is not given for appservice registration.
| * | | | Use body.get to check for 'user'Will Hunt2016-07-161-2/+1
| | | | |
| * | | | Fall back to 'username' if 'user' is not given for appservice reg.Will Hunt2016-07-161-3/+5
| |/ / /
* / / / Fix a doc-commentRichard van der Hoff2016-07-181-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_historyErik Johnston2016-07-152-2/+13
|\| | | | | | | | Various purge_history fixes
| * | Pull out min stream_ordering from ex_outlier_streamErik Johnston2016-07-151-1/+2
| | |
| * | event_backwards_extremeties may not be emptyErik Johnston2016-07-151-1/+11
| | |
* | | Merge pull request #919 from matrix-org/erikj/auth_fixErik Johnston2016-07-153-5/+35
|\ \ \ | |/ / |/| | Various auth.py fixes.
| * | CommentErik Johnston2016-07-152-0/+6
| | |
| * | Check sender signed eventErik Johnston2016-07-143-6/+12
| | |
| * | Check if alias event's state_key matches sender's domainErik Johnston2016-07-131-0/+11
| | |
| * | Check creation event's room_id domain matches sender'sErik Johnston2016-07-131-0/+7
| | |
* | | Merge pull request #921 from matrix-org/erikj/account_deactivateErik Johnston2016-07-141-0/+44
|\ \ \ | | | | | | | | Feature: Add an /account/deactivate endpoint
| * | | Add hs objectErik Johnston2016-07-141-0/+1
| | | |
| * | | Only accept password authErik Johnston2016-07-141-12/+0
| | | |
| * | | Add an /account/deactivate endpointErik Johnston2016-07-141-0/+55
| | |/ | |/|
* | | Merge pull request #918 from negzi/bugfix_for_token_expiryErik Johnston2016-07-144-6/+10
|\ \ \ | |/ / |/| | Bug fix: expire invalid access tokens
| * | Bug fix: expire invalid access tokensNegar Fazeli2016-07-134-6/+10
| |/
* | Merge pull request #915 from matrix-org/dbkr/more_requesttokensDavid Baker2016-07-133-30/+103
|\ \ | |/ |/| Add requestToken endpoints
| * be more pythonicDavid Baker2016-07-121-1/+1
| |
| * on_OPTIONS isn't neccessaryDavid Baker2016-07-122-10/+1
| |
| * Remove other debug loggingDavid Baker2016-07-121-2/+0
| |
| * Separate out requestTokens to separate handlersDavid Baker2016-07-112-65/+93
| |
| * Oops, remove debug loggingDavid Baker2016-07-111-4/+0
| |
| * Implement https://github.com/matrix-org/matrix-doc/pull/346/filesDavid Baker2016-07-082-0/+60
| |
* | Add a comment explaining allow_noneMark Haines2016-07-081-0/+2
| |
* | Ensure that the guest user is in the database when upgrading accountsMark Haines2016-07-081-0/+13
|/
* Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2016-07-085-9/+25
|\
| * Merge branch 'hotfixes-v0.16.1' v0.16.1-r1Erik Johnston2016-07-082-6/+11
| |\
| | * Bump version and changelogErik Johnston2016-07-071-1/+1
| | |
| | * Fix bug where we did not correctly explode when multiple user_ids were set ↵Erik Johnston2016-07-071-5/+10
| | | | | | | | | | | | in macaroon
| * | Merge pull request #886 from matrix-org/markjh/async_commitMark Haines2016-06-293-3/+14
| |\ \ | | | | | | | | Optionally make committing to postgres asynchronous.
| | * | Optionally make committing to postgres asynchronous.Mark Haines2016-06-203-3/+14
| | | | | | | | | | | | | | | | | | | | Useful when running tests when you don't care whether the server will lose data that it claims that it has committed.
* | | | CommentErik Johnston2016-07-071-0/+3
| | | |
* | | | Return 400 rather than 500Erik Johnston2016-07-071-1/+4
| | | |
* | | | Add rest servlet. Fix SQL.Erik Johnston2016-07-062-5/+5
| | | |
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/test2Erik Johnston2016-07-061-1/+1
|\ \ \ \
| * \ \ \ Merge pull request #909 from matrix-org/erikj/shared_secretErik Johnston2016-07-063-28/+48
| |\ \ \ \ | | | | | | | | | | | | Add an admin option to shared secret registration (breaks backwards compat)
| * | | | | Update password config commentKent Shikama2016-07-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kent Shikama <kent@kentshikama.com>
* | | | | | Merge branch 'erikj/shared_secret' into erikj/test2Erik Johnston2016-07-069-105/+187
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Check that there are no null bytes in user and passswordErik Johnston2016-07-061-0/+6
| | | | | |
| * | | | | Add null separator to hmacErik Johnston2016-07-061-0/+2
| | | | | |
| * | | | | Remove spurious txnErik Johnston2016-07-051-9/+0
| | | | | |
| * | | | | Fix for postgresErik Johnston2016-07-051-2/+2
| | | | | |
| * | | | | Add an admin option to shared secret registrationErik Johnston2016-07-053-24/+42
| | | | | |
| * | | | | Protect password when registering using shared secretErik Johnston2016-07-051-4/+7
| |/ / / /
| * | | | Merge pull request #904 from ↵David Baker2016-07-052-15/+29
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/dbkr/register_email_no_untrusted_id_server requestToken update
| | * | | | requestToken updateDavid Baker2016-06-302-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_aroundMark Haines2016-07-052-60/+102
| |\ \ \ \ \ | | | | | | | | | | | | | | Use a query that postgresql optimises better for get_events_around
| | * | | | | Fix typoMark Haines2016-07-051-1/+1
| | | | | | |
| | * | | | | Make get_events_around more efficient on sqlite3Mark Haines2016-07-051-13/+49
| | | | | | |
| | * | | | | Use true/false for boolean parameter inclusive to avoid potential for sqli, ↵Mark Haines2016-07-052-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | and possibly make the code clearer
| | * | | | | Use different SQL for postgres and sqlite3 for when using multicolumn indexesMark Haines2016-07-042-59/+59
| | | | | | |
| | * | | | | Use a query that postgresql optimises better for get_events_aroundMark Haines2016-07-041-12/+16
| | |/ / / /
| * | | | | Remove default password pepper stringKent Shikama2016-07-051-2/+1
| | | | | |
| * | | | | Fix password configKent Shikama2016-07-052-3/+3
| | | | | |
| * | | | | Fix pep8Kent Shikama2016-07-052-2/+3
| | | | | |
| * | | | | Add comment to prompt changing of pepperKent Shikama2016-07-051-0/+1
| | | | | |
| * | | | | Add pepper to password hashingKent Shikama2016-07-052-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kent Shikama <kent@kentshikama.com>
* | | | | | Add ReadWriteLock for pagination and history pruneErik Johnston2016-07-052-36/+38
| | | | | |
* | | | | | Add ReadWriteLockErik Johnston2016-07-051-0/+82
| | | | | |
* | | | | | Add purge_history APIErik Johnston2016-07-054-1/+38
| | | | | |
* | | | | | Add storage function to purge history for a roomErik Johnston2016-07-041-0/+140
|/ / / / /
* | | | | Fix style violationsKent Shikama2016-07-042-2/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kent Shikama <kent@kentshikama.com>
* | | | | Use .get() instead of [] to access password_hashKent Shikama2016-07-041-1/+1
| | | | |
* | | | | Optionally include password hash in createUser endpointKent Shikama2016-07-032-3/+5
|/ / / / | | | | | | | | | | | | Signed-off-by: Kent Shikama <kent@kentshikama.com>
* | | | Feature: Add deactivate account admin APIErik Johnston2016-06-303-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 raceErik Johnston2016-06-291-11/+0
| | | |
* | | | Implement purge_media_cache admin APIErik Johnston2016-06-295-20/+130
| | | |
* | | | Track approximate last access time for remote mediaErik Johnston2016-06-294-1/+71
| | | |
* | | | Merge pull request #894 from matrix-org/dbkr/push_room_namingDavid Baker2016-06-286-80/+26
|\ \ \ \ | | | | | | | | | | Use similar naming we use in email notifs for push
| * | | | even more pep8David Baker2016-06-241-0/+1
| | | | |
| * | | | more pep8David Baker2016-06-241-1/+0
| | | | |
| * | | | pep8David Baker2016-06-241-1/+0
| | | | |
| * | | | Use similar naming we use in email notifs for pushDavid Baker2016-06-246-79/+26
| | | | | | | | | | | | | | | | | | | | Fixes https://github.com/vector-im/vector-web/issues/1654
* | | | | remove vector.im from default secondary DS listMatthew Hodgson2016-06-271-1/+0
|/ / / /
* | | | Merge branch 'master' into developMark Haines2016-06-232-27/+152
|\| | |
| * | | Merge pull request #889 from matrix-org/markjh/synctl_workersMark Haines2016-06-211-27/+151
| |\ \ \ | | |_|/ | |/| | Optionally start or stop workers in synctl.
| | * | Optionally start or stop workers in synctl.Mark Haines2016-06-211-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.1Erik Johnston2016-06-2033-504/+545
| |\ \
| * | | point to the CAPTCHA docsMatthew Hodgson2016-06-121-0/+1
| | | |
* | | | Actually we need to order these properlyDavid Baker2016-06-221-2/+12
| | | | | | | | | | | | | | | | otherwise we'll end up returning the wrong 20
* | | | StyleDavid Baker2016-06-221-1/+1
| | | |
* | | | Put most recent 20 messages in notifDavid Baker2016-06-221-3/+4
| | | | | | | | | | | | | | | | Fixes https://github.com/vector-im/vector-web/issues/1648
* | | | Rework ldap integration with ldap3Martin Weinelt2016-06-223-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_repoMark Haines2016-06-213-132/+3
|\ \ \ \ | | | | | | | | | | Remove the legacy v0 content upload API.
| * | | | Remove the legacy v0 content upload API.Mark Haines2016-06-213-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_serverErik Johnston2016-06-202-67/+78
|\ \ \ \ | |_|_|/ |/| | | Linearize some federation endpoints based on (origin, room_id)
| * | | Linearize some federation endpoints based on (origin, room_id)Erik Johnston2016-06-172-67/+78
| |/ /
* | | Bump version and changelogErik Johnston2016-06-201-1/+1
| | |
* | | Add the create_profile method back since the tests use itMark Haines2016-06-171-0/+6
| | |
* | | Add a comment on why we don't create a profile for upgrading usersMark Haines2016-06-171-0/+1
| | |
* | | Remove registered_users from the distributor.Mark Haines2016-06-175-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/ujsonErik Johnston2016-06-171-1/+1
|\ \ | | | | | | Disable responding with canonical json for federation
| * | Disable responding with canonical json for federationErik Johnston2016-06-171-1/+1
| | |
* | | Merge pull request #877 from matrix-org/erikj/frozen_defaultErik Johnston2016-06-171-1/+1
|\ \ \ | | | | | | | | Turn use_frozen_events off by default
| * | | Turn use_frozen_events off by defaultErik Johnston2016-06-171-1/+1
| |/ /
* | | Merge pull request #876 from matrix-org/erikj/sign_ownErik Johnston2016-06-172-12/+18
|\ \ \ | | | | | | | | Only re-sign our own events
| * | | Only re-sign our own eventsErik Johnston2016-06-172-12/+18
| |/ /
* | | Fix ``KeyError: 'msgtype'``. Use ``.get``Mark Haines2016-06-171-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 workersMark Haines2016-06-172-2/+4
|/ /
* | Use worker_ prefixes for worker config, use existing support for multiple ↵Mark Haines2016-06-165-79/+33
| | | | | | | | config files
* | Access the event_cache_size directly from the server object.Mark Haines2016-06-165-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 directlyMark Haines2016-06-163-8/+6
| |
* | Comment on what's going on in clobber_with_worker_configMark Haines2016-06-161-1/+12
| |
* | Merge remote-tracking branch 'origin/develop' into markjh/worker_configMark Haines2016-06-1610-61/+112
|\ \
| * \ Merge pull request #873 from vt0r/bugfix/bcrypt-utf8-encodeErik Johnston2016-06-161-1/+1
| |\ \ | | | | | | | | Fix TypeError in call to bcrypt.hashpw
| | * | Fix TypeError in call to bcrypt.hashpwSalvatore LaMendola2016-06-161-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 lengthsErik Johnston2016-06-151-3/+3
| | | |
| * | | Handle floats as img widthsErik Johnston2016-06-151-1/+1
| | | |
| * | | Handle og props with not contentErik Johnston2016-06-151-1/+2
| |/ /
| * | Bump version and changelogErik Johnston2016-06-151-1/+1
| | |
| * | Linearize fetching of gaps on incoming eventsErik Johnston2016-06-154-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_bugRichard van der Hoff2016-06-151-2/+26
| |\ \ | | | | | | | | Work around TLS bug in twisted
| | * | Work around TLS bug in twistedRichard van der Hoff2016-06-151-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 backfilledErik Johnston2016-06-151-14/+16
| | |
| * | Merge pull request #868 from matrix-org/erikj/invalid_idErik Johnston2016-06-141-1/+4
| |\ \ | | | | | | | | Make get_domain_from_id throw SynapseError on invalid ID
| | * | Make get_domain_from_id throw SynapseError on invalid IDErik Johnston2016-06-141-1/+4
| | | |
* | | | Add worker config moduleMark Haines2016-06-161-0/+71
| | | |
* | | | Inline the synchrotron and pusher configs into the main configMark Haines2016-06-165-291/+154
|/ / /
* | | Merge pull request #863 from matrix-org/markjh/load_configMark Haines2016-06-102-45/+105
|\ \ \ | |/ / |/| | Add function to load config without generating it
| * | Add function to load config without generating itMark Haines2016-06-092-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
* | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2016-06-091-1/+1
|\ \ \ | |/ / |/| / | |/
| * Bump version and changelogErik Johnston2016-06-091-1/+1
| |
* | Merge pull request #862 from matrix-org/erikj/media_remote_errorErik Johnston2016-06-091-4/+10
|\ \ | | | | | | 502 on /thumbnail when can't contact remote server
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-27 22:18:04 +0000