Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2016-10-14 | 13 | -498/+712 |
|\ | | | | | | | erikj/fix_email_notifs | ||||
| * | Merge pull request #1168 from matrix-org/rav/ui_auth_on_device_delete | Richard van der Hoff | 2016-10-13 | 1 | -5/+20 |
| |\ | | | | | | | User-interactive auth on delete device | ||||
| | * | Handle delete device requests with no body | Richard van der Hoff | 2016-10-12 | 1 | -2/+11 |
| | | | | | | | | | | | | | | | We should probably return a 401 rather than a 400 for existing clients that don't know they have to do the UIA dance to delete a device. | ||||
| | * | User-interactive auth on delete device | Richard van der Hoff | 2016-10-12 | 1 | -5/+11 |
| | | | |||||
| * | | Merge pull request #1167 from matrix-org/markjh/fingerprints | Mark Haines | 2016-10-12 | 2 | -13/+46 |
| |\ \ | | | | | | | | | Add config option for adding additional TLS fingerprints | ||||
| | * | | Explain how long the servers can cache the TLS fingerprints for | Mark Haines | 2016-10-12 | 1 | -3/+4 |
| | | | | |||||
| | * | | Improve comment formatting | Mark Haines | 2016-10-12 | 2 | -4/+7 |
| | | | | |||||
| | * | | Add config option for adding additional TLS fingerprints | Mark Haines | 2016-10-11 | 2 | -12/+41 |
| | | | | |||||
| * | | | Merge pull request #1155 from matrix-org/erikj/pluggable_pwd_auth | Erik Johnston | 2016-10-12 | 5 | -398/+471 |
| |\ \ \ | | | | | | | | | | | Implement pluggable password auth | ||||
| | * | | | Implement pluggable password auth | Erik Johnston | 2016-10-03 | 5 | -398/+471 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows delegating the password auth to an external module. This also moves the LDAP auth to using this system, allowing it to be removed from the synapse tree entirely in the future. | ||||
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2016-10-11 | 18 | -289/+475 |
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | erikj/replication_noop | ||||
| | * | | | Merge pull request #1166 from matrix-org/rav/grandfather_broken_riot_signup | Richard van der Hoff | 2016-10-11 | 1 | -3/+14 |
| | |\ \ \ | | | | | | | | | | | | | Work around email-spamming Riot bug | ||||
| | | * | | | Work around email-spamming Riot bug | Richard van der Hoff | 2016-10-11 | 1 | -3/+14 |
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5d9546f9 introduced a change to synapse behaviour, in that failures in the interactive-auth process would return the flows and params data as well as an error code (as specced in https://github.com/matrix-org/matrix-doc/pull/397). That change exposed a bug in Riot which would make it request a new validation token (and send a new email) each time it got a 401 with a `flows` parameter (see https://github.com/vector-im/vector-web/issues/2447 and the fix at https://github.com/matrix-org/matrix-react-sdk/pull/510). To preserve compatibility with broken versions of Riot, grandfather in the old behaviour for the email validation stage. | ||||
| | * | | | Merge pull request #1157 from Rugvip/nolimit | Erik Johnston | 2016-10-11 | 10 | -46/+46 |
| | |\ \ \ | | | | | | | | | | | | | Remove rate limiting from app service senders and fix get_or_create_user requester | ||||
| | * \ \ \ | Merge pull request #1150 from Rugvip/state_key | Erik Johnston | 2016-10-11 | 1 | -10/+0 |
| | |\ \ \ \ | | | |_|/ / | | |/| | | | api/auth: fix for not being allowed to set your own state_key | ||||
| | | * | | | api/auth: fix for not being allowed to set your own state_key | Patrik Oldsberg | 2016-09-30 | 1 | -10/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com> | ||||
| | * | | | | Merge pull request #1160 from matrix-org/rav/401_on_password_fail | Richard van der Hoff | 2016-10-07 | 1 | -32/+52 |
| | |\ \ \ \ | | | | | | | | | | | | | | | Interactive Auth: Return 401 from for incorrect password | ||||
| | | * | | | | Interactive Auth: Return 401 from for incorrect password | Richard van der Hoff | 2016-10-07 | 1 | -32/+52 |
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This requires a bit of fettling, because I want to return a helpful error message too but we don't want to distinguish between unknown user and invalid password. To avoid hardcoding the error message into 15 places in the code, I've had to refactor a few methods to return None instead of throwing. Fixes https://matrix.org/jira/browse/SYN-744 | ||||
| | * | | | | Merge pull request #1159 from matrix-org/rav/uia_fallback_postmessage | Richard van der Hoff | 2016-10-06 | 1 | -1/+3 |
| | |\ \ \ \ | | | | | | | | | | | | | | | window.postmessage for Interactive Auth fallback | ||||
| | | * | | | | window.postmessage for Interactive Auth fallback | Richard van der Hoff | 2016-10-06 | 1 | -1/+3 |
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | If you're a webapp running the fallback in an iframe, you can't set set a window.onAuthDone function. Let's post a message back to window.opener instead. | ||||
| * | | | | | Fix check of wrong variable | Erik Johnston | 2016-10-11 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Reduce DB hits for replication | Erik Johnston | 2016-09-23 | 3 | -38/+108 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some streams will occaisonally advance their positions without actually having any new rows to send over federation. Currently this means that the token will not advance on the workers, leading to them repeatedly sending a slightly out of date token. This in turns requires the master to hit the DB to check if there are any new rows, rather than hitting the no op logic where we check if the given token matches the current token. This commit changes the API to always return an entry if the position for a stream has changed, allowing workers to advance their tokens correctly. | ||||
* | | | | | | Fix email push notifs being dropped | Erik Johnston | 2016-10-13 | 1 | -14/+25 |
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A lot of email push notifications were failing to be sent due to an exception being thrown along one of the (many) paths. This was due to a change where we moved from pulling out the full state for each room, but rather pulled out the event ids for the state and separately loaded the full events when needed. | ||||
* | | | | | rest/client/v1/register: use the correct requester in createUser | Patrik Oldsberg | 2016-10-06 | 2 | -7/+8 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com> | ||||
* | | | | | handlers/profile: added admin override for set_displayname and set_avatar_url | Patrik Oldsberg | 2016-10-06 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com> | ||||
* | | | | | handers: do not ratelimit app service senders | Patrik Oldsberg | 2016-10-06 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com> | ||||
* | | | | | storage/appservice: make appservice methods only relying on the cache ↵ | Patrik Oldsberg | 2016-10-06 | 8 | -34/+27 |
| |/ / / |/| | | | | | | | | | | | synchronous | ||||
* | | | | Bump changelog and version | Erik Johnston | 2016-10-05 | 1 | -1/+1 |
| | | | | |||||
* | | | | Bump version and changelog | Erik Johnston | 2016-09-30 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | Restructure ldap authentication | Martin Weinelt | 2016-09-29 | 1 | -87/+192 |
| | | | | | | | | | | | | | | | | | | | | | | | | - properly parse return values of ldap bind() calls - externalize authentication methods - change control flow to be more error-resilient - unbind ldap connections in many places - improve log messages and loglevels | ||||
* | | | Merge pull request #1145 from matrix-org/erikj/fix_reindex | Erik Johnston | 2016-09-29 | 1 | -15/+29 |
|\ \ \ | |_|/ |/| | | Fix background reindex of origin_server_ts | ||||
| * | | Fix background reindex of origin_server_ts | Erik Johnston | 2016-09-27 | 1 | -15/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | The storage function `_get_events_txn` was removed everywhere except from this background reindex. The function was removed due to it being (almost) completely unused while also being large and complex. Therefore, instead of resurrecting `_get_events_txn` we manually reimplement the bits that are needed directly. | ||||
* | | | Remove duplication | Erik Johnston | 2016-09-27 | 1 | -31/+19 |
| | | | |||||
* | | | Remove unused variable | Erik Johnston | 2016-09-27 | 1 | -3/+0 |
| | | | |||||
* | | | Fix perf of fetching state in SQLite | Erik Johnston | 2016-09-26 | 1 | -20/+41 |
|/ / | |||||
* | | Merge pull request #1140 from matrix-org/erikj/typing_fed_timeout | Erik Johnston | 2016-09-26 | 3 | -73/+111 |
|\ \ | | | | | | | Time out typing over federation | ||||
| * | | Move FEDERATION_PING_INTERVAL timer. Update log line | Erik Johnston | 2016-09-23 | 1 | -8/+10 |
| | | | |||||
| * | | Time out typing over federation | Erik Johnston | 2016-09-23 | 3 | -73/+109 |
| |/ | |||||
* | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-09-23 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | Bump version and changelog | Erik Johnston | 2016-09-19 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.18.0 | Erik Johnston | 2016-09-19 | 4 | -118/+193 |
| |\ | |||||
| * | | Update changelog and bump version | Erik Johnston | 2016-09-16 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #1136 from matrix-org/erikj/fix_signed_3pid | Erik Johnston | 2016-09-22 | 3 | -12/+35 |
|\ \ \ | | | | | | | | | Allow invites via 3pid to bypass sender sig check | ||||
| * | | | Update comments | Erik Johnston | 2016-09-22 | 1 | -2/+3 |
| | | | | |||||
| * | | | Add comments | Erik Johnston | 2016-09-22 | 2 | -0/+6 |
| | | | | |||||
| * | | | Shuffle things around to make unit tests work | Erik Johnston | 2016-09-22 | 2 | -15/+16 |
| | | | | |||||
| * | | | Allow invites via 3pid to bypass sender sig check | Erik Johnston | 2016-09-22 | 2 | -7/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a server sends a third party invite another server may be the one that the inviting user registers with. In this case it is that remote server that will issue an actual invitation, and wants to do it "in the name of" the original invitee. However, the new proper invite will not be signed by the original server, and thus other servers would reject the invite if it was seen as coming from the original user. To fix this, a special case has been added to the auth rules whereby another server can send an invite "in the name of" another server's user, so long as that user had previously issued a third party invite that is now being accepted. | ||||
* | | | | Merge pull request #1132 from matrix-org/erikj/initial_sync_split | Erik Johnston | 2016-09-22 | 6 | -383/+461 |
|\ \ \ \ | |/ / / |/| | | | Support /initialSync in synchrotron worker | ||||
| * | | | Support /initialSync in synchrotron worker | Erik Johnston | 2016-09-21 | 6 | -383/+461 |
| | |/ | |/| | |||||
* | | | Merge pull request #1134 from matrix-org/erikj/fix_stream_public_deletion | Erik Johnston | 2016-09-21 | 3 | -6/+31 |
|\ \ \ | | | | | | | | | Fix _delete_old_forward_extrem_cache query | ||||
| * | | | Match against event_id, rather than room_id | Erik Johnston | 2016-09-21 | 1 | -1/+1 |
| | | | | |||||
| * | | | Remove spurious AS clause | Erik Johnston | 2016-09-21 | 1 | -1/+1 |
| | | | | |||||
| * | | | Update correct table | Erik Johnston | 2016-09-21 | 1 | -6/+10 |
| | | | | |||||
| * | | | Readd entries to public_room_list_stream that were deleted | Erik Johnston | 2016-09-21 | 2 | -1/+23 |
| | | | | |||||
| * | | | Fix _delete_old_forward_extrem_cache query | Erik Johnston | 2016-09-21 | 1 | -5/+4 |
| |/ / | |||||
* / / | Add total_room_count_estimate to /publicRooms | Erik Johnston | 2016-09-21 | 1 | -0/+3 |
|/ / | |||||
* | | Merge pull request #1131 from matrix-org/matthew/e2e-notifs | Erik Johnston | 2016-09-19 | 1 | -0/+49 |
|\ \ | | | | | | | Notify on e2e events | ||||
| * | | _id field must uniquely identify different conditions | Erik Johnston | 2016-09-19 | 1 | -2/+2 |
| | | | |||||
| * | | proposal for notifying on e2e events | Matthew Hodgson | 2016-09-17 | 1 | -0/+49 |
| | | | |||||
* | | | Merge pull request #1130 from matrix-org/erikj/fix_pubroom_pag | Erik Johnston | 2016-09-19 | 1 | -12/+25 |
|\ \ \ | | | | | | | | | Handle fact that _generate_room_entry may not return a room entry | ||||
| * | | | PEP8 | Erik Johnston | 2016-09-17 | 1 | -1/+1 |
| | | | | |||||
| * | | | Handle fact that _generate_room_entry may not return a room entry | Erik Johnston | 2016-09-17 | 1 | -12/+25 |
| | | | | |||||
* | | | | Enable guest access to POST /publicRooms | Erik Johnston | 2016-09-17 | 1 | -2/+2 |
| |/ / |/| | | |||||
* | | | Merge pull request #1129 from matrix-org/erikj/fix_pubroom_pag | Erik Johnston | 2016-09-17 | 1 | -110/+123 |
|\| | | | | | | | | Fix and clean up publicRooms pagination | ||||
| * | | Spelling | Erik Johnston | 2016-09-17 | 1 | -1/+1 |
| | | | |||||
| * | | Fix and clean up publicRooms pagination | Erik Johnston | 2016-09-17 | 1 | -110/+123 |
| |/ | |||||
* | | Merge pull request #1127 from matrix-org/dbkr/publicroom_search_case_insensitive | Erik Johnston | 2016-09-17 | 1 | -4/+4 |
|\ \ | | | | | | | Make public room search case insensitive | ||||
| * | | Make public room search case insensitive | David Baker | 2016-09-16 | 1 | -4/+4 |
| |/ | |||||
* / | fix logger for client_reader worker | Matthew Hodgson | 2016-09-17 | 1 | -1/+1 |
|/ | |||||
* | Fix public room pagination for client_reader app | Erik Johnston | 2016-09-16 | 1 | -0/+1 |
| | |||||
* | Comment | Erik Johnston | 2016-09-16 | 1 | -0/+2 |
| | |||||
* | Make POST /publicRooms require auth | Erik Johnston | 2016-09-16 | 1 | -2/+1 |
| | |||||
* | Comment | Erik Johnston | 2016-09-16 | 1 | -0/+2 |
| | |||||
* | Add remote reoom cache | Erik Johnston | 2016-09-16 | 1 | -2/+23 |
| | |||||
* | Support filtering remote room lists | Erik Johnston | 2016-09-16 | 3 | -6/+18 |
| | |||||
* | Filter remote rooms lists locally | Erik Johnston | 2016-09-16 | 2 | -11/+25 |
| | |||||
* | Don't cache searched in /publicRooms | Erik Johnston | 2016-09-16 | 1 | -1/+5 |
| | |||||
* | Add new storage function to slave store | Erik Johnston | 2016-09-16 | 1 | -0/+1 |
| | |||||
* | Add very basic filter API to /publicRooms | Erik Johnston | 2016-09-15 | 1 | -5/+18 |
| | |||||
* | Change the way we calculate new_limit in /publicRooms and add POST API | Erik Johnston | 2016-09-15 | 2 | -15/+62 |
| | |||||
* | Handling expiring stream extrems correctly. | Erik Johnston | 2016-09-15 | 2 | -3/+22 |
| | |||||
* | Merge pull request #1125 from matrix-org/erikj/public_room_cache | Erik Johnston | 2016-09-15 | 2 | -6/+6 |
|\ | | | | | Change get_pos_of_last_change to return upper bound | ||||
| * | Change get_pos_of_last_change to return upper bound | Erik Johnston | 2016-09-15 | 2 | -6/+6 |
| | | |||||
* | | Merge pull request #1124 from matrix-org/erikj/enable_state_caching_workers | Erik Johnston | 2016-09-15 | 6 | -0/+6 |
|\ \ | |/ |/| | Enable state caches on workers | ||||
| * | Enable state caches on workers | Erik Johnston | 2016-09-15 | 6 | -0/+6 |
| | | |||||
* | | Use stream_change cache to make get_forward_extremeties_for_room cache more ↵ | Erik Johnston | 2016-09-15 | 3 | -2/+19 |
|/ | | | | effective | ||||
* | Add cache to get_forward_extremeties_for_room | Erik Johnston | 2016-09-15 | 2 | -1/+2 |
| | |||||
* | Remove default public rooms limit | Erik Johnston | 2016-09-15 | 1 | -1/+1 |
| | |||||
* | Merge pull request #1120 from matrix-org/erikj/push_invite_cache | Erik Johnston | 2016-09-15 | 1 | -9/+1 |
|\ | | | | | Ensure we don't mutate the cache of push rules | ||||
| * | Ensure we don't mutate the cache of push rules | Erik Johnston | 2016-09-15 | 1 | -9/+1 |
| | | |||||
* | | Merge pull request #1121 from matrix-org/erikj/public_room_paginate | Erik Johnston | 2016-09-15 | 18 | -139/+595 |
|\ \ | |/ |/| | Add pagination support to publicRooms | ||||
| * | By default limit /publicRooms to 100 entries | Erik Johnston | 2016-09-15 | 1 | -1/+1 |
| | | |||||
| * | Stream public room changes down replication | Erik Johnston | 2016-09-15 | 4 | -1/+74 |
| | | |||||
| * | Base public room list off of public_rooms stream | Erik Johnston | 2016-09-15 | 2 | -7/+79 |
| | | |||||
| * | Pass since/from parameters over federation | Erik Johnston | 2016-09-15 | 6 | -57/+63 |
| | | |||||
| * | Allow paginating both forwards and backwards | Erik Johnston | 2016-09-15 | 2 | -24/+65 |
| | | |||||
| * | Remove support for aggregate room lists | Erik Johnston | 2016-09-15 | 3 | -65/+1 |
| | | |||||
| * | Accept optional token to public room list | Erik Johnston | 2016-09-15 | 2 | -7/+76 |
| | | |||||
| * | Calculate the public room list from a stream_ordering | Erik Johnston | 2016-09-14 | 2 | -3/+43 |
| | | |||||
| * | Refactor public rooms to not pull out the full state for each room | Erik Johnston | 2016-09-14 | 2 | -16/+33 |
| | | |||||
| * | Add a room visibility stream | Erik Johnston | 2016-09-14 | 4 | -16/+100 |
| | | |||||
| * | Add a DB index to figure out past state at a stream ordering in a room | Erik Johnston | 2016-09-14 | 2 | -0/+118 |
| | | |||||
* | | Merge pull request #1117 from matrix-org/erikj/fix_state | Erik Johnston | 2016-09-14 | 3 | -20/+30 |
|\ \ | |/ |/| | Ensure we don't mutate state cache entries | ||||
| * | Amalgamate two identical consecutive if statements | Erik Johnston | 2016-09-14 | 1 | -7/+5 |
| | | |||||
| * | Fix reindex | Erik Johnston | 2016-09-14 | 1 | -15/+16 |
| | | |||||
| * | Ensure we don't mutate state cache entries | Erik Johnston | 2016-09-14 | 3 | -22/+33 |
| | | |||||
* | | Split out public room list into a worker process | Erik Johnston | 2016-09-14 | 1 | -0/+215 |
| | | |||||
* | | Move RoomListHandler into a separate file | Erik Johnston | 2016-09-14 | 3 | -159/+186 |
|/ | |||||
* | Merge pull request #1111 from matrix-org/matthew/device-ids | Matthew Hodgson | 2016-09-14 | 1 | -1/+1 |
|\ | | | | | make device IDs more useful for human disambiguation | ||||
| * | make device IDs more useful for human disambiguation | Matthew Hodgson | 2016-09-13 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1116 from matrix-org/paul/tiny-fixes | Paul Evans | 2016-09-13 | 1 | -2/+2 |
|\ \ | | | | | | | Fix typo "persiting" | ||||
| * | | Fix typo "persiting" | Paul "LeoNerd" Evans | 2016-09-13 | 1 | -2/+2 |
| | | | |||||
* | | | Limit how often we ask for keys from dead servers | Mark Haines | 2016-09-13 | 1 | -11/+30 |
|/ / | |||||
* | | Move the E2E key handling into the e2e handler | Mark Haines | 2016-09-13 | 2 | -115/+118 |
| | | |||||
* | | Merge pull request #1110 from matrix-org/markjh/e2e_timeout | Mark Haines | 2016-09-13 | 5 | -55/+115 |
|\ \ | | | | | | | Add a timeout parameter for end2end key queries. | ||||
| * | | Add a timeout parameter for end2end key queries. | Mark Haines | 2016-09-12 | 5 | -55/+115 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a timeout parameter for controlling how long synapse will wait for responses from remote servers. For servers that fail include how they failed to make it easier to debug. Fetch keys from different servers in parallel rather than in series. Set the default timeout to 10s. | ||||
* | | | Merge pull request #1109 from matrix-org/erikj/partial_indices | Erik Johnston | 2016-09-13 | 4 | -10/+41 |
|\ \ \ | | | | | | | | | Add WHERE clause support to index creation | ||||
| * | | | Remove where clause | Erik Johnston | 2016-09-12 | 1 | -1/+0 |
| | | | | |||||
| * | | | Index contains_url for file search queries | Erik Johnston | 2016-09-12 | 2 | -0/+25 |
| | | | | |||||
| * | | | Add WHERE clause support to index creation | Erik Johnston | 2016-09-12 | 2 | -10/+17 |
| | | | | |||||
* | | | | Merge pull request #1108 from matrix-org/erikj/create_dm | Erik Johnston | 2016-09-12 | 1 | -0/+6 |
|\ \ \ \ | |/ / / |/| | | | Add is_direct param to /createRoom | ||||
| * | | | Add is_direct param to /createRoom | Erik Johnston | 2016-09-12 | 1 | -0/+6 |
| |/ / | |||||
* | | | Merge pull request #1107 from matrix-org/erikj/backfill_none | Erik Johnston | 2016-09-12 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix backfill when cannot find an event. | ||||
| * | | | Fix backfill when cannot find an event. | Erik Johnston | 2016-09-12 | 1 | -1/+1 |
| |/ / | | | | | | | | | | `get_pdu` can succeed but return None. | ||||
* | | | Merge pull request #1106 from matrix-org/erikj/state_reindex_concurrent | Erik Johnston | 2016-09-12 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Create new index concurrently | ||||
| * | | | Create new index concurrently | Erik Johnston | 2016-09-12 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #1105 from matrix-org/erikj/make_notif_highlight_query_fast | Erik Johnston | 2016-09-12 | 2 | -1/+29 |
|\ \ \ | |/ / |/| | | Optimise /notifications query | ||||
| * | | Change the index to be stream_ordering, highlight | Erik Johnston | 2016-09-12 | 1 | -1/+1 |
| | | | |||||
| * | | Remove unused import | Erik Johnston | 2016-09-12 | 1 | -1/+0 |
| | | | |||||
| * | | Use register_background_index_update | Erik Johnston | 2016-09-12 | 1 | -24/+4 |
| | | | |||||
| * | | Add back in query change | Erik Johnston | 2016-09-12 | 1 | -1/+3 |
| | | | |||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2016-09-12 | 16 | -48/+133 |
| |\ \ | | | | | | | | | | | | | erikj/make_notif_highlight_query_fast | ||||
| * | | | Make reindex happen in bg | Erik Johnston | 2016-09-12 | 2 | -3/+32 |
| | | | | |||||
* | | | | Merge pull request #1104 from matrix-org/markjh/direct_to_device_federation_sync | Mark Haines | 2016-09-12 | 1 | -0/+2 |
|\ \ \ \ | |_|/ / |/| | | | Fix direct to device messages recieved over federation to notify sync | ||||
| * | | | Fix direct to device messages recieved over federation to notify sync | Mark Haines | 2016-09-12 | 1 | -0/+2 |
| | | | | |||||
* | | | | Add comments to existing schema deltas that used "CREATE INDEX" directly | Mark Haines | 2016-09-12 | 6 | -0/+24 |
|/ / / | |||||
* | | | Revert "Add index to event_push_actions" | Erik Johnston | 2016-09-12 | 2 | -21/+1 |
| | | | |||||
* | | | Merge pull request #1101 from matrix-org/erikj/state_types_idx | Erik Johnston | 2016-09-12 | 1 | -19/+35 |
|\ \ \ | | | | | | | | | Change state fetch query for postgres to be faster | ||||
| * | | | Change state fetch query for postgres to be faster | Erik Johnston | 2016-09-12 | 1 | -19/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | It turns out that postgres doesn't like doing a list of OR's and is about 1000x slower, so we just issue a query for each specific type seperately. | ||||
* | | | | Merge pull request #1097 from matrix-org/erikj/replication_typing_rest | Erik Johnston | 2016-09-12 | 2 | -1/+11 |
|\ \ \ \ | |/ / / |/| | | | Correctly handle typing stream id resetting | ||||
| * | | | Comment | Erik Johnston | 2016-09-09 | 1 | -0/+3 |
| | | | | |||||
| * | | | Correctly handle typing stream id resetting | Erik Johnston | 2016-09-09 | 1 | -1/+8 |
| | | | | |||||
* | | | | Merge pull request #1095 from matrix-org/erikj/batch_edus | Erik Johnston | 2016-09-12 | 5 | -20/+60 |
|\ \ \ \ | |_|_|/ |/| | | | Clobber EDUs in send queue | ||||
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/batch_edus | Erik Johnston | 2016-09-09 | 9 | -33/+148 |
| |\ \ \ | |||||
| * | | | | Fix incorrect attribute name | Erik Johnston | 2016-09-09 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Comment | Erik Johnston | 2016-09-09 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Add edu.type as part of key. Remove debug logging | Erik Johnston | 2016-09-09 | 1 | -2/+3 |
| | | | | | |||||
| * | | | | Clobber EDUs in send queue | Erik Johnston | 2016-09-09 | 5 | -20/+58 |
| | | | | | |||||
* | | | | | Merge pull request #1100 from VShell/fix-cas | Richard van der Hoff | 2016-09-09 | 1 | -5/+2 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Conform better to the CAS protocol specification | ||||
| * | | | | Conform better to the CAS protocol specification | Shell Turner | 2016-09-09 | 1 | -5/+2 |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Redirect to CAS's /login endpoint properly, and don't require an <attributes> element. Signed-off-by: Shell Turner <cam.turn@gmail.com> | ||||
* | | | | Merge remote-tracking branch 'origin/develop' into ↵ | David Baker | 2016-09-09 | 30 | -256/+915 |
|\| | | | | | | | | | | | | | | | dbkr/make_notif_highlight_query_fast | ||||
| * | | | Merge pull request #1096 from matrix-org/markjh/get_access_token | Mark Haines | 2016-09-09 | 6 | -27/+67 |
| |\ \ \ | | |_|/ | |/| | | Add helper function for getting access_tokens from requests | ||||
| | * | | Add helper function for getting access_tokens from requests | Mark Haines | 2016-09-09 | 6 | -27/+67 |
| | | | | | | | | | | | | | | | | | | | | | | | | Rather than reimplementing the token parsing in the various places. This will make it easier to change the token parsing to allow access_tokens in HTTP headers. | ||||
| * | | | Merge pull request #1091 from matrix-org/paul/third-party-lookup | Paul Evans | 2016-09-09 | 3 | -4/+72 |
| |\ \ \ | | | | | | | | | | | Improvements to 3PE lookup API | ||||
| | * | | | Log if rejecting 3PE query metadata result due to type check | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -4/+11 |
| | | | | | |||||
| | * | | | Reject malformed 3PE query metadata results earlier in AS API handling code | Paul "LeoNerd" Evans | 2016-09-09 | 2 | -11/+15 |
| | | | | | |||||
| | * | | | Minor fixes from PR comments | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | appease pep8 | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -1/+2 |
| | | | | | |||||
| | * | | | Python isn't JavaScript; have to quote dict keys | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Efficiency fix for lookups of a single protocol | Paul "LeoNerd" Evans | 2016-09-09 | 2 | -2/+7 |
| | | | | | |||||
| | * | | | Allow lookup of a single 3PE protocol query metadata | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -0/+21 |
| | | | | | |||||
| | * | | | Don't corrupt shared cache on subsequent protocol requests | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -0/+2 |
| | | | | | |||||
| | * | | | Collect up all the "instances" lists of individual AS protocol results into ↵ | Paul "LeoNerd" Evans | 2016-09-08 | 1 | -1/+29 |
| | | | | | | | | | | | | | | | | | | | | one combined answer to the client | ||||
| * | | | | Merge pull request #1094 from matrix-org/paul/get-state-whole-event | Paul Evans | 2016-09-09 | 1 | -2/+9 |
| |\ \ \ \ | | |_|_|/ | |/| | | | Allow clients to ask for the whole of a single state event | ||||
| | * | | | Filter returned events for client-facing format | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -2/+3 |
| | | | | | |||||
| | * | | | Allow clients to specify the format a room state event is returned in | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -1/+7 |
| | | |/ | | |/| | |||||
| * | | | Drop replication log levels | Erik Johnston | 2016-09-09 | 2 | -3/+2 |
| | | | | |||||
| * | | | Deduplicate presence in _update_states | Erik Johnston | 2016-09-09 | 1 | -0/+6 |
| |/ / | |||||
| * | | Merge pull request #1092 from matrix-org/erikj/transaction_queue_check | Erik Johnston | 2016-09-09 | 1 | -15/+16 |
| |\ \ | | | | | | | | | Check if destination is ready for retry earlier | ||||
| | * | | Check if destination is ready for retry earlier | Erik Johnston | 2016-09-09 | 1 | -15/+16 |
| | | | | |||||
| * | | | Merge pull request #1089 from matrix-org/markjh/direct_to_device_stream | Mark Haines | 2016-09-09 | 4 | -4/+38 |
| |\ \ \ | | |/ / | |/| | | Track the max device stream_id in a separate table, | ||||
| | * | | Use the previous MAX value if any to set the stream_id | Mark Haines | 2016-09-09 | 1 | -1/+2 |
| | | | | |||||
| | * | | Track the max_stream_device_id in a separate table, since we delete from the ↵ | Mark Haines | 2016-09-09 | 4 | -4/+37 |
| | | | | | | | | | | | | | | | | inbox table | ||||
| * | | | Fix tightloop on sending transaction | Erik Johnston | 2016-09-09 | 1 | -122/+134 |
| | | | | |||||
| * | | | Merge pull request #1088 from matrix-org/erikj/transaction_queue_check | Erik Johnston | 2016-09-09 | 1 | -38/+41 |
| |\ \ \ | | |/ / | |/| | | Correctly guard against multiple concurrent transactions | ||||
| | * | | Correctly guard against multiple concurrent transactions | Erik Johnston | 2016-09-09 | 1 | -38/+41 |
| | | | | |||||
| * | | | Merge pull request #1087 from matrix-org/markjh/reapply_delta | Mark Haines | 2016-09-09 | 1 | -1/+4 |
| |\ \ \ | | |/ / | |/| | | Reapply 34/device_outbox in 35/device_outbox_again.py since the schem… | ||||
| | * | | Just move the schema and add some DROPs | Mark Haines | 2016-09-09 | 2 | -35/+4 |
| | | | | |||||
| | * | | Only catch databas errors | Mark Haines | 2016-09-08 | 1 | -1/+1 |
| | | | | |||||
| | * | | Add a stub run_upgrade | Mark Haines | 2016-09-08 | 1 | -0/+4 |
| | | | | |||||
| | * | | Reapply 34/device_outbox in 35/device_outbox_again.py since the schema was ↵ | Mark Haines | 2016-09-08 | 1 | -0/+30 |
| | | | | | | | | | | | | | | | | bumped before it landed on develop | ||||
| * | | | Merge branch 'release-v0.17.3' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-09-09 | 2 | -2/+2 |
| |\ \ \ | |||||
| | * | | | Bump changelog and version | Erik Johnston | 2016-09-09 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Reduce batch size to be under SQL limit | Erik Johnston | 2016-09-09 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Update last_device_stream_id_by_dest if there is nothing to send | Erik Johnston | 2016-09-09 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge pull request #1081 from matrix-org/dbkr/notifications_only_highlight | Matthew Hodgson | 2016-09-09 | 2 | -2/+10 |
| |\ \ \ \ | | | | | | | | | | | | | Implement `only=highlight` on `/notifications` | ||||
| * \ \ \ \ | Merge pull request #1080 from matrix-org/dbkr/fix_notifications_api_with_from | David Baker | 2016-09-08 | 1 | -1/+1 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | Fix /notifications API when used with `from` param | ||||
| | * | | | | Fix /notifications API when used with `from` param | David Baker | 2016-09-08 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2016-09-08 | 3 | -24/+63 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | erikj/reindex_state_groups | ||||
| | * | | | | Merge pull request #1084 from matrix-org/markjh/direct_to_device_wildcard | Mark Haines | 2016-09-08 | 1 | -18/+36 |
| | |\ \ \ \ | | | | | | | | | | | | | | | Support wildcard device_ids for direct to device messages | ||||
| | | * | | | | Support wildcard device_ids for direct to device messages | Mark Haines | 2016-09-08 | 1 | -18/+36 |
| | | | | | | | |||||
| | * | | | | | Merge pull request #1082 from matrix-org/erikj/remote_public_rooms | Erik Johnston | 2016-09-08 | 2 | -6/+27 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Add server param to /publicRooms | ||||
| | | * | | | | | Use parse_string | Erik Johnston | 2016-09-08 | 1 | -2/+2 |
| | | | | | | | | |||||
| | | * | | | | | Add server param to /publicRooms | Erik Johnston | 2016-09-08 | 2 | -5/+26 |
| | | | | | | | | |||||
| * | | | | | | | Add delta file | Erik Johnston | 2016-09-08 | 1 | -0/+20 |
| | | | | | | | | |||||
| * | | | | | | | Reindex state_groups_state after pruning | Erik Johnston | 2016-09-08 | 2 | -2/+37 |
| |/ / / / / / | |||||
| * | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-09-08 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | Bump version and changelog | Erik Johnston | 2016-09-08 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Bump changelog and version | Erik Johnston | 2016-09-05 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Check the user_id for presence/typing matches origin | Erik Johnston | 2016-09-08 | 2 | -1/+15 |
| | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge branch 'develop' into markjh/direct_to_device_federation | Mark Haines | 2016-09-08 | 13 | -132/+542 |
| |\ \ \ \ \ | |||||
| * | | | | | | Add a new method to enqueue the device messages rather than sending a dummy EDU | Mark Haines | 2016-09-07 | 3 | -7/+20 |
| | | | | | | | |||||
| * | | | | | | Fix the stream change cache to work over replication | Mark Haines | 2016-09-07 | 2 | -1/+12 |
| | | | | | | | |||||
| * | | | | | | Move the check for federated device_messages. | Mark Haines | 2016-09-07 | 1 | -11/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the check into _attempt_new_transaction. Only delete messages if there were messages to delete. | ||||
| * | | | | | | Add stream change caches for device messages | Mark Haines | 2016-09-07 | 3 | -1/+53 |
| | | | | | | | |||||
| * | | | | | | Comment the add_messages storage functions | Mark Haines | 2016-09-07 | 1 | -8/+16 |
| | | | | | | | |||||
| * | | | | | | Send device messages over federation | Mark Haines | 2016-09-06 | 7 | -48/+179 |
| | | | | | | | |||||
| * | | | | | | Add storage methods for federated device messages | Mark Haines | 2016-09-06 | 1 | -7/+132 |
| | | | | | | | |||||
| * | | | | | | Add tables for federated device messages | Mark Haines | 2016-09-06 | 1 | -0/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds tables for storing the messages that need to be sent to a remote device and for deduplicating messages received. | ||||
| * | | | | | | Move _add_messages_to_device_inbox_txn into a separate method | Mark Haines | 2016-09-06 | 1 | -37/+32 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Add index to event_push_actions | David Baker | 2016-09-09 | 2 | -1/+21 |
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | and remove room_id caluse so it uses it Mostly from @negativemjark | ||||
* | | | | | Implement `only=highlight` on `/notifications` | David Baker | 2016-09-08 | 2 | -2/+10 |
| |/ / / |/| | | | |||||
* | | | | Log delta files we're applying | Erik Johnston | 2016-09-08 | 1 | -2/+2 |
| |/ / |/| | | |||||
* | | | Temporarily disable sequential scans for state fetching | Erik Johnston | 2016-09-08 | 1 | -0/+4 |
| |/ |/| | |||||
* | | Merge pull request #1077 from matrix-org/markjh/device_logging | Mark Haines | 2016-09-07 | 1 | -2/+6 |
|\ \ | | | | | | | Log the types and values when failing to store devices | ||||
| * | | Log the types and values when failing to store devices | Mark Haines | 2016-09-07 | 1 | -2/+6 |
| |/ | |||||
* | | Comment | Erik Johnston | 2016-09-07 | 1 | -0/+4 |
| | | |||||
* | | Add appopriate framing clause | Erik Johnston | 2016-09-07 | 1 | -0/+1 |
| | | |||||
* | | Use windowing function to make use of index | Erik Johnston | 2016-09-07 | 1 | -5/+5 |
| | | |||||
* | | Merge pull request #1065 from matrix-org/erikj/state_storage | Erik Johnston | 2016-09-07 | 8 | -73/+482 |
|\ \ | | | | | | | Move to storing state_groups_state as deltas | ||||
| * | | Scale the batch size so that we're not bitten by the minimum | Erik Johnston | 2016-09-05 | 1 | -1/+5 |
| | | | |||||
| * | | Correctly handle reindexing state groups that already have an edge | Erik Johnston | 2016-09-05 | 1 | -0/+19 |
| | | | |||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_storage | Erik Johnston | 2016-09-05 | 5 | -60/+35 |
| |\ \ | |||||
| * | | | Take value in a better way | Erik Johnston | 2016-09-05 | 2 | -3/+3 |
| | | | | |||||
| * | | | Comment about sqlite and WITH RECURSIVE | Erik Johnston | 2016-09-05 | 1 | -0/+4 |
| | | | | |||||
| * | | | Correctly delete old state groups in purge history API | Erik Johnston | 2016-09-05 | 2 | -20/+80 |
| | | | | |||||
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_storage | Erik Johnston | 2016-09-05 | 3 | -4/+12 |
| |\ \ \ | |||||
| * | | | | Add comments | Erik Johnston | 2016-09-05 | 2 | -41/+43 |
| | | | | | |||||
| * | | | | Add upgrade script that will slowly prune state_groups_state entries | Erik Johnston | 2016-09-05 | 3 | -75/+223 |
| | | | | | |||||
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_storage | Erik Johnston | 2016-09-02 | 6 | -15/+59 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_storage | Erik Johnston | 2016-09-02 | 13 | -84/+224 |
| |\ \ \ \ \ | |||||
| * | | | | | | Limit the length of state chains | Erik Johnston | 2016-09-02 | 2 | -43/+106 |
| | | | | | | | |||||
| * | | | | | | Move to storing state_groups_state as deltas | Erik Johnston | 2016-09-01 | 5 | -62/+172 |
| | | | | | | | |||||
* | | | | | | | Record counts of state changes | Erik Johnston | 2016-09-06 | 1 | -0/+4 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1072 from matrix-org/erikj/presence_fiddle | Erik Johnston | 2016-09-06 | 1 | -12/+10 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fiddle should_notify to better report stats | ||||
| * | | | | | | | Short circuit if presence is the same | Erik Johnston | 2016-09-06 | 1 | -0/+3 |
| | | | | | | | | |||||
| * | | | | | | | Fiddle should_notify to better report stats | Erik Johnston | 2016-09-06 | 1 | -12/+7 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Add quotes and be explicity about script-src | Erik Johnston | 2016-09-05 | 1 | -1/+2 |
| | | | | | | | |||||
* | | | | | | | Allow PDF to be rendered from media repo | Erik Johnston | 2016-09-05 | 1 | -1/+7 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #1070 from matrix-org/erikj/presence_stats | Erik Johnston | 2016-09-05 | 1 | -0/+8 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Record why we have chosen to notify | ||||
| * | | | | | | Record why we have chosen to notify | Erik Johnston | 2016-09-05 | 1 | -0/+8 |
| | |_|_|_|/ | |/| | | | | |||||
* / | | | | | Use get_joined_users_from_context instead of manually looking up hosts | Erik Johnston | 2016-09-05 | 2 | -46/+17 |
|/ / / / / | |||||
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/bulk_push | Erik Johnston | 2016-09-05 | 1 | -0/+6 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Merge pull request #1067 from matrix-org/markjh/idempotent | Mark Haines | 2016-09-05 | 1 | -0/+6 |
| |\ \ \ \ | | | | | | | | | | | | | Fix membership changes to be idempotent | ||||
| | * | | | | Fix membership changes to be idempotent | Mark Haines | 2016-09-02 | 1 | -0/+6 |
| | | | | | | |||||
* | | | | | | Remove unused imports | Erik Johnston | 2016-09-05 | 1 | -1/+0 |
| | | | | | | |||||
* | | | | | | Only fetch local pushers | Erik Johnston | 2016-09-05 | 1 | -1/+3 |
| | | | | | | |||||
* | | | | | | Make bulk_get_push_rules_for_room use get_joined_users_from_context cache | Erik Johnston | 2016-09-05 | 2 | -13/+8 |
|/ / / / / | |||||
* | | | | | Merge pull request #1066 from matrix-org/markjh/direct_to_device_lowerbound | Mark Haines | 2016-09-02 | 2 | -4/+6 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Only return new device messages in /sync | ||||
| * | | | | Only return new device messages in /sync | Mark Haines | 2016-09-02 | 2 | -4/+6 |
| |/ / / |