Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | Fix logging error when a tampered event is detected. (#5500) | Andrew Morgan | 2020-02-13 | 2 | -1/+1 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Fix logging error when a tampered event is detected. (#5500) | Richard van der Hoff | 2019-06-21 | 2 | -1/+1 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #5513 from matrix-org/erikj/fix_messages_token | Andrew Morgan | 2020-02-13 | 2 | -0/+3 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #5513 from matrix-org/erikj/fix_messages_token | Erik Johnston | 2019-06-21 | 2 | -0/+3 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fix /messages on worker when no token supplied | |||||
| | * | | | | | | | | | Newsfile | Erik Johnston | 2019-06-21 | 1 | -0/+1 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | Fix /messages on worker when no token supplied | Erik Johnston | 2019-06-21 | 1 | -0/+2 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #5505 from matrix-org/erikj/messages_worker | Andrew Morgan | 2020-02-13 | 2 | -1/+2 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #5505 from matrix-org/erikj/messages_worker | Erik Johnston | 2019-06-21 | 3 | -0/+10 | |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | Support pagination API in client_reader worker | |||||
| | * | | | | | | | | Update docs/workers.rst | Erik Johnston | 2019-06-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | E_TOO_MANY_NEGATIVES Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | |||||
| | * | | | | | | | | Newsfile | Erik Johnston | 2019-06-21 | 1 | -0/+1 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Support pagination API in client_reader worker | Andrew Morgan | 2020-02-13 | 2 | -0/+9 | |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | Support pagination API in client_reader worker | Erik Johnston | 2019-06-21 | 2 | -0/+9 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #5476 from matrix-org/erikj/histogram_extremities | Andrew Morgan | 2020-02-13 | 0 | -0/+0 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Merge pull request #5476 from matrix-org/erikj/histogram_extremities | Erik Johnston | 2019-06-21 | 3 | -1/+37 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add metrics for length of new extremities persisted. | |||||
* | | | | | | | | | | Improve email notification logging (#5502) | Andrew Morgan | 2020-02-13 | 2 | -1/+2 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Improve email notification logging (#5502) | Neil Johnson | 2019-06-20 | 2 | -1/+2 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Black | Andrew Morgan | 2020-02-13 | 2 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | Black | Erik Johnston | 2019-06-20 | 1 | -2/+2 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-06-20 | 400 | -10564/+9688 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/histogram_extremities | |||||
| * | | | | | | | | | Add descriptions and remove redundant set(..) | Erik Johnston | 2019-06-19 | 2 | -4/+7 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Run Black. (#5482) | Andrew Morgan | 2020-02-13 | 59 | -774/+877 | |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | Run Black. (#5482) | Amber Brown | 2019-06-20 | 376 | -10399/+9153 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Dinsic Blacking with black==18.6b2 | Andrew Morgan | 2020-02-11 | 353 | -10315/+8823 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #5042 from matrix-org/erikj/fix_get_missing_events_error | Andrew Morgan | 2020-02-10 | 0 | -0/+0 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #5042 from matrix-org/erikj/fix_get_missing_events_error | Erik Johnston | 2019-06-19 | 2 | -9/+20 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Handle the case of `get_missing_events` failing | |||||
* | | | | | | | | | | | Merge pull request #5480 from matrix-org/erikj/extremities_dummy_events | Andrew Morgan | 2020-02-10 | 3 | -4/+7 | |
|\| | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge pull request #5480 from matrix-org/erikj/extremities_dummy_events | Erik Johnston | 2019-06-19 | 7 | -1/+166 | |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add experimental option to reduce extremities. | |||||
| | * | | | | | | | | | | Run as background process and fix comments | Erik Johnston | 2019-06-19 | 3 | -4/+7 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #5490 from matrix-org/rav/xmlsec_in_docker | Andrew Morgan | 2020-02-10 | 0 | -0/+0 | |
|\| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge pull request #5490 from matrix-org/rav/xmlsec_in_docker | Richard van der Hoff | 2019-06-19 | 2 | -1/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Include xmlsec in the docker image | |||||
* | | | | | | | | | | | | | Merge pull request #5493 from matrix-org/babolivier/deactivate_bg_job_typo | Andrew Morgan | 2020-02-10 | 0 | -0/+0 | |
|\| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge pull request #5493 from matrix-org/babolivier/deactivate_bg_job_typo | Brendan Abolivier | 2019-06-19 | 2 | -1/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in deactivation background job | |||||
| | * | | | | | | | | | | | | Fix typo in deactivation background job | Brendan Abolivier | 2019-06-19 | 2 | -1/+2 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge pull request #4276 from Ralith/performance-advice | Andrew Morgan | 2020-02-10 | 0 | -0/+0 | |
|\| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge pull request #4276 from Ralith/performance-advice | Richard van der Hoff | 2019-06-18 | 3 | -7/+29 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve advice regarding poor performance | |||||
* | | | | | | | | | | | | | | Add some logging to 3pid invite sig verification (#5015) | Andrew Morgan | 2020-02-10 | 2 | -8/+39 | |
|\| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Add some logging to 3pid invite sig verification (#5015) | David Baker | 2019-06-18 | 2 | -8/+39 | |
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I had to add quite a lot of logging to diagnose a problem with 3pid invites - we only logged the one failure which isn't all that informative. NB. I'm not convinced the logic of this loop is right: I think it should just accept a single valid signature from a trusted source rather than fail if *any* signature is invalid. Also it should probably not skip the rest of middle loop if a check fails? However, I'm deliberately not changing the logic here. | |||||
* | | | | | | | | | | | | | changelog | Andrew Morgan | 2020-02-10 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | changelog | Richard van der Hoff | 2019-06-18 | 1 | -0/+1 | |
| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Include xmlsec in the docker image | Andrew Morgan | 2020-02-10 | 1 | -1/+3 | |
|\| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Include xmlsec in the docker image | Richard van der Hoff | 2019-06-18 | 1 | -1/+3 | |
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #5467. | |||||
* | | | | | | | | | | | | README.rst: fix header level | Andrew Morgan | 2020-02-10 | 3 | -7/+29 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | README.rst: fix header level | Richard van der Hoff | 2019-06-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Improve advice regarding poor performance | Benjamin Saunders | 2019-06-09 | 3 | -7/+29 | |
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Benjamin Saunders <ben.e.saunders@gmail.com> | |||||
* | | | | | | | | | | | Fix logline | Andrew Morgan | 2020-02-10 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Fix logline | Erik Johnston | 2019-06-18 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Andrew Morgan | 2020-02-10 | 2 | -9/+20 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/fix_get_missing_events_error | |||||
| * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-06-18 | 387 | -9715/+17324 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | erikj/fix_get_missing_events_error | |||||
| * | | | | | | | | | | Newsfile | Erik Johnston | 2019-04-10 | 1 | -0/+1 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Handle the case of `get_missing_events` failing | Erik Johnston | 2019-04-10 | 1 | -9/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently if a call to `/get_missing_events` fails we log an exception and stop processing the top level event we received over federation. Instead let's try and handle it sensibly given it is a somewhat expected failure mode. | |||||
* | | | | | | | | | | | Newsfile | Andrew Morgan | 2020-02-10 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Newsfile | Erik Johnston | 2019-06-18 | 1 | -0/+1 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Add experimental option to reduce extremities. | Andrew Morgan | 2020-02-10 | 6 | -1/+162 | |
|\| | | | | | | | | | | ||||||
| * | | | | | | | | | | Add experimental option to reduce extremities. | Erik Johnston | 2019-06-18 | 6 | -1/+162 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds new config option `cleanup_extremities_with_dummy_events` which periodically sends dummy events to rooms with more than 10 extremities. THIS IS REALLY EXPERIMENTAL. | |||||
* | | | | | | | | | | | Only count non-cache state resolution | Andrew Morgan | 2020-02-10 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Only count non-cache state resolution | Erik Johnston | 2019-06-18 | 1 | -3/+3 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Use consistent buckets | Andrew Morgan | 2020-02-10 | 3 | -1/+34 | |
|\| | | | | | | | | | | ||||||
| * | | | | | | | | | | Use consistent buckets | Erik Johnston | 2019-06-18 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Newsfile | Erik Johnston | 2019-06-17 | 1 | -0/+1 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Add metric fo number of state groups in resolution | Erik Johnston | 2019-06-17 | 1 | -0/+10 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Add metrics for len of new extremities persisted. | Erik Johnston | 2019-06-17 | 1 | -1/+23 | |
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Of new events being persisted add metrics for total size of forward extremities and number of unchanged, "stale" extremities. | |||||
* | | | | | | | | | | Fix seven contrib files with Python syntax errors (#5446) | Andrew Morgan | 2020-02-10 | 7 | -119/+131 | |
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | Fix seven contrib files with Python syntax errors (#5446) | cclauss | 2019-06-18 | 7 | -119/+131 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix seven contrib files with Python syntax errors Signed-off-by: cclauss <cclauss@me.com> | |||||
* | | | | | | | | | | Merge pull request #5477 from matrix-org/babolivier/third_party_rules_3pid | Andrew Morgan | 2020-02-10 | 1 | -0/+9 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #5477 from matrix-org/babolivier/third_party_rules_3pid | Brendan Abolivier | 2019-06-17 | 3 | -1/+43 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Add third party rules hook for 3PID invites | |||||
| | * | | | | | | | | | Make check_threepid_can_be_invited async | Brendan Abolivier | 2019-06-17 | 1 | -0/+1 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | Changelog | Brendan Abolivier | 2019-06-17 | 1 | -0/+1 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | Add third party rules hook for 3PID invites | Brendan Abolivier | 2019-06-17 | 2 | -1/+41 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #5479 from matrix-org/erikj/add_create_room_hook_develop | Andrew Morgan | 2020-02-10 | 0 | -0/+0 | |
|\| | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge pull request #5479 from matrix-org/erikj/add_create_room_hook_develop | Erik Johnston | 2019-06-17 | 3 | -4/+49 | |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add third party rules hook into create room | |||||
| | * | | | | | | | | | | Newsfile | Erik Johnston | 2019-06-17 | 1 | -0/+1 | |
| | |/ / / / / / / / / | ||||||
| | * / / / / / / / / | Add third party rules hook into create room | Erik Johnston | 2019-06-17 | 2 | -4/+48 | |
| | |/ / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #5478 from matrix-org/joriks/demo_python3 | Andrew Morgan | 2020-02-10 | 1 | -0/+1 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #5478 from matrix-org/joriks/demo_python3 | Jorik Schellekens | 2019-06-17 | 3 | -4/+71 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Joriks/demo python3 | |||||
| | * | | | | | | | | | Changelog | Jorik Schellekens | 2019-06-17 | 1 | -0/+1 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge commit '839f9b923' into dinsic-release-v1.1.0 | Andrew Morgan | 2020-02-10 | 2 | -4/+70 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | One shot demo server startup | Jorik Schellekens | 2019-06-17 | 2 | -4/+70 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure the demo servers to use untrusted tls certs so that they communicate with each other. This configuration makes them very unsafe so I've added warnings about it in the readme. | |||||
* | | | | | | | | | | | Remove Postgres 9.4 support (#5448) | Andrew Morgan | 2020-02-10 | 10 | -79/+50 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Remove Postgres 9.4 support (#5448) | Amber Brown | 2019-06-18 | 10 | -79/+50 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #5385 from matrix-org/erikj/reduce_http_exceptions | Andrew Morgan | 2020-02-10 | 5 | -19/+29 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #5385 from matrix-org/erikj/reduce_http_exceptions | Erik Johnston | 2019-06-17 | 5 | -19/+29 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Handle HttpResponseException when using federation client. | |||||
| | * | | | | | | | | | Handle failing to talk to master over replication | Erik Johnston | 2019-06-07 | 1 | -1/+9 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | Newsfile | Erik Johnston | 2019-06-07 | 1 | -0/+1 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | Handle HttpResponseException when using federation client. | Erik Johnston | 2019-06-07 | 3 | -18/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise we just log exceptions everywhere. | |||||
* | | | | | | | | | | | Merge commit 'dd927b29e' into dinsic-release-v1.1.0 | Andrew Morgan | 2020-02-10 | 5 | -30/+124 | |
|\| | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge pull request #5388 from matrix-org/erikj/fix_email_push | Erik Johnston | 2019-06-17 | 5 | -30/+124 | |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix email notifications for unnamed rooms with multiple people | |||||
| | * | | | | | | | | | | Newsfile | Erik Johnston | 2019-06-07 | 1 | -0/+1 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | Add test | Erik Johnston | 2019-06-07 | 3 | -8/+70 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | Refactor email tests | Erik Johnston | 2019-06-07 | 1 | -22/+42 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | Fix email notifications for large unnamed rooms. | Erik Johnston | 2019-06-07 | 1 | -0/+11 | |
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we try and calculate a description for a room for with no name but multiple other users we threw an exception (due to trying to subscript result of `dict.values()`). | |||||
* | | | | | | | | | | | Merge pull request #5389 from matrix-org/erikj/renew_attestations_on_master | Andrew Morgan | 2020-02-10 | 2 | -3/+5 | |
|\| | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge pull request #5389 from matrix-org/erikj/renew_attestations_on_master | Erik Johnston | 2019-06-17 | 2 | -3/+5 | |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Only start background group attestation renewals on master | |||||
| | * | | | | | | | | | | Newsfile | Erik Johnston | 2019-06-07 | 1 | -0/+1 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | Only start background group attestation renewals on master | Erik Johnston | 2019-06-07 | 1 | -3/+4 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Move SyTest to Buildkite (#5459) | Andrew Morgan | 2020-02-10 | 6 | -61/+222 | |
|\| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Move SyTest to Buildkite (#5459) | Amber Brown | 2019-06-17 | 6 | -76/+247 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Including workers! | |||||
* | | | | | | | | | | | | Merge pull request #5464 from matrix-org/erikj/3pid_remote_invite_state | Andrew Morgan | 2020-02-10 | 0 | -0/+0 | |
|\| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge pull request #5464 from matrix-org/erikj/3pid_remote_invite_state | Erik Johnston | 2019-06-17 | 3 | -7/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 3PID invite room state over federation. | |||||
* | | | | | | | | | | | | | Merge pull request #5440 from matrix-org/babolivier/third_party_event_rules | Andrew Morgan | 2020-02-10 | 0 | -0/+0 | |
|\| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge pull request #5440 from matrix-org/babolivier/third_party_event_rules | Brendan Abolivier | 2019-06-14 | 9 | -4/+284 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow server admins to define implementations of extra rules for allowing or denying incoming events | |||||
* | | | | | | | | | | | | | | Merge pull request #5461 from matrix-org/erikj/histograms_are_cumalitive | Andrew Morgan | 2020-02-10 | 4 | -12/+13 | |
|\| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Merge pull request #5461 from matrix-org/erikj/histograms_are_cumalitive | Erik Johnston | 2019-06-14 | 4 | -12/+13 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prometheus histograms are cumalative | |||||
| | * | | | | | | | | | | | | | Newsfile | Erik Johnston | 2019-06-14 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Prometheus histograms are cumalative | Erik Johnston | 2019-06-14 | 3 | -12/+12 | |
| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge remote-tracking branch 'dinsic/dinsic' into dinsic-release-v1.1.0 | Andrew Morgan | 2020-02-10 | 78 | -208/+2109 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Fix resetting password via a phone number (#21) dinsic_2020-02-10 | Andrew Morgan | 2020-01-24 | 2 | -1/+2 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Validate client_secret parameter according to spec (#20) | Andrew Morgan | 2020-01-22 | 4 | -1/+34 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Add the ability to restrict max avatar filesize and content-type (#19) | Andrew Morgan | 2019-12-12 | 5 | -2/+104 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Add some flaky sytests to a sytest-blacklist (#17) | Andrew Morgan | 2019-12-09 | 3 | -0/+16 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Add limit_profile_requests_to_known_users option (#18) | Andrew Morgan | 2019-12-05 | 5 | -2/+24 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Fix scripts/generate_signing_key.py import statement (#15) | Andrew Morgan | 2019-12-03 | 2 | -1/+2 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Capatilise letters after a - in new user displaynames (#14) | Andrew Morgan | 2019-12-02 | 3 | -16/+87 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge pull request #16 from matrix-org/babolivier/dinsic-state-retrieval | Brendan Abolivier | 2019-11-29 | 3 | -7/+16 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Discard retention policies when retrieving state | |||||
| | * | | | | | | | | | | | | | | | Changelog | Brendan Abolivier | 2019-11-29 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Discard retention policies when retrieving state | Brendan Abolivier | 2019-11-29 | 2 | -7/+15 | |
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Purge jobs don't delete the latest event in a room in order to keep the forward extremity and not break the room. On the other hand, get_state_events, when given an at_token argument calls filter_events_for_client to know if the user can see the event that matches that (sync) token. That function uses the retention policies of the events it's given to filter out those that are too old from a client's view. Some clients, such as Riot, when loading a room, request the list of members for the latest sync token it knows about, and get confused to the point of refusing to send any message if the server tells it that it can't get that information. This can happen very easily with the message retention feature turned on and a room with low activity so that the last event sent becomes too old according to the room's retention policy. An easy and clean fix for that issue is to discard the room's retention policies when retrieving state. | |||||
| * | | | | | | | | | | | | | | | Hide expired users from user directory, optionally show on renewal (#13) | Andrew Morgan | 2019-11-14 | 4 | -0/+191 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Add a /user/:user_id/info servlet to give user deactivated/expired ↵ | Andrew Morgan | 2019-11-14 | 3 | -6/+93 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | information (#12) | |||||
| * | | | | | | | | | | | | | | | Create configurable ratelimiter for 3pid invites (#11) | Andrew Morgan | 2019-11-12 | 5 | -8/+33 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge pull request #10 from matrix-org/babolivier/dinsic-retention-visibility | Brendan Abolivier | 2019-11-11 | 3 | -6/+20 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't apply retention policy based filtering on state events | |||||
| | * | | | | | | | | | | | | | | | Changelog | Brendan Abolivier | 2019-11-06 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Don't apply retention policy based filtering on state events | Brendan Abolivier | 2019-11-06 | 2 | -6/+19 | |
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per MSC1763, 'Retention is only considered for non-state events.', so don't filter out state events based on the room's retention policy. | |||||
| * | | | | | | | | | | | | | | | Support for routing outbound HTTP requests via a proxy (#6239) | Richard van der Hoff | 2019-11-01 | 16 | -15/+813 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `http_proxy` and `HTTPS_PROXY` env vars can be set to a `host[:port]` value which should point to a proxy. The address of the proxy should be excluded from IP blacklists such as the `url_preview_ip_range_blacklist`. The proxy will then be used for * push * url previews * phone-home stats * recaptcha validation * CAS auth validation It will *not* be used for: * Application Services * Identity servers * Outbound federation * In worker configurations, connections from workers to masters Fixes #4198. | |||||
| * | | | | | | | | | | | | | | | Merge pull request #9 from matrix-org/babolivier/ci | Brendan Abolivier | 2019-10-31 | 5 | -59/+138 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add SyTest to the BuildKite CI | |||||
| | * | | | | | | | | | | | | | | | Remove python TAP script | Brendan Abolivier | 2019-10-31 | 1 | -48/+0 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Don't use test image | Brendan Abolivier | 2019-10-31 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Remove CircleCI configuration | Brendan Abolivier | 2019-10-23 | 2 | -111/+0 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Move sytest jobs to the right location | Brendan Abolivier | 2019-10-23 | 1 | -102/+103 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Try running the workers job on bigger agents | Brendan Abolivier | 2019-10-21 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Add py3 jobs on BuildKite | Brendan Abolivier | 2019-10-18 | 1 | -2/+53 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Add TAP formatting script | Brendan Abolivier | 2019-10-18 | 1 | -0/+48 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Add workers to buildkite | Brendan Abolivier | 2019-10-09 | 1 | -0/+25 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Try to run stuff on buildkite | Brendan Abolivier | 2019-10-09 | 1 | -6/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Actually use the right image | Brendan Abolivier | 2019-10-09 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Add python3 jobs | Brendan Abolivier | 2019-10-09 | 1 | -4/+34 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | fix | Brendan Abolivier | 2019-10-08 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Try to fix CircleCI | Brendan Abolivier | 2019-10-08 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | peek | Brendan Abolivier | 2019-10-08 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | peek | Brendan Abolivier | 2019-10-08 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | peek | Brendan Abolivier | 2019-10-08 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | peek | Brendan Abolivier | 2019-10-08 | 2 | -0/+2 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | peek | Brendan Abolivier | 2019-10-08 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | peek | Brendan Abolivier | 2019-10-08 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Temporarily move the sytest job before the wait | Brendan Abolivier | 2019-10-08 | 1 | -26/+27 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | peek | Brendan Abolivier | 2019-10-08 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Try adding workers to CircleCI instead | Brendan Abolivier | 2019-10-07 | 1 | -0/+18 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Use mainline's merge_base_branch.sh | Brendan Abolivier | 2019-10-07 | 1 | -11/+10 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Changelog | Brendan Abolivier | 2019-10-07 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | First attempt at running SyTest in buildkite | Brendan Abolivier | 2019-10-07 | 2 | -0/+60 | |
| |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | Merge pull request #8 from matrix-org/babolivier/3pid-invite-revoked | Brendan Abolivier | 2019-10-04 | 4 | -5/+100 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't 500 when trying to exchange a revoked 3PID invite | |||||
| | * | | | | | | | | | | | | | | | Fixup tests | Brendan Abolivier | 2019-10-04 | 2 | -4/+12 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Typo | Brendan Abolivier | 2019-10-04 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Lint | Brendan Abolivier | 2019-10-04 | 1 | -3/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Incorporate review | Brendan Abolivier | 2019-10-04 | 1 | -14/+8 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Lint (again) | Brendan Abolivier | 2019-10-04 | 1 | -3/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Lint | Brendan Abolivier | 2019-10-04 | 1 | -5/+5 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Add test case | Brendan Abolivier | 2019-10-04 | 2 | -1/+84 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Changelog | Brendan Abolivier | 2019-10-04 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Lint | Brendan Abolivier | 2019-10-04 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Don't 500 code when trying to exchange a revoked 3PID invite | Brendan Abolivier | 2019-10-04 | 1 | -2/+13 | |
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While this is not documented in the spec (but should be), Riot (and other clients) revoke 3PID invites by sending a m.room.third_party_invite event with an empty ({}) content to the room's state. When the invited 3PID gets associated with a MXID, the identity server (which doesn't know about revocations) sends down to the MXID's homeserver all of the undelivered invites it has for this 3PID. The homeserver then tries to talk to the inviting homeserver in order to exchange these invite for m.room.member events. When one of the invite is revoked, the inviting homeserver responds with a 500 error because it tries to extract a 'display_name' property from the content, which is empty. This might cause the invited server to consider that the server is down and not try to exchange other, valid invites (or at least delay it). This fix handles the case of revoked invites by avoiding trying to fetch a 'display_name' from the original invite's content, and letting the m.room.member event fail the auth rules (because, since the original invite's content is empty, it doesn't have public keys), which results in sending a 403 with the correct error message to the invited server. | |||||
| * | | | | | | | | | | | | | | | Merge pull request #7 from matrix-org/babolivier/deactivation-invite | Brendan Abolivier | 2019-09-27 | 3 | -2/+94 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reject pending invites on deactivation | |||||
| | * | | | | | | | | | | | | | | | Fix git messing up | Brendan Abolivier | 2019-09-27 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | s/return/defer.returnValue/ | Brendan Abolivier | 2019-09-27 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Incorporate review | Brendan Abolivier | 2019-09-27 | 1 | -4/+2 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Update synapse/handlers/deactivate_account.py | Brendan Abolivier | 2019-09-27 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | |||||
| | * | | | | | | | | | | | | | | | Update synapse/handlers/deactivate_account.py | Brendan Abolivier | 2019-09-27 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | |||||
| | * | | | | | | | | | | | | | | | Update changelog.d/6125.feature | Brendan Abolivier | 2019-09-27 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | |||||
| | * | | | | | | | | | | | | | | | ok | Brendan Abolivier | 2019-09-27 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Lint | Brendan Abolivier | 2019-09-27 | 2 | -1/+85 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Merge pull request #6 from matrix-org/babolivier/access-rules-membership | Brendan Abolivier | 2019-09-26 | 2 | -1/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | Allow membership events which membership isn't join or invite in restricted rooms | |||||
| | * | | | | | | | | | | | | | | | Changelog | Brendan Abolivier | 2019-09-26 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Allow membership events which membership isn't join or invite in restricted ↵ | Brendan Abolivier | 2019-09-26 | 1 | -1/+9 | |
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rooms | |||||
| * | | | | | | | | | | | | | | | Merge pull request #5 from matrix-org/babolivier/get-retention-worker | Michael Kaye | 2019-09-25 | 2 | -55/+64 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix room retention policy management in worker mode | |||||
| | * | | | | | | | | | | | | | | | Typo | Brendan Abolivier | 2019-09-24 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Consider every room as having no retention policy if the feature is disabled | Brendan Abolivier | 2019-09-24 | 1 | -0/+8 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Changelog | Brendan Abolivier | 2019-09-24 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Move get_retention_policy_for_room to RoomWorkerStore | Brendan Abolivier | 2019-09-24 | 1 | -55/+55 | |
| |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | Merge pull request #4 from matrix-org/babolivier/strip_invalid_mxid_characters | Brendan Abolivier | 2019-09-20 | 3 | -2/+26 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix handling of filtered strings in Python 3 when processing MXIDs | |||||
| | * | | | | | | | | | | | | | | | Remove unnecessary cast to list | Brendan Abolivier | 2019-09-20 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Changelog | Brendan Abolivier | 2019-09-19 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Lint | Brendan Abolivier | 2019-09-19 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Use six.moves.filter when filtering out from MXID | Brendan Abolivier | 2019-09-19 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Python 2's filter() function and Python 3's don't return the same type when processing a string (respectively str and filter), therefore use six's compatibility mapping (which resolves to itertools.ifilter() if using Python2), then generate a string from the filtered list, in order to ensure consistent behaviour between Python 2 and Python 3. | |||||
| | * | | | | | | | | | | | | | | | Add unit tests for strip_invalid_mxid_characters | Brendan Abolivier | 2019-09-19 | 1 | -1/+21 | |
| |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | Merge pull request #2 from matrix-org/babolivier/dinsic-3pid-invite | Brendan Abolivier | 2019-09-10 | 3 | -9/+79 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't treat 3PID revocation as a new 3PID invite | |||||
| | * | | | | | | | | | | | | | | | Update changelog.d/2.bugfix | Brendan Abolivier | 2019-09-10 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | |||||
| | * | | | | | | | | | | | | | | | Process revocations in _on_membership_or_invite_direct | Brendan Abolivier | 2019-09-09 | 1 | -18/+11 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Typo | Brendan Abolivier | 2019-09-06 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Lint | Brendan Abolivier | 2019-09-06 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Changelog | Brendan Abolivier | 2019-09-06 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Only filter on 3PID invite tokens | Brendan Abolivier | 2019-09-06 | 1 | -6/+6 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Fix bogus conflict resolution | Brendan Abolivier | 2019-09-06 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Merge branch 'dinsic' into babolivier/dinsic-3pid-invite | Brendan Abolivier | 2019-09-06 | 6 | -13/+166 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | Don't process revoked/redacted events as part of the room's membership info | Brendan Abolivier | 2019-09-06 | 2 | -2/+12 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Don't treat 3PID revokation as a new 3PID invite | Brendan Abolivier | 2019-09-06 | 2 | -7/+74 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Merge pull request #3 from matrix-org/babolivier/password-reset-template-unicode | Brendan Abolivier | 2019-09-09 | 5 | -8/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | Ensure the password reset template is correctly converted to binary | |||||
| | * | | | | | | | | | | | | | | | | Rename io.open import to limite side-effects | Brendan Abolivier | 2019-09-09 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Lint | Brendan Abolivier | 2019-09-09 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Revert "Merge pull request #5932 from ↵ | Brendan Abolivier | 2019-09-09 | 3 | -7/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/babolivier/account_validity_template_encode" This reverts commit 84e695f506faf54982b9e19dceb9c02acffad95f, reversing changes made to 99eec6d2d5cc76e645c3fd7ca6cda85b2bab6feb. | |||||
| | * | | | | | | | | | | | | | | | | Read all files as UTF-8 | Brendan Abolivier | 2019-09-09 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Revert "Ensure the password reset template is correctly converted to binary" | Brendan Abolivier | 2019-09-09 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 665dd9f7f8db2f8d38f454d4d5b96efcf163a5db. | |||||
| | * | | | | | | | | | | | | | | | | Changelog | Brendan Abolivier | 2019-09-09 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Ensure the password reset template is correctly converted to binary | Brendan Abolivier | 2019-09-09 | 1 | -1/+2 | |
| |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regardless of the Python version | |||||
| * | | | | | | | | | | | | | | | | Merge pull request #1 from matrix-org/babolivier/direct-avatar-name | Brendan Abolivier | 2019-09-06 | 6 | -5/+159 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | Forbid changing the name, avatar or topic of a direct room | |||||
| | * | | | | | | | | | | | | | | | Fix CI | Brendan Abolivier | 2019-09-05 | 3 | -5/+5 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Lint | Brendan Abolivier | 2019-09-05 | 1 | -2/+0 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Changelog | Brendan Abolivier | 2019-09-05 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Add tests | Brendan Abolivier | 2019-09-05 | 1 | -0/+105 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Forbid changing the name, avatar or topic of a direct room | Brendan Abolivier | 2019-09-05 | 1 | -0/+50 | |
| |/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | Merge pull request #5465 from matrix-org/babolivier/fix_deactivation_bg_job | Andrew Morgan | 2020-02-10 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge pull request #5465 from matrix-org/babolivier/fix_deactivation_bg_job | Brendan Abolivier | 2019-06-14 | 2 | -2/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | Fix background job for deactivated flag | |||||
| | * | | | | | | | | | | | | | | Fix changelog | Brendan Abolivier | 2019-06-14 | 2 | -1/+2 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Changelog | Brendan Abolivier | 2019-06-14 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Fix background job for deactivated flag | Brendan Abolivier | 2019-06-14 | 1 | -2/+4 | |
| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge pull request #5462 from ↵ | Andrew Morgan | 2020-02-10 | 0 | -0/+0 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/babolivier/account_validity_deactivated_accounts_2 | |||||
| * | | | | | | | | | | | | | | | Merge pull request #5462 from ↵ | Brendan Abolivier | 2019-06-14 | 6 | -27/+68 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/babolivier/account_validity_deactivated_accounts_2 Don't send renewal emails to deactivated users (second attempt) | |||||
* | | | | | | | | | | | | | | | | Merge pull request #5460 from matrix-org/joriks/demo_python3 | Andrew Morgan | 2020-02-10 | 1 | -0/+1 | |
|\| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge pull request #5460 from matrix-org/joriks/demo_python3 | Jorik Schellekens | 2019-06-14 | 2 | -2/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use python3 in the demo | |||||
| | * | | | | | | | | | | | | | | | Changelog | Jorik Schellekens | 2019-06-14 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Don't send renewal emails to deactivated users | Andrew Morgan | 2020-02-10 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Don't send renewal emails to deactivated users | Brendan Abolivier | 2019-06-14 | 6 | -27/+68 | |
| | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge pull request #5390 from matrix-org/erikj/dont_log_on_fail_to_get_file | Andrew Morgan | 2020-02-10 | 3 | -6/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge pull request #5390 from matrix-org/erikj/dont_log_on_fail_to_get_file | Erik Johnston | 2019-06-14 | 3 | -6/+14 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | Don't log exception when failing to fetch remote content. | |||||
| | * | | | | | | | | | | | | | | Newsfile | Erik Johnston | 2019-06-07 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Don't log exception when failing to fetch remote content. | Erik Johnston | 2019-06-07 | 2 | -6/+13 | |
| | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In particular, let's not log stack traces when we stop processing becuase the response body was too large. | |||||
* | | | | | | | | | | | | | | | Track deactivated accounts in the database (#5378) | Andrew Morgan | 2020-02-10 | 1 | -0/+3 | |
|\| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Track deactivated accounts in the database (#5378) | Brendan Abolivier | 2019-06-14 | 5 | -0/+183 | |
| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Use python3 in the demo | Andrew Morgan | 2020-02-10 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Use python3 in the demo | Jorik Schellekens | 2019-06-14 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge pull request #5458 from matrix-org/hawkowl/fix-prometheus | Andrew Morgan | 2020-02-10 | 3 | -39/+25 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge pull request #5458 from matrix-org/hawkowl/fix-prometheus | Erik Johnston | 2019-06-14 | 3 | -39/+25 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | Fix Prometheus erroring after the extremities monitoring | |||||
| | * | | | | | | | | | | | | | changelog | Amber H. Brown | 2019-06-14 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | fix prometheus rendering error | Amber H. Brown | 2019-06-14 | 2 | -39/+24 | |
| |/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Updates to the federation_client script (#5447) | Andrew Morgan | 2020-02-10 | 2 | -5/+39 | |
|\| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Updates to the federation_client script (#5447) | Richard van der Hoff | 2019-06-13 | 2 | -5/+39 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * py3 fixes for federation_client * .well-known support for federation_client | |||||
* | | | | | | | | | | | | | | Clean up code for sending federation EDUs. (#5381) | Andrew Morgan | 2020-02-10 | 2 | -14/+27 | |
|\| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Clean up code for sending federation EDUs. (#5381) | Richard van der Hoff | 2019-06-13 | 2 | -14/+27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code confused the hell out of me today. Split _get_new_device_messages into its two (unrelated) parts. | |||||
* | | | | | | | | | | | | | | Expose statistics on extrems to prometheus (#5384) | Andrew Morgan | 2020-02-10 | 7 | -114/+331 | |
|\| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Expose statistics on extrems to prometheus (#5384) | Amber Brown | 2019-06-13 | 7 | -114/+331 | |
| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Remove Python 2.7 support. (#5425) | Andrew Morgan | 2020-02-10 | 22 | -130/+104 | |
|\| | | | | | | | | | | | | | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Remove Python 2.7 support. (#5425) | Amber Brown | 2019-06-12 | 9 | -170/+25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove 2.7 from CI and publishing * fill out classifiers and also make it not be installed on 3.5 * some minor bumps so that the old deps work on python 3.5 | |||||
| * | | | | | | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2019-06-11 | 18 | -50/+394 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2019-06-11 | 6 | -2/+14 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Don't warn user about password reset disabling through config code (#5387) | Andrew Morgan | 2019-06-11 | 3 | -10/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves the warning about password resets being disabled to the point where a user actually tries to reset their password. Is this an appropriate place for it to happen? Also removed the disabling of msisdn password resets when you don't have an email config, as that just doesn't make sense. Also change the error a user receives upon disabled passwords to specify that only email-based password reset is disabled. | |||||
| * | | | | | | | | | | | | add monthly active users to phonehome stats (#5252) | Neil Johnson | 2019-06-10 | 3 | -15/+31 | |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add monthly active users to phonehome stats | |||||
| * | | | | | | | | | | | Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2019-06-10 | 14 | -195/+489 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #5415 from matrix-org/erikj/fix_null_valid_until_ms | Erik Johnston | 2019-06-10 | 3 | -1/+58 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix key verification when key stored with null valid_until_ms | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #5412 from SohamG/fix-4130 | Erik Johnston | 2019-06-10 | 2 | -3/+17 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add --no-daemonize option to synctl | |||||
| | * | | | | | | | | | | | | | Accidentally reversed pep8 fixed before, fixed now | sohamg | 2019-06-10 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Edited description to note that the arg will not work with daemonize set in ↵ | sohamg | 2019-06-10 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the config. | |||||
| | * | | | | | | | | | | | | | Resolved pep8 extra spacing issue | sohamg | 2019-06-10 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Added changelog file. | sohamg | 2019-06-10 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | |