Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #5720 from matrix-org/erikj/transactions_upsert | Andrew Morgan | 2020-02-19 | 2 | -0/+21 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | Merge pull request #5720 from matrix-org/erikj/transactions_upsert | Erik Johnston | 2019-07-19 | 2 | -0/+21 | |
| |\ \ \ | | | | | | | | | | | Use upsert when updating destination retry interval | |||||
| | * | | | Newsfile | Erik Johnston | 2019-07-19 | 1 | -0/+1 | |
| | | | | | ||||||
| | * | | | Use upsert when updating destination retry interval | Erik Johnston | 2019-07-19 | 1 | -0/+20 | |
| | | |/ | | |/| | ||||||
* | | | | Merge pull request #5713 from matrix-org/erikj/use_cache_for_filtered_state | Andrew Morgan | 2020-02-19 | 2 | -2/+7 | |
|\| | | | ||||||
| * | | | Merge pull request #5713 from matrix-org/erikj/use_cache_for_filtered_state | Erik Johnston | 2019-07-19 | 2 | -2/+7 | |
| |\ \ \ | | | | | | | | | | | Delegate to cached version when using get_filtered_current_state_ids | |||||
| | * | | | Newsfile | Erik Johnston | 2019-07-18 | 1 | -0/+1 | |
| | | | | | ||||||
| | * | | | Delegate to cached version when using get_filtered_current_state_ids | Erik Johnston | 2019-07-18 | 1 | -2/+6 | |
| | | | | | | | | | | | | | | | | | | | | In the case where it gets called with `StateFilter.all()` | |||||
* | | | | | Merge pull request #5706 from matrix-org/erikj/add_memberships_to_current_state | Andrew Morgan | 2020-02-19 | 5 | -21/+100 | |
|\| | | | | ||||||
| * | | | | Merge pull request #5706 from matrix-org/erikj/add_memberships_to_current_state | Erik Johnston | 2019-07-19 | 8 | -41/+195 | |
| |\ \ \ \ | | | | | | | | | | | | | Add membership column to current_state_events table | |||||
| | * | | | | LoggingTransaction accepts None for callback lists. | Erik Johnston | 2019-07-19 | 3 | -6/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Its a bit disingenuousto give LoggingTransaction lists to append callbacks to if we're not going to run the callbacks. | |||||
| | * | | | | Update comment for new column | Erik Johnston | 2019-07-19 | 1 | -0/+3 | |
| | | | | | | ||||||
| | * | | | | Newsfile | Erik Johnston | 2019-07-18 | 1 | -0/+1 | |
| | | | | | | ||||||
| | * | | | | Use the current_state_events.membership column | Erik Johnston | 2019-07-18 | 1 | -17/+37 | |
| | | | | | | ||||||
| | * | | | | Track if current_state_events.membership is up to date | Erik Johnston | 2019-07-18 | 1 | -0/+45 | |
| | | | | | | ||||||
* | | | | | | Don't accept opentracing data from clients. (#5715) | Andrew Morgan | 2020-02-19 | 2 | -2/+2 | |
|\| | | | | | ||||||
| * | | | | | Don't accept opentracing data from clients. (#5715) | Jorik Schellekens | 2019-07-19 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Don't accept opentracing data from clients. * newsfile | |||||
* | | | | | | Add 'rel' attribute to default welcome page. (#5695) | Andrew Morgan | 2020-02-19 | 2 | -2/+3 | |
|\| | | | | | ||||||
| * | | | | | Add 'rel' attribute to default welcome page. (#5695) | Neil Johnson | 2019-07-19 | 2 | -2/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | add rel attribute as a precaution against reverse tabnabbing in future | |||||
* | | | | | | Update the coding style doc (#5719) | Andrew Morgan | 2020-02-19 | 2 | -30/+95 | |
|\| | | | | | ||||||
| * | | | | | Update the coding style doc (#5719) | Richard van der Hoff | 2019-07-19 | 2 | -30/+95 | |
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | A few fixes and removal of duplicated stuff, but mostly a bunch of the words on the config file. | |||||
* | | | | | Speed up the PostgreSQL unit tests (#5717) | Andrew Morgan | 2020-02-19 | 2 | -3/+10 | |
|\| | | | | ||||||
| * | | | | Speed up the PostgreSQL unit tests (#5717) | Amber Brown | 2019-07-19 | 2 | -3/+10 | |
| | | | | | ||||||
* | | | | | Remove non-dedicated logging options and command line arguments (#5678) | Andrew Morgan | 2020-02-19 | 5 | -76/+15 | |
|\| | | | | ||||||
| * | | | | Remove non-dedicated logging options and command line arguments (#5678) | Amber Brown | 2019-07-19 | 3 | -75/+13 | |
| | |_|/ | |/| | | ||||||
| * | | | towncrier | Neil Johnson | 2019-07-18 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | enable aggregations support by default | Neil Johnson | 2019-07-18 | 1 | -1/+1 | |
| | |/ | |/| | ||||||
* | | | Clean up opentracing configuration options (#5712) | Andrew Morgan | 2020-02-19 | 7 | -63/+96 | |
|\| | | ||||||
| * | | Clean up opentracing configuration options (#5712) | Richard van der Hoff | 2019-07-18 | 7 | -63/+96 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up config settings and dead code. This is mostly about cleaning up the config format, to bring it into line with our conventions. In particular: * There should be a blank line after `## Section ##' headings * There should be a blank line between each config setting * There should be a `#`-only line between a comment and the setting it describes * We don't really do the `# #` style commenting-out of whole sections if we can help it * rename `tracer_enabled` to `enabled` While we're here, do more config parsing upfront, which makes it easier to use later on. Also removes redundant code from LogContextScopeManager. Also changes the changelog fragment to a `feature` - it's exciting! | |||||
* | | | Support Prometheus_client 0.4.0+ (#5636) | Andrew Morgan | 2020-02-19 | 20 | -50/+399 | |
|\| | | ||||||
| * | | Support Prometheus_client 0.4.0+ (#5636) | Amber Brown | 2019-07-18 | 20 | -50/+399 | |
| | | | ||||||
* | | | Remove the ability to query relations when the original event was redacted. ↵ | Andrew Morgan | 2020-02-19 | 5 | -39/+180 | |
|\| | | | | | | | | | | | (#5629) | |||||
| * | | Remove the ability to query relations when the original event was redacted. ↵ | Andrew Morgan | 2019-07-18 | 5 | -39/+180 | |
| | | | | | | | | | | | | | | | | | | | | | (#5629) Fixes #5594 Forbid viewing relations on an event once it has been redacted. | |||||
* | | | Add background update for current_state_events.membership column | Andrew Morgan | 2020-02-19 | 2 | -0/+54 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Add background update for current_state_events.membership column | Erik Johnston | 2019-07-18 | 2 | -0/+54 | |
| | | | ||||||
* | | | Add membership column to current_state_events table. | Andrew Morgan | 2020-02-19 | 5 | -20/+41 | |
|\| | | ||||||
| * | | Add membership column to current_state_events table. | Erik Johnston | 2019-07-18 | 5 | -20/+41 | |
| | | | | | | | | | | | | | | | It turns out that doing a join is surprisingly expensive for the DB to do when room_membership table is larger than the disk cache. | |||||
* | | | Convert synapse.federation.transport.server to async (#5689) | Andrew Morgan | 2020-02-19 | 2 | -242/+189 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Convert synapse.federation.transport.server to async (#5689) | Richard van der Hoff | 2019-07-18 | 2 | -242/+189 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Convert BaseFederationServlet._wrap to async Empirically, this fixes some lost stacktraces. It should be safe because the wrapped function is called from JsonResource._async_render, which is already async. * Convert the rest of synapse.federation.transport.server to async We may as well do the whole file while we're here. * changelog * flake8 | |||||
* | | | Ignore redactions of m.room.create events (#5701) | Andrew Morgan | 2020-02-19 | 5 | -24/+57 | |
|\| | | ||||||
| * | | Ignore redactions of m.room.create events (#5701) | Richard van der Hoff | 2019-07-17 | 5 | -24/+57 | |
| | | | ||||||
* | | | Improve `Depends` specs in debian package. (#5675) | Andrew Morgan | 2020-02-19 | 6 | -3/+33 | |
|\| | | ||||||
| * | | Improve `Depends` specs in debian package. (#5675) | Richard van der Hoff | 2019-07-17 | 6 | -3/+33 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is basically a contrived way of adding a `Recommends` on `libpq5`, to fix #5653. The way this is supposed to happen in debhelper is to run `dh_shlibdeps`, which in turn runs `dpkg-shlibdeps`, which spits things out into `debian/<package>.substvars` whence they can later be included by `control`. Previously, we had disabled `dh_shlibdeps`, mostly because `dpkg-shlibdeps` gets confused about PIL's interdependent objects, but that's not really the right thing to do and there is another way to work around that. Since we don't always use postgres, we don't necessarily want a hard Depends on libpq5, so I've actually ended up adding an explicit invocation of `dpkg-shlibdeps` for `psycopg2`. I've also updated the build-depends list for the package, which was missing a couple of entries. | |||||
* | | | More refactoring in `get_events_as_list` (#5707) | Andrew Morgan | 2020-02-19 | 4 | -36/+197 | |
|\| | | ||||||
| * | | More refactoring in `get_events_as_list` (#5707) | Richard van der Hoff | 2019-07-17 | 4 | -27/+198 | |
| | | | | | | | | | | | | | | | | | | | | | | | | We can now use `_get_events_from_cache_or_db` rather than going right back to the database, which means that (a) we can benefit from caching, and (b) it opens the way forward to more extensive checks on the original event. We now always require the original event to exist before we will serve up a redaction. | |||||
* | | | Fix redaction authentication (#5700) | Andrew Morgan | 2020-02-19 | 2 | -94/+140 | |
|\| | | ||||||
| * | | Fix redaction authentication (#5700) | Richard van der Hoff | 2019-07-17 | 2 | -85/+131 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensures that redactions are correctly authenticated for recent room versions. There are a few things going on here: * `_fetch_event_rows` is updated to return a dict rather than a list of rows. * Rather than returning multiple copies of an event which was redacted multiple times, it returns the redactions as a list within the dict. * It also returns the actual rejection reason, rather than merely the fact that it was rejected, so that we don't have to query the table again in `_get_event_from_row`. * The redaction handling is factored out of `_get_event_from_row`, and now checks if any of the redactions are valid. | |||||
* | | | Refactor `get_events_as_list` (#5699) | Andrew Morgan | 2020-02-17 | 2 | -44/+68 | |
|\| | | ||||||
| * | | Refactor `get_events_as_list` (#5699) | Richard van der Hoff | 2019-07-17 | 2 | -48/+75 | |
| |/ | | | | | | | | | | | | | | | | | | | | | A couple of changes here: * get rid of a redundant `allow_rejected` condition - we should already have filtered out any rejected events before we get to that point in the code, and the redundancy is confusing. Instead, let's stick in an assertion just to make double-sure we aren't leaking rejected events by mistake. * factor out a `_get_events_from_cache_or_db` method, which is going to be important for a forthcoming fix to redactions. | |||||
* | | Merge pull request #5597 from matrix-org/erikj/admin_api_cmd | Andrew Morgan | 2020-02-17 | 8 | -13/+357 | |
|\| | ||||||
| * | Merge pull request #5597 from matrix-org/erikj/admin_api_cmd | Erik Johnston | 2019-07-16 | 8 | -13/+357 | |
| |\ | | | | | | | Create basic admin command app | |||||
| | * | Remove pointless description | Erik Johnston | 2019-07-16 | 1 | -1/+0 | |
| | | | ||||||
| | * | Clean up arg name and remove lying comment | Erik Johnston | 2019-07-16 | 1 | -7/+5 | |
| | | | ||||||
| | * | Fix typo in synapse/app/admin_cmd.py | Erik Johnston | 2019-07-16 | 1 | -1/+1 | |
| | | | | | | | | | Co-Authored-By: Aaron Raimist <aaron@raim.ist> | |||||
| | * | Fix invoking add_argument from homeserver.py | Erik Johnston | 2019-07-15 | 1 | -1/+1 | |
| | | | ||||||
| | * | s/exfiltrate_user_data/export_user_data/ | Erik Johnston | 2019-07-15 | 1 | -1/+1 | |
| | | | ||||||
| | * | Add FileExfiltrationWriter | Erik Johnston | 2019-07-15 | 1 | -1/+69 | |
| | | | ||||||
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_api_cmd | Erik Johnston | 2019-07-15 | 293 | -2140/+3248 | |
| | |\ | | |/ | |/| | ||||||
| | * | Use set_defaults(func=) style | Erik Johnston | 2019-07-15 | 1 | -11/+8 | |
| | | | ||||||
| | * | Move creation of ArgumentParser to caller | Erik Johnston | 2019-07-15 | 2 | -11/+8 | |
| | | | ||||||
| | * | Fix up comments | Erik Johnston | 2019-07-15 | 2 | -3/+3 | |
| | | | ||||||
| | * | Change add_arguments to be a static method | Erik Johnston | 2019-07-15 | 5 | -5/+39 | |
| | | | ||||||
| | * | Newsfile | Erik Johnston | 2019-07-02 | 1 | -0/+1 | |
| | | | ||||||
| | * | Add basic admin cmd app | Erik Johnston | 2019-07-02 | 3 | -6/+257 | |
| | | | ||||||
* | | | Return a different error from Invalid Password when a user is deactivated ↵ | Andrew Morgan | 2020-02-17 | 3 | -0/+26 | |
|\| | | | | | | | | | | | (#5674) | |||||
| * | | Return a different error from Invalid Password when a user is deactivated ↵ | Andrew Morgan | 2019-07-15 | 3 | -0/+26 | |
| | | | | | | | | | | | | | | | (#5674) Return `This account has been deactivated` instead of `Invalid password` when a user is deactivated. | |||||
* | | | Merge pull request #5589 from matrix-org/erikj/admin_exfiltrate_data | Andrew Morgan | 2020-02-17 | 6 | -7/+423 | |
|\| | | ||||||
| * | | Merge pull request #5589 from matrix-org/erikj/admin_exfiltrate_data | Erik Johnston | 2019-07-15 | 6 | -7/+423 | |
| |\ \ | | | | | | | | | Add basic function to get all data for a user out of synapse | |||||
| | * | | Fixup docstrings | Erik Johnston | 2019-07-12 | 1 | -7/+5 | |
| | | | | ||||||
| | * | | pep8 | Erik Johnston | 2019-07-05 | 1 | -4/+0 | |
| | | | | ||||||
| | * | | Remove FileExfiltrationWriter | Erik Johnston | 2019-07-05 | 1 | -63/+0 | |
| | | | | ||||||
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-07-05 | 217 | -1407/+1732 | |
| | |\ \ | | | | | | | | | | | | | | | | erikj/admin_exfiltrate_data | |||||
| | * | | | Assume key existence. Update docstrings | Erik Johnston | 2019-07-05 | 2 | -9/+11 | |
| | | | | | ||||||
| | * | | | Fixup from review comments. | Erik Johnston | 2019-07-04 | 2 | -22/+27 | |
| | | | | | ||||||
| | * | | | Apply comment fixups from code review | Erik Johnston | 2019-07-03 | 1 | -6/+6 | |
| | | |/ | | |/| | | | | | Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | |||||
| | * | | Newsfile | Erik Johnston | 2019-07-02 | 1 | -0/+1 | |
| | | | | ||||||
| | * | | Add basic function to get all data for a user out of synapse | Erik Johnston | 2019-07-02 | 4 | -1/+478 | |
| | | | | ||||||
* | | | | Add a `docker` type to the towncrier configuration (#5673) | Andrew Morgan | 2020-02-17 | 7 | -14/+27 | |
|\| | | | ||||||
| * | | | Add a `docker` type to the towncrier configuration (#5673) | Richard van der Hoff | 2019-07-12 | 7 | -14/+27 | |
| | | | | | | | | | | | | ... and certain other changelog-related fixes | |||||
* | | | | Implement access token expiry (#5660) | Andrew Morgan | 2020-02-17 | 16 | -36/+258 | |
|\| | | | ||||||
| * | | | Implement access token expiry (#5660) | Richard van der Hoff | 2019-07-12 | 14 | -31/+253 | |
| | | | | | | | | | | | | | | | | Record how long an access token is valid for, and raise a soft-logout once it expires. | |||||
| * | | | fix typo: backgroud -> background | Andrew Morgan | 2019-07-12 | 2 | -5/+5 | |
| | | | | ||||||
| * | | | fix changelog name | Richard van der Hoff | 2019-07-12 | 1 | -0/+0 | |
| | | | | ||||||
* | | | | Update reverse_proxy.rst (#5397) | Andrew Morgan | 2020-02-17 | 2 | -0/+3 | |
|\| | | | ||||||
| * | | | Update reverse_proxy.rst (#5397) | Ulrik Günther | 2019-07-12 | 2 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | | | Updates reverse_proxy.rst with information about nginx' URI normalisation. | |||||
* | | | | Add missing space in default logging file format generated by the Docker ↵ | Andrew Morgan | 2020-02-17 | 2 | -1/+2 | |
|\| | | | | | | | | | | | | | | | image (#5620) | |||||
| * | | | Add missing space in default logging file format generated by the Docker ↵ | Slavi Pantaleev | 2019-07-12 | 2 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | image (#5620) This adds a missing space, without which log lines appear uglier. Signed-off-by: Slavi Pantaleev <slavi@devture.com> | |||||
* | | | | Upgrade Alpine Linux used in the Docker image (3.8 -> 3.10) (#5619) | Andrew Morgan | 2020-02-17 | 2 | -2/+3 | |
|\| | | | ||||||
| * | | | Upgrade Alpine Linux used in the Docker image (3.8 -> 3.10) (#5619) | Slavi Pantaleev | 2019-07-12 | 2 | -2/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alpine Linux 3.8 is still supported, but it seems like it's quite outdated now. While Python should be the same on both, all other libraries, etc., are much newer in Alpine 3.9 and 3.10. Signed-off-by: Slavi Pantaleev <slavi@devture.com> | |||||
* | | | | Add a mechanism for per-test configs (#5657) | Andrew Morgan | 2020-02-17 | 2 | -1/+55 | |
|\| | | | ||||||
| * | | | Add a mechanism for per-test configs (#5657) | Richard van der Hoff | 2019-07-12 | 2 | -1/+55 | |
| | | | | | | | | | | | | | | | | | | | | | | | | It's useful to be able to tweak the homeserver config to be used for each test. This PR adds a mechanism to do so. | |||||
* | | | | Use /src for checking out synapse during sytests (#5664) | Andrew Morgan | 2020-02-17 | 2 | -0/+4 | |
|\| | | | ||||||
| * | | | Use /src for checking out synapse during sytests (#5664) | Amber Brown | 2019-07-11 | 2 | -0/+4 | |
| | | | | ||||||
* | | | | Improved docs on setting up Postgresql (#5661) | Andrew Morgan | 2020-02-17 | 2 | -4/+16 | |
|\| | | | ||||||
| * | | | Improved docs on setting up Postgresql (#5661) | Lrizika | 2019-07-11 | 2 | -4/+16 | |
| | | | | | | | | | | | | | | | | | | | | Added that synapse_user needs a database to access before it can auth Noted you'll need to enable password auth, linked to pg_hba.conf docs | |||||
* | | | | small typo fix (#5655) | Andrew Morgan | 2020-02-17 | 2 | -1/+2 | |
|\| | | | ||||||
| * | | | small typo fix (#5655) | Andrew Morgan | 2019-07-11 | 2 | -1/+2 | |
| | | | | ||||||
* | | | | Clean up exception handling for access_tokens (#5656) | Andrew Morgan | 2020-02-17 | 6 | -93/+111 | |
|\| | | | ||||||
| * | | | Clean up exception handling for access_tokens (#5656) | Richard van der Hoff | 2019-07-11 | 6 | -100/+111 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First of all, let's get rid of `TOKEN_NOT_FOUND_HTTP_STATUS`. It was a hack we did at one point when it was possible to return either a 403 or a 401 if the creds were missing. We always return a 401 in these cases now (thankfully), so it's not needed. Let's also stop abusing `AuthError` for these cases. Honestly they have nothing that relates them to the other places that `AuthError` is used, other than the fact that they are loosely under the 'Auth' banner. It makes no sense for them to share exception classes. Instead, let's add a couple of new exception classes: `InvalidClientTokenError` and `MissingClientTokenError`, for the `M_UNKNOWN_TOKEN` and `M_MISSING_TOKEN` cases respectively - and an `InvalidClientCredentialsError` base class for the two of them. | |||||
* | | | | Add basic opentracing support (#5544) | Andrew Morgan | 2020-02-17 | 12 | -12/+633 | |
|\| | | | ||||||
| * | | | Add basic opentracing support (#5544) | Jorik Schellekens | 2019-07-11 | 12 | -12/+633 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Configure and initialise tracer Includes config options for the tracer and sets up JaegerClient. * Scope manager using LogContexts We piggy-back our tracer scopes by using log context. The current log context gives us the current scope. If new scope is created we create a stack of scopes in the context. * jaeger is a dependency now * Carrier inject and extraction for Twisted Headers * Trace federation requests on the way in and out. The span is created in _started_processing and closed in _finished_processing because we need a meaningful log context. * Create logcontext for new scope. Instead of having a stack of scopes in a logcontext we create a new context for a new scope if the current logcontext already has a scope. * Remove scope from logcontext if logcontext is top level * Disable tracer if not configured * typo * Remove dependence on jaeger internals * bools * Set service name * :Explicitely state that the tracer is disabled * Black is the new black * Newsfile * Code style * Use the new config setup. * Generate config. * Copyright * Rename config to opentracing * Remove user whitelisting * Empty whitelist by default * User ConfigError instead of RuntimeError * Use isinstance * Use tag constants for opentracing. * Remove debug comment and no need to explicitely record error * Two errors a "s(c)entry" * Docstrings! * Remove debugging brainslip * Homeserver Whitlisting * Better opentracing config comment * linting * Inclue worker name in service_name * Make opentracing an optional dependency * Neater config retreival * Clean up dummy tags * Instantiate tracing as object instead of global class * Inlcude opentracing as a homeserver member. * Thread opentracing to the request level * Reference opetnracing through hs * Instantiate dummy opentracin g for tests. * About to revert, just keeping the unfinished changes just in case * Revert back to global state, commit number: 9ce4a3d9067bf9889b86c360c05ac88618b85c4f * Use class level methods in tracerutils * Start and stop requests spans in a place where we have access to the authenticated entity * Seen it, isort it * Make sure to close the active span. * I'm getting black and blue from this. * Logger formatting Co-Authored-By: Erik Johnston <erik@matrix.org> * Outdated comment * Import opentracing at the top * Return a contextmanager * Start tracing client requests from the servlet * Return noop context manager if not tracing * Explicitely say that these are federation requests * Include servlet name in client requests * Use context manager * Move opentracing to logging/ * Seen it, isort it again! * Ignore twisted return exceptions on context exit * Escape the scope * Scopes should be entered to make them useful. * Nicer decorator names * Just one init, init? * Don't need to close something that isn't open * Docs make you smarter | |||||
* | | | | Inline issue_access_token (#5659) | Andrew Morgan | 2020-02-17 | 3 | -8/+5 | |
|\| | | | ||||||
| * | | | Inline issue_access_token (#5659) | Richard van der Hoff | 2019-07-11 | 3 | -8/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is only used in one place, so it's clearer if we inline it and reduce the API surface. Also, fixes a buglet where we would create an access token even if we were about to block the user (we would never return the AT, so the user could never use it, but it was still created and added to the db.) | |||||
* | | | | Merge pull request #5658 from matrix-org/babolivier/is-json | Andrew Morgan | 2020-02-17 | 3 | -5/+6 | |
|\| | | | ||||||
| * | | | Merge pull request #5658 from matrix-org/babolivier/is-json | Brendan Abolivier | 2019-07-10 | 2 | -1/+2 | |
| |\ \ \ | | | | | | | | | | | Send 3PID bind requests as JSON data | |||||
| | * | | | Typo | Brendan Abolivier | 2019-07-10 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Rename changelog file | Brendan Abolivier | 2019-07-10 | 1 | -0/+0 | |
| | | | | | ||||||
| | * | | | Send 3PID bind requests as JSON data | Brendan Abolivier | 2019-07-10 | 2 | -1/+2 | |
| | | | | | ||||||
* | | | | | Remove access-token support from RegistrationStore.register (#5642) | Andrew Morgan | 2020-02-17 | 9 | -79/+30 | |
|\| | | | | ||||||
| * | | | | Remove access-token support from RegistrationStore.register (#5642) | Richard van der Hoff | 2019-07-10 | 9 | -79/+30 | |
| |/ / / | | | | | | | | | | | | | | | | | The 'token' param is no longer used anywhere except the tests, so let's kill that off too. | |||||
* | | | | Don't bundle aggregations when retrieving the original event (#5654) | Andrew Morgan | 2020-02-17 | 2 | -2/+13 | |
|\| | | | ||||||
| * | | | Don't bundle aggregations when retrieving the original event (#5654) | Andrew Morgan | 2019-07-10 | 2 | -2/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | A fix for PR #5626, which returned the original event content as part of a call to /relations. Only problem was that we were attempting to aggregate the relations on top of it when we did so. We now set bundle_aggregations to False in the get_event call. We also do this when pulling the relation events as well, because edits of edits are not something we'd like to support here. | |||||
* | | | | Add a linting script (#5627) | Andrew Morgan | 2020-02-17 | 2 | -0/+13 | |
|\| | | | ||||||
| * | | | Add a linting script (#5627) | Andrew Morgan | 2019-07-10 | 2 | -0/+13 | |
| | | | | | | | | | | | | Add a dev script to cover all the different linting steps. | |||||
* | | | | Correct pep517 flag in readme (#5651) | Andrew Morgan | 2020-02-17 | 2 | -1/+2 | |
|\| | | | ||||||
| * | | | Correct pep517 flag in readme (#5651) | Bruno Windels | 2019-07-10 | 2 | -1/+2 | |
| | | | | ||||||
* | | | | Merge pull request #5638 from matrix-org/babolivier/invite-json | Andrew Morgan | 2020-02-17 | 3 | -8/+30 | |
|\| | | | ||||||
| * | | | Merge pull request #5638 from matrix-org/babolivier/invite-json | Brendan Abolivier | 2019-07-09 | 2 | -4/+19 | |
| |\ \ \ | | | | | | | | | | | Use JSON when querying the IS's /store-invite endpoint | |||||
| | * \ \ | Merge branch 'develop' into babolivier/invite-json | Brendan Abolivier | 2019-07-08 | 241 | -1918/+2403 | |
| | |\ \ \ | ||||||
| | * | | | | Changelog | Brendan Abolivier | 2019-07-08 | 1 | -0/+1 | |
| | | | | | | ||||||
| | * | | | | Lint | Brendan Abolivier | 2019-07-08 | 1 | -1/+2 | |
| | | | | | | ||||||
| | * | | | | Use application/json when querying the IS's /store-invite endpoint | Brendan Abolivier | 2019-07-08 | 1 | -4/+17 | |
| | | | | | | ||||||
* | | | | | | remove unused and unnecessary check for FederationDeniedError (#5645) | Andrew Morgan | 2020-02-17 | 2 | -4/+2 | |
|\| | | | | | ||||||
| * | | | | | remove unused and unnecessary check for FederationDeniedError (#5645) | Hubert Chathi | 2019-07-09 | 2 | -4/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FederationDeniedError is a subclass of SynapseError, which is a subclass of CodeMessageException, so if e is a FederationDeniedError, then this check for FederationDeniedError will never be reached since it will be caught by the check for CodeMessageException above. The check for CodeMessageException does almost the same thing as this check (since FederationDeniedError initialises with code=403 and msg="Federation denied with %s."), so may as well just keep allowing it to handle this case. | |||||
* | | | | | | Include the original event in /relations (#5626) | Andrew Morgan | 2020-02-17 | 4 | -4/+12 | |
|\| | | | | | ||||||
| * | | | | | Include the original event in /relations (#5626) | Andrew Morgan | 2019-07-09 | 4 | -4/+12 | |
| | | | | | | | | | | | | | | | | | | When asking for the relations of an event, include the original event in the response. This will mostly be used for efficiently showing edit history, but could be useful in other circumstances. | |||||
* | | | | | | Merge pull request #5644 from matrix-org/babolivier/profile-allow-self | Andrew Morgan | 2020-02-17 | 1 | -0/+4 | |
|\| | | | | | ||||||
| * | | | | | Merge pull request #5644 from matrix-org/babolivier/profile-allow-self | Brendan Abolivier | 2019-07-09 | 3 | -0/+52 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Allow newly-registered users to lookup their own profiles | |||||
| | * | | | | | Lint | Brendan Abolivier | 2019-07-08 | 1 | -2/+2 | |
| | | | | | | | ||||||
| | * | | | | | Add test case | Brendan Abolivier | 2019-07-08 | 1 | -0/+47 | |
| | | | | | | | ||||||
| | * | | | | | Changelog | Brendan Abolivier | 2019-07-08 | 1 | -0/+1 | |
| | | | | | | | ||||||
| | * | | | | | Allow newly-registered users to lookup their own profiles | Brendan Abolivier | 2019-07-08 | 1 | -0/+4 | |
| | | |/ / / | | |/| | | | | | | | | | | | | | | | When a user creates an account and the 'require_auth_for_profile_requests' config flag is set, and a client that performed the registration wants to lookup the newly-created profile, the request will be denied because the user doesn't share a room with themselves yet. | |||||
* | | | | | | Remove access-token support from RegistrationHandler.register (#5641) | Andrew Morgan | 2020-02-17 | 8 | -81/+44 | |
|\| | | | | | ||||||
| * | | | | | Remove access-token support from RegistrationHandler.register (#5641) | Richard van der Hoff | 2019-07-08 | 8 | -81/+44 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nothing uses this now, so we can remove the dead code, and clean up the API. Since we're changing the shape of the return value anyway, we take the opportunity to give the method a better name. | |||||
* | | | | | | Unblacklist some user_directory sytests (#5637) | Andrew Morgan | 2020-02-17 | 2 | -4/+1 | |
|\| | | | | | ||||||
| * | | | | | Unblacklist some user_directory sytests (#5637) | Richard van der Hoff | 2019-07-09 | 2 | -4/+1 | |
| | | | | | | | | | | | | | | | | | | Fixes https://github.com/matrix-org/synapse/issues/2306 | |||||
* | | | | | | Better logging for auto-join. (#5643) | Andrew Morgan | 2020-02-17 | 2 | -0/+8 | |
|\| | | | | | ||||||
| * | | | | | Better logging for auto-join. (#5643) | Richard van der Hoff | 2019-07-08 | 2 | -0/+8 | |
| |/ / / / | | | | | | | | | | | It was pretty unclear what was going on, so I've added a couple of log lines. | |||||
* | | | | | Update ModuleApi to avoid register(generate_token=True) (#5640) | Andrew Morgan | 2020-02-17 | 2 | -8/+57 | |
|\| | | | | ||||||
| * | | | | Update ModuleApi to avoid register(generate_token=True) (#5640) | Richard van der Hoff | 2019-07-08 | 2 | -8/+57 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update ModuleApi to avoid register(generate_token=True) This is the only place this is still used, so I'm trying to kill it off. * changelog | |||||
* | | | | | Factor out some redundant code in the login impl (#5639) | Andrew Morgan | 2020-02-17 | 2 | -39/+11 | |
|\| | | | | ||||||
| * | | | | Factor out some redundant code in the login impl (#5639) | Richard van der Hoff | 2019-07-08 | 2 | -39/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Factor out some redundant code in the login impl Also fixes a redundant access_token which was generated during jwt login. * changelog | |||||
* | | | | | Move get_or_create_user to test code (#5628) | Andrew Morgan | 2020-02-17 | 2 | -9/+60 | |
|\| | | | | ||||||
| * | | | | Move get_or_create_user to test code (#5628) | Richard van der Hoff | 2019-07-08 | 3 | -60/+60 | |
| | | | | | | | | | | | | | | | This is only used in tests, so... | |||||
* | | | | | Add a few more common environment directory names to black exclusion (#5630) | Andrew Morgan | 2020-02-17 | 2 | -0/+3 | |
|\| | | | | ||||||
| * | | | | Add a few more common environment directory names to black exclusion (#5630) | Andrew Morgan | 2019-07-08 | 2 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add a few more common environment directory names to black exclusion * Add changelog | |||||
* | | | | | Add default push rule to ignore reactions (#5623) | Andrew Morgan | 2020-02-17 | 2 | -0/+14 | |
|\| | | | | ||||||
| * | | | | Add default push rule to ignore reactions (#5623) | J. Ryan Stinnett | 2019-07-05 | 2 | -0/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a default push rule following the proposal in [MSC2153](https://github.com/matrix-org/matrix-doc/pull/2153). See also https://github.com/vector-im/riot-web/issues/10208 See also https://github.com/matrix-org/matrix-js-sdk/pull/976 | |||||
* | | | | | Add origin_server_ts and sender fields to m.replace (#5613) | Andrew Morgan | 2020-02-17 | 3 | -7/+24 | |
|\| | | | | ||||||
| * | | | | Add origin_server_ts and sender fields to m.replace (#5613) | Andrew Morgan | 2019-07-05 | 3 | -7/+24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Riot team would like some extra fields as part of m.replace, so here you go. Fixes: #5598 | |||||
* | | | | | Remove support for invite_3pid_guest. (#5625) | Andrew Morgan | 2020-02-17 | 7 | -196/+3 | |
|\| | | | | ||||||
| * | | | | Remove support for invite_3pid_guest. (#5625) | Richard van der Hoff | 2019-07-05 | 7 | -196/+3 | |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has never been documented, and I'm not sure it's ever been used outside sytest. It's quite a lot of poorly-maintained code, so I'd like to get rid of it. For now I haven't removed the database table; I suggest we leave that for a future clearout. | |||||
* | | | | remove dead transaction persist code (#5622) | Andrew Morgan | 2020-02-17 | 4 | -69/+1 | |
|\| | | | ||||||
| * | | | remove dead transaction persist code (#5622) | Richard van der Hoff | 2019-07-05 | 4 | -69/+1 | |
| | | | | | | | | | | | | | | | | this hasn't done anything for years | |||||
* | | | | Fixes to the federation rate limiter (#5621) | Andrew Morgan | 2020-02-17 | 6 | -16/+148 | |
|\| | | | ||||||
| * | | | Fixes to the federation rate limiter (#5621) | Richard van der Hoff | 2019-07-05 | 6 | -16/+148 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Put the default window_size back to 1000ms (broken by #5181) - Make the `rc_federation` config actually do something - fix an off-by-one error in the 'concurrent' limit - Avoid creating an unused `_PerHostRatelimiter` object for every single incoming request | |||||
* | | | | Make errors about email password resets much clearer (#5616) | Andrew Morgan | 2020-02-17 | 2 | -11/+9 | |
|\| | | | ||||||
| * | | | Make errors about email password resets much clearer (#5616) | Andrew Morgan | 2019-07-05 | 2 | -11/+9 | |
| | | | | | | | | | | | | The runtime errors that dealt with local email password resets talked about config options that users may not even have in their config file yet (if upgrading). Instead, the cryptic errors are now replaced with hopefully much more helpful ones. | |||||
* | | | | Improve the backwards compatibility re-exports of synapse.logging.context ↵ | Andrew Morgan | 2020-02-17 | 4 | -5/+62 | |
|\| | | | | | | | | | | | | | | | (#5617) | |||||
| * | | | Improve the backwards compatibility re-exports of synapse.logging.context ↵ | Amber Brown | 2019-07-05 | 4 | -5/+62 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#5617) * Improve the backwards compatibility re-exports of synapse.logging.context. * reexport logformatter too | |||||
* | | | | Add a sytest blacklist file (#5611) | Andrew Morgan | 2020-02-17 | 5 | -169/+71 | |
|\| | | | ||||||
| * | | | Add a sytest blacklist file (#5611) | Andrew Morgan | 2019-07-05 | 5 | -148/+43 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add a sytest blacklist file * Add changelog * Add blacklist to manifest | |||||
* | | | | Blacklist some flaky tests | Andrew Morgan | 2020-02-14 | 1 | -0/+6 | |
| | | | | ||||||
* | | | | Pin black to 19.3b0 | Andrew Morgan | 2020-02-14 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Fix with isort==4.3.21 and black==19.3b0 | Andrew Morgan | 2020-02-14 | 13 | -24/+19 | |
| | | | | ||||||
* | | | | Delete duplicate user deactivation | Andrew Morgan | 2020-02-14 | 1 | -7/+0 | |
| | | | | ||||||
* | | | | Fix account_validity incorrect email response content | Andrew Morgan | 2020-02-14 | 1 | -2/+5 | |
| | | | | ||||||
* | | | | Fix incorrect run_in_background import statement | Andrew Morgan | 2020-02-14 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Fix signedjson deleted method | Andrew Morgan | 2020-02-14 | 1 | -4/+12 | |
| | | | | ||||||
* | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Andrew Morgan | 2020-02-14 | 1 | -0/+7 | |
|\| | | | ||||||
| * | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2019-07-04 | 3 | -6/+26 | |
| |\ \ \ | ||||||
* | \ \ \ | Update changelog | Andrew Morgan | 2020-02-14 | 1 | -0/+10 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | Update changelog v1.1.0 github/release-v1.1.0 release-v1.1.0 | Erik Johnston | 2019-07-04 | 1 | -0/+10 | |
| | | | | | ||||||
* | | | | | 1.1.0 | Andrew Morgan | 2020-02-14 | 4 | -6/+8 | |
|\| | | | | ||||||
| * | | | | 1.1.0 | Erik Johnston | 2019-07-04 | 4 | -4/+9 | |
| | | | | | ||||||
* | | | | | Merge pull request #5615 from matrix-org/anoa/fix_changelog_email_resets | Andrew Morgan | 2020-02-14 | 0 | -0/+0 | |
|\| | | | | ||||||
| * | | | | Merge pull request #5615 from matrix-org/anoa/fix_changelog_email_resets | Erik Johnston | 2019-07-04 | 2 | -1/+2 | |
| |\ \ \ \ | | | | | | | | | | | | | Suggest people use a config file for Docker instead of env vars | |||||
* | \ \ \ \ | Suggest people use a config file for Docker instead of env vars | Andrew Morgan | 2020-02-14 | 2 | -1/+2 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| * | | | | | Suggest people use a config file for Docker instead of env vars | Andrew Morgan | 2019-07-04 | 2 | -1/+2 | |
| |/ / / / | ||||||
* | | | | | Move logging utilities out of the side drawer of util/ and into logging/ (#5606) | Andrew Morgan | 2020-02-14 | 98 | -233/+249 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | Move logging utilities out of the side drawer of util/ and into logging/ (#5606) | Amber Brown | 2019-07-04 | 98 | -233/+249 | |
| | | | | | ||||||
* | | | | | Fix 'utime went backwards' errors on daemonization. (#5609) | Andrew Morgan | 2020-02-14 | 3 | -31/+44 | |
|\| | | | | ||||||
| * | | | | Fix 'utime went backwards' errors on daemonization. (#5609) | Richard van der Hoff | 2019-07-03 | 3 | -31/+44 | |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix 'utime went backwards' errors on daemonization. Fixes #5608 * remove spurious debug | |||||
* | | | | 1.1.0rc2 | Andrew Morgan | 2020-02-14 | 6 | -5/+18 | |
|\| | | | ||||||
| * | | | 1.1.0rc2 v1.1.0rc2 | Richard van der Hoff | 2019-07-03 | 6 | -5/+18 | |
| | | | | ||||||
* | | | | Fix a number of "Starting txn from sentinel context" warnings (#5605) | Andrew Morgan | 2020-02-14 | 5 | -6/+35 | |
|\| | | | ||||||
| * | | | Fix a number of "Starting txn from sentinel context" warnings (#5605) | Richard van der Hoff | 2019-07-03 | 5 | -6/+35 | |
| | | | | | | | | | | | | | | | | Fixes #5602, #5603 | |||||
* | | | | Remove SMTP_* env var functionality from docker conf (#5596) | Andrew Morgan | 2020-02-14 | 2 | -19/+1 | |
|\| | | | ||||||
| * | | | Remove SMTP_* env var functionality from docker conf (#5596) | Andrew Morgan | 2019-07-03 | 2 | -19/+1 | |
| | | | | | | | | | | | | | | | | | | | | Removes any `SMTP_*` docker container environment variables from having any effect on the default config. Fixes https://github.com/matrix-org/synapse/issues/5430 | |||||
* | | | | Fix media repo breaking (#5593) | Andrew Morgan | 2020-02-14 | 6 | -24/+58 | |
|\| | | | ||||||
| * | | | Fix media repo breaking (#5593) | Amber Brown | 2019-07-02 | 6 | -24/+58 | |
| | | | | ||||||
* | | | | tweak changelog | Andrew Morgan | 2020-02-14 | 1 | -10/+13 | |
|\| | | | ||||||
| * | | | tweak changelog v1.1.0rc1 | Richard van der Hoff | 2019-07-02 | 1 | -10/+13 | |
| | | | | ||||||
* | | | | Merge remote-tracking branch 'origin/master' into release-v1.1.0 | Andrew Morgan | 2020-02-14 | 0 | -0/+0 | |
|\| | | | ||||||
| * | | | Merge remote-tracking branch 'origin/master' into release-v1.1.0 | Richard van der Hoff | 2019-07-02 | 3 | -5/+7 | |
| |\ \ \ | ||||||
* | | | | | prepare v1.1.0rc1 | Andrew Morgan | 2020-02-14 | 91 | -94/+106 | |
|\| | | | | ||||||
| * | | | | prepare v1.1.0rc1 | Richard van der Hoff | 2019-07-02 | 91 | -94/+106 | |
| | | | | | ||||||
* | | | | | Complete the SAML2 implementation (#5422) | Andrew Morgan | 2020-02-14 | 7 | -45/+231 | |
|\| | | | | ||||||
| * | | | | Complete the SAML2 implementation (#5422) | Richard van der Hoff | 2019-07-02 | 7 | -45/+231 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * SAML2 Improvements and redirect stuff Signed-off-by: Alexander Trost <galexrt@googlemail.com> * Code cleanups and simplifications. Also: share the saml client between redirect and response handlers. * changelog * Revert redundant changes to static js * Move all the saml stuff out to a centralised handler * Add support for tracking SAML2 sessions. This allows us to correctly handle `allow_unsolicited: False`. * update sample config * cleanups * update sample config * rename BaseSSORedirectServlet for consistency * Address review comments | |||||
| | * \ \ \ | Merge branch 'develop' into rav/saml2_client | Richard van der Hoff | 2019-07-01 | 55 | -450/+832 | |
| | |\ \ \ \ | ||||||
| | * | | | | | Address review comments | Richard van der Hoff | 2019-07-01 | 1 | -5/+7 | |
| | | | | | | | ||||||
| | * | | | | | rename BaseSSORedirectServlet for consistency | Richard van der Hoff | 2019-06-27 | 1 | -3/+3 | |
| | | | | | | | ||||||
| | * | | | | | update sample config | Richard van der Hoff | 2019-06-27 | 1 | -6/+13 | |
| | | | | | | | ||||||
| | * | | | | | cleanups | Richard van der Hoff | 2019-06-27 | 3 | -11/+18 | |
| | | | | | | | ||||||
| | * | | | | | update sample config | Richard van der Hoff | 2019-06-26 | 1 | -0/+13 | |
| | | | | | | | ||||||
| | * | | | | | Add support for tracking SAML2 sessions. | Richard van der Hoff | 2019-06-26 | 2 | -3/+56 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to correctly handle `allow_unsolicited: False`. | |||||
| | * | | | | | Move all the saml stuff out to a centralised handler | Richard van der Hoff | 2019-06-26 | 4 | -50/+96 | |
| | | | | | | | ||||||
| | * | | | | | Revert redundant changes to static js | Richard van der Hoff | 2019-06-26 | 1 | -4/+2 | |
| | | | | | | | ||||||
| | * | | | | | Merge branch 'develop' into rav/saml2_client | Richard van der Hoff | 2019-06-26 | 478 | -11486/+18913 | |
| | |\ \ \ \ \ | ||||||
| | * | | | | | | changelog | Richard van der Hoff | 2019-06-11 | 1 | -0/+1 | |
| | | | | | | | | ||||||
| | * | | | | | | Merge tag 'v1.0.0rc3' into rav/saml2_client | Richard van der Hoff | 2019-06-11 | 6 | -2/+14 | |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 1.0.0rc3 (2019-06-10) ============================= Security: Fix authentication bug introduced in 1.0.0rc1. Please upgrade to rc3 immediately | |||||
| | * | | | | | | | Code cleanups and simplifications. | Richard van der Hoff | 2019-06-11 | 6 | -50/+53 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also: share the saml client between redirect and response handlers. | |||||
| | * | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/saml2_client | Richard van der Hoff | 2019-06-10 | 157 | -1096/+5758 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | SAML2 Improvements and redirect stuff | Alexander Trost | 2019-06-02 | 5 | -2/+55 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Alexander Trost <galexrt@googlemail.com> | |||||
* | | | | | | | | | | Merge pull request #5587 from matrix-org/erikj/fix_synctl | Andrew Morgan | 2020-02-14 | 2 | -6/+7 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #5587 from matrix-org/erikj/fix_synctl | Erik Johnston | 2019-07-02 | 2 | -6/+7 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fix --no-daemonize flag for synctl | |||||
| | * | | | | | | | | | Newsfile | Erik Johnston | 2019-07-02 | 1 | -0/+1 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | Fix --no-daemonize flag for synctl | Erik Johnston | 2019-07-02 | 1 | -6/+6 | |
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | ||||||
* | | | | | | | | | | Add ability to set timezone for Docker container (#5383) | Andrew Morgan | 2020-02-14 | 3 | -1/+3 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Add ability to set timezone for Docker container (#5383) | Amir Zarrinkafsh | 2019-07-02 | 3 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Amir Zarrinkafsh <nightah@me.com> | |||||
* | | | | | | | | | | Fix JWT login with new users (#5586) | Andrew Morgan | 2020-02-14 | 2 | -6/+4 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Fix JWT login with new users (#5586) | PauRE | 2019-07-02 | 2 | -6/+4 | |
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com> | |||||
* | | | | | | | | | fix async/await consentresource (#5585) | Andrew Morgan | 2020-02-14 | 2 | -1/+4 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | fix async/await consentresource (#5585) | Amber Brown | 2019-07-01 | 2 | -1/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #5582 | |||||
* | | | | | | | | | Merge pull request #5507 from matrix-org/erikj/presence_sync_tighloop | Andrew Morgan | 2020-02-14 | 2 | -2/+20 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Merge pull request #5507 from matrix-org/erikj/presence_sync_tighloop | Erik Johnston | 2019-07-01 | 2 | -2/+20 | |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | Fix sync tightloop bug. | |||||
| | * | | | | | | | Fixup comment | Erik Johnston | 2019-07-01 | 1 | -6/+13 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Newsfile | Erik Johnston | 2019-06-21 | 1 | -0/+1 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Fix sync tightloop bug. | Erik Johnston | 2019-06-21 | 1 | -2/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If, for some reason, presence updates take a while to persist then it can trigger clients to tightloop calling `/sync` due to the presence handler returning updates but not advancing the stream token. Fixes #5503. | |||||
* | | | | | | | | | Make the http server handle coroutine-making REST servlets (#5475) | Andrew Morgan | 2020-02-14 | 12 | -174/+162 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Make the http server handle coroutine-making REST servlets (#5475) | Amber Brown | 2019-06-29 | 12 | -174/+162 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #5576 from matrix-org/babolivier/3pid-invite-ratelimit | Andrew Morgan | 2020-02-14 | 0 | -0/+0 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Merge pull request #5576 from matrix-org/babolivier/3pid-invite-ratelimit | Brendan Abolivier | 2019-06-28 | 2 | -0/+2 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Don't update the ratelimiter before sending a 3PID invite | |||||
| | * | | | | | | | | Only ratelimit when sending the email | Brendan Abolivier | 2019-06-28 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we do the opposite, an event can arrive after or while sending the email and the 3PID invite event will get ratelimited. | |||||
| | * | | | | | | | | Changelog | Brendan Abolivier | 2019-06-28 | 1 | -0/+1 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Don't update the ratelimiter before sending a 3PID invite | Brendan Abolivier | 2019-06-28 | 1 | -1/+1 | |
| | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | This would cause emails being sent, but Synapse responding with a 429 when creating the event. The client would then retry, and with bad timing the same scenario would happen again. Some testing I did ended up sending me 10 emails for one single invite because of this. | |||||
* | | | | | | | | | Don't log GC 0s at INFO (#5557) | Andrew Morgan | 2020-02-14 | 2 | -1/+5 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Don't log GC 0s at INFO (#5557) | Amber Brown | 2019-06-28 | 2 | -1/+5 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Update the TLS cipher string and provide configurability for TLS on outgoing ↵ | Andrew Morgan | 2020-02-14 | 7 | -9/+190 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | federation (#5550) | |||||
| * | | | | | | | | Update the TLS cipher string and provide configurability for TLS on outgoing ↵ | Amber Brown | 2019-06-28 | 7 | -9/+190 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | federation (#5550) | |||||
* | | | | | | | | | Added possibilty to disable local password authentication (#5092) | Andrew Morgan | 2020-02-14 | 5 | -1/+18 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Added possibilty to disable local password authentication (#5092) | Daniel Hoffend | 2019-06-27 | 5 | -1/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Hoffend <dh@dotlan.net> | |||||
* | | | | | | | | | Include systemd-python in Debian package to allow logging to journal (#5261) | Andrew Morgan | 2020-02-14 | 2 | -1/+8 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Include systemd-python in Debian package to allow logging to journal (#5261) | Silke Hofstra | 2019-06-27 | 2 | -1/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Silke Hofstra <silke@slxh.eu> | |||||
* | | | | | | | | | Make it clearer that the template dir is relative to synapse's root dir (#5543) | Andrew Morgan | 2020-02-14 | 3 | -2/+19 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Make it clearer that the template dir is relative to synapse's root dir (#5543) | Andrew Morgan | 2019-06-27 | 3 | -2/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Helps address #5444 | |||||
* | | | | | | | | | Merge pull request #5559 from matrix-org/erikj/refactor_changed_devices | Andrew Morgan | 2020-02-14 | 4 | -37/+98 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Merge pull request #5559 from matrix-org/erikj/refactor_changed_devices | Erik Johnston | 2019-06-27 | 4 | -37/+98 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | Refactor devices changed query to pull less from DB | |||||
| | * | | | | | | | Review comments | Erik Johnston | 2019-06-27 | 2 | -7/+5 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Move changelog | Erik Johnston | 2019-06-26 | 1 | -0/+0 | |
| | | | | | | | | |