Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #6117 from matrix-org/erikj/fix_sample_config | Andrew Morgan | 2020-02-25 | 1 | -1/+1 |
|\ | |||||
| * | Fix 'redaction_retention_period' sampel config to match guidelines | Erik Johnston | 2019-09-26 | 1 | -1/+1 |
| | | |||||
* | | Explicitly log when a homeserver does not have a trusted key server ↵ | Andrew Morgan | 2020-02-25 | 1 | -4/+10 |
|\| | | | | | | | configured (#6090) | ||||
| * | Explicitly log when a homeserver does not have a trusted key server ↵ | Neil Johnson | 2019-09-26 | 1 | -4/+10 |
| | | | | | | | | configured (#6090) | ||||
* | | Merge pull request #6098 from matrix-org/erikj/cleanup_user_ips_2 | Andrew Morgan | 2020-02-25 | 1 | -0/+6 |
|\| | |||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-09-25 | 1 | -51/+90 |
| |\ | | | | | | | | | | erikj/cleanup_user_ips_2 | ||||
| * | | Review comments | Erik Johnston | 2019-09-25 | 1 | -1/+1 |
| | | | |||||
| * | | Prune rows in user_ips older than configured period | Erik Johnston | 2019-09-24 | 1 | -0/+6 |
| | | | | | | | | | | | | Defaults to pruning everything older than 28d. | ||||
* | | | Merge pull request #6037 from matrix-org/rav/saml_mapping_work | Andrew Morgan | 2020-02-25 | 1 | -0/+26 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_work | Richard van der Hoff | 2019-09-24 | 1 | -1/+18 |
| |\ \ | |||||
| * \ \ | Merge branch 'develop' into rav/saml_mapping_work | Richard van der Hoff | 2019-09-19 | 40 | -2177/+2402 |
| |\ \ \ | |||||
| * | | | | Record mappings from saml users in an external table | Richard van der Hoff | 2019-09-13 | 1 | -0/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to assign unique mxids to saml users based on an incrementing suffix. For that to work, we need to record the allocated mxid in a separate table. | ||||
* | | | | | Add submit_url response parameter to msisdn /requestToken (#6079) | Andrew Morgan | 2020-02-25 | 1 | -0/+2 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Add submit_url response parameter to msisdn /requestToken (#6079) | Andrew Morgan | 2019-09-23 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Second part of solving #6076 Fixes #6076 We return a submit_url parameter on calls to POST */msisdn/requestToken so that clients know where to submit token information to. | ||||
* | | | | | Merge pull request #6064 from matrix-org/rav/saml_config_cleanup | Andrew Morgan | 2020-02-25 | 1 | -51/+59 |
|\| | | | | |||||
| * | | | | Merge pull request #6064 from matrix-org/rav/saml_config_cleanup | Richard van der Hoff | 2019-09-23 | 1 | -51/+59 |
| |\ \ \ \ | | | | | | | | | | | | | Make the sample saml config closer to our standards | ||||
| | * \ \ \ | Merge branch 'develop' into rav/saml_config_cleanup | Richard van der Hoff | 2019-09-19 | 40 | -2177/+2402 |
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ / | |||||
| | * | | | Make the sample saml config closer to our standards | Richard van der Hoff | 2019-09-13 | 1 | -51/+59 |
| | | | | | | | | | | | | | | | | | | | | It' still not great, thanks to the nested dictionaries, but it's better. | ||||
* | | | | | Use the federation blacklist for requests to untrusted Identity Servers (#6000) | Andrew Morgan | 2020-02-25 | 1 | -0/+3 |
|\| | | | | |||||
| * | | | | Use the federation blacklist for requests to untrusted Identity Servers (#6000) | Andrew Morgan | 2019-09-23 | 1 | -0/+3 |
| | |_|/ | |/| | | | | | | | | | | | | | | Uses a SimpleHttpClient instance equipped with the federation_ip_range_blacklist list for requests to identity servers provided by user input. Does not use a blacklist when contacting identity servers specified by account_threepid_delegates. The homeserver trusts the latter and we don't want to prevent homeserver admins from specifying delegates that are on internal IP addresses. Fixes #5935 | ||||
* | | | | Allow HS to send emails when adding an email to the HS (#6042) | Andrew Morgan | 2020-02-25 | 1 | -0/+12 |
|\| | | | |||||
| * | | | Allow HS to send emails when adding an email to the HS (#6042) | Andrew Morgan | 2019-09-20 | 1 | -0/+12 |
| | | | | |||||
* | | | | Fix typo in account_threepid_delegates config (#6028) | Andrew Morgan | 2020-02-25 | 1 | -1/+1 |
|\| | | | |||||
| * | | | Fix typo in account_threepid_delegates config (#6028) | Jorik Schellekens | 2019-09-18 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Fix logcontext spam on non-Linux platforms (#6059) | Andrew Morgan | 2020-02-25 | 1 | -1/+1 |
|\| | | |||||
| * | | fix sample config | Richard van der Hoff | 2019-09-18 | 1 | -1/+1 |
| | | | | | | | | | | | | this was apparently broken by #6040. | ||||
* | | | (#5849) Convert rst to markdown (#6040) | Andrew Morgan | 2020-02-25 | 35 | -2179/+2074 |
|\| | | |||||
| * | | (#5849) Convert rst to markdown (#6040) | dstipp | 2019-09-17 | 35 | -2179/+2074 |
| | | | | | | | | | | | | | | | Converting some of the rst documentation to markdown. Attempted to preserve whitespace and line breaks to minimize cosmetic change. | ||||
* | | | Add developer docs for using SAML without a server (#6032) | Andrew Morgan | 2020-02-25 | 1 | -0/+37 |
|\| | | |||||
| * | | Add developer docs for using SAML without a server (#6032) | Travis Ralston | 2019-09-13 | 1 | -0/+37 |
| | | | |||||
* | | | add explanations on how to actually include an access_token (#6031) | Andrew Morgan | 2020-02-25 | 1 | -0/+12 |
|\ \ \ | |||||
| * | | | add explanations on how to actually include an access_token (#6031) | axel simon | 2019-09-13 | 1 | -0/+12 |
| | |/ | |/| | |||||
* | | | add report_stats_endpoint config option (#6012) | Andrew Morgan | 2020-02-25 | 1 | -0/+5 |
|\ \ \ | | |/ | |/| | |||||
| * | | add report_stats_endpoint config option (#6012) | Sorunome | 2019-09-12 | 1 | -0/+5 |
| | | | | | | | | | This PR adds the optional `report_stats_endpoint` to configure where stats are reported to, if enabled. | ||||
* | | | Merge pull request #6015 from matrix-org/erikj/ratelimit_admin_redaction | Andrew Morgan | 2020-02-25 | 1 | -0/+7 |
|\| | | |||||
| * | | Update sample config | Erik Johnston | 2019-09-11 | 1 | -1/+1 |
| | | | |||||
| * | | Update sample config | Erik Johnston | 2019-09-11 | 1 | -0/+7 |
| | | | |||||
* | | | Merge pull request #5934 from matrix-org/erikj/censor_redactions | Andrew Morgan | 2020-02-25 | 1 | -0/+7 |
|\| | | |||||
| * | | Merge pull request #5934 from matrix-org/erikj/censor_redactions | Erik Johnston | 2019-09-09 | 1 | -0/+7 |
| |\ \ | | | | | | | | | Censor redactions in DB after a month | ||||
| | * | | Default to censoring redactions after seven days | Erik Johnston | 2019-09-09 | 1 | -3/+5 |
| | | | | |||||
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-09-05 | 1 | -0/+62 |
| | |\ \ | | | | | | | | | | | | | | | | erikj/censor_redactions | ||||
| | * | | | Make redaction retention period configurable | Erik Johnston | 2019-09-05 | 1 | -0/+5 |
| | | | | | |||||
* | | | | | Servers-known-about statistic (#5981) | Andrew Morgan | 2020-02-25 | 1 | -0/+10 |
|\| | | | | |||||
| * | | | | Servers-known-about statistic (#5981) | Amber Brown | 2019-09-07 | 1 | -0/+10 |
| | | | | | |||||
* | | | | | Allow Synapse to send registration emails + choose Synapse or an external ↵ | Andrew Morgan | 2020-02-25 | 1 | -13/+43 |
|\| | | | | | | | | | | | | | | | | | | | server to handle 3pid validation (#5987) | ||||
| * | | | | Allow Synapse to send registration emails + choose Synapse or an external ↵ | Andrew Morgan | 2019-09-06 | 1 | -13/+43 |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server to handle 3pid validation (#5987) This is a combination of a few different PRs, finally all being merged into `develop`: * #5875 * #5876 * #5868 (This one added the `/versions` flag but the flag itself was actually [backed out](https://github.com/matrix-org/synapse/commit/891afb57cbdf9867f2848341b29c75d6f35eef5a#diff-e591d42d30690ffb79f63bb726200891) in #5969. What's left is just giving /versions access to the config file, which could be useful in the future) * #5835 * #5969 * #5940 Clients should not actually use the new registration functionality until https://github.com/matrix-org/synapse/pull/5972 is merged. UPGRADE.rst, changelog entries and config file changes should all be reviewed closely before this PR is merged. | ||||
* | | | | Fix and refactor room and user stats (#5971) | Andrew Morgan | 2020-02-25 | 1 | -0/+62 |
|\| | | | |||||
| * | | | Fix and refactor room and user stats (#5971) | Erik Johnston | 2019-09-04 | 1 | -0/+62 |
| |/ / | | | | | | | Previously the stats were not being correctly populated. | ||||
* | | | Add a link to python's logging config schema (#5926) | Andrew Morgan | 2020-02-24 | 1 | -1/+2 |
|\| | | |||||
| * | | Add a link to python's logging config schema (#5926) | Jorik Schellekens | 2019-08-28 | 1 | -1/+2 |
| | | | |||||
* | | | Config templating (#5900) | Andrew Morgan | 2020-02-21 | 1 | -8/+8 |
|\| | | |||||
| * | | Config templating (#5900) | Jorik Schellekens | 2019-08-28 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Template config files * Imagine a system composed entirely of x, y, z etc and the basic operations.. Wait George, why XOR? Why not just neq? George: Eh, I didn't think of that.. Co-Authored-By: Erik Johnston <erik@matrix.org> | ||||
* | | | Implement a structured logging output system. (#5680) | Andrew Morgan | 2020-02-21 | 1 | -0/+83 |
|\| | | |||||
| * | | Implement a structured logging output system. (#5680) | Amber Brown | 2019-08-28 | 1 | -0/+83 |
| | | | |||||
* | | | Merge pull request #5914 from matrix-org/rei/admin_getadmin | Andrew Morgan | 2020-02-21 | 1 | -0/+19 |
|\| | | |||||
| * | | Merge pull request #5914 from matrix-org/rei/admin_getadmin | reivilibre | 2019-08-28 | 1 | -0/+19 |
| |\ \ | | | | | | | | | Add GET method to admin API /users/@user:dom/admin | ||||
| | * | | Document GET method for retrieving admin bit of user in admin API | Olivier Wilkinson (reivilibre) | 2019-08-27 | 1 | -0/+19 |
| | | | | | | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net> | ||||
* | | | | Merge pull request #5895 from matrix-org/erikj/notary_key | Andrew Morgan | 2020-02-21 | 1 | -0/+8 |
|\| | | | |||||
| * | | | Merge pull request #5895 from matrix-org/erikj/notary_key | Erik Johnston | 2019-08-27 | 1 | -0/+8 |
| |\ \ \ | | |/ / | |/| | | Add config option to sign remote key query responses with a separate key. | ||||
| | * | | Fixup review comments | Erik Johnston | 2019-08-23 | 1 | -2/+2 |
| | | | | |||||
| | * | | Add config option for keys to use to sign keys | Erik Johnston | 2019-08-21 | 1 | -0/+8 |
| | |/ | | | | | | | | | | | | | This allows servers to separate keys that are used to sign remote keys when acting as a notary server. | ||||
* | | | Add Admin API capability to set adminship of a user (#5878) | Andrew Morgan | 2020-02-21 | 1 | -0/+20 |
|\| | | |||||
| * | | Add Admin API capability to set adminship of a user (#5878) | reivilibre | 2019-08-27 | 1 | -0/+20 |
| | | | | | | | | | Admin API: Set adminship of a user | ||||
* | | | Propagate opentracing contexts through EDUs (#5852) | Andrew Morgan | 2020-02-21 | 1 | -2/+25 |
|\| | | |||||
| * | | Propagate opentracing contexts through EDUs (#5852) | Jorik Schellekens | 2019-08-22 | 1 | -2/+25 |
| | | | | | | | | | | | | | | | Propagate opentracing contexts through EDUs Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | ||||
* | | | Servlet to purge old rooms (#5845) | Andrew Morgan | 2020-02-21 | 1 | -0/+18 |
|\| | | |||||
| * | | Servlet to purge old rooms (#5845) | Richard van der Hoff | 2019-08-22 | 1 | -0/+18 |
| |/ | |||||
* | | Don't load the media repo when configured to use an external media repo (#5754) | Andrew Morgan | 2020-02-20 | 2 | -0/+14 |
|\| | |||||
| * | Don't load the media repo when configured to use an external media repo (#5754) | Amber Brown | 2019-08-13 | 2 | -0/+14 |
| | | |||||
| * | Lint | Brendan Abolivier | 2019-08-01 | 1 | -1/+1 |
| | | |||||
| * | Sample config | Brendan Abolivier | 2019-08-01 | 1 | -0/+10 |
| | | |||||
* | | Remove non-functional 'expire_access_token' setting (#5782) | Andrew Morgan | 2020-02-20 | 1 | -4/+0 |
|\| | |||||
| * | Remove non-functional 'expire_access_token' setting (#5782) | Richard van der Hoff | 2019-07-30 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | | The `expire_access_token` didn't do what it sounded like it should do. What it actually did was make Synapse enforce the 'time' caveat on macaroons used as access tokens, but since our access token macaroons never contained such a caveat, it was always a no-op. (The code to add 'time' caveats was removed back in v0.18.5, in #1656) | ||||
* | | Room Complexity Client Implementation (#5783) | Andrew Morgan | 2020-02-20 | 1 | -0/+17 |
|\| | |||||
| * | Room Complexity Client Implementation (#5783) | Amber Brown | 2019-07-30 | 1 | -0/+17 |
| | | |||||
* | | Make Jaeger fully configurable (#5694) | Andrew Morgan | 2020-02-19 | 1 | -0/+16 |
|\| | |||||
| * | Make Jaeger fully configurable (#5694) | Jorik Schellekens | 2019-07-23 | 1 | -0/+16 |
| | | | | | | | | | | | | * Allow Jaeger to be configured * Update sample config | ||||
* | | Replace returnValue with return (#5736) | Andrew Morgan | 2020-02-19 | 1 | -1/+1 |
|\| | |||||
| * | Replace returnValue with return (#5736) | Amber Brown | 2019-07-23 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'release-v1.2.0' into develop | Jorik Schellekens | 2019-07-22 | 2 | -12/+102 |
| |\ | |||||
* | \ | Opentracing Documentation (#5703) | Andrew Morgan | 2020-02-19 | 2 | -12/+102 |
|\ \ \ | | |/ | |/| | |||||
| * | | Opentracing Documentation (#5703) | Jorik Schellekens | 2019-07-22 | 2 | -12/+102 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Opentracing survival guide * Update decorator names in doc * Doc cleanup These are all alterations as a result of comments in #5703, it includes mostly typos and clarifications. The most interesting changes are: - Split developer and user docs into two sections - Add a high level description of OpenTracing * newsfile * Move contributer specific info to docstring. * Sample config. * Trailing whitespace. * Update 5703.misc * Apply suggestions from code review Mostly just rewording parts of the docs for clarity. Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | ||||
* | | | Update the coding style doc (#5719) | Andrew Morgan | 2020-02-19 | 1 | -30/+94 |
|\ \ \ | | |/ | |/| | |||||
| * | | Update the coding style doc (#5719) | Richard van der Hoff | 2019-07-19 | 1 | -30/+94 |
| |/ | | | | | | | | | A few fixes and removal of duplicated stuff, but mostly a bunch of the words on the config file. | ||||
* | | Clean up opentracing configuration options (#5712) | Andrew Morgan | 2020-02-19 | 1 | -14/+31 |
|\| | |||||
| * | Clean up opentracing configuration options (#5712) | Richard van der Hoff | 2019-07-18 | 1 | -14/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+102 |
|\| | |||||
| * | Support Prometheus_client 0.4.0+ (#5636) | Amber Brown | 2019-07-18 | 1 | -0/+102 |
| | | |||||
* | | Improve `Depends` specs in debian package. (#5675) | Andrew Morgan | 2020-02-19 | 1 | -3/+5 |
|\| | |||||
| * | Improve `Depends` specs in debian package. (#5675) | Richard van der Hoff | 2019-07-17 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | Implement access token expiry (#5660) | Andrew Morgan | 2020-02-17 | 1 | -0/+11 |
|\| | |||||
| * | Implement access token expiry (#5660) | Richard van der Hoff | 2019-07-12 | 1 | -0/+11 |
| | | | | | | | | Record how long an access token is valid for, and raise a soft-logout once it expires. | ||||
* | | Update reverse_proxy.rst (#5397) | Andrew Morgan | 2020-02-17 | 1 | -0/+2 |
|\| | |||||
| * | Update reverse_proxy.rst (#5397) | Ulrik Günther | 2019-07-12 | 1 | -0/+2 |
| | | | | | | | | | | Updates reverse_proxy.rst with information about nginx' URI normalisation. | ||||
* | | Improved docs on setting up Postgresql (#5661) | Andrew Morgan | 2020-02-17 | 1 | -4/+15 |
|\| | |||||
| * | Improved docs on setting up Postgresql (#5661) | Lrizika | 2019-07-11 | 1 | -4/+15 |
| | | | | | | | | | | 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 | ||||
* | | Add basic opentracing support (#5544) | Andrew Morgan | 2020-02-17 | 1 | -0/+17 |
|\| | |||||
| * | Add basic opentracing support (#5544) | Jorik Schellekens | 2019-07-11 | 1 | -0/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | | Fix with isort==4.3.21 and black==19.3b0 | Andrew Morgan | 2020-02-14 | 1 | -4/+4 |
| | | |||||
* | | Move logging utilities out of the side drawer of util/ and into logging/ (#5606) | Andrew Morgan | 2020-02-14 | 1 | -19/+19 |
|\| | |||||
| * | Move logging utilities out of the side drawer of util/ and into logging/ (#5606) | Amber Brown | 2019-07-04 | 1 | -19/+19 |
| | | |||||
* | | Complete the SAML2 implementation (#5422) | Andrew Morgan | 2020-02-14 | 1 | -1/+21 |
|\| | |||||
| * | Merge branch 'develop' into rav/saml2_client | Richard van der Hoff | 2019-07-01 | 2 | -3/+28 |
| |\ | |||||
| * | | update sample config | Richard van der Hoff | 2019-06-27 | 1 | -6/+13 |
| | | | |||||
| * | | update sample config | Richard van der Hoff | 2019-06-26 | 1 | -0/+13 |
| | | | |||||
* | | | Update the TLS cipher string and provide configurability for TLS on outgoing ↵ | Andrew Morgan | 2020-02-14 | 1 | -0/+9 |
|\ \ \ | | |/ | |/| | | | | federation (#5550) | ||||
| * | | Update the TLS cipher string and provide configurability for TLS on outgoing ↵ | Amber Brown | 2019-06-28 | 1 | -0/+9 |
| | | | | | | | | | | | | federation (#5550) | ||||
* | | | Added possibilty to disable local password authentication (#5092) | Andrew Morgan | 2020-02-14 | 1 | -0/+6 |
|\| | | |||||
| * | | Added possibilty to disable local password authentication (#5092) | Daniel Hoffend | 2019-06-27 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Hoffend <dh@dotlan.net> | ||||
* | | | Make it clearer that the template dir is relative to synapse's root dir (#5543) | Andrew Morgan | 2020-02-14 | 1 | -1/+9 |
|\| | | |||||
| * | | Make it clearer that the template dir is relative to synapse's root dir (#5543) | Andrew Morgan | 2019-06-27 | 1 | -1/+9 |
| | | | | | | | | | Helps address #5444 | ||||
* | | | Merge pull request #5313 from twrist/patch-1 | Andrew Morgan | 2020-02-14 | 1 | -2/+4 |
|\| | | |||||
| * | | Merge pull request #5313 from twrist/patch-1 | Richard van der Hoff | 2019-06-27 | 1 | -2/+4 |
| |\ \ | | |/ | |/| | Update HAProxy example rules | ||||
| | * | Update HAProxy example rules | Ike Johnson | 2019-06-02 | 1 | -2/+4 |
| | | | | | | | | | These new rules allow a user to instead route only matrix traffic, allowing them to run matrix on the domain without affecting their existing websites | ||||
* | | | Remove & changelog (#5548) | Andrew Morgan | 2020-02-14 | 1 | -1/+1 |
|\| | | |||||
| * | | Merge branch 'master' into develop | Andrew Morgan | 2019-06-25 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | * master: Fix broken link in MSC1711 FAQ Update changelog to better expain password reset change (#5545) | ||||
| | * | | Fix broken link in MSC1711 FAQ | Richard van der Hoff | 2019-06-25 | 1 | -1/+1 |
| | | | | |||||
* | | | | Add info about black to code_style.rst (#5537) | Andrew Morgan | 2020-02-14 | 1 | -45/+42 |
|\| | | | |||||
| * | | | Add info about black to code_style.rst (#5537) | Andrew Morgan | 2019-06-24 | 1 | -45/+42 |
| | | | | | | | | | | | | | | | | | | | | Fixes #5533 Adds information about how to install and run black on the codebase. | ||||
* | | | | Merge pull request #5524 from matrix-org/rav/new_cmdline_options | Andrew Morgan | 2020-02-14 | 1 | -1/+1 |
|\| | | | |||||
| * | | | Merge pull request #5524 from matrix-org/rav/new_cmdline_options | Richard van der Hoff | 2019-06-24 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | Add --data-dir and --open-private-ports options. | ||||
| | * | | | Add "--open-private-ports" cmdline option | Richard van der Hoff | 2019-06-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | This is helpful when generating a config file for running synapse under docker. | ||||
| * | | | | Merge pull request #5534 from matrix-org/babolivier/federation-publicrooms | Brendan Abolivier | 2019-06-24 | 1 | -4/+8 |
| |\ \ \ \ | | |/ / / | |/| | | | Split public rooms directory auth config in two | ||||
| | * | | | Split public rooms directory auth config in two | Brendan Abolivier | 2019-06-24 | 1 | -4/+8 |
| | | | | | |||||
* | | | | | Merge pull request #5516 from matrix-org/rav/acme_key_path | Andrew Morgan | 2020-02-13 | 1 | -0/+7 |
|\| | | | | |||||
| * | | | | Allow configuration of the path used for ACME account keys. | Richard van der Hoff | 2019-06-24 | 1 | -0/+7 |
| |/ / / | | | | | | | | | | | | | | | | | Because sticking it in the same place as the config isn't necessarily the right thing to do. | ||||
* | | | | Drop support for cpu_affinity (#5525) | Andrew Morgan | 2020-02-13 | 1 | -23/+0 |
|\| | | | |||||
| * | | | Drop support for cpu_affinity (#5525) | Richard van der Hoff | 2019-06-22 | 1 | -23/+0 |
| | | | | | | | | | | | | This has no useful purpose on python3, and is generally a source of confusion. | ||||
* | | | | Merge pull request #5505 from matrix-org/erikj/messages_worker | Andrew Morgan | 2020-02-13 | 1 | -1/+1 |
|\| | | | |||||
| * | | | 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> | ||||
* | | | | Support pagination API in client_reader worker | Andrew Morgan | 2020-02-13 | 1 | -0/+7 |
|\| | | | |||||
| * | | | Support pagination API in client_reader worker | Erik Johnston | 2019-06-21 | 1 | -0/+7 |
| | | | | |||||
* | | | | Run Black. (#5482) | Andrew Morgan | 2020-02-13 | 1 | -79/+79 |
|\| | | | |||||
| * | | | Run Black. (#5482) | Amber Brown | 2019-06-20 | 1 | -79/+79 |
| | | | | |||||
* | | | | Remove Postgres 9.4 support (#5448) | Andrew Morgan | 2020-02-10 | 1 | -2/+2 |
|\| | | | |||||
| * | | | Remove Postgres 9.4 support (#5448) | Amber Brown | 2019-06-18 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge pull request #5440 from matrix-org/babolivier/third_party_event_rules | Brendan Abolivier | 2019-06-14 | 1 | -0/+13 |
| |\ \ \ | | |/ / | |/| | | Allow server admins to define implementations of extra rules for allowing or denying incoming events | ||||
* | | | | Add the ability to restrict max avatar filesize and content-type (#19) | Andrew Morgan | 2019-12-12 | 1 | -0/+24 |
| | | | | |||||
* | | | | Add limit_profile_requests_to_known_users option (#18) | Andrew Morgan | 2019-12-05 | 1 | -0/+7 |
| | | | | |||||
* | | | | Create configurable ratelimiter for 3pid invites (#11) | Andrew Morgan | 2019-11-12 | 1 | -0/+6 |
| | | | | |||||
* | | | | Merge branch 'dinsic' into babolivier/dinsic-message-retention | Brendan Abolivier | 2019-08-28 | 1 | -0/+10 |
|\ \ \ \ | |||||
| * | | | | Lint | Brendan Abolivier | 2019-08-01 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Sample config | Brendan Abolivier | 2019-08-01 | 1 | -0/+10 |
| | | | | | |||||
* | | | | | Implement per-room message retention policies | Brendan Abolivier | 2019-08-28 | 1 | -0/+63 |
|/ / / / | |||||
* | | | | Split public rooms directory auth config in two | Brendan Abolivier | 2019-06-24 | 1 | -4/+8 |
| | | | | |||||
* | | | | Merge branch 'babolivier/third_party_event_rules' into dinsic | Brendan Abolivier | 2019-06-14 | 1 | -0/+13 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Add plugin APIs for implementations of custom event rules. | Brendan Abolivier | 2019-06-14 | 1 | -0/+13 |
| | | | | |||||
* | | | | Merge branch 'dinsic' into babolivier/userdir_hide_users | Brendan Abolivier | 2019-06-12 | 7 | -67/+261 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' into dinsic | Brendan Abolivier | 2019-06-12 | 6 | -44/+239 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Neilj/improve federation docs (#5419) | Neil Johnson | 2019-06-11 | 2 | -3/+91 |
| | |/ / | | | | | | | | | | | | | Add FAQ questions to federate.md. Add a health warning making it clear that the 1711 upgrade FAQ is now out of date. | ||||
| | * | | Set default room version to v4. (#5379) | Neil Johnson | 2019-06-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Set default room version to v4. | ||||
| | * | | Add ability to perform password reset via email without trusting the ↵ | Andrew Morgan | 2019-06-06 | 1 | -10/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | identity server (#5377) Sends password reset emails from the homeserver instead of proxying to the identity server. This is now the default behaviour for security reasons. If you wish to continue proxying password reset requests to the identity server you must now enable the email.trust_identity_server_for_password_resets option. This PR is a culmination of 3 smaller PRs which have each been separately reviewed: * #5308 * #5345 * #5368 | ||||
| | * | | Stop hardcoding trust of old matrix.org key (#5374) | Richard van der Hoff | 2019-06-06 | 1 | -6/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are a few changes going on here: * We make checking the signature on a key server response optional: if no verify_keys are specified, we trust to TLS to validate the connection. * We change the default config so that it does not require responses to be signed by the old key. * We replace the old 'perspectives' config with 'trusted_key_servers', which is also formatted slightly differently. * We emit a warning to the logs every time we trust a key server response signed by the old key. | ||||
| | * | | Neilj/1.0 upgrade notes (#5371) | Neil Johnson | 2019-06-06 | 1 | -7/+5 |
| | | | | | | | | | | | | | | | | 1.0 upgrade/install notes | ||||
| | * | | Merge branch 'rav/fix_custom_ca' into rav/enable_tls_verification | Richard van der Hoff | 2019-06-05 | 2 | -6/+21 |
| | |\ \ | |||||
| | | * | | Fix notes about well-known and acme (#5357) | Richard van der Hoff | 2019-06-05 | 1 | -6/+5 |
| | | | | | | | | | | | | | | | | | | | | fixes #4951 | ||||
| | | * | | Neilj/mau tracking config explainer (#5284) | Neil Johnson | 2019-06-05 | 1 | -0/+16 |
| | | | | | | | | | | | | | | | | | | | | Improve documentation of monthly active user blocking and mau_trial_days | ||||
| | * | | | Update sample config | Richard van der Hoff | 2019-06-05 | 1 | -4/+4 |
| | |/ / | |||||
| | * | | Merge pull request #5276 from matrix-org/babolivier/account_validity_job_delta | Erik Johnston | 2019-05-31 | 1 | -1/+3 |
| | |\ \ | | | | | | | | | | | Allow configuring a range for the account validity startup job | ||||
| | * | | | Clarify that the admin change password endpoint logs them out (#5303) | Travis Ralston | 2019-05-31 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge pull request #5283 from aaronraimist/captcha-docs | Erik Johnston | 2019-05-29 | 1 | -0/+1 |
| | |\ \ \ | | | | | | | | | | | | | Specify the type of reCAPTCHA key to use (#5013) | ||||
| | | * | | | Specify the type of reCAPTCHA key to use (#5013) | Aaron Raimist | 2019-05-28 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist> | ||||
| | * | | | | regenerate sample config | Amber Brown | 2019-05-29 | 1 | -3/+3 |
| | | | | | | |||||
| | * | | | | Fix docs on resetting the user directory (#5036) | Aaron Raimist | 2019-05-28 | 1 | -7/+3 |
| | |/ / / | | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist> | ||||
| | * | | | Add missing blank line in config (#5249) | Richard van der Hoff | 2019-05-24 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Add config option for setting homeserver's default room version (#5223) | Andrew Morgan | 2019-05-23 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Replaces DEFAULT_ROOM_VERSION constant with a method that first checks the config, then returns a hardcoded value if the option is not present. That hardcoded value is now located in the server.py config file. | ||||
| | * | | | Room Statistics (#4338) | Amber Brown | 2019-05-21 | 1 | -0/+16 |
| | | |/ | | |/| | |||||
| * | | | Merge branch 'master' into dinsic | Brendan Abolivier | 2019-06-11 | 1 | -23/+22 |
| |\| | | |||||
| | * | | Merge pull request #5204 from ↵ | Brendan Abolivier | 2019-05-21 | 1 | -0/+8 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | matrix-org/babolivier/account_validity_expiration_date Add startup background job for account validity | ||||
| | * \ \ | Merge remote-tracking branch 'origin/master' into develop | Richard van der Hoff | 2019-05-17 | 1 | -23/+22 |
| | |\ \ \ | |||||
| | | * | | | Stop telling people to install the optional dependencies. (#5197) | Richard van der Hoff | 2019-05-17 | 1 | -23/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Stop telling people to install the optional dependencies. They're optional. Also update the postgres docs a bit for clarity(?) | ||||
* | | | | | | Generate sample config | Brendan Abolivier | 2019-06-10 | 1 | -0/+5 |
|/ / / / / | |||||
* | | | | | Merge branch 'babolivier/account_validity_job_delta' of ↵ dinsic_2019-05-31 | Erik Johnston | 2019-05-31 | 1 | -1/+3 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | github.com:matrix-org/synapse into dinsic | ||||
| * | | | | Sample config | Brendan Abolivier | 2019-05-31 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Sample config | Brendan Abolivier | 2019-05-31 | 1 | -8/+3 |
| | | | | | |||||
| * | | | | Config and changelog | Brendan Abolivier | 2019-05-28 | 1 | -0/+7 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #5214 from matrix-org/babolivier/password-policy | Brendan Abolivier | 2019-05-22 | 1 | -0/+30 |
|\ \ \ \ | | | | | | | | | | | Allow server admins to define and enforce a password policy (MSC2000) | ||||
| * | | | | Improve documentation on generated configuration | Brendan Abolivier | 2019-05-21 | 1 | -7/+27 |
| | | | | | |||||
| * | | | | Config and changelog | Brendan Abolivier | 2019-05-20 | 1 | -0/+10 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'babolivier/account_validity_expiration_date' into dinsic | Brendan Abolivier | 2019-05-21 | 1 | -0/+8 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Doc | Brendan Abolivier | 2019-05-21 | 1 | -0/+8 |
| |/ / | |||||
* | | | Merge branch 'babolivier/per_room_profiles' into dinsic dinsic_2019-05-17 | Brendan Abolivier | 2019-05-17 | 1 | -28/+49 |
|\| | | |||||
| * | | Changelog + sample config | Brendan Abolivier | 2019-05-16 | 1 | -0/+6 |
| | | | |||||
| * | | Make all the rate limiting options more consistent (#5181) | Amber Brown | 2019-05-15 | 1 | -28/+25 |
| | | | |||||
| * | | Add ability to blacklist ip ranges for federation traffic (#5043) | Andrew Morgan | 2019-05-13 | 1 | -0/+18 |
| |/ | |||||
* | | Merge branch 'release-v0.99.4' into dinsic dinsic_2019-05-14 | Brendan Abolivier | 2019-05-14 | 15 | -44/+212 |
|\| | |||||
| * | Make Prometheus snippet less confusing on the metrics collection doc (#4288) | Gergely Polonkai | 2019-05-10 | 1 | -1/+4 |
| | | | | | | Signed-off-by: Gergely Polonkai <gergely@polonkai.eu> | ||||
| * | Add AllowEncodedSlashes to apache (#5068) | colonelkrud | 2019-05-09 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | * Add AllowEncodedSlashes to apache Add `AllowEncodedSlashes On` to apache config to support encoding for v3 rooms. "The AllowEncodedSlashes setting is not inherited by virtual hosts, and virtual hosts are used in many default Apache configurations, such as the one in Ubuntu. The workaround is to add the AllowEncodedSlashes setting inside a <VirtualHost> container (/etc/apache2/sites-available/default in Ubuntu)." Source: https://stackoverflow.com/questions/4390436/need-to-allow-encoded-slashes-on-apache * change allowencodedslashes to nodecode | ||||
| * | add options to require an access_token to GET /profile and /publicRooms on ↵ | Matthew Hodgson | 2019-05-08 | 1 | -0/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CS API (#5083) This commit adds two config options: * `restrict_public_rooms_to_local_users` Requires auth to fetch the public rooms directory through the CS API and disables fetching it through the federation API. * `require_auth_for_profile_requests` When set to `true`, requires that requests to `/profile` over the CS API are authenticated, and only returns the user's profile if the requester shares a room with the profile's owner, as per MSC1301. MSC1301 also specifies a behaviour for federation (only returning the profile if the server asking for it shares a room with the profile's owner), but that's currently really non-trivial to do in a not too expensive way. Next step is writing down a MSC that allows a HS to specify which user sent the profile query. In this implementation, Synapse won't send a profile query over federation if it doesn't believe it already shares a room with the profile's owner, though. Groups have been intentionally omitted from this commit. | ||||
| * | Remove the requirement to authenticate for /admin/server_version. (#5122) | Richard van der Hoff | 2019-05-07 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | This endpoint isn't much use for its intended purpose if you first need to get yourself an admin's auth token. I've restricted it to the `/_synapse/admin` path to make it a bit easier to lock down for those concerned about exposing this information. I don't imagine anyone is using it in anger currently. | ||||
| * | Fix spelling in server notices admin API docs (#5142) | Travis Ralston | 2019-05-06 | 1 | -1/+1 |
| | | |||||
| * | Fix sample config | Richard van der Hoff | 2019-05-06 | 1 | -1/+1 |
| | | | | | | | | ... after it got broken in 1565ebec2c. | ||||
| * | Merge branch 'master' into develop | Richard van der Hoff | 2019-05-03 | 1 | -5/+12 |
| |\ | |||||
| | * | more config comment updates | Richard van der Hoff | 2019-05-03 | 1 | -2/+5 |
| | | | |||||
| | * | Blacklist 0.0.0.0 and :: by default for URL previews | Richard van der Hoff | 2019-05-03 | 1 | -5/+9 |
| | | | |||||
| * | | Add admin api for sending server_notices (#5121) | Richard van der Hoff | 2019-05-02 | 2 | -19/+54 |
| | | | |||||
| * | | Merge pull request #5124 from matrix-org/babolivier/aliases | Brendan Abolivier | 2019-05-02 | 1 | -0/+5 |
| |\ \ | | | | | | | | | Add some limitations to alias creation | ||||
| | * | | Add some limitations to alias creation | Brendan Abolivier | 2019-05-02 | 1 | -0/+5 |
| | | | | |||||
| * | | | Fix sample config | Richard van der Hoff | 2019-05-01 | 1 | -2/+2 |
| | | | | |||||
| * | | | Move admin API to a new prefix | Richard van der Hoff | 2019-05-01 | 8 | -12/+12 |
| |/ / | |||||
| * | | Merge pull request #5116 from matrix-org/babolivier/account_expiration | Brendan Abolivier | 2019-05-01 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Fix path in account validity admin route's doc | ||||
| | * | | Fix whole path for admin route | Brendan Abolivier | 2019-05-01 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fix typo in account validity admin route | Brendan Abolivier | 2019-05-01 | 1 | -1/+1 |
| | | | | |||||
| * | | | Config option for verifying federation certificates (MSC 1711) (#4967) | Andrew Morgan | 2019-04-25 | 2 | -1/+34 |
| |/ / | |||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-04-17 | 3 | -0/+27 |
| |\ \ | | | | | | | | | | | | | babolivier/account_expiration | ||||
| | * \ | Merge pull request #5047 from matrix-org/babolivier/account_expiration | Brendan Abolivier | 2019-04-17 | 1 | -3/+26 |
| | |\ \ | | | | | | | | | | | Send out emails with links to extend an account's validity period | ||||
| | * \ \ | Merge pull request #5063 from matrix-org/erikj/move_endpoints | Erik Johnston | 2019-04-15 | 1 | -0/+6 |
| | |\ \ \ | | | | | | | | | | | | | Move some rest endpoints to client reader | ||||
| | | * | | | Only handle GET requests for /push_rules | Erik Johnston | 2019-04-15 | 1 | -0/+3 |
| | | | | | | |||||
| | | * | | | Move some rest endpoints to client reader | Erik Johnston | 2019-04-15 | 1 | -0/+3 |
| | | | | | | |||||
| * | | | | | Add management endpoints for account validity | Brendan Abolivier | 2019-04-17 | 1 | -0/+42 |
| | |_|/ / | |/| | | | |||||
| * | | | | Send out emails with links to extend an account's validity period | Brendan Abolivier | 2019-04-17 | 1 | -3/+26 |
| | | | | | |||||
* | | | | | Merge branch 'develop' into dinsic | Andrew Morgan | 2019-04-15 | 2 | -0/+23 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge pull request #5027 from matrix-org/babolivier/account_expiration | Brendan Abolivier | 2019-04-09 | 1 | -0/+6 |
| |\| | | | | | | | | | | | | | Add time-based account expiration | ||||
| | * | | | Add account expiration feature | Brendan Abolivier | 2019-04-09 | 1 | -0/+6 |
| | | |/ | | |/| | |||||
| * | | | add context to phonehome stats (#5020) | Neil Johnson | 2019-04-08 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | add context to phonehome stats | ||||
| * | | | Add config option to block users from looking up 3PIDs (#5010) | Brendan Abolivier | 2019-04-04 | 1 | -0/+4 |
| | |/ | |/| | |||||
| * | | Add admin API for group deletion | Erik Johnston | 2019-04-03 | 1 | -0/+14 |
| |/ | |||||
* | | Add config option to block users from looking up 3PIDs (#5010) dinsic_2019-04-05 | Brendan Abolivier | 2019-04-05 | 1 | -0/+4 |
| | | |||||
* | | Merge branch 'master' of github.com:matrix-org/synapse into dinsic | Erik Johnston | 2019-04-05 | 3 | -10/+20 |
|\| | |||||
| * | Support 3PID login in password providers (#4931) | Andrew Morgan | 2019-03-26 | 1 | -0/+14 |
| | | | | | | | | | | Adds a new method, check_3pid_auth, which gives password providers the chance to allow authentication with third-party identifiers such as email or msisdn. | ||||
| * | Fix nginx example in ACME doc. (#4923) | Richard van der Hoff | 2019-03-25 | 1 | -1/+1 |
| | | |||||
| * | Update Apache Setup To Remove Location Syntax (#4870) | Colin W | 2019-03-21 | 1 | -9/+5 |
| | | | | | | | | | | This one should close #4841. Many thanks to @dev4223 for bringing it up and finding a solution. Signed-off-by: Colin White | ||||
* | | Sample config | Erik Johnston | 2019-04-03 | 1 | -0/+5 |
| | | |||||
* | | Update sample config | Erik Johnston | 2019-03-21 | 1 | -0/+52 |
|/ | |||||
* | Merge pull request #4896 from matrix-org/erikj/disable_room_directory | Erik Johnston | 2019-03-21 | 1 | -0/+6 |
|\ | | | | | Add option to disable search room lists | ||||
| * | Fix up config comments | Erik Johnston | 2019-03-20 | 1 | -3/+4 |
| | | |||||
| * | Add option to disable search room lists | Erik Johnston | 2019-03-19 | 1 | -0/+5 |
| | | | | | | | | This disables both local and remote room list searching. | ||||
* | | Merge pull request #4895 from matrix-org/erikj/disable_user_search | Erik Johnston | 2019-03-20 | 1 | -0/+5 |
|\ \ | | | | | | | Add option to disable searching in the user dir | ||||
| * | | Fix up sample config | Erik Johnston | 2019-03-20 | 1 | -2/+4 |
| | | | |||||
| * | | Update sample config | Erik Johnston | 2019-03-19 | 1 | -0/+3 |
| |/ | |||||
* / | Batch up outgoing read-receipts to reduce federation traffic. (#4890) | Richard van der Hoff | 2019-03-20 | 1 | -0/+8 |
|/ | | | | Rate-limit outgoing read-receipts as per #4730. | ||||
* | Add note on tuning postgres | Erik Johnston | 2019-03-19 | 1 | -2/+20 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into develop | Richard van der Hoff | 2019-03-19 | 2 | -5/+3 |
|\ | |||||
| * | Repoint docs for federation (#4881) | Michael Kaye | 2019-03-19 | 1 | -1/+1 |
| | | |||||
| * | fix some typos in federate.md | Richard van der Hoff | 2019-03-15 | 1 | -4/+2 |
| | | |||||
* | | Comment out most options in the generated config. (#4863) | Richard van der Hoff | 2019-03-19 | 1 | -73/+80 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it so that most options in the config are optional, and commented out in the generated config. The reasons this is a good thing are as follows: * If we decide that we should change the default for an option, we can do so, and only those admins that have deliberately chosen to override that option will be stuck on the old setting. * It moves us towards a point where we can get rid of the super-surprising feature of synapse where the default settings for the config come from the generated yaml. * It makes setting up a test config for unit testing an order of magnitude easier (see forthcoming PR). * It makes the generated config more consistent, and hopefully easier for users to understand. | ||||
* | | Add ratelimiting on failed login attempts (#4865) | Brendan Abolivier | 2019-03-18 | 1 | -0/+6 |
| | | |||||
* | | Add ratelimiting on login (#4821) | Brendan Abolivier | 2019-03-15 | 1 | -11/+28 |
| | | | | | | Add two ratelimiters on login (per-IP address and per-userID). | ||||
* | | Document using a certificate with a full chain (#4849) | Andrew Morgan | 2019-03-13 | 1 | -0/+5 |
| | | |||||
* | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Neil Johnson | 2019-03-12 | 1 | -0/+125 |
|\| | |||||
| * | fix orphaned sentence | Neil Johnson | 2019-03-12 | 1 | -1/+0 |
| | | |||||
| * | Neilj/improved delegation doc 2 (#4832) | Neil Johnson | 2019-03-12 | 1 | -0/+126 |
| | | | | | | | | | | Improved federation configuration docs. Specifically detailing .well-known and SRV based delegation methods. Inspiration Valentin Lab <valentin.lab@kalysto.org> for https://github.com/matrix-org/synapse/pull/4781 | ||||
* | | Clarify what registration_shared_secret allows for (#2885) (#4844) | Aaron Raimist | 2019-03-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | * Clarify what registration_shared_secret allows for (#2885) Signed-off-by: Aaron Raimist <aaron@raim.ist> * Add changelog Signed-off-by: Aaron Raimist <aaron@raim.ist> | ||||
* | | Reword the sample config header to be less scary (#4801) | Matthew Hodgson | 2019-03-07 | 2 | -10/+20 |
| | | |||||
* | | Update sample config | Brendan Abolivier | 2019-03-05 | 1 | -11/+13 |
| | | |||||
* | | Merge pull request #4772 from jbweston/jbweston/server-version-api | Erik Johnston | 2019-03-05 | 1 | -0/+22 |
|\ \ | | | | | | | Add 'server_version' endpoint to admin API | ||||
| * | | add API documentation | Joseph Weston | 2019-03-02 | 1 | -0/+22 |
| | | | | | | | | | | | | Signed-off-by: Joseph Weston <joseph@weston.cloud> | ||||
* | | | Add rate-limiting on registration (#4735) | Brendan Abolivier | 2019-03-05 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Rate-limiting for registration * Add unit test for registration rate limiting * Add config parameters for rate limiting on auth endpoints * Doc * Fix doc of rate limiting function Co-Authored-By: babolivier <contact@brendanabolivier.com> * Incorporate review * Fix config parsing * Fix linting errors * Set default config for auth rate limiting * Fix tests * Add changelog * Advance reactor instead of mocked clock * Move parameters to registration specific config and give them more sensible default values * Remove unused config options * Don't mock the rate limiter un MAU tests * Rename _register_with_store into register_with_store * Make CI happy * Remove unused import * Update sample config * Fix ratelimiting test for py2 * Add non-guest test | ||||
* | | | Merge pull request #4796 from matrix-org/erikj/factor_out_e2e_keys | Erik Johnston | 2019-03-05 | 1 | -0/+2 |
|\ \ \ | | | | | | | | | Allow /keys/{changes,query} API to run on worker | ||||
| * | | | Allow /keys/{changes,query} API to run on worker | Erik Johnston | 2019-03-04 | 1 | -0/+2 |
| | | | |