maxmustermann/synapse
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
16363 commits 636 branches 519 tags 164 MiB
Commit graph

16363 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Morgan a099ab7d38 Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes 2020-01-14 10:37:32 +00:00
Andrew Morgan 1177d3f3a3
Quarantine media by ID or user ID (#6681) 2020-01-13 18:10:43 +00:00
Richard van der Hoff 47f4f493f0
Document more supported endpoints for workers (#6698) 2020-01-13 15:32:02 +00:00
Richard van der Hoff 326c893d24
Kill off RegistrationError (#6691) 
This is pretty pointless. Let's just use SynapseError.
 2020-01-13 12:48:22 +00:00
Richard van der Hoff 2d07c73777
Don't assign numeric IDs for empty usernames (#6690) 
Fix a bug where we would assign a numeric userid if somebody tried registering
with an empty username
 2020-01-13 12:47:30 +00:00
Richard van der Hoff 3cfac9593c
Merge pull request #6689 from matrix-org/rav/saml_mapping_provider_updates 
Updates to the SAML mapping provider API
 2020-01-13 12:44:55 +00:00
Richard van der Hoff 8039685051
Allow additional_resources to implement Resource directly (#6686) 
AdditionalResource really doesn't add any value, and it gets in the way for
resources which want to support child resources or the like. So, if the
resource object already implements the IResource interface, don't bother
wrapping it.
 2020-01-13 12:42:44 +00:00
Richard van der Hoff feee819973
Fix exceptions on requests for non-ascii urls (#6682) 
Fixes #6402
 2020-01-13 12:41:51 +00:00
Richard van der Hoff da4e52544e comment for run_in_background 2020-01-12 21:53:47 +00:00
Richard van der Hoff d56e95ea8b changelog 2020-01-12 21:42:15 +00:00
Richard van der Hoff dc69a1cf43 Pass client redirect URL into SAML mapping providers 2020-01-12 21:40:49 +00:00
Richard van der Hoff 47e63cc67a Pass the module_api into the SamlMappingProvider 
... for consistency with other modules, and because we'll need it sooner or
later and it will be a pain to introduce later.
 2020-01-12 21:40:49 +00:00
Richard van der Hoff 1d16f5ea0e
Merge pull request #6675 from matrix-org/rav/die_sqlite37_die_die_die 
Refuse to start if sqlite is older than 3.11.0
 2020-01-10 12:17:22 +00:00
Richard van der Hoff 937dea42e7 update install notes for CentOS 2020-01-09 18:11:04 +00:00
Richard van der Hoff c3843fd075 changelog 2020-01-09 18:11:04 +00:00
Richard van der Hoff bf46821180 Refuse to start if sqlite is older than 3.11.0 2020-01-09 18:11:04 +00:00
Richard van der Hoff e48ba84e0b Check postgres version in check_database 
this saves doing it on each connection, and will allow us to pass extra options
in.
 2020-01-09 18:05:59 +00:00
Richard van der Hoff e97d1cf001 Modify check_database to take a connection rather than a cursor 
We might not need the cursor at all.
 2020-01-09 18:05:50 +00:00
Erik Johnston 645b1f0ea1 Merge branch 'master' of github.com:matrix-org/synapse into develop 2020-01-09 17:14:02 +00:00
Erik Johnston c2ba994dbb
Add note about log_file no longer be accepted (#6674) 2020-01-09 17:13:36 +00:00
Manuel Stahl d2906fe666 Allow admin users to create or modify users without a shared secret (#6495) 
Signed-off-by: Manuel Stahl <manuel.stahl@awesome-technologies.de>
 2020-01-09 13:31:00 +00:00
Erik Johnston d773290cb1 Merge branch 'master' into develop 2020-01-09 13:25:48 +00:00
Erik Johnston 9dfcf47e9b Fixup changelog 2020-01-09 11:40:27 +00:00
Erik Johnston 24b2c940fb 1.8.0 2020-01-09 11:39:29 +00:00
Erik Johnston ce72a9ccdb Merge branch 'erikj/media_admin_apis' of github.com:matrix-org/synapse into matrix-org-hotfixes 2020-01-08 15:52:58 +00:00
Erik Johnston bace86ed15 Merge branch 'release-v1.8.0' of github.com:matrix-org/synapse into matrix-org-hotfixes 2020-01-08 15:52:48 +00:00
Erik Johnston 7c232bd98b
Merge pull request #6664 from matrix-org/erikj/media_admin_apis 
Fix media repo admin APIs when using a media worker.
 2020-01-08 15:50:06 +00:00
Erik Johnston d74054afda Shuffle the code 2020-01-08 14:57:45 +00:00
Erik Johnston bca3455b38 Comments 2020-01-08 14:27:35 +00:00
Erik Johnston 187dc6ad02 Do not rely on streaming events, as media repo doesn't 2020-01-08 14:24:28 +00:00
Brendan Abolivier e16521faab
Merge pull request #6665 from matrix-org/babolivier/retention_doc_typo 
Fix typo in message retention policies doc
 2020-01-08 13:57:02 +00:00
Erik Johnston 4e2a072a05 Newsfile 2020-01-08 13:28:19 +00:00
Brendan Abolivier 32ad2a3349
Changelog 2020-01-08 13:28:12 +00:00
Brendan Abolivier 3889fcd9d7
Fix typo in message retention policies doc 2020-01-08 13:27:29 +00:00
Richard van der Hoff b064a41291 Merge remote-tracking branch 'origin/release-v1.8.0' into develop 2020-01-08 13:27:17 +00:00
Manuel Stahl 7caaa29daa Fix GET request on /_synapse/admin/v2/users endpoint (#6563) 
Fixes #6552
 2020-01-08 13:26:40 +00:00
Erik Johnston 1adf27c82a Import RoomStore in media worker to fix admin APIs 2020-01-08 13:26:20 +00:00
Erik Johnston 3cf7d6d5b6 Move media admin store functions to worker store 2020-01-08 13:26:20 +00:00
Richard van der Hoff 573fee759c
Back out ill-advised notary server hackery (#6657) 
This was ill-advised. We can't modify verify_keys here, because the response
object has already been signed by the requested key.

Furthermore, it's somewhat unnecessary because existing versions of Synapse
(which get upset that the notary key isn't present in verify_keys) will fall
back to a direct fetch via `/key/v2/server`.

Also: more tests for fetching keys via perspectives: it would be nice if we actually tested when our fetcher can't talk to our notary impl.
 2020-01-08 13:24:10 +00:00
Brendan Abolivier cff1cb8685
Merge pull request #6624 from matrix-org/babolivier/retention_doc 
Add complete documentation of the message retention policies support
 2020-01-08 11:24:47 +00:00
Fabian Meyer dd57715de2 contrib/docker-compose: fixing mount that overrides containers' /etc (#6656) 
The mount in the form of ./matrix-config:/etc overwrites the contents of the container /etc folder. Since all valid ca certificates are stored in /etc, the synapse.push.httppusher, for example, cannot validate the certificate from matrix.org.
 2020-01-08 07:25:05 +00:00
Matthew Hodgson 91718b3f23 typo 2020-01-07 15:46:04 +00:00
Erik Johnston be29ed7ad8
Correctly proxy remote group HTTP errors. (#6654) 
e.g. if remote returns a 404 then that shouldn't be treated as an error
but should be proxied through.
 2020-01-07 15:36:41 +00:00
Brendan Abolivier 2b6b7f482a
Merge pull request #6621 from matrix-org/babolivier/purge_job_config_typo 
Fix a typo in the purge jobs configuration example
 2020-01-07 16:17:40 +01:00
Brendan Abolivier 3675fb9bc6
Fix reference 2020-01-07 15:15:16 +00:00
Brendan Abolivier 7ba98a2874
Incorporate review 2020-01-07 15:14:33 +00:00
Brendan Abolivier 4be582d7c8 Merge branch 'develop' into babolivier/retention_doc 2020-01-07 15:07:19 +00:00
Brendan Abolivier 01fbd95736
Apply suggestions from code review 
Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
 2020-01-07 15:59:38 +01:00
Brendan Abolivier 03edfc5850
Update changelog.d/6624.doc 
Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
 2020-01-07 15:59:05 +01:00
Brendan Abolivier 391fb47791
Reword 2020-01-07 14:54:32 +00:00