summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Make ExpiringCache slightly more performantErik Johnston2018-09-211-1/+5
|
* NewsfileErik Johnston2018-09-211-0/+1
|
* Fix some instances of ExpiringCache not expiring cache itemsErik Johnston2018-09-2116-39/+12
| | | | | | | | ExpiringCache required that `start()` be called before it would actually start expiring entries. A number of places didn't do that. This PR removes `start` from ExpiringCache, and automatically starts backround reaping process on creation instead.
* Merge pull request #3927 from matrix-org/erikj/handle_background_errorsErik Johnston2018-09-212-0/+7
|\ | | | | Handle exceptions thrown by background tasks
| * Add missing loggerErik Johnston2018-09-201-0/+4
| |
| * NewsfileErik Johnston2018-09-201-0/+1
| |
| * Handle exceptions thrown by background tasksErik Johnston2018-09-201-0/+2
| | | | | | | | Fixes #3921
* | Always LL ourselves if we're in a room to simplify clients (#3916)Matthew Hodgson2018-09-202-0/+5
| | | | | | | | Should fix https://github.com/vector-im/riot-web/issues/7209
* | Merge pull request #3868 from matrix-org/neilj/fix_room_invite_mail_linksNeil Johnson2018-09-202-1/+2
|\ \ | | | | | | Neilj/fix room invite mail links
| * \ Merge remote-tracking branch 'origin/develop' into ↵Richard van der Hoff2018-09-1831-98/+351
| |\ \ | | | | | | | | | | | | neilj/fix_room_invite_mail_links
| * | | towncrierNeil Johnson2018-09-131-0/+1
| | | |
| * | | fix link for case that config.email_riot_base_url is setNeil Johnson2018-09-131-1/+1
| | | |
* | | | Fix client IPs being broken on Python 3 (#3908)Amber Brown2018-09-209-58/+238
| |_|/ |/| |
* | | Merge pull request #3914 from matrix-org/erikj/remove_retry_cacheErik Johnston2018-09-202-8/+1
|\ \ \ | | | | | | | | Remove get_destination_retry_timings cache
| * | | Fix up changelog and remove spurious commentErik Johnston2018-09-192-3/+1
| | | |
| * | | pep8Erik Johnston2018-09-191-1/+0
| | | |
| * | | NewsfileErik Johnston2018-09-191-0/+1
| | | |
| * | | Remove get_destination_retry_timings cacheErik Johnston2018-09-191-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we rely on the master to invalidate this cache promptly. However, after having moved most federation endpoints off of master this no longer happens, causing outbound fedeariont to get blackholed. Fixes #3798
* | | | Add a way to run tests in PostgreSQL in Docker (#3699)Amber Brown2018-09-208-9/+79
| | | |
* | | | Add a regression test for logging on failed connections (#3912)Amber Brown2018-09-204-5/+77
| | | |
* | | | Improve the logging when handling a federation transaction (#3904)Richard van der Hoff2018-09-193-56/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's try to rationalise the logging that happens when we are processing an incoming transaction, to make it easier to figure out what is going wrong when they take ages. In particular: - make everything start with a [room_id event_id] prefix - make sure we log a warning when catching exceptions rather than just turning them into other, more cryptic, exceptions.
* | | | Merge pull request #3910 from matrix-org/erikj/update_timeoutErik Johnston2018-09-195-87/+52
|\ \ \ \ | |/ / / |/| | | Update to use new timeout function everywhere.
| * | | FixupErik Johnston2018-09-192-4/+1
| | | |
| * | | Replace custom DeferredTimeoutError with defer.TimeoutErrorErik Johnston2018-09-192-12/+5
| | | |
| * | | Run canceller first to allow it to generate correct errorErik Johnston2018-09-191-2/+5
| | | |
| * | | NewsfileErik Johnston2018-09-191-0/+1
| | | |
| * | | Update to use new timeout function everywhere.Erik Johnston2018-09-194-72/+43
|/ / / | | | | | | | | | | | | | | | | | | The existing deferred timeout helper function (and the one into twisted) suffer from a bug when a deferred's canceller throws an exception, #3842. The new helper function doesn't suffer from this problem.
* | | update changelog for #3909Richard van der Hoff2018-09-191-1/+1
| | |
* | | Merge pull request #3909 from turt2live/travis/fix-logging-1Amber Brown2018-09-192-4/+5
|\ \ \ | | | | | | | | Fix matrixfederationclient.py logging: Destination is a string
| * | | ChangelogTravis Ralston2018-09-181-0/+1
| | | |
| * | | Destination is a stringTravis Ralston2018-09-181-4/+4
| | | |
* | | | Remove documentation referencing Cygwin (#3873)Amber Brown2018-09-193-31/+10
| | | |
* | | | Merge pull request #3907 from matrix-org/rav/set_sni_to_server_nameAmber Brown2018-09-192-3/+11
|\ \ \ \ | | | | | | | | | | Set SNI to the server_name, not whatever was in the SRV record
| * | | | changelogRichard van der Hoff2018-09-181-0/+1
| | | | |
| * | | | Set SNI to the server_name, not whatever was in the SRV recordRichard van der Hoff2018-09-181-3/+10
| | |_|/ | |/| | | | | | | | | | Fixes #3843
* | | | Merge pull request #3903 from matrix-org/rav/increase_get_missing_events_timeoutAmber Brown2018-09-192-1/+31
|\ \ \ \ | |_|/ / |/| | | Bump timeout on get_missing_events request
| * | | changelogRichard van der Hoff2018-09-181-0/+1
| | | |
| * | | Bump timeout on get_missing_events requestRichard van der Hoff2018-09-181-1/+30
| |/ /
* | | Use directory server for room joins (#3899)Richard van der Hoff2018-09-182-0/+6
| | | | | | | | | | | | | | | | | | When we do a join, always try the server we used for the alias lookup first. Fixes #2418
* | | Refactor matrixfederationclient to fix logging (#3906)Richard van der Hoff2018-09-185-186/+359
| | | | | | | | | | | | | | | | | | | | | | | | We want to wait until we have read the response body before we log the request as complete, otherwise a confusing thing happens where the request appears to have completed, but we later fail it. To do this, we factor the salient details of a request out to a separate object, which can then keep track of the txn_id, so that it can be logged.
* | | Merge pull request #3894 from matrix-org/hs/phone_home_py_versionAmber Brown2018-09-192-0/+5
|\ \ \ | |/ / |/| | Add python_version phone home stat
| * | Create 3894.featureWill Hunt2018-09-171-0/+1
| | |
| * | typoWill Hunt2018-09-171-1/+1
| | |
| * | make pip happy?Will Hunt2018-09-171-2/+4
| | |
| * | Use a string for versionsWill Hunt2018-09-171-1/+1
| | |
| * | Add python_version phone home statWill Hunt2018-09-171-0/+2
| | |
* | | Merge pull request #3879 from matrix-org/matthew/fix-autojoinRichard van der Hoff2018-09-182-0/+2
|\ \ \ | | | | | | | | don't ratelimit autojoins
| * | | changelogMatthew Hodgson2018-09-151-0/+1
| | | |
| * | | don't ratelimit autojoinsMatthew Hodgson2018-09-151-0/+1
| | | |
* | | | Merge pull request #3882 from SimmyD/max_upload_docker_varRichard van der Hoff2018-09-183-1/+3
|\ \ \ \ | | | | | | | | | | Add variable for changing the max upload size in Docker container
| * | | | Adding the ability to change MAX_UPLOAD_SIZE for the docker container variables.Simon Dwyer2018-09-161-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon Dwyer <simon@thedwyers.co>
| * | | | Added description for "SYNAPSE_MAX_UPLOAD_SIZE" variable.Simon Dwyer2018-09-161-1/+1
| | | | |
| * | | | Added description for "SYNAPSE_MAX_UPLOAD_SIZE" variable.Simon Dwyer2018-09-161-0/+1
| | | | |
| * | | | Added 'MAX_UPLOAD_SIZE' variable and set default to "10M"Simon Dwyer2018-09-161-1/+1
| |/ / /
* | | | Merge pull request #3889 from matrix-org/rav/404_on_remove_unknown_aliasRichard van der Hoff2018-09-183-4/+17
|\ \ \ \ | | | | | | | | | | Return a 404 when deleting unknown room alias
| * | | | Reinstate missing null checkRichard van der Hoff2018-09-171-1/+1
| | | | |
| * | | | changelogRichard van der Hoff2018-09-171-0/+1
| | | | |
| * | | | Return a 404 when deleting unknown room aliasRichard van der Hoff2018-09-172-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per https://github.com/matrix-org/matrix-doc/issues/1675 Fixes https://github.com/matrix-org/synapse/issues/2782
* | | | | Merge pull request #3895 from matrix-org/rav/decode_bytes_in_metricsRichard van der Hoff2018-09-183-12/+13
|\ \ \ \ \ | | | | | | | | | | | | Fix more b'abcd' noise in metrics
| * | | | | changelogRichard van der Hoff2018-09-171-0/+1
| | | | | |
| * | | | | Fix more b'abcd' noise in metricsRichard van der Hoff2018-09-172-12/+12
| | | | | |
* | | | | | Merge pull request #3897 from aaronraimist/synaspse-typoRichard van der Hoff2018-09-182-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix typo in README, synaspse -> synapse
| * | | | | | Add changelogAaron Raimist2018-09-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
| * | | | | | Fix typo in README, synaspse -> synapseAaron Raimist2018-09-171-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
* | | | / / Merge pull request #3892 from matrix-org/rav/decode_bytes_in_request_logsRichard van der Hoff2018-09-173-5/+9
|\| | | | | | |_|_|/ / |/| | | | Fix some b'abcd' noise in logs and metrics
| * | | | changelogRichard van der Hoff2018-09-171-0/+1
| | | | |
| * | | | Fix some b'abcd' noise in logs and metricsRichard van der Hoff2018-09-172-5/+8
|/ / / / | | | | | | | | | | | | | | | | Python 3 compatibility: make sure that we decode some byte sequences before we use them to create log lines and metrics labels.
* / / / README: run python_dependencies with -mRichard van der Hoff2018-09-171-1/+1
|/ / / | | | | | | ... to stop things which try to import `types` getting `synapse.types` instead
* | | Merge pull request #3888 from matrix-org/rav/nuke_nuke_roomsAmber Brown2018-09-172-57/+1
|\ \ \ | |/ / |/| | Remove nuke-room-from-db.sh script
| * | changelogRichard van der Hoff2018-09-171-0/+1
| | |
| * | Remove nuke-room-from-db.sh scriptRichard van der Hoff2018-09-171-57/+0
|/ / | | | | | | | | | | | | | | | | | | | | | | The problem with this script is that it is largely untested, entirely unmaintained, and running it is likely to make your synapse blow up in exciting ways. For example, it leaves a bunch of tables with dead values in it, like event_to_state_groups. Having it here sends a message that it is a supported part of synapse, which is absolutely not the case.
* | missing changelogMatthew Hodgson2018-09-151-0/+1
| |
* | mention libjemalloc in readme (#3877)Vincent Breitmoser2018-09-151-0/+8
| |
* | Fix timeout functionErik Johnston2018-09-151-1/+2
| | | | | | | | | | Turns out deferred.cancel sometimes throws, so we do that last to ensure that we always do resolve the new deferred.
* | Merge pull request #3875 from matrix-org/erikj/extra_timeoutsErik Johnston2018-09-143-0/+63
|\ \ | | | | | | Add an awful secondary timeout to fix wedged requests
| * | NewsfileErik Johnston2018-09-141-0/+1
| | |
| * | Add an awful secondary timeout to fix wedged requestsErik Johnston2018-09-142-0/+62
|/ / | | | | | | This is an attempt to mitigate #3842 by adding yet-another-timeout
* | don't filter membership events based on history visibility (#3874)Matthew Hodgson2018-09-142-8/+1
| | | | | | | | | | | | | | | | don't filter membership events based on history visibility as we will already have filtered the messages in the timeline, and state events are always visible. and because @erikjohnston said so.
* | Merge pull request #3872 from matrix-org/hawkowl/timeouts-2Erik Johnston2018-09-145-7/+13
|\ \ | | | | | | timeouts 2: electric boogaloo
| * | fixAmber Brown2018-09-151-3/+3
| | |
| * | changelogAmber Brown2018-09-151-0/+1
| | |
| * | fixAmber Brown2018-09-141-1/+4
| | |
| * | fixAmber Brown2018-09-141-1/+1
| | |
| * | redact betterAmber Brown2018-09-141-2/+2
| | |
| * | we do that higher upAmber Brown2018-09-141-0/+1
| | |
| * | Merge remote-tracking branch 'origin/develop' into hawkowl/timeouts-2Amber Brown2018-09-148-61/+55
| |\|
| * | buffer?Amber Brown2018-09-141-1/+2
| | |
* | | Merge pull request #3871 from matrix-org/erikj/in_flight_block_metricsErik Johnston2018-09-145-4/+217
|\ \ \ | | | | | | | | Add in flight real time metrics for Measure blocks
| * | | Remove spurious commentErik Johnston2018-09-141-2/+0
| | | |
| * | | Measure outbound requestsErik Johnston2018-09-141-3/+6
| | | |
| * | | NewsfileErik Johnston2018-09-141-0/+1
| | | |
| * | | TestsErik Johnston2018-09-141-0/+81
| | | |
| * | | Add in flight real time metrics for Measure blocksErik Johnston2018-09-142-1/+131
|/ / /
* | | Merge pull request #3860 from matrix-org/travis/typo-1Travis Ralston2018-09-132-1/+2
|\ \ \ | |_|/ |/| | Fix minor typo in exception
| * | Create 3860.miscTravis Ralston2018-09-131-0/+1
| | |
| * | Fix minor typo in exceptionTravis Ralston2018-09-131-1/+1
|/ /
* / merge (#3576)Amber Brown2018-09-148-61/+55
|/
* Merge pull request #3856 from matrix-org/erikj/speed_up_purge hhs-8Erik Johnston2018-09-132-16/+29
|\ | | | | Make purge history slightly faster
| * commentErik Johnston2018-09-131-0/+2
| |
| * pep8Erik Johnston2018-09-131-1/+0
| |
| * Create indices after insertionErik Johnston2018-09-131-14/+18
| |
| * Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2018-09-134-2/+28
| |\ | | | | | | | | | erikj/speed_up_purge
| * | NewsfileErik Johnston2018-09-131-0/+1
| | |
| * | Make purge history slightly fasterErik Johnston2018-09-131-2/+9
| | | | | | | | | | | | | | | Don't pull out events that are outliers and won't be deleted, as nothing should happen to them.
* | | Merge pull request #3859 from matrix-org/erikj/add_iterkeysAmber Brown2018-09-143-1/+7
|\ \ \ | | | | | | | | Fix handling of redacted events from federation
| * | | NewsfileErik Johnston2018-09-131-0/+1
| | | |
| * | | Fix handling of redacted events from federationErik Johnston2018-09-132-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we receive an event that doesn't pass their content hash check (e.g. due to already being redacted) then we hit a bug which causes an exception to be raised, which then promplty stops the event (and request) from being processed. This effects all sorts of federation APIs, including joining rooms with a redacted state event.
* | | | fix circleci merged builds (#3858)Amber Brown2018-09-142-0/+5
|/ / / | | | | | | | | | | | | | | | * fix * changelog
* | / Attempt to figure out what's going on with timeouts (#3857)Amber Brown2018-09-144-57/+241
| |/ |/|
* | Remove some superfluous logging (#3855)Amber Brown2018-09-134-2/+28
|/
* Merge pull request #3846 from matrix-org/neilj/expose-registered-users hhs-7Neil Johnson2018-09-124-3/+60
|\ | | | | expose number of real reserved users
| * improve namingNeil Johnson2018-09-124-10/+14
| |
| * towncrierNeil Johnson2018-09-121-0/+1
| |
| * expose number of real reserved usersNeil Johnson2018-09-123-3/+55
| |
* | show heroes if a room has a 'deleted' name/canonical_alias (#3851)Matthew Hodgson2018-09-122-2/+16
| |
* | Merge pull request #3853 from matrix-org/erikj/log_outbound_each_timeErik Johnston2018-09-122-75/+75
|\ \ | | | | | | Log outbound requests when we retry
| * | NewsfileErik Johnston2018-09-121-0/+1
| | |
| * | Log outbound requests when we retryErik Johnston2018-09-121-75/+74
| | |
* | | argh pep8Matthew Hodgson2018-09-121-1/+1
| | |
* | | correctly log gappy sync metricsMatthew Hodgson2018-09-121-1/+1
| | |
* | | fix loglineMatthew Hodgson2018-09-121-1/+1
| | |
* | | Merge pull request #3841 from matrix-org/erikj/manhole_key_lengthErik Johnston2018-09-122-13/+32
|\ \ \ | | | | | | | | Change the manhole SSH key to have more bits
| * | | NewsfileErik Johnston2018-09-111-0/+1
| | | |
| * | | Change the manhole SSH key to have more bitsErik Johnston2018-09-111-13/+31
| | | | | | | | | | | | | | | | | | | | Newer versions of openssh client refuse to connect to the old key due to its length.
* | | | Add JUnit summaries to CircleCI as well as merged runs (#3704)Amber Brown2018-09-123-0/+94
| | | |
* | | | Port federation/ to py3 (#3847)Amber Brown2018-09-124-19/+19
| | | |
* | | | Merge pull request #3835 from krombel/fix_3821Amber Brown2018-09-122-1/+6
|\ \ \ \ | | | | | | | | | | fix VOIP crashes under Python 3
| * | | | add changelogKrombel2018-09-101-0/+1
| | | | |
| * | | | fix VOIP crashes under Python 3 (#3821)Krombel2018-09-101-1/+5
| | | | |
* | | | | Merge pull request #3826 from matrix-org/rav/logging_for_keyringAmber Brown2018-09-124-13/+47
|\ \ \ \ \ | | | | | | | | | | | | add some logging for the keyring queue
| * | | | | changelogRichard van der Hoff2018-09-071-0/+1
| | | | | |
| * | | | | clearer logging when things fail, tooRichard van der Hoff2018-09-062-7/+28
| | | | | |
| * | | | | add some logging for the keyring queueRichard van der Hoff2018-09-061-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | why is it so damn slow?
* | | | | | Merge pull request #3824 from matrix-org/rav/fix_jwt_importAmber Brown2018-09-123-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix jwt import check
| * | | | | | changelogRichard van der Hoff2018-09-071-0/+1
| | | | | | |
| * | | | | | Fix jwt import checkRichard van der Hoff2018-09-072-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This handy code attempted to check that we could import jwt, but utterly failed to check it was the right jwt. Fixes https://github.com/matrix-org/synapse/issues/3793
* | | | | | | Port rest/ to Python 3 (#3823)Amber Brown2018-09-1218-100/+113
| |_|_|_|/ / |/| | | | |
* | | | | | Port crypto/ to Python 3 (#3822)Amber Brown2018-09-124-6/+14
| | | | | |
* | | | | | Merge pull request #3845 from matrix-org/erikj/timeout_readsAmber Brown2018-09-122-7/+46
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Timeout reading body for outbound HTTP requests
| * | | | | NewsfileErik Johnston2018-09-121-0/+1
| | | | | |
| * | | | | Timeout reading body for outbound HTTP requestsErik Johnston2018-09-121-7/+45
|/ / / / /
* | | | / Speed up lazy loading (#3827)Matthew Hodgson2018-09-125-30/+159
| |_|_|/ |/| | | | | | | | | | | | | | | * speed up room summaries by pulling their data from room_memberships rather than room state * disable LL for incr syncs, and log incr sync stats (#3840)
* | | | Merge pull request #3834 from mvgorcum/developErik Johnston2018-09-102-10/+17
|\ \ \ \ | |_|_|/ |/| | | Remove build requirements after building docker image
| * | | add runtime dependenciesJan Christian Grünhage2018-09-101-5/+10
| | | |
| * | | NewsfileMathijs van Gorcum2018-09-101-0/+1
| | | |
| * | | Move COPY before RUN and merge RUNsMathijs van Gorcum2018-09-101-5/+5
| | | |
| * | | Remove build requirements after buildingMathijs van Gorcum2018-09-101-2/+3
|/ / /
* | | Merge pull request #3810 from matrix-org/erikj/send_tags_down_sync_on_joinAmber Brown2018-09-072-0/+14
|\ \ \ | | | | | | | | Send existing room tags down sync on join
| * | | NewsfileErik Johnston2018-09-061-0/+1
| | | |
| * | | Don't send empty tags list down syncErik Johnston2018-09-061-0/+5
| | | |
| * | | Send existing room tags down sync on joinErik Johnston2018-09-061-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a user joined a room any existing tags were not sent down the sync stream. Ordinarily this isn't a problem because the user needs to be in the room to have set tags in it, however synapse will sometimes add tags for a user to a room, e.g. for server notices, which need to come down sync.
* | | | Merge pull request #3783 from cwmke/developRichard van der Hoff2018-09-071-0/+12
|\ \ \ \ | |_|/ / |/| | | Add apache vhost config to Readme
| * | | Remove end '/'sColin W2018-09-021-2/+2
| | | |
| * | | Update readme on develop branchColin W2018-09-021-0/+12
| | | |
* | | | Merge branch 'master' into developAmber Brown2018-09-0729-28/+61
|\ \ \ \
| * | | | changelog v0.33.4 github/release-v0.33.4 release-v0.33.4Amber Brown2018-09-072-1/+9
| | | | |
| * | | | versionAmber Brown2018-09-071-1/+1
| | | | |
| * | | | Merge branch 'master' of github.com:matrix-org/synapse into release-v0.33.4 v0.33.4rc2Erik Johnston2018-09-060-0/+0
| |\ \ \ \
| * | | | | Bump version and changelogErik Johnston2018-09-062-1/+7
| | | | | |
| * | | | | Merge tag 'v0.33.3.1' into release-v0.33.4Erik Johnston2018-09-067-46/+158
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 0.33.3.1 (2018-09-06) ============================= SECURITY FIXES -------------- - Fix an issue where event signatures were not always correctly validated ([\#3796](https://github.com/matrix-org/synapse/issues/3796)) - Fix an issue where server_acls could be circumvented for incoming events ([\#3796](https://github.com/matrix-org/synapse/issues/3796)) Internal Changes ---------------- - Unignore synctl in .dockerignore to fix docker builds ([\#3802](https://github.com/matrix-org/synapse/issues/3802))
| * \ \ \ \ \ Merge pull request #3802 from matrix-org/jcgruenhage/docker-unignore-synctlAmber Brown2018-09-062-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | remove synctl from .dockerignore
| | * | | | | | Create 3802.miscJan Christian Grünhage2018-09-061-0/+1
| | | | | | | |
| | * | | | | | remove synctl from .dockerignoreJan Christian Grünhage2018-09-061-1/+0
| |/ / / / / /
| * | | | | | version and towncrier v0.33.4rc1Amber Brown2018-09-0429-28/+45
| | | | | | |
* | | | | | | Port tests/ to Python 3 (#3808)Amber Brown2018-09-0712-430/+349
| | | | | | |
* | | | | | | Merge pull request #3800 from matrix-org/neilj/remove-guests-from-mau-count hhs-6Neil Johnson2018-09-065-6/+54
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | guest users should not be part of mau total
| * | | | | | ensure guests never enter mau listNeil Johnson2018-09-064-8/+10
| | | | | | |
| * | | | | | towncrierNeil Johnson2018-09-051-0/+1
| | | | | | |
| * | | | | | guest users should not be part of mau totalNeil Johnson2018-09-052-3/+48
| | | | | | |
* | | | | | | Merge pull request #3805 from matrix-org/erikj/limit_transaction_pdus_edusAmber Brown2018-09-072-0/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Limit the number of PDUs/EDUs per fedreation transaction
| * | | | | | | SpellingErik Johnston2018-09-061-1/+1
| | | | | | | |
| * | | | | | | NewsfileErik Johnston2018-09-061-0/+1
| | | | | | | |
| * | | | | | | Limit the number of PDUs/EDUs per fedreation transactionErik Johnston2018-09-061-0/+12
| | | | | | | |
* | | | | | | | Merge pull request #3806 from matrix-org/erikj/limit_postgres_travisAmber Brown2018-09-072-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Only start postgres instance for postgres tests on Travis CI
| * | | | | | | | NewsfileErik Johnston2018-09-061-0/+1
| | | | | | | | |
| * | | | | | | | Only start postgres instance for postgres tests on Travis CIErik Johnston2018-09-061-3/+2
| |/ / / / / / /
* | | | | | | | Merge pull request #3788 from matrix-org/erikj/remove_conn_idAmber Brown2018-09-072-12/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove conn_id from repl prometheus metrics
| * | | | | | | | Remove conn_idErik Johnston2018-09-041-2/+2
| | | | | | | | |
| * | | | | | | | NewsfileErik Johnston2018-09-031-0/+1
| | | | | | | | |
| * | | | | | | | Remove conn_id from repl prometheus metricsErik Johnston2018-09-031-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `conn_id` gets set to a random string, and so we end up filling up prometheus with tonnes of data series, which is bad.
* | | | | | | | | Merge pull request #3795 from matrix-org/erikj/faster_sync_stateAmber Brown2018-09-072-8/+9
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | User iter* during sync state calculations
| * | | | | | | | | NewsfileErik Johnston2018-09-051-0/+1
| | | | | | | | | |
| * | | | | | | | | User iter* during sync state calculationsErik Johnston2018-09-051-8/+8
| | | | | | | | | |
* | | | | | | | | | Merge pull request #3804 from matrix-org/rav/fix_openssl_depAmber Brown2018-09-072-2/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | bump dep on pyopenssl to 16.x
| * | | | | | | | | changelogRichard van der Hoff2018-09-061-0/+1
| | | | | | | | | |
| * | | | | | | | | bump dep on pyopenssl to 16.xRichard van der Hoff2018-09-061-2/+2
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Port handlers/ to Python 3 (#3803)Amber Brown2018-09-078-19/+24
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge branch 'master' into developRichard van der Hoff2018-09-069-47/+157
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge tag 'v0.33.3.1'Richard van der Hoff2018-09-069-47/+157
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 0.33.3.1 (2018-09-06) ============================= SECURITY FIXES -------------- - Fix an issue where event signatures were not always correctly validated ([\#3796](https://github.com/matrix-org/synapse/issues/3796)) - Fix an issue where server_acls could be circumvented for incoming events ([\#3796](https://github.com/matrix-org/synapse/issues/3796)) Internal Changes ---------------- - Unignore synctl in .dockerignore to fix docker builds ([\#3802](https://github.com/matrix-org/synapse/issues/3802))
| | * | | | | prepare v0.33.3.1 v0.33.3.1 github/release-v0.33.3.1 release-v0.33.3.1Richard van der Hoff2018-09-063-2/+15
| | | | | | |
| | * | | | | Create 3802.miscJan Christian Grünhage2018-09-061-0/+1
| | | | | | |
| | * | | | | remove synctl from .dockerignoreJan Christian Grünhage2018-09-061-1/+0
| | | | | | |
| | * | | | | Fix origin handling for pushed transactionsRichard van der Hoff2018-09-055-29/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the actual origin for push transactions, rather than whatever the remote server claimed.
| | * | | | | Check that signatures on events are validRichard van der Hoff2018-09-051-16/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should check that both the sender's server, and the server which created the event_id (which may be different from whatever the remote server has told us the origin is), have signed the event.
* | | | | | | Merge pull request #3790 from matrix-org/rav/respect_event_format_in_filterRichard van der Hoff2018-09-053-13/+40
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Implement 'event_format' filter param in /sync
| * | | | | | | changelogRichard van der Hoff2018-09-041-0/+1
| | | | | | | |
| * | | | | | | Implement 'event_format' filter param in /syncRichard van der Hoff2018-09-042-13/+39
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | This has been specced and part-implemented; let's implement it for /sync (but no other endpoints yet :/).
* | | | | | | Port http/ to Python 3 (#3771)Amber Brown2018-09-068-186/+134
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #3789 from matrix-org/neilj/improve_threepid_error_strings hhs-5Neil Johnson2018-09-043-7/+22
|\ \ \ \ \ \ | |/ / / / / |/| | | | | improve human readable error messages
| * | | | | towncrierNeil Johnson2018-09-041-0/+1
| | | | | |
| * | | | | improve human readable error messageNeil Johnson2018-09-041-1/+2
| | | | | |
| * | | | | improve human readable error messagesNeil Johnson2018-09-042-7/+20
| | | | | |
* | | | | | Fix tests on postgresql (#3740)Amber Brown2018-09-0418-341/+356
| |_|_|/ / |/| | | |
* | | | | Merge pull request #3737 from matrix-org/erikj/remove_redundant_state_funcErik Johnston2018-09-034-57/+8
|\ \ \ \ \ | | | | | | | | | | | | Remove unnecessary resolve_events_with_state_map
| * | | | | NewsfileErik Johnston2018-09-031-0/+1
| | | | | |
| * | | | | Remove unnecessary resolve_events_with_state_mapErik Johnston2018-08-223-57/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We only ever used the synchronous resolve_events_with_state_map in one place, which is trivial to replace with the async version.
* | | | | | Merge pull request #3378 from NickEckardt/developAmber Brown2018-09-032-5/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | matrix-synapse-auto-deploy is no longer maintained.
| * | | | | Create 3378.miscAmber Brown2018-09-031-0/+1
| | | | | |
| * | | | | Merge branch 'develop' into developAmber Brown2018-09-03441-11570/+24237
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #3777 from matrix-org/neilj/fix_register_user_registrationNeil Johnson2018-08-319-5/+78
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | fix bug where preserved threepid user comes to sign up and server is …
| * | | | | assert rather than warn hhs-4Neil Johnson2018-08-311-3/+2
| | | | | |
| * | | | | move threepid checker to config, add missing yieldsNeil Johnson2018-08-316-21/+41
| | | | | |
| * | | | | fix reference to is_threepid_reservedNeil Johnson2018-08-311-1/+1
| | | | | |
| * | | | | typoNeil Johnson2018-08-311-1/+1
| | | | | |
| * | | | | ensure post registration auth checks do not fail erroneouslyNeil Johnson2018-08-314-6/+24
| | | | | |
| * | | | | news fragemntNeil Johnson2018-08-311-0/+1
| | | | | |
| * | | | | fix bug where preserved threepid user comes to sign up and server is mau blockedNeil Johnson2018-08-315-3/+38
|/ / / / /
* | | | | Port storage/ to Python 3 (#3725)Amber Brown2018-08-3117-36/+208
| | | | |
* | | | | Merge pull request #3764 from matrix-org/rav/close_db_conn_after_initRichard van der Hoff2018-08-3016-54/+41
|\ \ \ \ \ | | | | | | | | | | | | Make sure that we close db connections opened during init
| * | | | | Fix up testsRichard van der Hoff2018-08-283-6/+10
| | | | | |
| * | | | | use abc.abstractpropertyRichard van der Hoff2018-08-281-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | This gives clearer messages when someone gets it wrong
| * | | | | changelogRichard van der Hoff2018-08-281-0/+1
| | | | | |
| * | | | | Make sure that we close db connections opened during initRichard van der Hoff2018-08-2812-48/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should explicitly close any db connections we open, because failing to do so can block other transactions as per https://github.com/matrix-org/synapse/issues/3682. Let's also try to factor out some of the boilerplate by having server classes define their datastore class rather than duplicating the whole of `setup`.
* | | | | | Merge pull request #3768 from krombel/fix_3445Erik Johnston2018-08-292-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix #3445 - do not use itervalues() on SortedDict()
| * | | | | | changelogKrombel2018-08-292-1/+1
| | | | | | |
| * | | | | | fix #3445Krombel2018-08-292-2/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | itervalues(d) calls d.itervalues() [PY2] and d.values() [PY3] but SortedDict only implements d.values()
* | | | | | Update CONTRIBUTING to clarify miscs & Markdown (#3730)Amber Brown2018-08-292-3/+5
| | | | | |
* | | | | | don't return non-LL-member state in incremental sync state blocks (#3760)Matthew Hodgson2018-08-282-1/+9
|/ / / / / | | | | | | | | | | don't return non-LL-member state in incremental sync state blocks
* | | | | Merge pull request #3758 from matrix-org/erikj/admin_contact hhs-3Erik Johnston2018-08-248-13/+14
|\ \ \ \ \ | | | | | | | | | | | | Change admin_uri to admin_contact in config and errors
| * \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_contactErik Johnston2018-08-243-4/+5
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #3756 from matrix-org/erikj/fix_tags_server_noticesErik Johnston2018-08-243-4/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix checking if service notice room is already tagged
| * | | | | | NewsfileErik Johnston2018-08-241-0/+1
| | | | | | |
| * | | | | | Fix checking if service notice room is already taggedErik Johnston2018-08-242-4/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | This manifested in synapse repeatedly setting the tag for the room
| * | | | | NewsfileErik Johnston2018-08-241-0/+1
| | | | | |
| * | | | | Change admin_uri to admin_contact in config and errorsErik Johnston2018-08-247-13/+13
|/ / / / /
* | | | | Merge pull request #3755 from matrix-org/erikj/fix_server_notice_tags hhs-2Erik Johnston2018-08-243-4/+16
|\ \ \ \ \ | | | | | | | | | | | | Fix up tagging server notice rooms.
| * | | | | NewsfileErik Johnston2018-08-241-0/+1
| | | | | |
| * | | | | Ensure we wake up /sync when we add tag to notice roomErik Johnston2018-08-242-2/+13
| | | | | |
| * | | | | Make content of tag an empty object rather than nullErik Johnston2018-08-242-2/+2
|/ / / / /
* | | | | Merge pull request #3754 from matrix-org/erikj/fix_whitelist hhs-1Erik Johnston2018-08-242-1/+2
|\ \ \ \ \ | | | | | | | | | | | | Allow federation_domain_whitelist to be emtpy list
| * | | | | NewsfileErik Johnston2018-08-241-0/+1
| | | | | |
| * | | | | Fix bug when federation_domain_whitelist is an emtpy listErik Johnston2018-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Outbound federation were incorrectly allowed when the config option was set to an empty list
* | | | | | Merge pull request #3753 from matrix-org/erikj/fix_no_server_noticseErik Johnston2018-08-242-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix bug where we broke sync when using limit_usage_by_mau
| * | | | | | NewsfileErik Johnston2018-08-241-0/+1
| | | | | | |
| * | | | | | Fix bug where we broke sync when using limit_usage_by_mauErik Johnston2018-08-241-0/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | We assumed that we always had service notices configured, but that is not always true
* | | | | | Merge pull request #3751 from matrix-org/rav/twisted_17Richard van der Hoff2018-08-242-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Pin to twisted 17.1 or later
| * | | | | changelogRichard van der Hoff2018-08-241-0/+1
| | | | | |
| * | | | | Pin to twisted 17.1 or laterRichard van der Hoff2018-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/matrix-org/synapse/issues/3741.
* | | | | | Merge pull request #3749 from matrix-org/erikj/add_trial_usersErik Johnston2018-08-248-5/+272
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Implement trial users
| * | | | | NewsfileErik Johnston2018-08-231-0/+1
| | | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-07 14:38:10 +0000