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

13869 commits

This branch
This branch
All branches
Author SHA1 Message Date
Erik Johnston b0bf1ea7bd Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes 2019-03-21 14:10:31 +00:00
Erik Johnston 01e6b405be
Merge pull request #4908 from matrix-org/erikj/block_peek_on_blocked_rooms 
Deny peeking into rooms that have been blocked
 2019-03-21 14:07:17 +00:00
Richard van der Hoff 27813b4ca1
Update changelog.d/4908.bugfix 
Co-Authored-By: erikjohnston <erikj@jki.re>
 2019-03-21 14:05:59 +00:00
Colin W ab4e4c6c2f Update Apache Setup To Remove Location Syntax (#4870) 
This one should close #4841. Many thanks to @dev4223 for bringing it up and finding a solution.

Signed-off-by: Colin White
 2019-03-21 14:05:56 +00:00
Erik Johnston d3f640f0ac isort 2019-03-21 11:29:48 +00:00
Erik Johnston 017ed9d423 Newsfile 2019-03-21 11:26:47 +00:00
Erik Johnston 3959858eaa
Merge pull request #4904 from matrix-org/erikj/fix_shutdown 
Fixup shutdown room API
 2019-03-21 11:24:42 +00:00
Erik Johnston cd80cbffea Fix typo and add description 2019-03-21 11:24:04 +00:00
Erik Johnston 536a266520 Deny peeking into rooms that have been blocked 2019-03-21 11:20:13 +00:00
Erik Johnston 4a8a1ac962 Rejig testcase to make it more extensible 2019-03-21 11:02:11 +00:00
Erik Johnston 9c9e618b93 Remove debug 2019-03-21 10:58:56 +00:00
Erik Johnston 5c6f61f81c Add tests 2019-03-21 10:51:21 +00:00
Erik Johnston 3ecec5ede2 Fix upsert 2019-03-21 10:21:15 +00:00
Erik Johnston 09f991a63d
Merge pull request #4896 from matrix-org/erikj/disable_room_directory 
Add option to disable search room lists
 2019-03-21 10:16:54 +00:00
Richard van der Hoff a6f2d3053d
Log requests which are simulated by the unit tests. (#4905) 
Rather than stubbing out the access_log, make it actually log the requests,
which makes it a lot more obvious what is going on during tests.
 2019-03-20 18:00:02 +00:00
Erik Johnston cd62981a6a Revert spurious delete 2019-03-20 17:51:27 +00:00
Erik Johnston 8d8834d3e7 comment block_room 2019-03-20 17:49:56 +00:00
Erik Johnston aa959a6c07 Use flags 2019-03-20 17:40:29 +00:00
Erik Johnston 7d47cc1305 Move requester check into assert_accepted_privacy_policy 2019-03-20 17:08:36 +00:00
Erik Johnston 30e69ff9b6 Newsfile 2019-03-20 16:56:55 +00:00
Erik Johnston 72a14860ab Gracefully handle failing to kick user 2019-03-20 16:54:21 +00:00
Erik Johnston 6b28890543 Log new room ID 2019-03-20 16:52:28 +00:00
Erik Johnston 74c46d81fa Only require consent for events with an associated request 
There are a number of instances where a server or admin may puppet a
user to join/leave rooms, which we don't want to fail if the user has
not consented to the privacy policy. We fix this by adding a check to
test if the requester has an associated access_token, which is used as a
proxy to answer the question of whether the action is being done on
behalf of a real request from the user.
 2019-03-20 16:50:23 +00:00
Erik Johnston 67d618e111 Allow blocking a room multiple times 2019-03-20 16:50:05 +00:00
Erik Johnston 263f2c9ce1
Merge pull request #4895 from matrix-org/erikj/disable_user_search 
Add option to disable searching in the user dir
 2019-03-20 16:47:15 +00:00
Amber Brown 4d53017432
Batching in the user directory import (#4900) 2019-03-21 03:06:36 +11:00
Richard van der Hoff cdb8036161
Add a config option for torture-testing worker replication. (#4902) 
Setting this to 50 or so makes a bunch of sytests fail in worker mode.
 2019-03-20 16:04:35 +00:00
Richard van der Hoff a902d13180
Batch up outgoing read-receipts to reduce federation traffic. (#4890) 
Rate-limit outgoing read-receipts as per #4730.
 2019-03-20 16:02:25 +00:00
Erik Johnston 3660d24ebe Add test 2019-03-20 15:16:36 +00:00
Erik Johnston cc09685830 Add test 2019-03-20 14:53:44 +00:00
Erik Johnston cd8c5b91ad Fix up sample config 2019-03-20 14:35:41 +00:00
Richard van der Hoff ab20f85c59
Update synapse/config/user_directory.py 
Co-Authored-By: erikjohnston <erikj@jki.re>
 2019-03-20 14:33:11 +00:00
Erik Johnston cc197a61a1 Disable publishing to room list when its disabled 2019-03-20 14:30:36 +00:00
Erik Johnston 2c90422146 Pull out config option 2019-03-20 14:25:58 +00:00
Erik Johnston 7529038e66 Return before we log 2019-03-20 14:25:28 +00:00
Erik Johnston 926f29ea6d Fix up config comments 2019-03-20 14:24:53 +00:00
Erik Johnston bf5876990f Newsfile 2019-03-19 17:10:54 +00:00
Erik Johnston 213c98c00a Add option to disable search room lists 
This disables both local and remote room list searching.
 2019-03-19 17:10:52 +00:00
Erik Johnston 855bf4658d Update sample config 2019-03-19 16:47:04 +00:00
Erik Johnston 0891202629 Newsfile 2019-03-19 16:41:57 +00:00
Erik Johnston 320667a479 Add option to disable searching in the user dir 
We still populate it, as it can still be accessed via the admin API.
 2019-03-19 16:40:19 +00:00
Erik Johnston 11f2125885
Merge pull request #4894 from matrix-org/erikj/postgres_tuning 
Add note on tuning postgres
 2019-03-19 16:21:24 +00:00
Erik Johnston 38ae23d5c2 Newsfile 2019-03-19 16:07:07 +00:00
Erik Johnston b616a8717b Add note on tuning postgres 2019-03-19 16:05:32 +00:00
Erik Johnston 4aa0b707d2
Merge pull request #4879 from matrix-org/erikj/test_old_deps 
Add py27-old test case to buildkite
 2019-03-19 13:05:39 +00:00
Erik Johnston b0e767f7bb Add comment back in 2019-03-19 12:51:32 +00:00
Richard van der Hoff 5cf00c9f60
Merge pull request #4889 from matrix-org/rav/test_real_config 
Use a regular HomeServerConfig object for unit tests
 2019-03-19 12:27:07 +00:00
Richard van der Hoff 7872638c31
Merge pull request #4888 from matrix-org/rav/fix_disabled_hs 
Enforce hs_disabled_message correctly
 2019-03-19 12:22:13 +00:00
Richard van der Hoff 2561b628af Merge branch 'develop' into matrix-org-hotfixes 2019-03-19 12:19:20 +00:00
Richard van der Hoff 73c6630718 Revert "Reinstate EDU-batching hacks" 
This reverts commit ed8ccc3737.
 2019-03-19 12:17:28 +00:00