Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Only construct sets when necessary | Mark Haines | 2017-01-17 | 1 | -14/+19 |
| | |||||
* | Use better names | Erik Johnston | 2017-01-17 | 1 | -9/+7 |
| | |||||
* | Use better variable name | Erik Johnston | 2017-01-17 | 1 | -3/+3 |
| | |||||
* | Correctly handle case of rejected events in state res | Erik Johnston | 2017-01-17 | 1 | -10/+16 |
| | |||||
* | Check event is in state_map | Erik Johnston | 2017-01-17 | 1 | -2/+7 |
| | |||||
* | Fix couple of federation state bugs | Erik Johnston | 2017-01-17 | 2 | -3/+5 |
| | |||||
* | Optimise state resolution | Erik Johnston | 2017-01-17 | 5 | -70/+204 |
| | |||||
* | Put staticmethods at module level | Erik Johnston | 2017-01-16 | 1 | -123/+121 |
| | |||||
* | Split out static state methods from StateHandler | Erik Johnston | 2017-01-13 | 1 | -70/+74 |
| | |||||
* | Remove unused function | Erik Johnston | 2017-01-13 | 1 | -3/+0 |
| | |||||
* | Split event auth code into seperate module | Erik Johnston | 2017-01-13 | 2 | -645/+650 |
| | |||||
* | Split out static auth methods from Auth object | Erik Johnston | 2017-01-10 | 1 | -419/+495 |
| | |||||
* | Remove spurious for..else.. | Erik Johnston | 2017-01-10 | 1 | -11/+0 |
| | |||||
* | Merge pull request #1792 from matrix-org/erikj/limit_cache_prefill_device | Erik Johnston | 2017-01-10 | 2 | -3/+6 |
|\ | | | | | Limit number of entries to prefill from cache | ||||
| * | Limit number of entries to prefill from cache | Erik Johnston | 2017-01-10 | 2 | -3/+6 |
| | | | | | | | | | | | | | | | | | | Some tables, like device_inbox, take a long time to query at startup for the stream change cache prefills. This is likely because they are slower growing streams and so are more fragmented on disk. For now, lets pull fewer entries out to make startup quicker. In future, we should add a better index to make it even faster. | ||||
* | | Merge pull request #1790 from matrix-org/erikj/linearizer | Erik Johnston | 2017-01-10 | 1 | -2/+5 |
|\ \ | | | | | | | Add paranoia exception catch in Linearizer | ||||
| * | | Add paranoia exception catch in Linearizer | Erik Johnston | 2017-01-10 | 1 | -2/+5 |
| |/ | |||||
* | | Log which files we saved attachments to in the media_repository | Mark Haines | 2017-01-10 | 3 | -0/+11 |
| | | |||||
* | | Merge pull request #1789 from matrix-org/erikj/decouple_presence | Erik Johnston | 2017-01-10 | 1 | -1/+3 |
|\ \ | | | | | | | Don't block messages sending on bumping presence | ||||
| * | | Comment | Erik Johnston | 2017-01-10 | 1 | -0/+2 |
| | | | |||||
| * | | Don't block messages sending on bumping presence | Erik Johnston | 2017-01-10 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #1787 from matrix-org/erikj/linearize_member | Erik Johnston | 2017-01-10 | 2 | -15/+32 |
|\ \ | | | | | | | Linearize updates to membership via PUT /state/ | ||||
| * | | Linearize updates to membership via PUT /state/ | Erik Johnston | 2017-01-09 | 2 | -15/+32 |
| |/ | |||||
* / | Name linearizer's for better logs | Erik Johnston | 2017-01-09 | 4 | -5/+5 |
|/ | |||||
* | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2017-01-09 | 1 | -1/+1 |
|\ | |||||
| * | Bump version and changelog v0.18.7 | Erik Johnston | 2017-01-09 | 1 | -1/+1 |
| | | |||||
* | | gah, fix mangled merge of 0.18.7 into develop | Matthew Hodgson | 2017-01-07 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'release-v0.18.7' into develop | Matthew | 2017-01-07 | 2 | -21/+21 |
|\| | |||||
| * | bump changelog & version v0.18.7-rc2 | Matthew | 2017-01-07 | 1 | -1/+1 |
| | | |||||
| * | do the discard check in the right place to avoid grabbing dependent events | Matthew | 2017-01-07 | 1 | -20/+20 |
| | | |||||
* | | Merge branch 'release-v0.18.7' into develop | Matthew Hodgson | 2017-01-07 | 3 | -3/+25 |
|\| | |||||
| * | Discard PDUs from invalid origins due to #1753 in 0.18.[56] v0.18.7-rc1 | Matthew | 2017-01-07 | 1 | -1/+23 |
| | | |||||
| * | oops, this should have been rc1 | Matthew Hodgson | 2017-01-07 | 1 | -1/+1 |
| | | |||||
| * | move logging to right place | Matthew Hodgson | 2017-01-07 | 1 | -1/+1 |
| | | |||||
| * | bump version | Matthew | 2017-01-06 | 1 | -1/+1 |
| | | |||||
| * | fix typo breaking the fix to #1753 | Matthew | 2017-01-06 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'release-v0.18.6' into develop | Mark Haines | 2017-01-06 | 2 | -5/+7 |
|\| | |||||
| * | Bump version and changelog v0.18.6 | Mark Haines | 2017-01-06 | 1 | -1/+1 |
| | | |||||
| * | handlers/room_member: fix guest access check when joining rooms | Patrik Oldsberg | 2017-01-06 | 1 | -4/+6 |
| | | | | | | | | Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com> | ||||
* | | Merge branch 'release-v0.18.6' into develop | Matthew Hodgson | 2017-01-05 | 6 | -4/+10 |
|\| | |||||
| * | Fix flake8 and update changelog v0.18.6-rc3 | Mark Haines | 2017-01-05 | 2 | -5/+5 |
| | | |||||
| * | Merge pull request #1767 from matrix-org/matthew/resolve_state_group_logging | Matthew Hodgson | 2017-01-05 | 5 | -3/+9 |
| |\ | | | | | | | log call paths for resolve_state_group | ||||
| | * | Fix case | Matthew Hodgson | 2017-01-05 | 1 | -1/+1 |
| | | | |||||
| | * | add logging for all the places we call resolve_state_groups. my kingdom for ↵ | Matthew Hodgson | 2017-01-05 | 3 | -0/+6 |
| | | | | | | | | | | | | a backtrace that actually works. | ||||
| | * | fix annoying typos | Matthew Hodgson | 2017-01-05 | 2 | -3/+3 |
| | | | |||||
| * | | Bump version and changelog to v0.18.6-rc3 | Mark Haines | 2017-01-05 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'release-v0.18.6' into develop | Matthew Hodgson | 2017-01-05 | 5 | -8/+47 |
|\| | |||||
| * | More logging for the linearizer and for get_events | Mark Haines | 2017-01-05 | 2 | -2/+13 |
| | | |||||
| * | fix comment | Matthew Hodgson | 2017-01-05 | 1 | -1/+17 |
| | | |||||
| * | limit total timeout for get_missing_events to 10s | Matthew Hodgson | 2017-01-05 | 3 | -3/+11 |
| | | |||||
| * | Only send events that originate on this server. | Mark Haines | 2017-01-05 | 3 | -0/+25 |
| | | | | | | | | | | | | Or events that are sent via the federation "send_join" API. This should match the behaviour from before v0.18.5 and #1635 landed. | ||||
| * | Get the destinations from the state from before the event | Mark Haines | 2017-01-04 | 1 | -8/+9 |
| | | | | | | | | Rather than the state after then event. | ||||
| * | Send ALL membership events to the server that was affected. | Mark Haines | 2017-01-04 | 1 | -3/+5 |
| | | | | | | | | | | | | Send all membership changes to the server that was affected. This ensures that if the last member of a room on a server was kicked or banned they get told about it. | ||||
* | | fix comment | Matthew Hodgson | 2017-01-05 | 1 | -1/+17 |
| | | |||||
* | | limit total timeout for get_missing_events to 10s | Matthew Hodgson | 2016-12-31 | 3 | -3/+11 |
| | | |||||
* | | Merge branch 'release-v0.18.6' into develop | Matthew Hodgson | 2016-12-31 | 4 | -70/+15 |
|\| | |||||
| * | Bump version and changelog v0.18.6-rc2 | Mark Haines | 2016-12-30 | 1 | -1/+1 |
| | | |||||
| * | s/aquire/acquire/g | Mark Haines | 2016-12-30 | 2 | -3/+3 |
| | | |||||
| * | Add more useful logging when we block fetching events | Mark Haines | 2016-12-30 | 2 | -0/+14 |
| | | |||||
| * | Remove fallback from get_missing_events. | Mark Haines | 2016-12-30 | 1 | -69/+0 |
| | | | | | | | | | | | | | | get_missing_events used to fallback to fetching the missing events individually requesting from every server in the room, one by one.e This could be unacceptably slow, possibly causing #1732 | ||||
* | | Merge remote-tracking branch 'origin/release-v0.18.6' into develop | Mark Haines | 2016-12-30 | 1 | -3/+13 |
|\| | |||||
| * | Use the new twisted logging framework. | Mark Haines | 2016-12-30 | 1 | -3/+13 |
| | | | | | | | | | | Hopefully adding an observer to the new framework will avoid a memory leak https://twistedmatrix.com/trac/ticket/8164 | ||||
* | | Merge branch 'release-v0.18.6' into develop | Mark Haines | 2016-12-29 | 3 | -8/+71 |
|\| | |||||
| * | Bump changelog and version v0.18.6-rc1 | Mark Haines | 2016-12-29 | 1 | -1/+1 |
| | | |||||
| * | Manually abort the underlying TLS connection. | Mark Haines | 2016-12-29 | 1 | -2/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | The abort() method calls loseConnection() which tries to shutdown the TLS connection cleanly. We now call abortConnection() directly which should promptly close both the TLS connection and the underlying TCP connection. I also added some TODO markers to consider cancelling the old previous timeout rather than checking time.time(). But given how urgently we want to get this code released I'd rather leave the existing code with the duplicate timeouts and the time.time() check. | ||||
| * | Respect long_retries param and default to off | Erik Johnston | 2016-12-29 | 1 | -2/+2 |
| | | |||||
| * | Spelling and comments | Erik Johnston | 2016-12-29 | 1 | -4/+6 |
| | | |||||
| * | Clean up | Erik Johnston | 2016-12-29 | 2 | -7/+4 |
| | | |||||
| * | Wrap connections in an N minute timeout to ensure they get reaped correctly | Erik Johnston | 2016-12-29 | 2 | -5/+61 |
| | | |||||
* | | Fix another comment typo | David Baker | 2016-12-21 | 1 | -1/+1 |
| | | |||||
* | | Add /account/3pid/delete endpoint | David Baker | 2016-12-20 | 3 | -1/+57 |
| | | | | | | | | Also fix a typo in a comment | ||||
* | | Fix check for bind_address | Johannes Löthberg | 2016-12-20 | 8 | -16/+16 |
| | | | | | | | | | | | | | | The empty string is a valid setting for the bind_address option, so explicitly check for None here instead. Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> | ||||
* | | Merge pull request #1711 from matrix-org/matthew/utf8-password-change | Matthew Hodgson | 2016-12-20 | 1 | -2/+2 |
|\ \ | | | | | | | fix ability to change password to a non-ascii one | ||||
| * | | fix ability to change password to a non-ascii one | Matthew Hodgson | 2016-12-18 | 1 | -2/+2 |
| | | | | | | | | | | | | https://github.com/vector-im/riot-web/issues/2658 | ||||
* | | | Merge pull request #1709 from kyrias/bind_addresses | Matthew Hodgson | 2016-12-19 | 9 | -175/+303 |
|\ \ \ | | | | | | | | | Add support for specifying multiple bind addresses | ||||
| * | | | Add IPv6 comment to default config | Johannes Löthberg | 2016-12-18 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> | ||||
| * | | | Make default homeserver config use bind_addresses | Johannes Löthberg | 2016-12-18 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | | Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> | ||||
| * | | | Add support for specifying multiple bind addresses | Johannes Löthberg | 2016-12-18 | 8 | -171/+294 |
| |/ / | | | | | | | | | | Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> | ||||
* | | | Merge pull request #1696 from kyrias/ipv6 | Matthew Hodgson | 2016-12-19 | 3 | -24/+23 |
|\ \ \ | |/ / |/| | | IPv6 support | ||||
| * | | Bump twisted dependency | Johannes Löthberg | 2016-12-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | At least 16.0.0 is needed for wrapClientTLS support. Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> | ||||
| * | | Remove spurious newline | Johannes Löthberg | 2016-12-12 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | Apparently I just removed the spaces instead... Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> | ||||
| * | | Fixup for #1689 and #1690 | Johannes Löthberg | 2016-12-12 | 2 | -8/+13 |
| | | | | | | | | | | | | Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> | ||||
| * | | IPv6 support for endpoint.py | Glyph | 2016-12-11 | 1 | -4/+4 |
| | | | | | | | | | Similar to https://github.com/matrix-org/synapse/pull/1689, but for endpoint.py | ||||
| * | | IPv6 support for client.py | Glyph | 2016-12-11 | 1 | -16/+11 |
| | | | | | | | | | This is an (untested) general sketch of how to use wrapClientTLS to implement TLS over IPv6, as well as faster connections over IPv4. | ||||
* | | | Cache network room list queries. | Erik Johnston | 2016-12-16 | 1 | -3/+4 |
| |/ |/| | |||||
* | | Bump version and changelog | Erik Johnston | 2016-12-16 | 1 | -1/+1 |
| | | |||||
* | | Add some logging for syncing to_device events | Richard van der Hoff | 2016-12-15 | 2 | -5/+10 |
| | | | | | | | | | | Attempt to track down the loss of to_device events (https://github.com/vector-im/riot-web/issues/2711 etc). | ||||
* | | Merge pull request #1698 from matrix-org/erikj/room_list | Erik Johnston | 2016-12-15 | 1 | -2/+4 |
|\ \ | | | | | | | Fix caching on public room list | ||||
| * \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/room_list | Erik Johnston | 2016-12-13 | 1 | -1/+1 |
| |\ \ | |||||
| * | | | Fix caching on public room list | Erik Johnston | 2016-12-13 | 1 | -2/+4 |
| | | | | |||||
* | | | | Merge pull request #1700 from matrix-org/erikj/backfill_filter | Erik Johnston | 2016-12-15 | 1 | -2/+5 |
|\ \ \ \ | | | | | | | | | | | Fix /backfill returning events it shouldn't | ||||
| * | | | | Comment | Erik Johnston | 2016-12-14 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Fix /backfill returning events it shouldn't | Erik Johnston | 2016-12-14 | 1 | -2/+3 |
| | | | | | |||||
* | | | | | Fix crash in url preview when html tag has no text | Marcin Bachry | 2016-12-14 | 1 | -1/+4 |
|/ / / / | | | | | | | | | | | | | Signed-off-by: Marcin Bachry <hegel666@gmail.com> | ||||
* | / / | Fixup membership query | Erik Johnston | 2016-12-14 | 1 | -2/+2 |
| |/ / |/| | | |||||
* | | | Bump changelog and version | Erik Johnston | 2016-12-13 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #1697 from matrix-org/erikj/fix_bg_member | Erik Johnston | 2016-12-12 | 1 | -1/+1 |
|\ \ | | | | | | | Fix background update that prematurely stopped | ||||
| * | | Fix background update that prematurely stopped | Erik Johnston | 2016-12-12 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #1676 from matrix-org/erikj/room_list | Erik Johnston | 2016-12-12 | 15 | -42/+399 |
|\ \ \ | |/ / |/| | | Add new API appservice specific public room list | ||||
| * | | Rename network_id to instance_id on client side | Erik Johnston | 2016-12-12 | 1 | -1/+1 |
| | | | |||||
| * | | Add cache to get_public_room_ids_at_stream_id | Erik Johnston | 2016-12-12 | 2 | -1/+4 |
| | | | |||||
| * | | Notify replication. Use correct network_id | Erik Johnston | 2016-12-12 | 1 | -1/+3 |
| | | | |||||
| * | | Docstring | Erik Johnston | 2016-12-12 | 1 | -0/+12 |
| | | | |||||
| * | | Comments | Erik Johnston | 2016-12-07 | 3 | -2/+12 |
| | | | |||||
| * | | Don't include appservice id | Erik Johnston | 2016-12-06 | 1 | -1/+0 |
| | | | |||||
| * | | Add new API appservice specific public room list | Erik Johnston | 2016-12-06 | 14 | -40/+371 |
| | | | |||||
* | | | Remove unspecced GET endpoints for e2e keys | Richard van der Hoff | 2016-12-12 | 1 | -39/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | GET /keys/claim is a terrible idea, since it isn't idempotent; also it throws 500 errors if you call it without all the right params. GET /keys/query is arguable, but it's unspecced, so let's get rid of it too to stop people relying on unspecced APIs. | ||||
* | | | Merge pull request #1620 from matrix-org/erikj/concurrent_room_access | Erik Johnston | 2016-12-12 | 2 | -27/+91 |
|\ \ \ | | | | | | | | | Limit the number of events that can be created on a given room concurrently | ||||
| * | | | Comments | Erik Johnston | 2016-11-11 | 2 | -0/+15 |
| | | | | |||||
| * | | | Limit the number of events that can be created on a given room concurretnly | Erik Johnston | 2016-11-10 | 1 | -27/+31 |
| | | | | |||||
| * | | | Add Limiter: limit concurrent access to resource | Erik Johnston | 2016-11-10 | 1 | -0/+45 |
| | | | | |||||
* | | | | Merge pull request #1686 from matrix-org/rav/fix_federation_key_fails | Richard van der Hoff | 2016-12-12 | 1 | -0/+10 |
|\ \ \ \ | |_|_|/ |/| | | | E2E key query: handle federation fails | ||||
| * | | | Remove unused import | Richard van der Hoff | 2016-12-12 | 1 | -1/+0 |
| | | | | |||||
| * | | | E2E key query: handle federation fails | Richard van der Hoff | 2016-12-09 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | Don't fail the whole request if we can't connect to a particular server. | ||||
* | | | | Correctly handle timeout errors | Erik Johnston | 2016-12-09 | 2 | -7/+20 |
| | | | | |||||
* | | | | Fix rare notifier bug where listeners dont timeout | Erik Johnston | 2016-12-09 | 2 | -11/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | There was a race condition that caused the notifier to 'miss' the timeout notification, since there were no other checks for the timeout this caused listeners to get stuck in a loop until something happened. | ||||
* | | | | Merge pull request #1680 from matrix-org/erikj/joined_rooms | Erik Johnston | 2016-12-09 | 6 | -9/+165 |
|\ \ \ \ | | | | | | | | | | | Add new room membership APIs | ||||
| * | | | | Add /room/<room_id>/joined_members API | Erik Johnston | 2016-12-08 | 3 | -9/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This returns the currently joined members in the room with their display names and avatar urls. This is more efficient than /members for large rooms where you don't need the full events. | ||||
| * | | | | Add profile data to the room_membership table for joins | Erik Johnston | 2016-12-08 | 4 | -0/+110 |
| | | | | | |||||
| * | | | | Add joined_rooms servlet | Erik Johnston | 2016-12-08 | 1 | -0/+17 |
| |/ / / | |||||
* | | | | Fix ignored read-receipts | Richard van der Hoff | 2016-12-08 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | Don't ignore read-receipts which arrive in the same EDU as a read-receipt for an old event. | ||||
* | | | | Fix result of insert_receipt | Richard van der Hoff | 2016-12-08 | 1 | -1/+1 |
|/ / / | | | | | | | | | | This should fix the absence of notifications when new receipts arrive. | ||||
* | / | Prevent user tokens being used as guest tokens (#1675) | Richard van der Hoff | 2016-12-06 | 2 | -16/+37 |
| |/ |/| | | | | | | | Make sure that a user cannot pretend to be a guest by adding 'guest = True' caveats. | ||||
* | | Merge pull request #653 from matrix-org/erikj/preset_guest_join | Erik Johnston | 2016-12-05 | 1 | -0/+10 |
|\ \ | | | | | | | Enable guest access for private rooms by default | ||||
| * | | Enable guest access for private rooms by default | Erik Johnston | 2016-03-17 | 1 | -0/+10 |
| | | | |||||
* | | | Merge pull request #1649 from matrix-org/dbkr/log_ui_auth_args | Erik Johnston | 2016-12-05 | 1 | -1/+9 |
|\ \ \ | | | | | | | | | Log the args that we have on UI auth completion | ||||
| * | | | Clarify that creds doesn not contain passwords. | David Baker | 2016-11-24 | 1 | -1/+3 |
| | | | | |||||
| * | | | Log the args that we have on UI auth completion | David Baker | 2016-11-24 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | This will be super helpful for debugging if we have more registration woes. | ||||
* | | | | Bugfix: Console logging handler missing default filter | pik | 2016-12-03 | 1 | -0/+1 |
| | | | | |||||
* | | | | preview_url_resource: Ellipsis must be in unicode string | Johannes Löthberg | 2016-12-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> | ||||
* | | | | Fix doc-string | Richard van der Hoff | 2016-12-01 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | Remove refresh_token reference | ||||
* | | | | Rip out more refresh_token code | Richard van der Hoff | 2016-11-30 | 6 | -105/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We might as well treat all refresh_tokens as invalid. Just return a 403 from /tokenrefresh, so that we don't have a load of dead, untestable code hanging around. Still TODO: removing the table from the schema. | ||||
* | | | | Merge branch 'develop' into rav/no_more_refresh_tokens | Richard van der Hoff | 2016-11-30 | 10 | -61/+80 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #1660 from matrix-org/rav/better_content_type_validation | Richard van der Hoff | 2016-11-30 | 1 | -18/+30 |
| |\ \ \ \ | | | | | | | | | | | | | More intelligent Content-Type parsing | ||||
| | * | | | | More intelligent Content-Type parsing | Richard van der Hoff | 2016-11-30 | 1 | -18/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Content-Type is allowed to contain options (`; charset=utf-8`, for instance). We should allow that. | ||||
| * | | | | | Merge pull request #1656 from matrix-org/rav/remove_time_caveat | Richard van der Hoff | 2016-11-30 | 5 | -29/+21 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Stop putting a time caveat on access tokens | ||||
| | * | | | | | Comments | Richard van der Hoff | 2016-11-30 | 1 | -3/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update comments in verify_macaroon | ||||
| | * | | | | | Stop putting a time caveat on access tokens | Richard van der Hoff | 2016-11-29 | 5 | -26/+12 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'time' caveat on the access tokens was something of a lie, since we weren't enforcing it; more pertinently its presence stops us ever adding useful time caveats. Let's move in the right direction by not lying in our caveats. | ||||
| * | | | | | Merge pull request #1653 from matrix-org/rav/guest_e2e | Richard van der Hoff | 2016-11-29 | 5 | -14/+29 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | Implement E2E for guests | ||||
| | * | | | | Allow guest access to endpoints for E2E | Richard van der Hoff | 2016-11-25 | 3 | -9/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose /devices, /keys, and /sendToDevice to guest users, so that they can use E2E. | ||||
| | * | | | | Give guest users a device_id | Richard van der Hoff | 2016-11-25 | 2 | -5/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to create devices for guests so that they can use e2e, but we don't have anywhere to store it, so just use a fixed one. | ||||
* | | | | | | Stop generating refresh tokens | Richard van der Hoff | 2016-11-28 | 3 | -37/+16 |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we're not doing refresh tokens any more, we should start killing off the dead code paths. /tokenrefresh itself is a bit of a thornier subject, since there might be apps out there using it, but we can at least not generate refresh tokens on new logins. | ||||
* | | | | | Merge pull request #1655 from matrix-org/rav/remove_redundant_macaroon_checks | Richard van der Hoff | 2016-11-25 | 1 | -26/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove redundant list of known caveat prefixes | ||||
| * | | | | | Remove redundant list of known caveat prefixes | Richard van der Hoff | 2016-11-24 | 1 | -26/+8 |
| |/ / / / | | | | | | | | | | | | | | | | Also add some comments. | ||||
* | | | | | Use correct var | Erik Johnston | 2016-11-24 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Correctly handle 500's and 429 on federation | Erik Johnston | 2016-11-24 | 2 | -1/+8 |
| | | | | | |||||
* | | | | | Bump version and changelog v0.18.5-rc2 | Erik Johnston | 2016-11-24 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Don't send old events as federation | Erik Johnston | 2016-11-24 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Bump changelog and version v0.18.5-rc1 | Erik Johnston | 2016-11-24 | 1 | -1/+1 |
| |/ / / |/| | | | |||||
* | | | | Comment | Erik Johnston | 2016-11-23 | 1 | -1/+3 |
| | | | | |||||
* | | | | More efficient notif count queries | Erik Johnston | 2016-11-23 | 2 | -8/+48 |
| | | | | |||||
* | | | | Merge pull request #1635 from matrix-org/erikj/split_out_fed_txn | Erik Johnston | 2016-11-23 | 34 | -213/+1108 |
|\ \ \ \ | | | | | | | | | | | Split out federation transaction sending to a worker | ||||
| * | | | | Shuffle receipt handler around so that worker apps don't need to load it | Erik Johnston | 2016-11-23 | 6 | -8/+10 |
| | | | | | |||||
| * | | | | Ensure only main or federation_sender process can send federation traffic | Erik Johnston | 2016-11-23 | 3 | -5/+21 |
| | | | | | |||||
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2016-11-23 | 8 | -24/+199 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | erikj/split_out_fed_txn | ||||
| * | | | | | Comment | Erik Johnston | 2016-11-23 | 1 | -0/+3 |
| | | | | | | |||||
| * | | | | | Explicit federation ack | Erik Johnston | 2016-11-23 | 3 | -8/+25 |
| | | | | | | |||||
| * | | | | | Fix tests and flake8 | Erik Johnston | 2016-11-22 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | Invalidate retry cache in both directions | Erik Johnston | 2016-11-22 | 6 | -27/+132 |
| | | | | | | |||||
| * | | | | | Comments | Erik Johnston | 2016-11-21 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | Add some metrics | Erik Johnston | 2016-11-21 | 1 | -48/+68 |
| | | | | | | |||||
| * | | | | | Comments | Erik Johnston | 2016-11-21 | 3 | -0/+41 |
| | | | | | | |||||
| * | | | | | Remove explicit calls to send_pdu | Erik Johnston | 2016-11-21 | 3 | -61/+9 |
| | | | | | | |||||
| * | | | | | Fix tests | Erik Johnston | 2016-11-21 | 2 | -2/+5 |
| | | | | | | |||||
| * | | | | | Store federation stream positions in the database | Erik Johnston | 2016-11-21 | 6 | -24/+94 |
| | | | | | | |||||
| * | | | | | Handle sending events and device messages over federation | Erik Johnston | 2016-11-17 | 14 | -55/+185 |
| | | | | | | |||||
| * | | | | | Hook up the send queue and create a federation sender worker | Erik Johnston | 2016-11-16 | 8 | -22/+419 |
| | | | | | | |||||
| * | | | | | Add initial cut of federation send queue | Erik Johnston | 2016-11-16 | 1 | -0/+174 |
| | | | | | | |||||
| * | | | | | Use new federation_sender DI | Erik Johnston | 2016-11-16 | 7 | -63/+26 |
| | | | | | | |||||
| * | | | | | Add transaction queue and transport layer to DI | Erik Johnston | 2016-11-16 | 5 | -10/+16 |
| | | | | | | |||||
| * | | | | | Move logic into transaction_queue | Erik Johnston | 2016-11-16 | 3 | -19/+18 |
| | | | | | | |||||
| * | | | | | Rename transaction queue functions to send_* | Erik Johnston | 2016-11-16 | 2 | -12/+12 |
| | | | | | | |||||
* | | | | | | Merge pull request #1641 from matrix-org/erikj/as_pushers | Erik Johnston | 2016-11-23 | 2 | -2/+18 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Ignore AS users when fetching push rules | ||||
| * | | | | | Ignore AS users when fetching push rules | Erik Johnston | 2016-11-23 | 2 | -2/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By ignoring AS users early on when fetching push rules for a room we can avoid needlessly hitting the DB and filling up the caches. | ||||
* | | | | | | Return early on /sync code paths if a '*' filter is used | Kegan Dougal | 2016-11-22 | 2 | -9/+51 |
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is currently very conservative in that it only does this if there is no `since` token. This limits the risk to clients likely to be doing one-off syncs (like bridges), but does mean that normal human clients won't benefit from the time savings here. If the savings are large enough, I would consider generalising this to just check the filter. | ||||
* | | | | | Merge pull request #1638 from matrix-org/kegan/sync-event-fields | Kegsay | 2016-11-22 | 3 | -14/+127 |
|\ \ \ \ \ | |/ / / / |/| | | | | Implement "event_fields" in filters | ||||
| * | | | | Review comments | Kegan Dougal | 2016-11-22 | 1 | -11/+9 |
| | | | | | |||||
| * | | | | Also check for dict since sometimes they aren't frozen | Kegan Dougal | 2016-11-22 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Glue only_event_fields into the sync rest servlet | Kegan Dougal | 2016-11-22 | 3 | -11/+15 |
| | | | | | |||||
| * | | | | More tests | Kegan Dougal | 2016-11-22 | 1 | -3/+4 |
| | | | | | |||||
| * | | | | Start adding some tests | Kegan Dougal | 2016-11-21 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | Move event_fields filtering to serialize_event | Kegan Dougal | 2016-11-21 | 2 | -59/+98 |
| | | | | | | | | | | | | | | | | | | | | Also make it an inclusive not exclusive filter, as the spec demands. | ||||
| * | | | | Add filter_event_fields and filter_field to FilterCollection | Kegan Dougal | 2016-11-21 | 1 | -0/+69 |
| |/ / / | |||||
* | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-11-22 | 2 | -1/+12 |
|\ \ \ \ | |||||
| * | | | | Fix flake8 | Mark Haines | 2016-11-18 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Work around client replacing reg params | David Baker | 2016-11-18 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Works around https://github.com/vector-im/vector-android/issues/715 and equivalent for iOS | ||||
| * | | | | Bump changelog and version v0.18.4-rc1 | Erik Johnston | 2016-11-14 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Fail with a coherent error message if `/sync?filter=` is invalid | Kegan Dougal | 2016-11-21 | 2 | -0/+9 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #1628 from matrix-org/erikj/ldap_split_out | Erik Johnston | 2016-11-15 | 4 | -378/+17 |
|\ \ \ \ | | | | | | | | | | | Use external ldap auth pacakge | ||||
| * | | | | Use external ldap auth pacakge | Erik Johnston | 2016-11-15 | 4 | -378/+17 |
| | | | | | |||||
* | | | | | Merge pull request #1617 from matrix-org/erikj/intern_state_dict | Erik Johnston | 2016-11-15 | 1 | -1/+4 |
|\ \ \ \ \ | |/ / / / |/| | | | | Correctly intern keys in state cache | ||||
| * | | | | Correctly intern keys in state cache | Erik Johnston | 2016-11-08 | 1 | -1/+4 |
| | | | | | |||||
* | | | | | New Flake8 fixes | Erik Johnston | 2016-11-15 | 2 | -0/+3 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #1624 from matrix-org/kegan/idempotent-requests | Kegsay | 2016-11-14 | 6 | -184/+133 |
|\ \ \ \ | | | | | | | | | | | Store Promise<Response> instead of Response for HTTP API transactions | ||||
| * | | | | Clean transactions based on time. Add HttpTransactionCache tests. | Kegan Dougal | 2016-11-14 | 4 | -8/+30 |
| | | | | | |||||
| * | | | | Move .observe() up to the cache to make things neater | Kegan Dougal | 2016-11-14 | 3 | -33/+11 |
| | | | | | |||||
| * | | | | Review comments | Kegan Dougal | 2016-11-11 | 5 | -158/+119 |
| | | | | | |||||
| * | | | | More flake8 | Kegan Dougal | 2016-11-11 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | Flake8 and fix whoopsie | Kegan Dougal | 2016-11-11 | 1 | -4/+8 |
| | | | | | |||||
| * | | | | Use ObservableDeferreds instead of Deferreds as they behave as intended | Kegan Dougal | 2016-11-11 | 2 | -30/+31 |
| | | | | | |||||
| * | | | | Use observable deferreds because they are sane | Kegan Dougal | 2016-11-11 | 1 | -3/+4 |
| | | | | | |||||
| * | | | | Flake8 | Kegan Dougal | 2016-11-10 | 2 | -4/+4 |
| | | | | | |||||
| * | | | | Store Promise<Response> instead of Response for HTTP API transactions | Kegan Dougal | 2016-11-10 | 4 | -88/+68 |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a race whereby: - User hits an endpoint. - No cached transaction so executes main code. - User hits same endpoint. - No cache transaction so executes main code. - Main code finishes executing and caches response and returns. - Main code finishes executing and caches response and returns. This race is common in the wild when Synapse is struggling under load. This commit fixes the race by: - User hits an endpoint. - Caches the promise to execute the main code and executes main code. - User hits same endpoint. - Yields on the same promise as the first request. - Main code finishes executing and returns, unblocking both requests. | ||||
* | | | | Merge pull request #1625 from DanielDent/patch-1 | Erik Johnston | 2016-11-12 | 1 | -2/+3 |
|\ \ \ \ | |/ / / |/| | | | Add support for durations in minutes | ||||
| * | | | Add support for durations in minutes | Daniel Dent | 2016-11-12 | 1 | -2/+3 |
| | | | | |||||
* | | | | Don't assume providers raise ConfigError's | Erik Johnston | 2016-11-08 | 1 | -2/+7 |
| | | | | |||||
* | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-11-08 | 2 | -2/+3 |
|\| | | | |||||
| * | | | Bump version and changelog | Erik Johnston | 2016-11-08 | 1 | -1/+1 |
| | | | | |||||
| * | | | Explicitly set authentication mode in ldap3 | Erik Johnston | 2016-11-08 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | This only makes a difference for versions of ldap3 before 1.0, but a) its best to be explicit and b) there are distributions that package ancient versions for ldap3 (e.g. debian). | ||||
* | | | | Merge pull request #1615 from matrix-org/erikj/limit_prev_events | Erik Johnston | 2016-11-08 | 1 | -0/+15 |
|\ \ \ \ | | | | | | | | | | | Limit the number of prev_events of new events | ||||
| * | | | | Sample correctly | Erik Johnston | 2016-11-08 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | Limit the number of prev_events of new events | Erik Johnston | 2016-11-08 | 1 | -0/+13 |
| | |/ / | |/| | | |||||
* / | | | Respect use_frozen_dicts option in workers | Erik Johnston | 2016-11-08 | 6 | -0/+22 |
|/ / / | |||||
* | | | Merge pull request #1198 from euank/more-ip-blacklist | Erik Johnston | 2016-11-07 | 1 | -0/+2 |
|\ \ \ | | | | | | | | | default config: blacklist more internal ips | ||||
| * | | | default config: blacklist more internal ips | Euan Kemp | 2016-11-06 | 1 | -0/+2 |
| |/ / | |||||
* | | | Comment | Erik Johnston | 2016-11-04 | 1 | -0/+1 |
| | | | |||||
* | | | Remove unused but buggy function | Erik Johnston | 2016-11-04 | 1 | -11/+1 |
| | | | |||||
* | | | Rename the python-specific metrics now the docs claim that we have done | Paul "LeoNerd" Evans | 2016-11-03 | 1 | -7/+9 |
| | | | |||||
* | | | Since we don't export per-filetype fd counts any more, delete all the code ↵ | Paul "LeoNerd" Evans | 2016-11-03 | 1 | -36/+4 |
| | | | | | | | | | | | | related to that too | ||||
* | | | Remove now-unused 'resource' import | Paul "LeoNerd" Evans | 2016-11-03 | 1 | -8/+0 |
| | | | |||||
* | | | Now we have new-style metrics don't bother exporting legacy-named process ones | Paul "LeoNerd" Evans | 2016-11-03 | 1 | -16/+1 |
| | | | |||||
* | | | Remove spurious comment | Erik Johnston | 2016-11-03 | 1 | -2/+2 |
| | | | |||||
* | | | Replace postgres GIN with GIST | Erik Johnston | 2016-11-03 | 3 | -1/+45 |
| | | | | | | | | | | | | | | | This is because GIN can be slow to write too, especially when the table gets large. | ||||
* | | | Don't error on non-ascii passwords | David Baker | 2016-11-03 | 1 | -1/+1 |
| | | | |||||
* | | | Set CORs headers on responses from the media repo | Mark Haines | 2016-11-02 | 3 | -7/+22 |
| | | | |||||
* | | | Merge pull request #1188 from matrix-org/erikj/sent_transactions | Erik Johnston | 2016-11-01 | 1 | -150/+4 |
|\ \ \ | |/ / |/| | | Remove sent_transactions table. | ||||
| * | | Continue to clean up received_transactions | Erik Johnston | 2016-11-01 | 1 | -0/+14 |
| | | | |||||
| * | | Removed unused stuff | Erik Johnston | 2016-10-31 | 1 | -163/+3 |
| | | | |||||
| * | | Increase batching of sent transaction inserts | Erik Johnston | 2016-10-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | This should further reduce the number of individual inserts, transactions and updates that are required for keeping sent_transactions up to date. | ||||
* | | | Bump version and changelog | Erik Johnston | 2016-11-01 | 1 | -1/+1 |
| | | | |||||
* | | | Bump changelog and version | Mark Haines | 2016-10-28 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'develop' into release-v0.18.2 | Mark Haines | 2016-10-28 | 3 | -9/+9 |
|\| | | |||||
| * | | Set up the process collector during metrics __init__; that way all ↵ | Paul "LeoNerd" Evans | 2016-10-27 | 2 | -2/+3 |
| | | | | | | | | | | | | split-process workers have it | ||||
| * | | Pass the Metrics group into the process collector instead of having it find ↵ | Paul "LeoNerd" Evans | 2016-10-27 | 2 | -8/+4 |
| | | | | | | | | | | | | its own one; this avoids it needing to import from synapse.metrics | ||||
| * | | Allow creation of a 'subspace' within a Metrics object, returning another one | Paul "LeoNerd" Evans | 2016-10-27 | 1 | -0/+3 |
| | | | |||||
* | | | Bump changelog and version v0.18.2-rc4 | Erik Johnston | 2016-10-27 | 1 | -1/+1 |
|/ / | |||||
* | | Use most recently added binding, not most recently seen user. | Erik Johnston | 2016-10-27 | 1 | -19/+11 |
| | | |||||
* | | Fix user_threepids schema delta | Erik Johnston | 2016-10-27 | 1 | -1/+38 |
| | | | | | | | | | | | | | | | | | | | | | | The delta `37/user_threepids.sql` aimed to update all the email addresses to be lower case, however duplicate emails may exist in the table already. This commit adds a step where the delta moves the duplicate emails to a new `medium` `email_old`. Only the most recently used account keeps the binding intact. We move rather than delete so that we retain some record of which emails were associated with which account. | ||||
* | | Bump changelog and version | Erik Johnston | 2016-10-27 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1098 from matrix-org/markjh/bearer_token | Mark Haines | 2016-10-25 | 1 | -9/+37 |
|\ \ | | | | | | | Allow clients to supply access_tokens as headers | ||||
| * \ | Merge branch 'develop' into markjh/bearer_token | Mark Haines | 2016-09-12 | 9 | -45/+108 |
| |\ \ | |||||
| * | | | Fix unit tests | Mark Haines | 2016-09-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'develop' into markjh/bearer_token | Mark Haines | 2016-09-09 | 7 | -9/+89 |
| |\ \ \ | |||||
| * | | | | Allow clients to supply access_tokens as headers | Mark Haines | 2016-09-09 | 1 | -9/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clients can continue to supply access tokens as query parameters or can supply the token as a header: Authorization: Bearer <access_token_goes_here> This matches the ouath2 format of https://tools.ietf.org/html/rfc6750#section-2.1 | ||||
* | | | | | Merge branch 'release-v0.18.2' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-10-25 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Bump version and changelog | Erik Johnston | 2016-10-25 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Fix infinite typing bug | Erik Johnston | 2016-10-24 | 1 | -2/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's a bug somewhere that causes typing notifications to not be timed out properly. By adding a paranoia timer and using correct inequalities notifications should stop being stuck, even if it the root cause hasn't been fixed. | ||||
* | | | | | | Actually use the new function | Erik Johnston | 2016-10-24 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Fix incredubly slow back pagination query | Erik Johnston | 2016-10-24 | 4 | -12/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a client didn't specify a from token when paginating backwards synapse would attempt to query the (global) maximum topological token. This a) doesn't make much sense since they're room specific and b) there are no indices that lets postgres do this efficiently. | ||||
* | | | | | | Merge pull request #1177 from matrix-org/paul/standard-metric-names | Paul Evans | 2016-10-21 | 4 | -66/+191 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Standardise prometheus metrics |