summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5071 from matrix-org/babolivier/3pid-checkBrendan Abolivier2019-04-172-0/+19
|\ | | | | Make sure we're not registering the same 3pid twice
| * Make sure we're not registering the same 3pid twiceBrendan Abolivier2019-04-172-0/+19
| |
* | Merge pull request #5070 from matrix-org/erikj/postpathErik Johnston2019-04-172-8/+9
|\ \ | | | | | | Remove usage of request.postpath
| * | NewsfileErik Johnston2019-04-161-0/+1
| | |
| * | Remove usage of request.postpathErik Johnston2019-04-161-8/+8
| | | | | | | | | | | | | | | | | | | | | This is an undocumented variable in twisted, and relies on the servlet being mounted in the right way. This also breaks getting push rules on workers.
* | | Merge pull request #5065 from matrix-org/erikj/fix_versionsErik Johnston2019-04-162-1/+2
|\ \ \ | | | | | | | | VersionRestServlet doesn't take a param
| * | | NewsfileErik Johnston2019-04-151-0/+1
| | | |
| * | | VersionRestServlet doesn't take a paramErik Johnston2019-04-151-1/+1
| | | |
* | | | Use packages.matrix.org for packages (#5067)Travis Ralston2019-04-162-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use packages.matrix.org for packages See https://github.com/vector-im/riot-web/issues/9497 (applies to more than just Olm) * changelog
* | | | Add systemd-python to optional dependencies (#4339)Silke Hofstra2019-04-164-10/+13
|/ / / | | | | | | | | | | | | | | | | | | Using systemd-python allows for logging to the systemd journal, as is documented in: `synapse/contrib/systemd/log_config.yaml`. Signed-off-by: Silke Hofstra <silke@slxh.eu>
* | | Merge pull request #5063 from matrix-org/erikj/move_endpointsErik Johnston2019-04-154-4/+21
|\| | | | | | | | Move some rest endpoints to client reader
| * | Only handle GET requests for /push_rulesErik Johnston2019-04-152-0/+10
| | |
| * | NewsfileErik Johnston2019-04-151-0/+1
| | |
| * | Move some rest endpoints to client readerErik Johnston2019-04-152-4/+10
| | |
* | | update grafana dashboardRichard van der Hoff2019-04-131-5211/+1
| | |
* | | Remove periods from copyright headers (#5046)Andrew Morgan2019-04-1112-11/+12
| | |
* | | Merge pull request #5033 from matrix-org/erikj/fix_schema_deltaErik Johnston2019-04-102-1/+4
|\ \ \ | | | | | | | | Fix schema upgrade when dropping tables
| * | | NewsfileErik Johnston2019-04-091-0/+1
| | | |
| * | | Fix schema upgrade when dropping tablesErik Johnston2019-04-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to drop tables in the correct order due to foreign table constraints (on `application_services`), otherwise the DROP TABLE command will fail. Introduced in #4992.
* | | | Fix disappearing exceptions in manhole. (#5035)Richard van der Hoff2019-04-102-2/+58
| | | | | | | | | | | | Avoid sending syntax errors from the manhole to sentry.
* | | | Merge pull request #5027 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-099-3/+143
|\ \ \ \ | |/ / / |/| | | Add time-based account expiration
| * | | Add account expiration featureBrendan Abolivier2019-04-0910-4/+144
| | |/ | |/|
* | | Merge pull request #5030 from matrix-org/rav/rewrite_g_s_v_kRichard van der Hoff2019-04-095-91/+136
|\ \ \ | | | | | | | | Rewrite Datastore.get_server_verify_keys
| * | | changelogRichard van der Hoff2019-04-091-0/+1
| | | |
| * | | Rewrite Datastore.get_server_verify_keysRichard van der Hoff2019-04-093-52/+113
| | | | | | | | | | | | | | | | Rewrite this so that it doesn't hammer the database.
| * | | Rewrite test_keys as a HomeserverTestCaseRichard van der Hoff2019-04-081-19/+15
| | | |
| * | | Replace SlavedKeyStore with a shimRichard van der Hoff2019-04-081-14/+4
| | | | | | | | | | | | | | | | | | | | since we're pulling everything out of KeyStore anyway, we may as well simplify it.
| * | | Remove redundant merged_keys dictRichard van der Hoff2019-04-081-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | There's no point in collecting a merged dict of keys: it is sufficient to consider just the new keys which have been fetched by the most recent key_fetch_fns.
* | | | Bump psycopg requirement (#5032)Richard van der Hoff2019-04-092-1/+4
|/ / /
* | | Remove unused server_tls_certificates functions (#5028)Richard van der Hoff2019-04-086-63/+7
| | | | | | | | | | | | These have been unused since #4120, and with the demise of perspectives, it is unlikely that they will ever be used again.
* | | add context to phonehome stats (#5020)Neil Johnson2019-04-084-1/+9
| | | | | | | | | | | | add context to phonehome stats
* | | Merge pull request #5024 from matrix-org/rav/record_correct_server_in_serverkeysRichard van der Hoff2019-04-083-1/+3
|\ \ \ | | | | | | | | Fix from_server buglet in get_keys_from_perspectives
| * | | Fix from_server buglet in get_keys_from_perspectivesRichard van der Hoff2019-04-083-1/+3
| | | | | | | | | | | | | | | | | | | | make sure we store the name of the server the keys came from, rather than the origin server, after doing a fetch-from-perspectives.
* | | | drop tables listed in #1830 (#4992)Neil Johnson2019-04-0826-757/+43
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tables dropped: * application_services, * application_services_regex, * transaction_id_to_pdu, * stats_reporting * current_state_resets * event_content_hashes * event_destinations * event_edge_hashes * event_signatures * feedback * room_hosts * state_forward_extremities
* | | Merge pull request #5001 from matrix-org/rav/keyring_cleanupsRichard van der Hoff2019-04-084-33/+181
|\ \ \ | | | | | | | | Cleanups in the Keyring
| * | | changelogRichard van der Hoff2019-04-041-0/+1
| | | |
| * | | Hoist server_name check out of process_v2_responseRichard van der Hoff2019-04-041-13/+7
| | | | | | | | | | | | | | | | | | | | It's easier to check it in the caller than to complicate the interface with an extra param.
| * | | Clean up Keyring.process_v2_responseRichard van der Hoff2019-04-041-23/+46
| | | | | | | | | | | | | | | | | | | | | | | | Make this just return the key dict, rather than a single-entry dict mapping the server name to the key dict. It's easy for the caller to get the server name from from the response object anyway.
| * | | test for get_keys_from_perspectivesRichard van der Hoff2019-04-041-0/+67
| | | |
| * | | add a test for get_keys_from_serverRichard van der Hoff2019-04-041-0/+63
| | | |
| * | | Fix docstring on get_server_keys_jsonRichard van der Hoff2019-04-041-2/+2
| | | |
* | | | Add config option to block users from looking up 3PIDs (#5010)Brendan Abolivier2019-04-046-1/+81
| |_|/ |/| |
* | | Clean up the database pagination code (#5007)Amber Brown2019-04-053-67/+64
| | | | | | | | | | | | | | | | | | | | | | | | * rewrite & simplify * changelog * cleanup potential sql injection
* | | Merge pull request #5002 from matrix-org/erikj/delete_groupErik Johnston2019-04-046-0/+275
|\ \ \ | | | | | | | | Add delete group admin API
| * | | NewsfileErik Johnston2019-04-031-0/+1
| | | |
| * | | Add unit test for deleting groupsErik Johnston2019-04-031-0/+124
| | | |
| * | | Add admin API for group deletionErik Johnston2019-04-032-0/+40
| | | |
| * | | Add functions to delete a groupErik Johnston2019-04-032-0/+110
| | | |
* | | | Prevent kicking users who aren't in the room (#4999)Andrew Morgan2019-04-042-0/+10
| | | | | | | | | | | | Prevent kick events from succeeding if the user is not currently in the room.
* | | | Avoid redundant URL encoding (#4555)Marcel Krüger2019-04-042-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Do not double encode fallback redirect URL Signed-off-by: Marcel Fabian Krüger <zauguin@gmail.com>
* | | | Merge pull request #5004 from ajensenwaud/developErik Johnston2019-04-042-1/+2
|\ \ \ \ | | | | | | | | | | Fix issue #4596
| * | | | Fix issue #4596Anders2019-04-032-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Make synapse_port_db --curses work with Python 3. Signed-off-by: Anders Jensen-Waud <anders@jensenwaud.com>
* | | | | Correct default POSTGRES_USER in Docker README (#4987)*=0=1=4=*2019-04-042-2/+4
| |/ / / |/| | | | | | | Correct default POSTGRES_USER in Docker README
* | | | Fix grammar and document get_current_users_in_room (#4998)Andrew Morgan2019-04-0313-20/+32
| |/ / |/| |
* | | Rewrite KeyringTestCase as a HomeServerTestCase (#4986)Richard van der Hoff2019-04-032-107/+105
| | | | | | | | | | | | | | | This is a bit fiddly due to the keyring doing weird things with logcontexts.
* | | Remove presence lists (#4989)Neil Johnson2019-04-039-456/+23
| | | | | | | | | Remove presence list support as per MSC 1819
* | | Merge pull request #4982 from matrix-org/erikj/msc1915Erik Johnston2019-04-037-17/+216
|\ \ \ | | | | | | | | Implement MSC1915 - 3PID unbind APIs
| * | | Correctly handle id_server paramErik Johnston2019-04-021-0/+1
| | | |
| * | | Remove threepid binding if id server returns 400/404/501Erik Johnston2019-04-021-9/+10
| | | |
| * | | Fixup docstringsErik Johnston2019-04-023-7/+9
| | | |
| * | | NewsfileErik Johnston2019-04-011-0/+1
| | | |
| * | | Add unbind API to /r0 as it is now stabalisedErik Johnston2019-04-011-1/+1
| | | |
| * | | Grandfather in existing user threepidsErik Johnston2019-04-012-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | We assume, as we did before, that users bound their threepid to one of the trusted identity servers. So we simply fill the new table with all threepids in `user_threepids` joined with the trusted identity servers.
| * | | Allowing specifying IS to use in unbind API.Erik Johnston2019-04-014-8/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default the homeserver will use the identity server used during the binding of the 3PID to unbind the 3PID. However, we need to allow clients to explicitly ask the homeserver to unbind via a particular identity server, for the case where the 3PID was bound out of band from the homeserver. Implements MSC915.
| * | | For unbind poke IS used during binding of 3PIDErik Johnston2019-04-011-9/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the behaviour from using the server specified trusted identity server to using the IS that used during the binding of the 3PID, if known. This is the behaviour specified by MSC1915.
| * | | Track IS used to bind 3PIDsErik Johnston2019-04-013-0/+119
| | | | | | | | | | | | | | | | | | | | This will then be used to know which IS to default to when unbinding the threepid.
* | | | Run black on the rest of the storage module (#4996)Amber Brown2019-04-0342-2455/+2131
| | | |
* | | | Merge pull request #4991 from matrix-org/erikj/stagger_push_startupErik Johnston2019-04-025-8/+74
|\ \ \ \ | | | | | | | | | | Make starting pushers faster during start up
| * | | | s/misc/feature/Erik Johnston2019-04-021-0/+0
| | | | |
| * | | | NewsfileErik Johnston2019-04-021-0/+1
| | | | |
| * | | | Make starting pushers faster during start upErik Johnston2019-04-024-8/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We start all pushers on start up and immediately start a background process to fetch push to send. This makes start up incredibly painful when dealing with many pushers. Instead, let's do a quick fast DB check to see if there *may* be push to send and only start the background processes for those pushers. We also stagger starting up and doing those checks so that we don't try and handle all pushers at once.
* | | | | Transfer related groups on room upgrade (#4990)Andrew Morgan2019-04-023-0/+3
| | | | | | | | | | | | | | | Transfers the m.room.related_groups state event on room upgrade.
* | | | | Add config.signing_key_path. (#4974)Richard van der Hoff2019-04-022-1/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | As requested by @andrewshadura
* | / / Fix sync bug when accepting invites (#4956)Richard van der Hoff2019-04-027-69/+237
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Hopefully this time we really will fix #4422. We need to make sure that the cache on `get_rooms_for_user_with_stream_ordering` is invalidated *before* the SyncHandler is notified for the new events, and we can now do so reliably via the `events` stream.
* | | Neilj/fix threepid auth check (with tests) (#4474)Neil Johnson2019-04-012-0/+33
| | | | | | | | | test threepid checking
* | | Merge pull request #4981 from ↵manuroe2019-04-012-5/+16
|\ \ \ | | | | | | | | | | | | | | | | matrix-org/manuroe/demo_bypass_account_rate_limiting start.sh: Fix the --no-rate-limit option for messages
| * | | start.sh: Fix the --no-rate-limit option for messages and make it bypass ↵manuroe2019-04-012-5/+16
| | | | | | | | | | | | | | | | rate limit on registration and login too.
* | | | Merge branch 'master' into developNeil Johnson2019-04-0188-89/+107
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | 0.99.3 v0.99.3 github/release-v0.99.3 release-v0.99.3Neil Johnson2019-04-013-3/+13
| | |
| * | convert rst link to mdNeil Johnson2019-04-011-1/+1
| | |
| * | 0.99.3rc1 v0.99.3rc1Neil Johnson2019-03-2785-85/+93
| | |
| * | bump versionNeil Johnson2019-03-271-1/+1
| | |
* | | Collect room-version variations into one place (#4969)Richard van der Hoff2019-04-0128-168/+222
| |/ |/| | | | | Collect all the things that make room-versions different to one another into one place, so that it's easier to define new room versions.
* | Merge pull request #4968 from Jurrie/feature/fix_small_stuff_in_Docker_README.mdRichard van der Hoff2019-03-292-2/+4
|\ \ | | | | | | Feature/fix small stuff in docker readme.md
| * | Add changelog.d entryJurrie Overgoor2019-03-291-0/+1
| | |
| * | Add -p argument for docker run command exampleJurrie Overgoor2019-03-291-0/+1
| | | | | | | | | Signed-off-by: Jurrie Overgoor <1213142+Jurrie@users.noreply.github.com>
| * | Fix typo in TLS filenamesJurrie Overgoor2019-03-291-2/+2
|/ / | | | | Signed-off-by: Jurrie Overgoor <1213142+Jurrie@users.noreply.github.com>
* | Merge pull request #4955 from matrix-org/rav/merge_state_into_eventsRichard van der Hoff2019-03-289-49/+141
|\ \ | | | | | | Combine the CurrentStateDeltaStream into the EventStream
| * | changelogRichard van der Hoff2019-03-271-0/+1
| | |
| * | Combine the CurrentStateDeltaStream into the EventStreamRichard van der Hoff2019-03-275-33/+43
| | |
| * | Make EventStream rows have a typeRichard van der Hoff2019-03-274-17/+98
| | | | | | | | | | | | ... as a precursor to combining it with the CurrentStateDelta stream.
* | | Merge pull request #4954 from matrix-org/rav/refactor_parse_rowRichard van der Hoff2019-03-284-5/+22
|\ \ \ | | | | | | | | Refactors to replication stream row update/parsing
| * \ \ Merge remote-tracking branch 'origin/develop' into rav/refactor_parse_rowRichard van der Hoff2019-03-283-380/+336
| |\ \ \ | | |/ / | |/| |
| * | | changelogRichard van der Hoff2019-03-271-0/+1
| | | |
| * | | Skip building a ROW_TYPE when building updatesRichard van der Hoff2019-03-271-2/+2
| | | | | | | | | | | | | | | | | | | | We're about to turn it straight into a JSON object anyway so building a ROW_TYPE is a bit pointless, and reduces flexibility in the update_function.
| * | | Add parse_row method to replication stream classRichard van der Hoff2019-03-273-3/+19
| | | | | | | | | | | | | | | | This will allow individual stream classes to override how a row is parsed.
* | | | remove log line for password (#4965)Neil Johnson2019-03-282-2/+1
| | | | | | | | | | | | | | | | Remove log line for password.
* | | | Allow password providers to bind emails (#4947)Andrew Morgan2019-03-283-4/+23
| | | | | | | | | | | | This PR allows password provider modules to bind email addresses when a user is registering and is motivated by matrix-org/matrix-synapse-ldap3#58
* | | | Merge pull request #4942 from matrix-org/erikj/fix_presenceErik Johnston2019-03-285-33/+412
|\ \ \ \ | |_|/ / |/| | | Use event streams to calculate presence
| * | | Use an assertErik Johnston2019-03-281-2/+1
| | | |
| * | | Review commentsErik Johnston2019-03-282-49/+71
| | | |
| * | | NewsfileErik Johnston2019-03-271-0/+1
| | | |
| * | | Add unit testsErik Johnston2019-03-271-1/+171
| | | |
| * | | Use event streams to calculate presenceErik Johnston2019-03-273-32/+219
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Primarily this fixes a bug in the handling of remote users joining a room where the server sent out the presence for all local users in the room to all servers in the room. We also change to using the state delta stream, rather than the distributor, as it will make it easier to split processing out of the master process (as well as being more flexible). Finally, when sending presence states to newly joined servers we filter out old presence states to reduce the number sent. Initially we filter out states that are offline and have a last active more than a week ago, though this can be changed down the line. Fixes #3962
* | | Merge pull request #4953 from matrix-org/rav/refactor_replication_streamsRichard van der Hoff2019-03-288-77/+136
|\ \ \ | | |/ | |/| Split up replication.tcp.streams into smaller files
| * | changelogRichard van der Hoff2019-03-271-0/+2
| | |
| * | move FederationStream out to its own fileRichard van der Hoff2019-03-274-23/+43
| | |
| * | move EventsStream out to its own fileRichard van der Hoff2019-03-273-23/+42
| | |
| * | Move replication.tcp.streams into a packageRichard van der Hoff2019-03-274-35/+53
| | |
* | | Run `black` on some storage modules that the stats branch touches (#4959)Amber Brown2019-03-293-380/+336
|/ /
* / Fix/improve some docstrings in the replication code. (#4949)Richard van der Hoff2019-03-273-7/+20
|/
* Support 3PID login in password providers (#4931)Andrew Morgan2019-03-268-26/+137
| | | | | 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.
* Use the state event amount for userdir import batching, not room count (#4944)Amber Brown2019-03-272-8/+21
|
* Make federation endpoints more tolerant of trailing slashes v2 (#4935)Andrew Morgan2019-03-265-11/+13
| | | Redo of https://github.com/matrix-org/synapse/pull/4840
* Fix ClientReplicationStreamProtocol.__str__ (#4929)Richard van der Hoff2019-03-253-4/+6
| | | | | | | | `__str__` depended on `self.addr`, which was absent from ClientReplicationStreamProtocol, so attempting to call str on such an object would raise an exception. We can calculate the peer addr from the transport, so there is no need for addr anyway.
* Fix bug where read-receipts lost their timestamps (#4927)Richard van der Hoff2019-03-258-12/+179
| | | | | Make sure that they are sent correctly over the replication stream. Fixes: #4898
* Use an explicit dbname for postgres connections in the tests. (#4928)Richard van der Hoff2019-03-252-18/+17
| | | | | | I don't have a database with the same name as my user, so leaving the database name unset fails. While we're at it, clear out some unused stuff in the test setup.
* Fix nginx example in ACME doc. (#4923)Richard van der Hoff2019-03-252-1/+2
|
* Refactor out state delta handling into its own class (#4917)Amber Brown2019-03-255-110/+152
|
* Merge pull request #4869 from matrix-org/erikj/yaml_loadErik Johnston2019-03-228-11/+12
|\ | | | | Fix yaml warnings by using safe_load
| * NewsfileErik Johnston2019-03-221-0/+1
| |
| * Use yaml safe_loadErik Johnston2019-03-227-11/+11
| |
* | Allow newsfragments to end with exclamation marks! (#4912)Richard van der Hoff2019-03-212-2/+3
| |
* | Some more porting to HomeserverTestCase and remove old RESTHelper (#4913)Amber Brown2019-03-225-230/+124
| |
* | Remove trailing slashes from outbound federation requests and retry on 400 ↵Andrew Morgan2019-03-215-17/+191
|\ \ | |/ |/| | | | | (#4840) As per #3622, we remove trailing slashes from outbound federation requests. However, to ensure that we remain backwards compatible with previous versions of Synapse, if we receive a HTTP 400 with `M_UNRECOGNIZED`, then we are likely talking to an older version of Synapse in which case we retry with a trailing slash appended to the request path.
| * Clean up backoff_on_404 and metehod callsAndrew Morgan2019-03-211-9/+13
| |
| * kwargs doesn't like commas on calling funcs either. TILAndrew Morgan2019-03-201-2/+2
| |
| * lintAndrew Morgan2019-03-202-3/+7
| |
| * New test, fix issuesAndrew Morgan2019-03-202-49/+73
| |
| * Fix comments. v0.99.2 -> v0.99.3Andrew Morgan2019-03-202-6/+6
| |
| * Just return if not doing any trailing slash shennanigansAndrew Morgan2019-03-201-0/+2
| |
| * Federation test fixed!Andrew Morgan2019-03-201-2/+5
| |
| * lintAndrew Morgan2019-03-181-1/+1
| |
| * Better exception handlingAndrew Morgan2019-03-182-20/+18
| |
| * Correct var nameAndrew Morgan2019-03-132-2/+56
| |
| * receiving a 400 caused an exception. handle itAndrew Morgan2019-03-131-5/+12
| |
| * is this what purgatory feels likeAndrew Morgan2019-03-131-3/+3
| |
| * i should have given up x3Andrew Morgan2019-03-131-39/+0
| |
| * i should have given up x2Andrew Morgan2019-03-132-18/+52
| |
| * i should have given upAndrew Morgan2019-03-131-1/+1
| |
| * there comes a time when you should give up. but you dontAndrew Morgan2019-03-131-1/+1
| |
| * as aboveAndrew Morgan2019-03-131-2/+4
| |
| * no kwargs todayAndrew Morgan2019-03-131-7/+12
| |
| * Or perhaps I was the one who was drunkAndrew Morgan2019-03-131-6/+3
| |
| * go home python, you're drunkAndrew Morgan2019-03-131-4/+2
| |
| * Syntax checker is borkAndrew Morgan2019-03-131-6/+5
| |
| * Destructure againAndrew Morgan2019-03-131-7/+8
| |
| * Are you happy nowAndrew Morgan2019-03-131-2/+2
| |
| * Syntax testAndrew Morgan2019-03-131-6/+5
| |
| * Remove testing codeAndrew Morgan2019-03-131-3/+0
| |
| * Add missing docstring detailAndrew Morgan2019-03-131-1/+1
| |
| * Fix syntax issuesAndrew Morgan2019-03-131-7/+10
| |
| * Switch to wrapper function around _send_requestAndrew Morgan2019-03-133-39/+78
| |
| * Retry on 400:M_UNRECOGNIZEDAndrew Morgan2019-03-131-6/+10
| |
| * Fix paranthesis indentAndrew Morgan2019-03-131-1/+2
| |
| * Add workaround noteAndrew Morgan2019-03-131-10/+4
| |
| * Correct argument nameAndrew Morgan2019-03-121-2/+2
| |
| * Cleaner way of implementing trailing slashesAndrew Morgan2019-03-123-70/+66
| |
| * and againAndrew Morgan2019-03-111-1/+1
| |
| * Fix syntax errorAndrew Morgan2019-03-111-1/+1
| |
| * We're calling different functions nowAndrew Morgan2019-03-111-2/+2
| |
| * Merge branch 'develop' into anoa/trailing_slashes_clientAndrew Morgan2019-03-115-12/+14
| |\
| * \ Merge branch 'develop' into anoa/trailing_slashes_clientAndrew Morgan2019-03-118-19/+57
| |\ \
| * | | lintAndrew Morgan2019-03-081-1/+3
| | | |
| * | | Add changelogAndrew Morgan2019-03-081-0/+1
| | | |
| * | | Retry certain federation requests on 404Andrew Morgan2019-03-082-5/+50
| | | |
| * | | Remove trailing slashes from outbound federation requestsAndrew Morgan2019-03-081-7/+7
| | | |
* | | | Merge pull request #4908 from matrix-org/erikj/block_peek_on_blocked_roomsErik Johnston2019-03-214-3/+77
|\ \ \ \ | | | | | | | | | | Deny peeking into rooms that have been blocked
| * | | | Update changelog.d/4908.bugfixRichard van der Hoff2019-03-211-1/+1
| | | | | | | | | | | | | | | Co-Authored-By: erikjohnston <erikj@jki.re>
| * | | | isortErik Johnston2019-03-211-1/+1
| | | | |
| * | | | NewsfileErik Johnston2019-03-211-0/+1
| | | | |
| * | | | Deny peeking into rooms that have been blockedErik Johnston2019-03-213-3/+76
| | | | |
* | | | | Update Apache Setup To Remove Location Syntax (#4870)Colin W2019-03-212-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | This one should close #4841. Many thanks to @dev4223 for bringing it up and finding a solution. Signed-off-by: Colin White
* | | | | Merge pull request #4904 from matrix-org/erikj/fix_shutdownErik Johnston2019-03-218-25/+137
|\ \ \ \ \ | | | | | | | | | | | | Fixup shutdown room API
| * | | | | Fix typo and add descriptionErik Johnston2019-03-211-1/+5
| |/ / / /
| * | | | Rejig testcase to make it more extensibleErik Johnston2019-03-211-17/+22
| | | | |
| * | | | Remove debugErik Johnston2019-03-211-1/+0
| | | | |
| * | | | Add testsErik Johnston2019-03-211-1/+66
| | | | |
| * | | | Fix upsertErik Johnston2019-03-211-0/+1
| | | | |
| * | | | Revert spurious deleteErik Johnston2019-03-201-0/+4
| | | | |
| * | | | comment block_roomErik Johnston2019-03-201-0/+9
| | | | |
| * | | | Use flagsErik Johnston2019-03-205-15/+17
| | | | |
| * | | | Move requester check into assert_accepted_privacy_policyErik Johnston2019-03-201-5/+8
| | | | |
| * | | | NewsfileErik Johnston2019-03-201-0/+1
| | | | |
| * | | | Gracefully handle failing to kick userErik Johnston2019-03-201-19/+27
| | | | |
| * | | | Log new room IDErik Johnston2019-03-201-1/+6
| | | | |
| * | | | Only require consent for events with an associated requestErik Johnston2019-03-201-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Allow blocking a room multiple timesErik Johnston2019-03-201-2/+4
| | | | |
* | | | | Merge pull request #4896 from matrix-org/erikj/disable_room_directoryErik Johnston2019-03-217-3/+97
|\ \ \ \ \ | | | | | | | | | | | | Add option to disable search room lists
| * | | | | Add testErik Johnston2019-03-202-3/+58
| | | | | |
| * | | | | Disable publishing to room list when its disabledErik Johnston2019-03-201-0/+8
| | | | | |
| * | | | | Pull out config optionErik Johnston2019-03-201-3/+3
| | | | | |
| * | | | | Return before we logErik Johnston2019-03-201-4/+5
| | | | | |
| * | | | | Fix up config commentsErik Johnston2019-03-202-6/+8
| | | | | |
| * | | | | NewsfileErik Johnston2019-03-191-0/+1
| | | | | |
| * | | | | Add option to disable search room listsErik Johnston2019-03-193-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | This disables both local and remote room list searching.
* | | | | | Log requests which are simulated by the unit tests. (#4905)Richard van der Hoff2019-03-202-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge pull request #4895 from matrix-org/erikj/disable_user_searchErik Johnston2019-03-205-0/+73
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Add option to disable searching in the user dir
| * | | | | Add testErik Johnston2019-03-201-0/+52
| | | | | |
| * | | | | Fix up sample configErik Johnston2019-03-202-4/+8
| | | | | |
| * | | | | Update synapse/config/user_directory.pyRichard van der Hoff2019-03-201-1/+1
| | | | | | | | | | | | | | | | | | Co-Authored-By: erikjohnston <erikj@jki.re>
| * | | | | Update sample configErik Johnston2019-03-191-0/+3
| | | | | |
| * | | | | NewsfileErik Johnston2019-03-191-0/+1
| | | | | |
| * | | | | Add option to disable searching in the user dirErik Johnston2019-03-192-0/+13
| |/ / / / | | | | | | | | | | | | | | | We still populate it, as it can still be accessed via the admin API.
* | | | | Batching in the user directory import (#4900)Amber Brown2019-03-212-0/+14
| | | | |
* | | | | Add a config option for torture-testing worker replication. (#4902)Richard van der Hoff2019-03-203-1/+23
| | | | | | | | | | | | | | | Setting this to 50 or so makes a bunch of sytests fail in worker mode.
* | | | | Batch up outgoing read-receipts to reduce federation traffic. (#4890)Richard van der Hoff2019-03-207-22/+308
|/ / / / | | | | | | | | | | | | Rate-limit outgoing read-receipts as per #4730.
* | | | Merge pull request #4894 from matrix-org/erikj/postgres_tuningErik Johnston2019-03-192-2/+21
|\ \ \ \ | | | | | | | | | | Add note on tuning postgres
| * | | | NewsfileErik Johnston2019-03-191-0/+1
| | | | |
| * | | | Add note on tuning postgresErik Johnston2019-03-191-2/+20
|/ / / /
* | | | Merge pull request #4879 from matrix-org/erikj/test_old_depsErik Johnston2019-03-193-1/+21
|\ \ \ \ | | | | | | | | | | Add py27-old test case to buildkite
| * | | | Add comment back inErik Johnston2019-03-191-0/+1
| | | | |
| * | | | Update newsfileErik Johnston2019-03-191-1/+1
| | | | |
| * | | | Revert changesErik Johnston2019-03-191-12/+2
| | | | |
| * | | | Bring py27-old into line with other test envsErik Johnston2019-03-181-0/+14
| | | | |
| * | | | Add coverage to py27-oldErik Johnston2019-03-181-3/+6
| | | | |
| * | | | NewsfileErik Johnston2019-03-181-0/+1
| | | | |
| * | | | Add py27-old test case to buildkiteErik Johnston2019-03-181-0/+11
| | | | |
* | | | | Merge pull request #4889 from matrix-org/rav/test_real_configRichard van der Hoff2019-03-198-18/+44
|\ \ \ \ \ | | | | | | | | | | | | Use a regular HomeServerConfig object for unit tests
| * | | | | Fix RegistrationTestCaseRichard van der Hoff2019-03-191-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | turns out this relies on there being a `user_consent_version` set.
| * | | | | changelogRichard van der Hoff2019-03-191-0/+1
| | | | | |
| * | | | | Use a regular HomeServerConfig object for unit testsRichard van der Hoff2019-03-193-13/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than using a Mock for the homeserver config, use a genuine HomeServerConfig object. This makes for a more realistic test, and means that we don't have to keep remembering to add things to the mock config every time we add a new config setting.
| * | | | | Fix resource limits testsRichard van der Hoff2019-03-191-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that we have a `server_notices_mxid` set, given that we are relying on it.
| * | | | | Fix registration testRichard van der Hoff2019-03-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Set allow_guest_access = True, since we rely on it * config doesn't have a `hostname` attribute; it is `server_name`
| * | | | | Fix email testRichard van der Hoff2019-03-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Mailer expects the config object to have `email_smtp_pass` and `email_riot_base_url` attributes (and it won't by default, because the default config impl doesn't set any of the attributes unless email_enable_notifs is set).
| * | | | | Merge remote-tracking branch 'origin/develop' into HEADRichard van der Hoff2019-03-1910-11/+45
| |\ \ \ \ \
* | | | | | | Merge pull request #4888 from matrix-org/rav/fix_disabled_hsRichard van der Hoff2019-03-193-3/+24
|\| | | | | | | |/ / / / / |/| | | | | Enforce hs_disabled_message correctly
| * | | | | Enforce hs_disabled_message correctlyRichard van der Hoff2019-03-193-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a bug where hs_disabled_message was not enforced for 3pid-based requests if there was no server_notices_mxid configured.
* | | | | | fix test_auto_create_auto_join_where_no_consent (#4886)Neil Johnson2019-03-195-5/+39
| | | | | |
* | | | | | Fix user directory background update (#4887)Erik Johnston2019-03-192-1/+2
| | | | | |
* | | | | | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2019-03-193-5/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Repoint docs for federation (#4881)Michael Kaye2019-03-192-1/+2
| | | | | |
| * | | | | fix some typos in federate.mdRichard van der Hoff2019-03-151-4/+2
| | | | | |
* | | | | | Comment out most options in the generated config. (#4863)Richard van der Hoff2019-03-1916-171/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Migrate the user directory initial population to a background task (#4864)Amber Brown2019-03-198-301/+405
| | | | | |
* | | | | | Add ratelimiting on failed login attempts (#4865)Brendan Abolivier2019-03-186-5/+86
| |/ / / / |/| | | |
* | | | | Add ratelimiting on login (#4821)Brendan Abolivier2019-03-1511-37/+259
| | | | | | | | | | | | | | | Add two ratelimiters on login (per-IP address and per-userID).
* | | | | Merge pull request #4855 from matrix-org/rav/refactor_transaction_queueRichard van der Hoff2019-03-158-761/+865
|\ \ \ \ \ | | | | | | | | | | | | Split TransactionQueue up
| * | | | | changelogRichard van der Hoff2019-03-131-0/+1
| | | | | |
| * | | | | Rename and move the classesRichard van der Hoff2019-03-137-811/+864
| | | | | |
| * | | | | Factor per-destination stuff out of TransactionQueueRichard van der Hoff2019-03-131-132/+182
| | | | | | | | | | | | | | | | | | | | | | | | This is easier than having to have a million fields keyed on destination.
* | | | | | Merge pull request #4852 from matrix-org/rav/move_rr_sending_to_workerRichard van der Hoff2019-03-156-55/+111
|\| | | | | | | | | | | | | | | | | Move client receipt processing to federation sender worker.
| * | | | | changelogRichard van der Hoff2019-03-131-0/+1
| | | | | |
| * | | | | Move client receipt processing to federation sender worker.Richard van der Hoff2019-03-134-33/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is mostly a prerequisite for #4730, but also fits with the general theme of "move everything off the master that we possibly can".
| * | | | | declare a ReadReceipt classRichard van der Hoff2019-03-132-24/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm going to use this in queues and things, so it'll be useful to give it more of a structure.
* | | | | | Merge pull request #4853 from matrix-org/erikj/worker_docker_ciErik Johnston2019-03-155-17/+54
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow passing --daemonize to workers
| * | | | | | Correctly handle all command line optionsErik Johnston2019-03-143-16/+42
| | | | | | |
| * | | | | | NewsfileErik Johnston2019-03-131-0/+1
| | | | | | |
| * | | | | | Allow passing --daemonize to workersErik Johnston2019-03-132-1/+11
| | | | | | |
* | | | | | | Add systemd setup that supports workers (#4662)Luca Corbatto2019-03-156-0/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This setup is a way to manage workers with systemd. It does however not require workers. You can use this setup without workers. You just have to make sure that the homeserver is forking and writes its PID file to the location the service is looking in. The currently distributed setup in the debian package does not work in conjunction with workers. * Adds changelog * Lets systemd handle the forking Sets all services to `type=simple` and disables daemonizing on the synapse side. * Formats readme to 80 columns per line * Allows for full restart of all workers * Changes README to reflect the new setup * Adds dot to end of changelog file * Removes surplus word Co-Authored-By: targodan <targodan@users.noreply.github.com> * Adds missing word Co-Authored-By: targodan <targodan@users.noreply.github.com> * Fixes linebreak Co-Authored-By: targodan <targodan@users.noreply.github.com> * Fixes unit type