1
0
Commit Graph

1604 Commits

Author SHA1 Message Date
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
Andrew Morgan
35a521bd6f Implement a structured logging output system. (#5680) 2020-02-21 11:38:13 +00:00
Andrew Morgan
0c67c66e4f Merge pull request #5864 from matrix-org/erikj/reliable_lookups 2020-02-21 11:32:21 +00:00
Andrew Morgan
d0cde0f655 Merge pull request #5877 from Awesome-Technologies/remove_shared_secret_registration 2020-02-21 11:22:20 +00:00
Andrew Morgan
12e21b5a80 Merge pull request #5850 from matrix-org/erikj/retry_well_known_on_fail 2020-02-21 11:01:35 +00:00
Andrew Morgan
7d03cd449e Refactor the Appservice scheduler code (#5886) 2020-02-21 10:51:25 +00:00
Andrew Morgan
480d7e2cac Merge pull request #5844 from matrix-org/erikj/retry_well_known_lookup 2020-02-20 16:00:11 +00:00
Andrew Morgan
2a2111708f Merge pull request #5836 from matrix-org/erikj/lower_bound_ttl_well_known 2020-02-20 15:59:29 +00:00
Andrew Morgan
408959c9d9 Merge pull request #5788 from matrix-org/rav/metaredactions 2020-02-20 15:58:43 +00:00
Andrew Morgan
d3e927bcbb Merge pull request #5794 from matrix-org/erikj/share_ssl_options_for_well_known 2020-02-20 15:44:08 +00:00
Andrew Morgan
f04902acb8 Remove DelayedCall debugging from test runs (#5787) 2020-02-20 15:43:32 +00:00
Andrew Morgan
bab6f6052c Merge pull request #5746 from matrix-org/erikj/test_bg_update_currnet_state 2020-02-20 15:41:31 +00:00
Andrew Morgan
b7424f4943 Remove non-functional 'expire_access_token' setting (#5782) 2020-02-20 15:41:21 +00:00
Andrew Morgan
d478a36ae4 Room Complexity Client Implementation (#5783) 2020-02-20 15:41:08 +00:00
Andrew Morgan
471a6b1b56 Convert RedactionTestCase to modern test style (#5768) 2020-02-19 16:05:44 +00:00
Andrew Morgan
c544308db4 Fix some error cases in the caching layer. (#5749) 2020-02-19 16:05:16 +00:00
Andrew Morgan
bc34ac53ec Fix servlet metric names (#5734) 2020-02-19 15:13:08 +00:00
Andrew Morgan
f590f77a16 Replace returnValue with return (#5736) 2020-02-19 15:11:59 +00:00
Andrew Morgan
bf6300e0a1 Fix stack overflow in Keyring (#5724) 2020-02-19 11:50:18 +00:00
Andrew Morgan
adb043107f Support Prometheus_client 0.4.0+ (#5636) 2020-02-19 11:46:23 +00:00
Andrew Morgan
005c26556b Remove the ability to query relations when the original event was redacted. (#5629) 2020-02-19 11:45:42 +00:00
Andrew Morgan
b194ac056c Ignore redactions of m.room.create events (#5701) 2020-02-19 11:44:59 +00:00
Andrew Morgan
a27e991693 More refactoring in get_events_as_list (#5707) 2020-02-19 11:44:37 +00:00
Andrew Morgan
29adbe8546 Merge pull request #5589 from matrix-org/erikj/admin_exfiltrate_data 2020-02-17 17:17:59 +00:00
Andrew Morgan
2f450fa149 Implement access token expiry (#5660) 2020-02-17 17:17:02 +00:00
Andrew Morgan
f51c674437 Add a mechanism for per-test configs (#5657) 2020-02-17 17:16:03 +00:00
Andrew Morgan
b5844ad699 Clean up exception handling for access_tokens (#5656) 2020-02-17 17:13:41 +00:00
Andrew Morgan
ade1224b84 Inline issue_access_token (#5659) 2020-02-17 16:50:59 +00:00
Andrew Morgan
84a1465332 Merge pull request #5658 from matrix-org/babolivier/is-json 2020-02-17 16:50:01 +00:00
Andrew Morgan
ee2de6734b Remove access-token support from RegistrationStore.register (#5642) 2020-02-17 16:36:11 +00:00
Andrew Morgan
d246c99947 Merge pull request #5638 from matrix-org/babolivier/invite-json 2020-02-17 16:35:24 +00:00
Andrew Morgan
748ebe2fd5 Include the original event in /relations (#5626) 2020-02-17 13:53:53 +00:00
Andrew Morgan
5e752310be Remove access-token support from RegistrationHandler.register (#5641) 2020-02-17 13:41:58 +00:00
Andrew Morgan
0f0c74493a Move get_or_create_user to test code (#5628) 2020-02-17 13:31:16 +00:00
Andrew Morgan
4eb0bbad04 Add origin_server_ts and sender fields to m.replace (#5613) 2020-02-17 13:21:58 +00:00
Andrew Morgan
1a23d184e9 Fixes to the federation rate limiter (#5621) 2020-02-17 13:21:25 +00:00
Andrew Morgan
622d0be1b3 Fix with isort==4.3.21 and black==19.3b0 2020-02-14 14:27:12 +00:00
Andrew Morgan
c9aab2de34 Fix signedjson deleted method 2020-02-14 12:03:12 +00:00
Andrew Morgan
41120db159 Move logging utilities out of the side drawer of util/ and into logging/ (#5606) 2020-02-14 11:02:55 +00:00
Andrew Morgan
3c29cee8e9 Fix media repo breaking (#5593) 2020-02-14 10:59:44 +00:00
Andrew Morgan
65787fe811 Make the http server handle coroutine-making REST servlets (#5475) 2020-02-14 10:57:48 +00:00
Andrew Morgan
38e09af420 Update the TLS cipher string and provide configurability for TLS on outgoing federation (#5550) 2020-02-14 10:57:04 +00:00
Andrew Morgan
634f6a65cb Pass config_dir_path and data_dir_path into Config.read_config. (#5522) 2020-02-13 12:04:46 +00:00
Andrew Morgan
28eba8747e Run Black. (#5482) 2020-02-13 11:30:15 +00:00
Andrew Morgan
0295abdcf7 Dinsic Blacking with black==18.6b2 2020-02-11 16:18:29 +00:00