1
0
Commit Graph

924 Commits

Author SHA1 Message Date
Brendan Abolivier
2e3b9a0fcb Revert "Revert "Merge pull request #7315 from matrix-org/babolivier/request_token""
This reverts commit 1adf6a5587.
2020-04-23 11:23:53 +02:00
Brendan Abolivier
fb825759e3 Merge branch 'master' into develop 2020-04-23 11:23:33 +02:00
Brendan Abolivier
1adf6a5587 Revert "Merge pull request #7315 from matrix-org/babolivier/request_token"
This reverts commit 6f4319368b, reversing
changes made to 0d775fcc2d.
2020-04-23 11:23:10 +02:00
Brendan Abolivier
6f4319368b Merge pull request #7315 from matrix-org/babolivier/request_token
Config option to inhibit 3PID errors on /requestToken
2020-04-23 10:38:57 +02:00
Richard van der Hoff
71a1abb8a1 Stop the master relaying USER_SYNC for other workers (#7318)
Long story short: if we're handling presence on the current worker, we shouldn't be sending USER_SYNC commands over replication.

In an attempt to figure out what is going on here, I ended up refactoring some bits of the presencehandler code, so the first 4 commits here are non-functional refactors to move this code slightly closer to sanity. (There's still plenty to do here :/). Suggest reviewing individual commits.

Fixes (I hope) #7257.
2020-04-22 22:39:04 +01:00
Brendan Abolivier
69ad7cc13b Config option to inhibit 3PID errors on /requestToken
Adds a request_token_inhibit_errors configuration flag (disabled by
default) which, if enabled, change the behaviour of all /requestToken
endpoints so that they return a 200 and a fake sid if the 3PID was/was
not found associated with an account (depending on the endpoint),
instead of an error.

Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
2020-04-22 23:38:42 +02:00
Andrew Morgan
e66bbf7a9d Fix and refactor rewritten IS url feature. Add sample config docs (#40) 2020-04-22 14:23:10 +01:00
Dirk Klimpel
6b6685db9f Extend room admin api with additional attributes (#7225) 2020-04-22 13:38:41 +01:00
Richard van der Hoff
2aa5bf13c8 Merge branch 'release-v1.12.4' into develop 2020-04-22 13:09:23 +01:00
Richard van der Hoff
974c0d726a Support GET account_data requests on a worker (#7311) 2020-04-21 10:46:30 +01:00
Lars Franke
13917232d5 Fix indention in generated config file (#7300)
Also adjust sample_config.yaml

Signed-off-by: Lars Franke <frcl@mailbox.org>
2020-04-20 16:51:27 +01:00
nataraj-hates-MS-for-stealing-github
0d775fcc2d Improve example TURN configuration in documentation (#7284) 2020-04-17 08:04:23 -04:00
Tristan Lins
c07fca9e2f Clarify the comments for media_storage_providers options (#7272) 2020-04-17 07:09:33 -04:00
Andrew Morgan
a48138784e Allow specifying the value of Accept-Language header for URL previews (#7265) 2020-04-15 13:35:29 +01:00
Ryan Hovland
4a0dadafbe Add setting to nginx configuration to allow larger file uploads (#7251) 2020-04-13 17:23:36 +01:00
Andrew Morgan
a026bdaab7 Add matrix-synapse-shared-secret-auth as an example password provider (#7248) 2020-04-09 12:49:05 +01:00
Richard van der Hoff
cae4121484 Make systemd-with-workers doc official (#7234)
Simplify and update this documentation, and make it part of the core dist.
2020-04-08 11:59:26 +01:00
Andrew Morgan
29b7e22b93 Add documentation to password_providers config option (#7238) 2020-04-08 00:46:50 +01:00
Martin Milata
b0db928c63 Extend web_client_location to handle absolute URLs (#7006)
Log warning when filesystem path is used.

Signed-off-by: Martin Milata <martin@martinmilata.cz>
2020-04-03 11:57:34 -04:00
Richard van der Hoff
0122ef1037 Revert "Merge pull request #7153 from matrix-org/babolivier/sso_whitelist_login_fallback"
This was incorrectly merged to master.

This reverts commit 319c41f573, reversing
changes made to 229eb81498.
2020-04-03 11:17:39 +01:00
siroccal
250f87d0de Update postgres.md (#7119) 2020-04-01 12:44:51 +01:00
Jostein Kjønigsen
2e826cd80c Improve TURN documentation. (#7167) 2020-03-31 15:50:48 +01:00
Andrew Morgan
d9f29f8dae Fix a small typo in the metrics_flags config option. (#7171) 2020-03-30 17:38:21 +01:00
Erik Johnston
4f21c33be3 Remove usage of "conn_id" for presence. (#7128)
* Remove `conn_id` usage for UserSyncCommand.

Each tcp replication connection is assigned a "conn_id", which is used
to give an ID to a remotely connected worker. In a redis world, there
will no longer be a one to one mapping between connection and instance,
so instead we need to replace such usages with an ID generated by the
remote instances and included in the replicaiton commands.

This really only effects UserSyncCommand.

* Add CLEAR_USER_SYNCS command that is sent on shutdown.

This should help with the case where a synchrotron gets restarted
gracefully, rather than rely on 5 minute timeout.
2020-03-30 16:37:24 +01:00
Patrick Cloke
c5f89fba55 Add developer documentation for running a local CAS server (#7147) 2020-03-30 07:28:42 -04:00
Richard van der Hoff
b7da598a61 Always whitelist the login fallback for SSO (#7153)
That fallback sets the redirect URL to itself (so it can process the login
token then return gracefully to the client). This would make it pointless to
ask the user for confirmation, since the URL the confirmation page would be
showing wouldn't be the client's.
2020-03-27 20:24:52 +00:00
Dirk Klimpel
fb69690761 Admin API to join users to a room. (#7051) 2020-03-27 19:16:43 +00:00
Dirk Klimpel
8327eb9280 Add options to prevent users from changing their profile. (#7096) 2020-03-27 19:15:23 +00:00
Brendan Abolivier
319c41f573 Merge pull request #7153 from matrix-org/babolivier/sso_whitelist_login_fallback
Always whitelist the login fallback for SSO
2020-03-27 15:34:41 +01:00
Brendan Abolivier
63aea691a7 Update the wording of the config comment 2020-03-27 15:09:12 +01:00
Brendan Abolivier
7083147961 Regenerate sample config 2020-03-26 19:01:54 +01:00
Dirk Klimpel
e8e2ddb60a Allow server admins to define and enforce a password policy (MSC2000). (#7118) 2020-03-26 16:51:13 +00:00
Aaron Raimist
6ca5e56fd1 Remove unused captcha_bypass_secret option (#7137)
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-03-25 17:49:34 +00:00
Erik Johnston
4cff617df1 Move catchup of replication streams to worker. (#7024)
This changes the replication protocol so that the server does not send down `RDATA` for rows that happened before the client connected. Instead, the server will send a `POSITION` and clients then query the database (or master out of band) to get up to date.
2020-03-25 14:54:01 +00:00
Richard van der Hoff
39230d2171 Clean up some LoggingContext stuff (#7120)
* Pull Sentinel out of LoggingContext

... and drop a few unnecessary references to it

* Factor out LoggingContext.current_context

move `current_context` and `set_context` out to top-level functions.

Mostly this means that I can more easily trace what's actually referring to
LoggingContext, but I think it's generally neater.

* move copy-to-parent into `stop`

this really just makes `start` and `stop` more symetric. It also means that it
behaves correctly if you manually `set_log_context` rather than using the
context manager.

* Replace `LoggingContext.alive` with `finished`

Turn `alive` into `finished` and make it a bit better defined.
2020-03-24 14:45:33 +00:00
Andrew Morgan
6ed566e52a Add an option to the set password API to choose whether to logout other devices. (#7085)
* commit '88b41986d':
  Add an option to the set password API to choose whether to logout other devices. (#7085)
2020-03-24 14:42:12 +00:00
Andrew Morgan
6095a49d4a Merge commit '6a3504636' into dinsic-release-v1.12.x
* commit '6a3504636': (29 commits)
  Revert "Add options to disable setting profile info for prevent changes. (#7053)"
  Populate the room version from state events (#7070)
  Fix buggy condition in account validity handler (#7074)
  Use innerText instead of innerHTML
  Add type annotations and comments to auth handler (#7063)
  Lint
  Put the file in the templates directory
  Update wording and config
  Changelog
  Move the default SAML2 error HTML to a dedicated file
  Refactor a bit
  Also don't fail on aliases events in this case
  Lint
  Changelog
  Also don't filter out events sent by ignored users when checking state visibility
  Fix condition
  Don't filter out dummy events when we're checking the visibility of state
  Update sample_config.yaml
  Update synapse/config/registration.py
  lint, fix tests
  ...
2020-03-24 14:36:35 +00:00
Andrew Morgan
42cbe33d33 Merge pull request #7058 from matrix-org/babolivier/saml_error_html
* commit '6640460d0':
  Rephrase default message
  Hopefully mypy is happy now
  Attempt at appeasing the gods of mypy
  Lint
  Changelog
  Update sample config
  SAML2: render a comprehensible error page if something goes wrong
2020-03-24 14:25:26 +00:00
Andrew Morgan
a95e5cc0a2 Update routing of fallback auth in the worker docs. (#7048)
* commit '66315d862':
  Update routing of fallback auth in the worker docs. (#7048)
2020-03-24 14:24:48 +00:00
Andrew Morgan
959b119d58 v1.11.1
* commit 'fd983fad9':
  v1.11.1
  Fix wrong handler being used in SAML handler
  Factor out complete_sso_login and expose it to the Module API
  Add a whitelist for the SSO confirmation step.
  Add a confirmation step to the SSO login flow
2020-03-24 13:42:54 +00:00
Andrew Morgan
5dac67e2db Fix minor issues with email config (#6962)
* commit '4c2ed3f20':
  Fix minor issues with email config (#6962)
2020-03-24 13:23:02 +00:00
Andrew Morgan
35d74a232c Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957)
* commit '509e381af':
  Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957)
  changelog
  Increase MAX_EVENTS_BEHIND for replication clients
2020-03-24 13:16:43 +00:00
Andrew Morgan
b63baf1a18 Merge pull request #6940 from matrix-org/babolivier/federate.md
* commit 'bbe39f808':
  Incorporate review
  Incorporate review
  Phrasing
  Changelog
  Add mention of SRV records as an advanced topic
  Argh trailing spaces
  Fix links in the reverse proxy doc
  Make federate.md more of a sumary of the steps to follow to set up replication
  Split the delegating documentation out of federate.md and trim it down
2020-03-24 13:15:08 +00:00
Andrew Morgan
7534f1a7c0 Merge pull request #6907 from matrix-org/babolivier/acme-config
* commit 'd484126bf':
  Make the log more noticeable
  Print the error as an error log and raise the same exception we got
  Linters are hard but in they end they just want what's best for us
  Lint
  Changelog
  Lint
  Add a separator for the config warning
  Add a comprehensive error when failing to register for an ACME account
  Add mention and warning about ACME v1 deprecation to the Synapse config
2020-03-24 13:13:43 +00:00
Andrew Morgan
480ed7d168 Fix worker docs to point /publicised_groups API correctly. (#6938)
* commit '818def824':
  Fix worker docs to point `/publicised_groups` API correctly. (#6938)
2020-03-24 13:12:46 +00:00
Andrew Morgan
1c257f8083 Add a warning about indentation to generated config (#6920)
* commit '97a42bbc3':
  Add a warning about indentation to generated config (#6920)
2020-03-23 17:48:14 +00:00
Andrew Morgan
b683d4b07e Filter the results of user directory searching via the spam checker (#6888)
* commit '49f877d32':
  Filter the results of user directory searching via the spam checker (#6888)
2020-03-23 17:38:09 +00:00
Andrew Morgan
27cad30417 Add documentation for the spam checker module (#6906)
* commit '361de49c9':
  Add documentation for the spam checker module (#6906)
2020-03-23 17:16:23 +00:00
Andrew Morgan
f3fb2c3a3f Merge pull request #6905 from matrix-org/babolivier/acme.md
* commit 'f48bf4feb':
  Update docs/ACME.md
  Mention that using Synapse to serve certificates requires restarts
  Changelog
  Remove duplicated info about certbot et al
  Update ACME.md to mention ACME v1 deprecation
2020-03-23 17:16:16 +00:00
Andrew Morgan
fe99288d55 Merge pull request #6891 from matrix-org/babolivier/retention-doc-amend
* commit '6cd34da8b':
  Rephrase
  Update the changelog file
  Also spell it out in the purge history API doc
  Changelog
  Spell out that Synapse never purges the last event sent in a room
2020-03-23 17:15:49 +00:00