1
0
Commit Graph

1730 Commits

Author SHA1 Message Date
Andrew Morgan
c14c890bf3 Merge pull request #6279 from matrix-org/erikj/federation_server_async_await
* commit 'b4465564c':
  Don't return coroutines
  Make concurrently_execute work with async/await
  Newsfile
  Port federation_server to async/await
2020-03-16 15:34:59 +00:00
Andrew Morgan
446c957ad1 Merge pull request #6263 from matrix-org/erikj/caches_return_deferreds
* commit '561133c3c':
  Update docstring
  Newsfile
  Quick fix to ensure cache descriptors always return deferreds
2020-03-16 15:33:49 +00:00
Andrew Morgan
97f1b92b56 Merge pull request #6253 from matrix-org/uhoreg/e2e_backup_delete_keys
* commit 'da78f6177':
  remove unneeded imports
  switch to using HomeserverTestCase
  remove some unnecessary lines
  add changelog
  delete keys when deleting backups
2020-03-16 15:31:19 +00:00
Andrew Morgan
1b5ea48ed2 Merge pull request #6255 from matrix-org/erikj/stats_config
* commit '87259b3a3':
  Fix tests
  Newsfile
  Remove repeated calls to config.stats_enabled.
2020-03-16 15:31:12 +00:00
Andrew Morgan
759e8dd793 Option to suppress resource exceeded alerting (#6173)
* commit '2794b7905':
  Option to suppress resource exceeded alerting (#6173)
2020-03-16 15:27:03 +00:00
Andrew Morgan
bf1fad8462 Merge pull request #6231 from matrix-org/erikj/refactor_stores 2020-03-16 15:13:49 +00:00
Andrew Morgan
8165d3c81d Merge pull request #5726 from matrix-org/uhoreg/e2e_cross-signing2-part2
* commit '276173163':
  Add changelog entry
  fix doc strings
  make isort happy
  add some comments
  drop some logger lines to debug
  make changes based on PR feedback
  add function docs
  use something that's the right type for user_id
  run black
  split out signature processing into separate functions
  avoid modifying input parameter
  fix test
  update with newer coding style
  add test
  make isort happy
  make black happy
  allow uploading signatures of master key signed by devices
  implement device signature uploading/fetching
2020-03-16 14:59:03 +00:00
Andrew Morgan
95b332e90a Remove Auth.check method (#6217)
* commit '93eaeec75':
  Remove Auth.check method (#6217)
  add note about database upgrade
  use the right function for when we're already in runInteraction
  add user signature stream change cache to slaved device store
  black
  use stream ID generator instead of timestamp
  make isort happy
  apply PR review suggestions
  fix formatting
  add changelog
  make changes from PR review
  don't need to return the hidden column any more
  really fix queries to work with Postgres
  PostgreSQL, Y U no like?
  remove extra SQL query param
  add changelog file
  apply changes from PR review
  allow uploading keys for cross-signing
  allow devices to be marked as "hidden"
2020-03-16 14:55:37 +00:00
Andrew Morgan
3261565623 Fix presence timeouts when synchrotron restarts. (#6212) 2020-02-26 12:40:51 +00:00
Andrew Morgan
20fccf0067 Merge pull request #6193 from matrix-org/uhoreg/interpret_device_key_in_storage 2020-02-26 12:37:22 +00:00
Andrew Morgan
4b2d706900 Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_version 2020-02-26 12:37:13 +00:00
Andrew Morgan
20893707bf Fix MAU reaping where reserved users are specified. (#6168) 2020-02-26 12:36:45 +00:00
Andrew Morgan
22fc7597f7 Merge pull request #6186 from matrix-org/erikj/disable_sql_bytes 2020-02-26 12:36:21 +00:00
Andrew Morgan
aac22dc0d4 Merge pull request #6127 from matrix-org/erikj/patch_inner 2020-02-26 12:34:14 +00:00
Andrew Morgan
846f1c0593 Add domain validation when creating room with list of invitees (#6121) 2020-02-26 12:33:59 +00:00
Andrew Morgan
f29da285bc send 404 as http-status when filter-id is unknown to the server (#2380) 2020-02-26 12:33:37 +00:00
Andrew Morgan
aa4590795a Fix races in room stats (and other) updates. (#6187) 2020-02-26 12:33:19 +00:00
Andrew Morgan
19099efcfb Refactor HomeserverConfig so it can be typechecked (#6137) 2020-02-26 12:32:49 +00:00
Andrew Morgan
f8baba9c54 Merge pull request #6147 from matrix-org/babolivier/3pid-invite-revoked 2020-02-26 12:26:11 +00:00
Andrew Morgan
4ab5cf88a2 Land improved room list based on room stats (#6019) 2020-02-26 12:12:33 +00:00
Andrew Morgan
f5a623f070 Merge pull request #6146 from matrix-org/erikj/fix_destination_retry_timings 2020-02-26 12:09:38 +00:00
Andrew Morgan
2ac458d86d Merge pull request #6145 from matrix-org/erikj/fix_censored_redactions 2020-02-26 12:08:58 +00:00
Andrew Morgan
31c75f338a Merge pull request #6125 from matrix-org/babolivier/deactivation-invite 2020-02-26 12:07:37 +00:00
Andrew Morgan
90900898ad Move lookup-related functions from RoomMemberHandler to IdentityHandler (#5978) 2020-02-26 12:03:29 +00:00
Andrew Morgan
eba1b9c156 Fix dummy event insertion consent bug (#6053) 2020-02-25 17:54:48 +00:00
Andrew Morgan
f6d3b67360 Merge pull request #6098 from matrix-org/erikj/cleanup_user_ips_2 2020-02-25 17:54:41 +00:00
Andrew Morgan
41e59e6ac3 Merge pull request #6089 from matrix-org/erikj/cleanup_user_ips 2020-02-25 17:54:30 +00:00
Andrew Morgan
4c42e1a042 Stop advertising unsupported flows for registration (#6107) 2020-02-25 17:53:48 +00:00
Andrew Morgan
e9387cea79 Refactor the user-interactive auth handling (#6105) 2020-02-25 17:53:22 +00:00
Andrew Morgan
b979833dbc Refactor code for calculating registration flows (#6106) 2020-02-25 17:50:27 +00:00
Andrew Morgan
e034f14fca Use the federation blacklist for requests to untrusted Identity Servers (#6000) 2020-02-25 17:46:09 +00:00
Andrew Morgan
b4c2acd7af Implement MSC2290 (#6043) 2020-02-25 15:42:28 +00:00
Andrew Morgan
74912d4eab Add 'failure_ts' column to 'destinations' table (#6016) 2020-02-25 14:28:24 +00:00
Andrew Morgan
e1f4c52e88 Fix well-known lookups with the federation certificate whitelist (#5997) 2020-02-25 14:28:16 +00:00
Andrew Morgan
15a9ca24aa Fix for structured logging tests stomping on logs (#6023) 2020-02-25 14:27:36 +00:00
Andrew Morgan
9b9dfc2766 Merge pull request #6020 from matrix-org/jaywink/allow-support-users-to-register 2020-02-25 14:22:17 +00:00
Andrew Morgan
1dfbad8f10 Merge pull request #6015 from matrix-org/erikj/ratelimit_admin_redaction 2020-02-25 13:57:56 +00:00
Andrew Morgan
136caf4221 Fix existing v2 identity server calls (MSC2140) (#6013) 2020-02-25 13:45:26 +00:00
Andrew Morgan
e75de4107d Merge pull request #6004 from matrix-org/jaywink/autojoin-create-real-users 2020-02-25 11:53:22 +00:00
Andrew Morgan
6bedb3fe1c Merge pull request #5934 from matrix-org/erikj/censor_redactions 2020-02-25 11:41:35 +00:00
Andrew Morgan
0a3f3e30c4 Add a build info metric to Prometheus (#6005) 2020-02-25 11:37:27 +00:00
Andrew Morgan
87856c6aa9 Servers-known-about statistic (#5981) 2020-02-25 11:37:02 +00:00
Andrew Morgan
3c34ddab01 Remove extraneous unittest.DEBUG's 2020-02-25 11:36:04 +00:00
Andrew Morgan
476932cdef Increase expected state events in tests for new room by one 2020-02-25 11:14:11 +00:00
Andrew Morgan
91e030ae12 Fix and refactor room and user stats (#5971) 2020-02-25 10:16:48 +00:00
Andrew Morgan
6c058e3206 Remove unnecessary parentheses around return statements (#5931) 2020-02-24 17:54:53 +00:00
Andrew Morgan
3a59bd253e Revert "Use the v2 lookup API for 3PID invites (#5897)"
This reverts commit 978f263e7c, reversing
changes made to 4f6ee99818.
2020-02-24 17:23:46 +00:00
Andrew Morgan
3d5f1ebf06 Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consent 2020-02-24 17:19:09 +00:00
Andrew Morgan
978f263e7c Use the v2 lookup API for 3PID invites (#5897) 2020-02-24 17:15:16 +00:00
Andrew Morgan
4f6ee99818 Config templating (#5900) 2020-02-21 11:38:45 +00:00