Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Allow creation of a 'subspace' within a Metrics object, returning another one | Paul "LeoNerd" Evans | 2016-10-27 | 1 | -0/+3 |
| | |||||
* | Merge pull request #1183 from matrix-org/erikj/fix_email_update | Erik Johnston | 2016-10-27 | 1 | -1/+30 |
|\ | | | | | Fix user_threepids schema delta | ||||
| * | 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. | ||||
* | Update changelog v0.18.2-rc3 | Erik Johnston | 2016-10-27 | 1 | -0/+1 |
| | |||||
* | Bump changelog and version | Erik Johnston | 2016-10-27 | 2 | -2/+8 |
| | |||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.18.2 | Erik Johnston | 2016-10-27 | 27 | -170/+509 |
|\ | |||||
| * | Merge pull request #1098 from matrix-org/markjh/bearer_token | Mark Haines | 2016-10-25 | 6 | -23/+66 |
| |\ | | | | | | | 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 | 6 | -15/+30 |
| | | | | |||||
| | * | | 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 | 2 | -1/+20 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Fixup change log v0.18.2-rc2 | Erik Johnston | 2016-10-25 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Bump version and changelog | Erik Johnston | 2016-10-25 | 2 | -1/+20 |
| | | | | | |||||
| * | | | | Merge pull request #1179 from matrix-org/erikj/typing_timer_paranoia | Erik Johnston | 2016-10-25 | 1 | -2/+10 |
| |\ \ \ \ | | | | | | | | | | | | | Fix infinite typing bug | ||||
| | * | | | | 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. | ||||
| * | | | | Merge pull request #1178 from matrix-org/erikj/current_room_token | Erik Johnston | 2016-10-24 | 4 | -12/+48 |
| |\ \ \ \ | | | | | | | | | | | | | Fix incredibly slow back pagination query | ||||
| | * | | | | 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 | ||||
| | * | | | | Split callback metric lambda functions down onto their own lines to keep ↵ | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -8/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | line lengths under 90 | ||||
| | * | | | | Adjust code for <100 char line limit | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Cut the raw /proc/self/stat line up into named fields at collection time | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -8/+22 |
| | | | | | | |||||
| | * | | | | Move the process metrics collector code into its own file | Paul "LeoNerd" Evans | 2016-10-19 | 3 | -141/+161 |
| | | | | | | |||||
| | * | | | | A slightly neater way to manage metric collector functions | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -2/+8 |
| | | | | | | |||||
| | * | | | | appease pep8 | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -3/+5 |
| | | | | | | |||||
| | * | | | | Also guard /proc/self/fds-related code with a suitable psuedoconstant | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -3/+5 |
| | | | | | | |||||
| | * | | | | Guard registration of process-wide metrics by existence of the requisite ↵ | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -45/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | /proc entries | ||||
| | * | | | | Add standard process_start_time_seconds metric | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -0/+15 |
| | | | | | | |||||
| | * | | | | Add standard process_max_fds metric | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -0/+13 |
| | | | | | | |||||
| | * | | | | Add standard process_open_fds metric | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -20/+29 |
| | | | | | | |||||
| | * | | | | Add standard process_*_memory_bytes metrics | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -0/+8 |
| | | | | | | |||||
| | * | | | | Use /proc/self/stat to generate the new process_cpu_*_seconds_total metrics | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -4/+12 |
| | | | | | | |||||
| | * | | | | Export CPU usage metrics also under prometheus-standard metric name | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -0/+15 |
| | | | | | | |||||
| | * | | | | Callback metric values might not just be integers - allow floats | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Merge pull request #1175 from ↵ | Luke Barnard | 2016-10-20 | 5 | -12/+35 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/luke/feature-configurable-as-rate-limiting Allow Configurable Rate Limiting Per AS | ||||
| | * | | | | | Style | Luke Barnard | 2016-10-20 | 1 | -2/+3 |
| | | | | | | | |||||
| | * | | | | | Closing brace on following line | Luke Barnard | 2016-10-20 | 1 | -1/+2 |
| | | | | | | | |||||
| | * | | | | | as_user->app_service, less redundant comments, better positioned comments | Luke Barnard | 2016-10-20 | 3 | -14/+11 |
| | | | | | | | |||||
| | * | | | | | flake8 | Luke Barnard | 2016-10-20 | 1 | -1/+3 |
| | | | | | | | |||||
| | * | | | | | Use real AS object by passing it through the requester | Luke Barnard | 2016-10-20 | 3 | -18/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This means synapse does not have to check if the AS is interested, but instead it effectively re-uses what it already knew about the requesting user | ||||
| | * | | | | | Allow Configurable Rate Limiting Per AS | Luke Barnard | 2016-10-18 | 3 | -1/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a flag loaded from the registration file of an AS that will determine whether or not its users are rate limited (by ratelimit in _base.py). Needed for IRC bridge reasons - see https://github.com/matrix-org/matrix-appservice-irc/issues/240. | ||||
| * | | | | | | Merge pull request #1164 from pik/error-codes | Erik Johnston | 2016-10-19 | 4 | -48/+94 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Clarify Error codes for GET /filter/ | ||||
| | * | | | | | | Refactor test_filter to use real DataStore | pik | 2016-10-18 | 3 | -46/+83 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add tests for filter api errors | ||||
| | * | | | | | | Fix MockHttpRequest always returning M_UNKNOWN errcode in testing | pik | 2016-10-14 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Error codes for filters | Alexander Maznev | 2016-10-14 | 2 | -7/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add tests Signed-off-by: Alexander Maznev <alexander.maznev@gmail.com> | ||||
| * | | | | | | | Merge pull request #1176 from matrix-org/erikj/eager_ratelimit_check | Erik Johnston | 2016-10-19 | 2 | -6/+25 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | Check whether to ratelimit sooner to avoid work | ||||
| | * | | | | | | Comment | Erik Johnston | 2016-10-19 | 1 | -0/+3 |
| | | | | | | | | |||||
| | * | | | | | | Check whether to ratelimit sooner to avoid work | Erik Johnston | 2016-10-19 | 2 | -6/+22 |
| | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Merge pull request #1170 from matrix-org/dbkr/password_reset_case_insensitive | David Baker | 2016-10-19 | 2 | -0/+35 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Make password reset email field case insensitive | ||||
| | * | | | | | | Latest delta is now 37 | David Baker | 2016-10-19 | 1 | -0/+0 |
| | | | | | | | | |||||
| | * | | | | | | Merge remote-tracking branch 'origin/develop' into ↵ | David Baker | 2016-10-19 | 8 | -6/+117 |
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | dbkr/password_reset_case_insensitive | ||||
| * | | | | | | | Merge pull request #1174 from matrix-org/erikj/email_push_noop | Erik Johnston | 2016-10-18 | 2 | -1/+5 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | Reduce redundant database work in email pusher | ||||
| | * | | | | | | Fix push notifications for a single unread message | Erik Johnston | 2016-10-18 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Reduce redundant database work in email pusher | Erik Johnston | 2016-10-18 | 1 | -0/+4 |
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the last stream ordering if the `get_unread_push_actions_for_user_in_range_for_email` returns no new push actions. This reduces the range that it needs to check next iteration. | ||||
| * | | | | | | Merge branch 'release-v0.18.2' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-10-18 | 2 | -2/+29 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Update changelog v0.18.2-rc1 | Erik Johnston | 2016-10-17 | 1 | -4/+7 |
| | | | | | | | |||||
* | | | | | | | Bump version and changelog | Erik Johnston | 2016-10-17 | 2 | -2/+26 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #1113 from matrix-org/erikj/remove_auth | Erik Johnston | 2016-10-17 | 3 | -2/+82 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Remove redundant event_auth index | ||||
| * | | | | | | Bump schema version | Erik Johnston | 2016-10-17 | 2 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Remove TODO | Erik Johnston | 2016-10-17 | 1 | -2/+0 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/remove_auth | Erik Johnston | 2016-10-17 | 80 | -1379/+2949 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #1162 from larroy/master | Erik Johnston | 2016-10-14 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Use sys.executable instead of hardcoded python. fixes #1161 | ||||
| * | | | | | | | Use sys.executable instead of hardcoded python. fixes #1161 | Pedro Larroy | 2016-10-08 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Drop some unused indices | Erik Johnston | 2016-10-17 | 3 | -17/+83 |
| | | | | | | | | |||||
| | * | | | | | | Remove redundant event_auth index | Erik Johnston | 2016-09-13 | 1 | -0/+16 |
| | | | | | | | | |||||
| | | * | | | | | Convert emails to lowercase when storing | David Baker | 2016-10-19 | 2 | -1/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And db migration sql to convert existing addresses. | ||||
| | | * | | | | | Revert part of 6207399 | David Baker | 2016-10-14 | 1 | -20/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | older sqlite doesn't support indexes on expressions, lets just store things lowercase in the db | ||||
| | | * | | | | | Merge remote-tracking branch 'origin/develop' into ↵ | David Baker | 2016-10-14 | 17 | -477/+691 |
| | | |\ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | dbkr/password_reset_case_insensitive | ||||
* | | | | | | | | Merge pull request #1169 from matrix-org/erikj/fix_email_notifs | Erik Johnston | 2016-10-14 | 1 | -14/+25 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix email push notifs being dropped | ||||
| * \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2016-10-14 | 18 | -508/+734 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | 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 | 7 | -401/+486 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Implement pluggable password auth | ||||
| * | | | | | | | | | | Implement pluggable password auth | Erik Johnston | 2016-10-03 | 7 | -401/+486 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 pull request #1141 from matrix-org/erikj/replication_noop | Erik Johnston | 2016-10-11 | 6 | -44/+114 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | Reduce DB hits for replication | ||||
| * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2016-10-11 | 28 | -331/+599 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | erikj/replication_noop | ||||
| * | | | | | | | | | | Fix check of wrong variable | Erik Johnston | 2016-10-11 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Reduce DB hits for replication | Erik Johnston | 2016-09-23 | 6 | -45/+115 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| | | | | | | * | | | | Make password reset email field case insensitive | David Baker | 2016-10-14 | 2 | -10/+36 |
| |_|_|_|_|_|/ / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | 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 | 14 | -77/+64 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | Remove rate limiting from app service senders and fix get_or_create_user requester | ||||
| * | | | | | | | | | rest/client/v1/register: use the correct requester in createUser | Patrik Oldsberg | 2016-10-06 | 4 | -31/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 10 | -41/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | synchronous | ||||
* | | | | | | | | | | 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. | ||||
* | | | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-10-05 | 2 | -1/+30 |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'release-v0.18.1' of github.com:matrix-org/synapse v0.18.1 | Erik Johnston | 2016-10-05 | 24 | -611/+942 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Bump changelog and version | Erik Johnston | 2016-10-05 | 2 | -1/+7 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Update changelog v0.18.1-rc1 | Erik Johnston | 2016-09-30 | 1 | -0/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Bump version and changelog | Erik Johnston | 2016-09-30 | 2 | -1/+22 |
| | | |_|/ / / / / | | |/| | | | | | | |||||
* | | | | | | | | | Merge pull request #1156 from matrix-org/dbkr/email_notifs_add_riot_brand | David Baker | 2016-10-04 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | Add Riot brand to email notifs | ||||
| * | | | | | | | | Add Riot brand to email notifs | David Baker | 2016-10-04 | 1 | -1/+3 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #1153 from matrix-org/erikj/ldap_restructure | Erik Johnston | 2016-09-30 | 1 | -87/+192 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Restructure ldap authentication | ||||
| * | | | | | | | | 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. | ||||
* | | | | | | | | Merge pull request #1146 from matrix-org/erikj/port_script_fix | Erik Johnston | 2016-09-27 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Update port script with recently added tables | ||||
| * | | | | | | | | Update port script with recently added tables | Erik Johnston | 2016-09-27 | 1 | -0/+9 |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also fixes a bug where the port script would explode when it encountered the newly added boolean column `public_room_list_stream.visibility` | ||||
* | | | | | | | | Merge pull request #1144 from matrix-org/erikj/sqlite_state_perf | Erik Johnston | 2016-09-27 | 1 | -23/+29 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Fix perf of fetching state in SQLite | ||||
| * | | | | | | | 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 | 6 | -83/+122 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | 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 | 6 | -83/+120 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | typo | Matthew Hodgson | 2016-09-25 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-09-23 | 2 | -1/+55 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | |||||
| * | | | | | Merge branch 'release-v0.18.0' of github.com:matrix-org/synapse v0.18.0 | Erik Johnston | 2016-09-19 | 80 | -777/+3089 |
| |\ \ \ \ \ | |||||
| | * | | | | | Bump version and changelog | Erik Johnston | 2016-09-19 | 2 | -3/+16 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.18.0 | Erik Johnston | 2016-09-19 | 5 | -118/+194 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Update changelog v0.18.0-rc1 | Erik Johnston | 2016-09-16 | 1 | -2/+3 |
| | | | | | | | | |||||
| | * | | | | | | Update changelog and bump version | Erik Johnston | 2016-09-16 | 2 | -1/+41 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'release-v0.17.3' of github.com:matrix-org/synapse v0.17.3 | Erik Johnston | 2016-09-09 | 3 | -3/+10 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | 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 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge pull request #1133 from matrix-org/erikj/public_room_count | Erik Johnston | 2016-09-21 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | Add total_room_count_estimate to /publicRooms | ||||
| * | | | | | | | | 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 |
| |/ / / / / / / | |||||
* | | | | | | | | mention client_reader worker | Matthew Hodgson | 2016-09-17 | 1 | -0/+1 |
| | | | | | | | | |||||
* | | | | | | | | 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 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1126 from matrix-org/erikj/public_room_cache | Erik Johnston | 2016-09-16 | 7 | -24/+158 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add very basic filter API to /publicRooms | ||||
| * | | | | | | | 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 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #1123 from matrix-org/erikj/public_room_cache | Erik Johnston | 2016-09-15 | 3 | -2/+19 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / / | Use stream_change cache to make get_forward_extremeties_for_room cache more effective | ||||
| * | | | | | | | Use stream_change cache to make get_forward_extremeties_for_room cache more ↵ | Erik Johnston | 2016-09-15 | 3 | -2/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | effective | ||||
* | | | | | | | | Merge pull request #1122 from matrix-org/erikj/public_room_cache | Erik Johnston | 2016-09-15 | 2 | -1/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Add cache to get_forward_extremeties_for_room | ||||
| * | | | | | | | 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 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #1118 from matrix-org/erikj/public_rooms_splitout | Erik Johnston | 2016-09-14 | 5 | -159/+403 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / / | Split out public room list into a worker process | ||||
| * | | | | | | | Enable testing of client_reader | Erik Johnston | 2016-09-14 | 1 | -0/+2 |
| | | | | | | | | |||||
| * | | | | | | | 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 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #1114 from matrix-org/markjh/limit_key_retries | Mark Haines | 2016-09-13 | 1 | -11/+30 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | Limit how often we ask for keys from dead servers | ||||
| * | | | | | | | | Limit how often we ask for keys from dead servers | Mark Haines | 2016-09-13 | 1 | -11/+30 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #1112 from matrix-org/markjh/e2e_key_handler | Mark Haines | 2016-09-13 | 2 | -115/+118 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | Move the E2E key handling into the e2e handler | ||||
| * | | | | | | | 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 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #1103 from matrix-org/markjh/comment_on_create_index | Mark Haines | 2016-09-12 | 6 | -0/+24 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Add comments to existing schema deltas that used "CREATE INDEX" directly | ||||
| * | | | | | | | Add comments to existing schema deltas that used "CREATE INDEX" directly | Mark Haines | 2016-09-12 | 6 | -0/+24 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #1102 from ↵ | Erik Johnston | 2016-09-12 | 2 | -21/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/revert-1099-dbkr/make_notif_highlight_query_fast Revert "Add index to event_push_actions" | ||||
| * | | | | | | | 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 pull request #1099 from matrix-org/dbkr/make_notif_highlight_query_fast | David Baker | 2016-09-09 | 2 | -1/+21 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | | | Add index to event_push_actions | ||||
| * | | | | | | Merge remote-tracking branch 'origin/develop' into ↵ | David Baker | 2016-09-09 | 32 | -256/+967 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | 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 |