summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Some vagrant hackery for testing the debsRichard van der Hoff2019-05-174-0/+48
|
* Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2019-05-173-25/+25
|\
| * Stop telling people to install the optional dependencies. (#5197)Richard van der Hoff2019-05-173-25/+25
| | | | | | | | | | | | | | | | | | * Stop telling people to install the optional dependencies. They're optional. Also update the postgres docs a bit for clarity(?)
* | Merge pull request #5196 from matrix-org/babolivier/per_room_profilesBrendan Abolivier2019-05-175-1/+96
|\ \ | | | | | | Add an option to disable per-room profiles
| * | LintBrendan Abolivier2019-05-161-1/+0
| | |
| * | LintBrendan Abolivier2019-05-161-1/+3
| | |
| * | Changelog + sample configBrendan Abolivier2019-05-162-0/+7
| | |
| * | Forgot copyrightBrendan Abolivier2019-05-161-0/+1
| | |
| * | Add test caseBrendan Abolivier2019-05-161-1/+67
| | |
| * | Add option to disable per-room profilesBrendan Abolivier2019-05-162-0/+20
| | |
* | | Fix image orientation when generating thumbnail (#5039)PauRE2019-05-164-1/+46
| | |
* | | Merge pull request #5174 from matrix-org/dbkr/add_dummy_flow_to_recaptcha_onlyDavid Baker2019-05-164-7/+27
|\ \ \ | |/ / |/| | Re-order registration stages to do msisdn & email auth last
| * | Terms might not be the last stageDavid Baker2019-05-131-1/+1
| | |
| * | Merge remote-tracking branch 'origin/develop' into ↵David Baker2019-05-132-1/+1
| |\ \ | | | | | | | | | | | | dbkr/add_dummy_flow_to_recaptcha_only
| * \ \ Merge remote-tracking branch 'origin/develop' into ↵David Baker2019-05-134-31/+47
| |\ \ \ | | | | | | | | | | | | | | | dbkr/add_dummy_flow_to_recaptcha_only
| * | | | And now I realise why the test is failing...David Baker2019-05-131-1/+8
| | | | |
| * | | | Update changelogDavid Baker2019-05-101-1/+1
| | | | |
| * | | | Re-order flows so that email auth is done lastDavid Baker2019-05-101-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's more natural for the user if the bit that takes them away from the registration flow comes last. Adding the dummy stage allows us to do the stages in this order without the ambiguity.
| * | | | Thanks, automated grammar pedantry.David Baker2019-05-101-1/+1
| | | | |
| * | | | CommentDavid Baker2019-05-101-0/+4
| | | | |
| * | | | Add changelog entryDavid Baker2019-05-101-0/+1
| | | | |
| * | | | Add a DUMMY stage to captcha-only registration flowDavid Baker2019-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the client to complete the email last which is more natual for the user. Without this stage, if the client would complete the recaptcha (and terms, if enabled) stages and then the registration request would complete because you've now completed a flow, even if you were intending to complete the flow that's the same except has email auth at the end. Adding a dummy auth stage to the recaptcha-only flow means it's always unambiguous which flow the client was trying to complete. Longer term we should think about changing the protocol so the client explicitly says which flow it's trying to complete. vector-im/riot-web#9586
* | | | | Make /sync attempt to return device updates for both joined and invited ↵Matthew Hodgson2019-05-162-19/+26
| | | | | | | | | | | | | | | | | | | | users (#3484)
* | | | | Merge pull request #5187 from ↵David Baker2019-05-162-18/+23
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/dbkr/only_check_threepid_not_in_use_if_actually_registering Only check 3pids not in use when registering
| * | | | | Make newsfile clearerDavid Baker2019-05-151-1/+1
| | | | | |
| * | | | | Have I got newsfile for youDavid Baker2019-05-141-0/+1
| | | | | |
| * | | | | Only check 3pids not in use when registeringDavid Baker2019-05-141-18/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We checked that 3pids were not already in use before we checked if we were going to return the account previously registered in the same UI auth session, in which case the 3pids will definitely be in use. https://github.com/vector-im/riot-web/issues/9586
* | | | | | Make all the rate limiting options more consistent (#5181)Amber Brown2019-05-158-131/+138
| | | | | |
* | | | | | Drop support for v2_alpha API prefix (#5190)Richard van der Hoff2019-05-158-26/+21
| | | | | |
* | | | | | Merge branch 'master' into developRichard van der Hoff2019-05-153-8/+16
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | fix some typos in the changelog v0.99.4 github/release-v0.99.4 release-v0.99.4Richard van der Hoff2019-05-151-5/+4
| | | | | |
| * | | | | 0.99.4Richard van der Hoff2019-05-153-3/+12
| | | | | |
* | | | | | Merge pull request #5183 from matrix-org/erikj/async_serialize_eventErik Johnston2019-05-1513-101/+194
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow client event serialization to be async
| * | | | | | Update docstring with correct return typeErik Johnston2019-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
| * | | | | | NewsfileErik Johnston2019-05-142-6/+7
| | | | | | |
| * | | | | | Allow client event serialization to be asyncErik Johnston2019-05-1412-95/+187
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #5184 from matrix-org/erikj/expose_get_events_as_arrayErik Johnston2019-05-157-30/+55
|\ \ \ \ \ \ | | | | | | | | | | | | | | Expose DataStore._get_events as get_events_as_list
| * | | | | | Update docstring with correct typeErik Johnston2019-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
| * | | | | | NewsfileErik Johnston2019-05-141-0/+1
| | | | | | |
| * | | | | | Expose DataStore._get_events as get_events_as_listErik Johnston2019-05-146-30/+54
| |/ / / / / | | | | | | | | | | | | | | | | | | This is in preparation for reaction work which requires it.
* | | | | | Merge pull request #5185 from matrix-org/erikj/fix_config_ratelimitingErik Johnston2019-05-152-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use correct config option for ratelimiting in tests
| * | | | | | NewsfileErik Johnston2019-05-141-0/+1
| | | | | | |
| * | | | | | Use correct config option for ratelimiting in testsErik Johnston2019-05-141-1/+2
| |/ / / / /
* / / / / / comment about user_joined_roomRichard van der Hoff2019-05-141-0/+1
|/ / / / /
* | | | | Migrate all tests to use the dict-based config format instead of hanging ↵Amber Brown2019-05-1323-203/+240
| | | | | | | | | | | | | | | | | | | | items off HomeserverConfig (#5171)
* | | | | Add ability to blacklist ip ranges for federation traffic (#5043)Andrew Morgan2019-05-136-14/+168
|/ / / /
* | | / 0.99.4rc1 v0.99.4rc1Brendan Abolivier2019-05-1375-78/+83
| |_|/ |/| |
* | | Merge pull request #5179 from matrix-org/babolivier/isortBrendan Abolivier2019-05-132-1/+1
|\ \ \ | |_|/ |/| | Fix CI after new release of isort
| * | Fix changelogBrendan Abolivier2019-05-131-0/+0
| | |
| * | ChangelogBrendan Abolivier2019-05-131-0/+1
| | |
| * | Fix CI after new release of isortBrendan Abolivier2019-05-131-1/+0
|/ /
* | Merge branch 'master' into developRichard van der Hoff2019-05-100-0/+0
|\ \
| * | fix sample configRichard van der Hoff2019-05-101-1/+1
| | |
* | | URL preview blacklisting fixes (#5155)Andrew Morgan2019-05-104-31/+47
| |/ |/| | | Prevents a SynapseError being raised inside of a IResolutionReceiver and instead opts to just return 0 results. This thus means that we have to lump a failed lookup and a blacklisted lookup together with the same error message, but the substitute should be generic enough to cover both cases.
* | Revert 085ae346ace418e0fc043ac5f568f85ebf80038eDavid Baker2019-05-101-1/+1
| | | | | | | | Accidentally went straight to develop
* | Add a DUMMY stage to captcha-only registration flowDavid Baker2019-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the client to complete the email last which is more natual for the user. Without this stage, if the client would complete the recaptcha (and terms, if enabled) stages and then the registration request would complete because you've now completed a flow, even if you were intending to complete the flow that's the same except has email auth at the end. Adding a dummy auth stage to the recaptcha-only flow means it's always unambiguous which flow the client was trying to complete. Longer term we should think about changing the protocol so the client explicitly says which flow it's trying to complete. https://github.com/vector-im/riot-web/issues/9586
* | Make Prometheus snippet less confusing on the metrics collection doc (#4288)Gergely Polonkai2019-05-101-1/+4
| | | | | | Signed-off-by: Gergely Polonkai <gergely@polonkai.eu>
* | Set syslog identifiers in systemd units (#5023)Christoph Müller2019-05-106-1/+14
| |
* | Run Black on the tests again (#5170)Amber Brown2019-05-1054-1169/+829
| |
* | Add AllowEncodedSlashes to apache (#5068)colonelkrud2019-05-091-0/+2
| | | | | | | | | | | | | | | | * Add AllowEncodedSlashes to apache Add `AllowEncodedSlashes On` to apache config to support encoding for v3 rooms. "The AllowEncodedSlashes setting is not inherited by virtual hosts, and virtual hosts are used in many default Apache configurations, such as the one in Ubuntu. The workaround is to add the AllowEncodedSlashes setting inside a <VirtualHost> container (/etc/apache2/sites-available/default in Ubuntu)." Source: https://stackoverflow.com/questions/4390436/need-to-allow-encoded-slashes-on-apache * change allowencodedslashes to nodecode
* | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2019-05-091-16/+5
|\|
| * remove instructions for jessie installation (#5164)Richard van der Hoff2019-05-091-16/+5
| | | | | | We don't ship jessie packages, so these were a bit misleading.
* | Run `black` on per_destination_queueRichard van der Hoff2019-05-091-35/+39
| | | | | | | | ... mostly to fix pep8 fails
* | Limit the number of EDUs in transactions to 100 as expected by receiver (#5138)Quentin Dufour2019-05-093-27/+32
| | | | | | Fixes #3951.
* | Fix bogus imports in tests (#5154)Brendan Abolivier2019-05-084-5/+7
| |
* | add options to require an access_token to GET /profile and /publicRooms on ↵Matthew Hodgson2019-05-089-13/+252
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CS API (#5083) This commit adds two config options: * `restrict_public_rooms_to_local_users` Requires auth to fetch the public rooms directory through the CS API and disables fetching it through the federation API. * `require_auth_for_profile_requests` When set to `true`, requires that requests to `/profile` over the CS API are authenticated, and only returns the user's profile if the requester shares a room with the profile's owner, as per MSC1301. MSC1301 also specifies a behaviour for federation (only returning the profile if the server asking for it shares a room with the profile's owner), but that's currently really non-trivial to do in a not too expensive way. Next step is writing down a MSC that allows a HS to specify which user sent the profile query. In this implementation, Synapse won't send a profile query over federation if it doesn't believe it already shares a room with the profile's owner, though. Groups have been intentionally omitted from this commit.
* | Merge pull request #5037 from matrix-org/erikj/limit_inflight_dnsErik Johnston2019-05-082-1/+83
|\ \ | | | | | | Limit in flight DNS requests
| * | NewsfileErik Johnston2019-04-091-0/+1
| | |
| * | Limit in flight DNS requestsErik Johnston2019-04-091-1/+82
| | | | | | | | | | | | | | | | | | | | | This is to work around a bug in twisted where a large number of concurrent DNS requests cause it to tight loop forever. c.f. https://twistedmatrix.com/trac/ticket/9620#ticket
* | | Do checks on aliases for incoming m.room.aliases events (#5128)Brendan Abolivier2019-05-087-8/+225
| | | | | | | | | | | | | | | Follow-up to #5124 Also added a bunch of checks to make sure everything (both the stuff added on #5124 and this PR) works as intended.
* | | Merge pull request #5104 from matrix-org/erikj/ratelimit_3pid_inviteErik Johnston2019-05-072-0/+12
|\ \ \ | | | | | | | | Ratelimit 3pid invites
| * | | Rate limit earlyErik Johnston2019-05-021-2/+3
| | | |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-04-26108-6218/+1842
| |\ \ \ | | | | | | | | | | | | | | | erikj/ratelimit_3pid_invite
| * | | | NewsfileErik Johnston2019-04-261-0/+1
| | | | |
| * | | | Ratelimit 3pid invitesErik Johnston2019-04-261-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | We do ratelimit sending the 3PID invite events, but that happens after spamming the identity server.
* | | | | Remove the requirement to authenticate for /admin/server_version. (#5122)Richard van der Hoff2019-05-075-38/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This endpoint isn't much use for its intended purpose if you first need to get yourself an admin's auth token. I've restricted it to the `/_synapse/admin` path to make it a bit easier to lock down for those concerned about exposing this information. I don't imagine anyone is using it in anger currently.
* | | | | Fix spelling in server notices admin API docs (#5142)Travis Ralston2019-05-062-1/+2
| | | | |
* | | | | Fix sample configRichard van der Hoff2019-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | ... after it got broken in 1565ebec2c.
* | | | | Merge branch 'master' into developRichard van der Hoff2019-05-039-19/+84
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge tag 'v0.99.3.2'Richard van der Hoff2019-05-039-19/+84
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 0.99.3.2 (2019-05-03) ============================= Internal Changes ---------------- - Ensure that we have `urllib3` <1.25, to resolve incompatibility with `requests`. ([\#5135](https://github.com/matrix-org/synapse/issues/5135))
| | * | | | 0.99.3.2 v0.99.3.2 github/release-v0.99.3.2 release-v0.99.3.2Richard van der Hoff2019-05-034-2/+16
| | | | | |
| | * | | | include disco in deb build target listRichard van der Hoff2019-05-031-0/+1
| | | | | |
| | * | | | Merge pull request #5135 from matrix-org/rav/build_fixesRichard van der Hoff2019-05-033-1/+11
| | |\ \ \ \ | | | | | | | | | | | | | | Build fixes
| | | * | | | changelogRichard van der Hoff2019-05-031-0/+1
| | | | | | |
| | | * | | | Debian: we now need libpq-dev.Richard van der Hoff2019-05-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | psycopg 2.8 is now out, which means that the C library gets built from source, so we now need libpq-dev when building. Turns out the need for this package is already documented in docs/postgres.rst.
| | | * | | | pin urllib3 to <1.25Richard van der Hoff2019-05-031-0/+8
| | |/ / / /
| | * | | | changelog tweaks v0.99.3.1 github/release-v0.99.3.1 release-v0.99.3.1Richard van der Hoff2019-05-031-2/+4
| | | | | |
| | * | | | 0.99.3.1Richard van der Hoff2019-05-035-3/+16
| | | | | |
| | * | | | Merge pull request #5134 from matrix-org/rav/url_preview_blacklistRichard van der Hoff2019-05-033-15/+34
| | |\ \ \ \ | | | | | | | | | | | | | | Blacklist 0.0.0.0 and :: by default for URL previews
| | | * | | | more config comment updatesRichard van der Hoff2019-05-032-4/+10
| | | | | | |
| | | * | | | Blacklist 0.0.0.0 and :: by default for URL previewsRichard van der Hoff2019-05-033-15/+28
| | | | | | |
| | * | | | | Merge pull request #5133 from matrix-org/rav/systemrandomRichard van der Hoff2019-05-032-2/+8
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | Use SystemRandom for token generation.
| | | * | | | typoNeil Johnson2019-05-031-1/+1
| | | | | | |
| | | * | | | Use SystemRandom for token generationRichard van der Hoff2019-05-032-2/+8
| | | | | | |
* | | | | | | Add admin api for sending server_notices (#5121)Richard van der Hoff2019-05-0221-42/+196
| | | | | | |
* | | | | | | Merge pull request #5124 from matrix-org/babolivier/aliasesBrendan Abolivier2019-05-025-2/+40
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add some limitations to alias creation
| * | | | | | | Add some limitations to alias creationBrendan Abolivier2019-05-025-2/+40
| | | | | | | |
* | | | | | | | Factor out an "assert_requester_is_admin" function (#5120)Richard van der Hoff2019-05-024-76/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than copying-and-pasting the same four lines hundreds of times
* | | | | | | | Merge pull request #5119 from matrix-org/rav/admin_api_urlsRichard van der Hoff2019-05-0230-114/+180
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Move the admin API to `/_synapse/admin/v1`
| * | | | | | | fix examplesRichard van der Hoff2019-05-011-4/+4
| | | | | | | |
| * | | | | | | Fix sample configRichard van der Hoff2019-05-011-2/+2
| | | | | | | |
| * | | | | | | changelogRichard van der Hoff2019-05-011-0/+1
| | | | | | | |
| * | | | | | | Move admin api impl to its own packageRichard van der Hoff2019-05-0119-42/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It doesn't really belong under rest/client/v1 any more.
| * | | | | | | Move admin API to a new prefixRichard van der Hoff2019-05-0112-36/+76
| | | | | | | |
| * | | | | | | Move admin API away from ClientV1RestServletRichard van der Hoff2019-05-011-33/+33
|/ / / / / / /
* | | | | | | Merge pull request #5116 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-05-012-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix path in account validity admin route's doc
| * | | | | | | Rename changelog fileBrendan Abolivier2019-05-011-0/+0
| | | | | | | |
| * | | | | | | Add changelogBrendan Abolivier2019-05-011-0/+1
| | | | | | | |
| * | | | | | | Fix whole path for admin routeBrendan Abolivier2019-05-011-1/+1
| | | | | | | |
| * | | | | | | Fix typo in account validity admin routeBrendan Abolivier2019-05-011-1/+1
| | | | | | | |
* | | | | | | | Add a default .m.rule.tombstone push rule (#4867)Travis Ralston2019-04-292-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add a default .m.rule.tombstone push rule In support of MSC1930: https://github.com/matrix-org/matrix-doc/pull/1930 * changelog * Appease the changelog linter
* | | | | | | | Merge pull request #5100 from matrix-org/rav/verification_hackeryRichard van der Hoff2019-04-293-18/+55
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | Improve logging when event-signature checking fails
| * | | | | | | changelogRichard van der Hoff2019-04-251-0/+1
| | | | | | | |
| * | | | | | | more logging improvementsRichard van der Hoff2019-04-251-8/+11
| | | | | | | |
| * | | | | | | remove extraneous exception loggingRichard van der Hoff2019-04-252-18/+34
| | | | | | | |
| * | | | | | | Clarify logging when PDU signature checking failsRichard van der Hoff2019-04-252-3/+20
| | | | | | | |
* | | | | | | | Merge pull request #5103 from matrix-org/rav/fix_notif_loopRichard van der Hoff2019-04-263-0/+24
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fix infinite loop in presence handler
| * | | | | | | Fix infinite loop in presence handlerRichard van der Hoff2019-04-263-0/+24
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Fixes #5102
* | | | | | | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2019-04-251-0/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | add gpg key fingerprintRichard van der Hoff2019-04-221-0/+2
| | | | | | |
* | | | | | | Merge pull request #5098 from matrix-org/rav/fix_pep_517Richard van der Hoff2019-04-253-2/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Workarounds for pep-517 errors
| * | | | | | | ChangelogRichard van der Hoff2019-04-251-0/+1
| | | | | | | |
| * | | | | | | Add --no-pep-517 to README instructionsRichard van der Hoff2019-04-251-2/+2
| | | | | | | |
| * | | | | | | set PIP_USE_PEP517 = False for testsRichard van der Hoff2019-04-251-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pip 19.1 otherwise complains about "editable mode is not supported for pyproject.toml-style projects"
* | | | | | | | Fix handling of SYNAPSE_NO_TLS in docker image (#5005)*=0=1=4=*2019-04-253-2/+16
|/ / / / / / /
* | | | | | | Config option for verifying federation certificates (MSC 1711) (#4967)Andrew Morgan2019-04-258-17/+158
| | | | | | |
* | | | | | | Remove log error for .well-known/matrix/client (#4972)Michael Kaye2019-04-242-1/+2
| | | | | | |
* | | | | | | Prevent "producer not unregistered" message (#5009)Amber Brown2019-04-242-0/+5
| | | | | | |
* | | | | | | Merge pull request #5077 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-182-2/+7
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | Don't crash on lack of expiry templates
| * | | | | | Don't crash on lack of expiry templatesBrendan Abolivier2019-04-182-2/+7
| | | | | | |
* | | | | | | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2019-04-171-4/+24
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Update debian install docs for new key and repo (#5074)Richard van der Hoff2019-04-171-5/+25
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #5073 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-178-26/+246
|\ \ \ \ \ \ | | |/ / / / | |/| | | | Add some endpoints for account validity management
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-04-17216-10038/+5057
| |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | babolivier/account_expiration
* | | | | | Merge pull request #5047 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-1717-43/+699
|\ \ \ \ \ \ | | | | | | | | | | | | | | Send out emails with links to extend an account's validity period
* \ \ \ \ \ \ 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
* | | | | | | 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
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | |
* | | | | | | 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
|/ / / / / /
| | | | * / Add management endpoints for account validityBrendan Abolivier2019-04-178-26/+246
| | | |/ /
| | | * / Send out emails with links to extend an account's validity periodBrendan Abolivier2019-04-1717-43/+699
| | |/ /
| | * / Add account expiration featureBrendan Abolivier2019-04-0910-4/+144
| |/ /
| * | 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
|/ /
* | 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
| |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-16 12:18:22 +0000