1
0
Commit Graph

1552 Commits

Author SHA1 Message Date
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
Andrew Morgan
f98c652b4e Merge pull request #5480 from matrix-org/erikj/extremities_dummy_events 2020-02-10 18:56:49 +00:00
Andrew Morgan
c9eb99d25b Add experimental option to reduce extremities. 2020-02-10 18:54:03 +00:00
Andrew Morgan
ecdc5752d4 Merge commit 'dd927b29e' into dinsic-release-v1.1.0 2020-02-10 16:53:36 +00:00
Andrew Morgan
72c14cb133 Merge pull request #5461 from matrix-org/erikj/histograms_are_cumalitive 2020-02-10 16:39:29 +00:00
Andrew Morgan
dd486836f7 Merge remote-tracking branch 'dinsic/dinsic' into dinsic-release-v1.1.0 2020-02-10 16:37:49 +00:00
Andrew Morgan
0ed71e4e4b Merge pull request #5458 from matrix-org/hawkowl/fix-prometheus 2020-02-10 14:48:37 +00:00
Andrew Morgan
9efcd2da53 Expose statistics on extrems to prometheus (#5384) 2020-02-10 14:42:57 +00:00
Andrew Morgan
d49933470d Add limit_profile_requests_to_known_users option (#18) 2019-12-05 11:55:12 +00:00
Andrew Morgan
b69732705d Capatilise letters after a - in new user displaynames (#14) 2019-12-02 15:10:23 +00:00
Andrew Morgan
c446f59047 Hide expired users from user directory, optionally show on renewal (#13) 2019-11-14 18:42:55 +00:00
Andrew Morgan
d6b7606e07 Create configurable ratelimiter for 3pid invites (#11) 2019-11-12 11:38:35 +00:00
Brendan Abolivier
dfa60504af Don't apply retention policy based filtering on state events
As per MSC1763, 'Retention is only considered for non-state events.', so don't filter out state events based on the room's retention policy.
2019-11-06 15:47:40 +00:00
Richard van der Hoff
85f15ac592 Support for routing outbound HTTP requests via a proxy (#6239)
The `http_proxy` and `HTTPS_PROXY` env vars can be set to a `host[:port]` value which should point to a proxy.

The address of the proxy should be excluded from IP blacklists such as the `url_preview_ip_range_blacklist`.

The proxy will then be used for
 * push
 * url previews
 * phone-home stats
 * recaptcha validation
 * CAS auth validation

It will *not* be used for:
 * Application Services
 * Identity servers
 * Outbound federation
 * In worker configurations, connections from workers to masters

Fixes #4198.
2019-11-01 14:22:46 +00:00
Brendan Abolivier
c49ba3677c Fixup tests 2019-10-04 12:21:33 +01:00
Brendan Abolivier
d694546453 Lint (again) 2019-10-04 12:10:19 +01:00
Brendan Abolivier
06159a0ee7 Lint 2019-10-04 12:10:19 +01:00
Brendan Abolivier
a6a55039a4 Add test case 2019-10-04 12:10:19 +01:00
Brendan Abolivier
ce2448efbe Fix git messing up 2019-09-27 17:18:10 +01:00
Brendan Abolivier
97672c03e2 ok 2019-09-27 16:57:19 +01:00
Brendan Abolivier
acf6b2388e Lint 2019-09-27 16:57:19 +01:00
Brendan Abolivier
ae036ed636 Add unit tests for strip_invalid_mxid_characters 2019-09-19 11:58:06 +01:00