Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Logcontexts for replication command handlers | Richard van der Hoff | 2018-08-17 | 8 | -20/+53 |
| | | | | | | | | | | Run the handlers for replication commands as background processes. This should improve the visibility in our metrics, and reduce the number of "running db transaction from sentinel context" warnings. Ideally it means converting the things that fire off deferreds into the night into things that actually return a Deferred when they are done. I've made a bit of a stab at this, but it will probably be leaky. | ||||
* | Fix inbound federation on reader worker | Erik Johnston | 2018-08-16 | 1 | -0/+2 |
| | | | | | Inbound federation requires calculating push, which in turn relies on having access to account data. | ||||
* | Add GET media/v1/config (#3184) | Will Hunt | 2018-08-16 | 2 | -1/+50 |
| | |||||
* | lazyload aware /messages (#3589) | Matthew Hodgson | 2018-08-16 | 2 | -2/+46 |
| | |||||
* | initial cut at a room summary API (#3574) | Matthew Hodgson | 2018-08-16 | 5 | -18/+158 |
| | |||||
* | Merge pull request #3689 from matrix-org/neilj/fix_off_by_1+maus | Neil Johnson | 2018-08-15 | 1 | -2/+2 |
|\ | | | | | Fix Mau off by one errors | ||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-15 | 23 | -178/+591 |
| |\ | | | | | | | | | | neilj/fix_off_by_1+maus | ||||
| * \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-14 | 2 | -2/+3 |
| |\ \ | | | | | | | | | | | | | neilj/fix_off_by_1+maus | ||||
| * | | | support admin_email config and pass through into blocking errors, return ↵ | Neil Johnson | 2018-08-14 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | AuthError in all cases | ||||
| * | | | fix off by 1s on mau | Neil Johnson | 2018-08-14 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-14 | 1 | -10/+0 |
| |\ \ \ | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus | ||||
| * \ \ \ | Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-14 | 4 | -17/+35 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus | ||||
| * \ \ \ \ | Merge branch 'neilj/mau_sync_block' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-14 | 3 | -8/+26 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus | ||||
* | | | | | | | speed up /members and add at= and membership params (#3568) | Matthew Hodgson | 2018-08-15 | 4 | -18/+170 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Merge pull request #3653 from matrix-org/erikj/split_federation | Erik Johnston | 2018-08-15 | 14 | -138/+498 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Move more federation APIs to workers | ||||
| * \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-15 | 54 | -337/+368 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | erikj/split_federation | ||||
| * | | | | | | | Use federation handler function rather than duplicate | Erik Johnston | 2018-08-15 | 2 | -48/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This involves renaming _persist_events to be a public function. | ||||
| * | | | | | | | Rename slave TransactionStore to SlaveTransactionStore | Erik Johnston | 2018-08-15 | 6 | -11/+11 |
| | | | | | | | | |||||
| * | | | | | | | Move clean_room_for_join to master | Erik Johnston | 2018-08-09 | 2 | -2/+49 |
| | | | | | | | | |||||
| * | | | | | | | Fixup doc comments | Erik Johnston | 2018-08-09 | 2 | -0/+28 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-09 | 30 | -126/+667 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/split_federation | ||||
| * | | | | | | | | Pull in necessary stores in federation_reader | Erik Johnston | 2018-08-06 | 2 | -1/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Move necessary storage functions to worker classes | Erik Johnston | 2018-08-06 | 3 | -98/+100 |
| | | | | | | | | | |||||
| * | | | | | | | | Import all functions from TransactionStore | Erik Johnston | 2018-08-06 | 1 | -11/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Add EDU/query handling over replication | Erik Johnston | 2018-08-06 | 4 | -13/+62 |
| | | | | | | | | | |||||
| * | | | | | | | | Add replication APIs for persisting federation events | Erik Johnston | 2018-08-06 | 4 | -10/+290 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #3687 from matrix-org/neilj/admin_email | Neil Johnson | 2018-08-15 | 4 | -22/+24 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | support admin_email config and pass through into blocking errors, | ||||
| * | | | | | | | | clean up AuthError | Neil Johnson | 2018-08-15 | 1 | -7/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'neilj/update_limits_error_codes' of ↵ | Neil Johnson | 2018-08-15 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:matrix-org/synapse into neilj/admin_email | ||||
| | * | | | | | | | | update error codes for resource limiting | Neil Johnson | 2018-08-15 | 1 | -2/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | update admin email to uri | Neil Johnson | 2018-08-15 | 1 | -1/+1 |
| |/ / / / / / / / | |||||
| * | | | | | | | | replace admin_email with admin_uri for greater flexibility | Neil Johnson | 2018-08-15 | 3 | -8/+8 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_email | Neil Johnson | 2018-08-14 | 3 | -25/+56 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| * | | | | | | | | remove blank line | Neil Johnson | 2018-08-14 | 1 | -1/+0 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | Update register.py | Neil Johnson | 2018-08-14 | 1 | -10/+0 |
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | remove comments | ||||
| * | | | | | | support admin_email config and pass through into blocking errors, return ↵ | Neil Johnson | 2018-08-13 | 4 | -17/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | AuthError in all cases | ||||
* | | | | | | | Merge pull request #3690 from matrix-org/neilj/change_prometheus_mau_metric_name | Neil Johnson | 2018-08-15 | 1 | -3/+3 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | combine mau metrics into one group | ||||
| * \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-14 | 3 | -9/+28 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | neilj/change_prometheus_mau_metric_name | ||||
| * | | | | | | | pep8 | Neil Johnson | 2018-08-14 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | combine mau metrics into one group | Neil Johnson | 2018-08-14 | 1 | -4/+3 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge pull request #3667 from matrix-org/erikj/fixup_unbind | Erik Johnston | 2018-08-15 | 5 | -20/+78 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Don't fail requests to unbind 3pids for non supporting ID servers | ||||
| * | | | | | | Log when we 3pid/unbind request fails | Erik Johnston | 2018-08-09 | 1 | -0/+2 |
| | | | | | | | |||||
| * | | | | | | Don't fail requests to unbind 3pids for non supporting ID servers | Erik Johnston | 2018-08-08 | 5 | -20/+76 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Older identity servers may not support the unbind 3pid request, so we shouldn't fail the requests if we received one of 400/404/501. The request still fails if we receive e.g. 500 responses, allowing clients to retry requests on transient identity server errors that otherwise do support the API. Fixes #3661 | ||||
* | | | | | | | adding missing yield | Neil Johnson | 2018-08-14 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #3670 from matrix-org/neilj/mau_sync_block | Neil Johnson | 2018-08-14 | 3 | -8/+27 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Block ability to read via sync if mau limit exceeded | ||||
| * | | | | | | make comments clearer | Neil Johnson | 2018-08-14 | 1 | -1/+2 |
| | |_|_|_|/ | |/| | | | | |||||
| * | | | | | rename _user_last_seen_monthly_active | Neil Johnson | 2018-08-09 | 2 | -6/+6 |
| | | | | | | |||||
| * | | | | | fix errant parenthesis | Neil Johnson | 2018-08-09 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | only block on sync where user is not part of the mau cohort | Neil Johnson | 2018-08-09 | 2 | -3/+17 |
| | | | | | | |||||
| * | | | | | block sync if auth checks fail | Neil Johnson | 2018-08-09 | 1 | -7/+5 |
| | | | | | | |||||
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-09 | 3 | -0/+9 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | neilj/mau_sync_block | ||||
| * \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-09 | 21 | -298/+667 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | neilj/mau_sync_block | ||||
| * | | | | | | | sync auth blocking | Neil Johnson | 2018-08-08 | 1 | -5/+11 |
| | | | | | | | | |||||
* | | | | | | | | Merge remote-tracking branch 'origin/develop' into ↵ | Amber Brown | 2018-08-14 | 4 | -196/+11 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | neilj/fix_reap_users_in_postgres | ||||
| * | | | | | | | Merge pull request #3677 from andrewshadura/master | Richard van der Hoff | 2018-08-13 | 2 | -196/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use recaptcha_ajax.js directly from Google | ||||
| | * | | | | | | | Use recaptcha_ajax.js directly from Google | Andrej Shadura | 2018-08-10 | 2 | -196/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The script recaptcha_ajax.js contains minified non-free code which we probably cannot redistribute. Since it talks to Google servers anyway, it is better to just download it from Google directly instead of shipping it. This fixes #1932. | ||||
| * | | | | | | | | Revert "support admin_email config and pass through into blocking errors, ↵ | Neil Johnson | 2018-08-13 | 4 | -35/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | return AuthError in all cases" This reverts commit 0d43f991a19840a224d3dac78d79f13d78212ee6. | ||||
| * | | | | | | | | support admin_email config and pass through into blocking errors, return ↵ | Neil Johnson | 2018-08-13 | 4 | -17/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AuthError in all cases | ||||
| * | | | | | | | | Run tests under PostgreSQL (#3423) | Amber Brown | 2018-08-13 | 2 | -0/+10 |
| | | | | | | | | | |||||
* | | | | | | | | | fix sqlite/postgres incompatibility in reap_monthly_active_users | Neil Johnson | 2018-08-11 | 1 | -16/+28 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'rav/fix_linearizer_cancellation' into develop | Richard van der Hoff | 2018-08-10 | 1 | -43/+68 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix linearizer cancellation on twisted < 18.7 | Richard van der Hoff | 2018-08-10 | 1 | -43/+68 |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns out that cancellation of inlineDeferreds didn't really work properly until Twisted 18.7. This commit refactors Linearizer.queue to avoid inlineCallbacks. | ||||
* | | | | | | | | log *after* reloading log config | Richard van der Hoff | 2018-08-10 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... because logging *before* reloading means the log message gets lost in the old MemoryLogger | ||||
* | | | | | | | | Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678) | Amber Brown | 2018-08-10 | 29 | -31/+31 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #3439 from vojeroen/send_sni_for_federation_requests | Richard van der Hoff | 2018-08-10 | 13 | -16/+110 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | send SNI for federation requests | ||||
| * | | | | | | | more generic conversion of str/bytes to unicode | Jeroen | 2018-08-09 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | include private functions from twisted | Jeroen | 2018-08-09 | 1 | -2/+35 |
| | | | | | | | | |||||
| * | | | | | | | updated docstring for ServerContextFactory | Jeroen | 2018-08-08 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | fix isort | Jeroen | 2018-07-29 | 1 | -2/+3 |
| | | | | | | | | |||||
| * | | | | | | | fix accidental removal of hs | Jeroen | 2018-07-27 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'develop' into send_sni_for_federation_requests | Richard van der Hoff | 2018-07-27 | 72 | -1162/+2278 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/develop' into ↵ | Jeroen | 2018-07-14 | 259 | -1767/+1825 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | send_sni_for_federation_requests # Conflicts: # synapse/crypto/context_factory.py | ||||
| * \ \ \ \ \ \ \ \ | Merge branch 'develop' into send_sni_for_federation_requests | Jeroen | 2018-07-09 | 68 | -191/+791 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # synapse/http/endpoint.py | ||||
| * | | | | | | | | | | take idna implementation from twisted | Jeroen | 2018-06-26 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | allow self-signed certificates | Jeroen | 2018-06-26 | 3 | -35/+36 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | formatting changes for pep8 | Jeroen | 2018-06-25 | 4 | -5/+8 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | send SNI for federation requests | Jeroen | 2018-06-24 | 14 | -13/+69 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #3655 from matrix-org/neilj/disable_hs | Neil Johnson | 2018-08-09 | 3 | -0/+9 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | Flag to disable HS without disabling federation | ||||
| * | | | | | | | | | | fix pep8 too many lines | Neil Johnson | 2018-08-08 | 1 | -1/+0 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'develop' into neilj/disable_hs | Neil Johnson | 2018-08-08 | 12 | -22/+240 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into neilj/disable_hs | Neil Johnson | 2018-08-08 | 3 | -6/+54 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/disable_hs | Neil Johnson | 2018-08-08 | 4 | -37/+69 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-06 | 1 | -4/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/disable_hs | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-06 | 1 | -4/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/disable_hs | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-06 | 2 | -8/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/disable_hs | ||||
| * | | | | | | | | | | | | | | | disable HS from config | Neil Johnson | 2018-08-04 | 3 | -0/+9 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge branch 'master' into develop | Amber Brown | 2018-08-09 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | 0.33.2 | Amber Brown | 2018-08-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | fix for rc1 v0.33.2rc1 | Amber Brown | 2018-08-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | version | Amber Brown | 2018-08-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge pull request #3632 from matrix-org/erikj/refactor_repl_servlet | Erik Johnston | 2018-08-09 | 5 | -274/+395 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add helper base class for generating new replication endpoints | ||||
| * | | | | | | | | | | | | | | | Fixup wording and remove dead code | Erik Johnston | 2018-08-09 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Rename POST param to METHOD | Erik Johnston | 2018-08-08 | 2 | -13/+22 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixup logging and docstrings | Erik Johnston | 2018-08-08 | 2 | -2/+40 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fix isort | Erik Johnston | 2018-08-06 | 1 | -4/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-03 | 40 | -601/+707 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/refactor_repl_servlet | ||||
| * | | | | | | | | | | | | | | | Use new helper base class for membership requests | Erik Johnston | 2018-07-31 | 2 | -195/+108 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Use new helper base class for ReplicationSendEventRestServlet | Erik Johnston | 2018-07-31 | 2 | -86/+40 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Add helper base class for generating new replication endpoints | Erik Johnston | 2018-07-31 | 1 | -0/+208 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will hopefully reduce the boiler plate required to implement new internal HTTP requests. | ||||
* | | | | | | | | | | | | | | | | Merge pull request #3664 from matrix-org/rav/federation_metrics | Richard van der Hoff | 2018-08-08 | 3 | -1/+32 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | more metrics for the federation and appservice senders | ||||
| * | | | | | | | | | | | | | | | fix metric name | Richard van der Hoff | 2018-08-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | more metrics for the federation and appservice senders | Richard van der Hoff | 2018-08-07 | 3 | -1/+32 |
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge pull request #3654 from matrix-org/rav/room_versions | Richard van der Hoff | 2018-08-08 | 12 | -22/+239 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | Support for room versioning | ||||
| * | | | | | | | | | | | | | | Don't expose default_room_version as config opt | Richard van der Hoff | 2018-08-07 | 3 | -15/+5 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Check m.room.create for sane room_versions | Richard van der Hoff | 2018-08-06 | 2 | -4/+32 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | include known room versions in outgoing make_joins | Richard van der Hoff | 2018-08-06 | 4 | -8/+25 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | sanity check response from make_join | Richard van der Hoff | 2018-08-03 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Enforce compatibility when processing make_join requests | Richard van der Hoff | 2018-08-03 | 3 | -4/+63 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reject make_join requests from servers which do not support the room version. Also include the room version in the response. | ||||
| * | | | | | | | | | | | | | | Basic support for room versioning | Richard van der Hoff | 2018-08-03 | 6 | -5/+79 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the first tranche of support for room versioning. It includes: * setting the default room version in the config file * new room_version param on the createRoom API * storing the version of newly-created rooms in the m.room.create event * fishing the version of existing rooms out of the m.room.create event | ||||
| * | | | | | | | | | | | | | | Docstrings for BaseFederationServlet | Richard van der Hoff | 2018-08-03 | 1 | -0/+47 |
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... to save me reverse-engineering this stuff again. | ||||
* | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-08 | 4 | -36/+68 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/reserved_users | ||||
| * | | | | | | | | | | | | | Merge pull request #3633 from matrix-org/neilj/mau_tracker | Neil Johnson | 2018-08-08 | 10 | -53/+220 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | API for monthly_active_users table | ||||
| | * | | | | | | | | | | | | typos | Neil Johnson | 2018-08-08 | 2 | -3/+3 |
| | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fix occasional glitches in the synapse_event_persisted_position metric | Richard van der Hoff | 2018-08-07 | 1 | -3/+8 |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every so often this metric glitched to a negative number. I'm assuming it was due to backfilled events. | ||||
| * | | | | | | | | | | | Return M_NOT_FOUND when a profile could not be found. (#3596) | Will Hunt | 2018-08-03 | 1 | -31/+58 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | prevent total number of reserved users being too large | Neil Johnson | 2018-08-07 | 1 | -1/+3 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | implement reserved users for mau limits | Neil Johnson | 2018-08-07 | 3 | -12/+41 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | WIP building out mau reserved users | Neil Johnson | 2018-08-06 | 1 | -1/+15 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | load mau limit threepids | Neil Johnson | 2018-08-06 | 1 | -0/+3 |
| |/ / / / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Fix postgres compatibility bug | Neil Johnson | 2018-08-06 | 1 | -4/+15 |
| |_|_|_|/ / / / / |/| | | | | | | | | |||||
* | | | | | | | | | update comments to reflect new sig | Neil Johnson | 2018-08-06 | 1 | -4/+1 |
| |_|_|/ / / / / |/| | | | | | | | |||||
* | | | | | | | | make use of _simple_select_one_onecol, improved comments | Neil Johnson | 2018-08-06 | 2 | -8/+15 |
| |_|/ / / / / |/| | | | | | | |||||
* | | | | | | | py3 fix | Neil Johnson | 2018-08-03 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | bug fixes | Neil Johnson | 2018-08-03 | 3 | -19/+7 |
| | | | | | | | |||||
* | | | | | | | wip commit - tests failing | Neil Johnson | 2018-08-03 | 3 | -40/+53 |
| | | | | | | | |||||
* | | | | | | | fix (lots of) py3 test failures | Neil Johnson | 2018-08-03 | 1 | -2/+2 |
| | | | | | | | |||||
* | | | | | | | fix caching and tests | Neil Johnson | 2018-08-03 | 2 | -49/+43 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_tracker | Neil Johnson | 2018-08-03 | 18 | -376/+433 |
|\| | | | | | | |||||
| * | | | | | | Merge pull request #3639 from matrix-org/rav/refactor_error_handling | Richard van der Hoff | 2018-08-02 | 8 | -142/+123 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Clean up handling of errors from outbound requests | ||||
| | * | | | | | | Kill off MatrixCodeMessageException | Richard van der Hoff | 2018-08-01 | 5 | -78/+47 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code brings the SimpleHttpClient into line with the MatrixFederationHttpClient by having it raise HttpResponseExceptions when a request fails (rather than trying to parse for matrix errors and maybe raising MatrixCodeMessageException). Then, whenever we were checking for MatrixCodeMessageException and turning them into SynapseErrors, we now need to check for HttpResponseExceptions and call to_synapse_error. | ||||
| | * | | | | | | Refactor code for turning HttpResponseException into SynapseError | Richard van der Hoff | 2018-08-01 | 3 | -34/+56 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit replaces SynapseError.from_http_response_exception with HttpResponseException.to_synapse_error. The new method actually returns a ProxiedRequestError, which allows us to pass through additional metadata from the API call. | ||||
| | * | | | | | | Be more careful which errors we send back over the C-S API | Richard van der Hoff | 2018-08-01 | 3 | -32/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We really shouldn't be sending all CodeMessageExceptions back over the C-S API; it will include things like 401s which we shouldn't proxy. That means that we need to explicitly turn a few HttpResponseExceptions into SynapseErrors in the federation layer. The effect of the latter is that the matrix errcode will get passed through correctly to calling clients, which might help with some of the random M_UNKNOWN errors when trying to join rooms. | ||||
| * | | | | | | | Merge pull request #3638 from ↵ | Richard van der Hoff | 2018-08-02 | 1 | -129/+148 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/rav/refactor_federation_client_exception_handling Factor out exception handling in federation_client | ||||
| | * | | | | | | Factor out exception handling in federation_client | Richard van der Hoff | 2018-08-01 | 1 | -129/+148 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Factor out the error handling from make_membership_event, send_join, and send_leave, so that it can be shared. | ||||
| * | | | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2018-08-02 | 9 | -19/+65 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge tag 'v0.33.1' | Richard van der Hoff | 2018-08-02 | 8 | -19/+63 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 0.33.1 (2018-08-02) =========================== SECURITY FIXES -------------- - Fix a potential issue where servers could request events for rooms they have not joined. (`#3641 <https://github.com/matrix-org/synapse/issues/3641>`_) - Fix a potential issue where users could see events in private rooms before they joined. (`#3642 <https://github.com/matrix-org/synapse/issues/3642>`_) | ||||
| | | * | | | | | | | Prepare 0.33.1 | Richard van der Hoff | 2018-08-02 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Check room visibility for /event/ requests | Richard van der Hoff | 2018-08-02 | 3 | -6/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that the user has permission to view the requeseted event for /event/{eventId} and /room/{roomId}/event/{eventId} requests. Also check that the event is in the given room for /room/{roomId}/event/{eventId}, for sanity. | ||||
| | | * | | | | | | | Avoid extra db lookups | Richard van der Hoff | 2018-08-02 | 3 | -62/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we're about to look up the events themselves anyway, we can skip the extra db queries here. | ||||
| | | * | | | | | | | Validation for events/rooms in fed requests | Richard van der Hoff | 2018-08-02 | 3 | -1/+64 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we get a federation request which refers to an event id, make sure that said event is in the room the caller claims it is in. (patch supplied by @turt2live) | ||||
| | * | | | | | | | | Merge pull request #3377 from Valodim/note-affinity | Richard van der Hoff | 2018-07-19 | 1 | -0/+2 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | document that the affinity package is required for the cpu_affinity setting | ||||
| | | * | | | | | | | add note that the affinity package is required for the cpu_affinity setting | Vincent Breitmoser | 2018-06-09 | 1 | -0/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #3621 from matrix-org/erikj/split_fed_store | Erik Johnston | 2018-08-02 | 2 | -89/+100 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Split out DB writes in federation handler | ||||
| | * | | | | | | | | | update docs | Erik Johnston | 2018-08-01 | 2 | -4/+6 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | _persist_auth_tree no longer returns anything | Erik Johnston | 2018-08-01 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-07-30 | 26 | -108/+446 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/split_fed_store | ||||
| | * | | | | | | | | | | Split out DB writes in federation handler | Erik Johnston | 2018-07-25 | 2 | -85/+94 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow us to easily add an internal replication API to proxy these reqeusts to master, so that we can move federation APIs to workers. | ||||
* | | | | | | | | | | | | update generate_monthly_active_users, and reap_monthly_active_users | Neil Johnson | 2018-08-02 | 1 | -2/+2 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | typo | Neil Johnson | 2018-08-02 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | wip attempt at caching | Neil Johnson | 2018-08-02 | 1 | -9/+47 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | do mau checks based on monthly_active_users table | Neil Johnson | 2018-08-02 | 4 | -19/+29 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | remove unused count_monthly_users | Neil Johnson | 2018-08-02 | 1 | -25/+0 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | insertion into monthly_active_users | Neil Johnson | 2018-08-02 | 4 | -8/+36 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-02 | 2 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/mau_tracker | ||||
| * | | | | | | | | | | | | self.db_conn unused | Neil Johnson | 2018-08-01 | 1 | -1/+0 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | normalise reaping query | Neil Johnson | 2018-08-01 | 1 | -3/+38 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Revert "change monthly_active_users table to be a single column" | Neil Johnson | 2018-08-02 | 2 | -4/+10 |
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ec716a35b219d147dee51733b55573952799a549. | ||||
* | | | | | | | | | | | | change monthly_active_users table to be a single column | Neil Johnson | 2018-08-01 | 2 | -10/+4 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_tracker | Neil Johnson | 2018-08-01 | 29 | -236/+282 |
|\| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #3630 from matrix-org/neilj/mau_sign_in_log_in_limits | Neil Johnson | 2018-08-01 | 7 | -4/+90 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial impl of capping MAU | ||||
| | * | | | | | | | | | | | count_monthly_users is now async | Neil Johnson | 2018-08-01 | 1 | -1/+2 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | improve clarity | Neil Johnson | 2018-08-01 | 1 | -4/+5 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-01 | 14 | -187/+98 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/mau_sign_in_log_in_limits | ||||
| | * | | | | | | | | | | | | count_monthly_users() async | Neil Johnson | 2018-08-01 | 1 | -4/+7 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | remove need to plot limit_usage_by_mau | Neil Johnson | 2018-08-01 | 2 | -7/+6 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | remove errant print | Neil Johnson | 2018-08-01 | 1 | -1/+0 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | make count_monthly_users async synapse/handlers/auth.py | Neil Johnson | 2018-08-01 | 2 | -17/+18 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | only need to loop if mau limiting is enabled | Neil Johnson | 2018-08-01 | 1 | -1/+2 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | coding style | Neil Johnson | 2018-07-31 | 5 | -6/+10 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | remove errant logging | Neil Johnson | 2018-07-30 | 1 | -1/+0 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | actually close conn | Neil Johnson | 2018-07-30 | 1 | -4/+8 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | factor out metrics from __init__ to app/homeserver | Neil Johnson | 2018-07-30 | 2 | -25/+32 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | limit register and sign in on number of monthly users | Neil Johnson | 2018-07-30 | 5 | -2/+69 |
| | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #3620 from fuzzmz/return-404-room-not-found | Richard van der Hoff | 2018-08-01 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | return 404 if room not found | ||||
| | * | | | | | | | | | | | return NotFoundError if room not found | Serban Constantin | 2018-07-31 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per the Client-Server API[0] we should return `M_NOT_FOUND` if the room isn't found instead of generic SynapseError. This ensures that /directory/list API returns 404 for room not found instead of 400. [0]: https://matrix.org/docs/spec/client_server/unstable.html#get-matrix-client-r0-directory-list-room-roomid Signed-off-by: Serban Constantin <serban.constantin@gmail.com> | ||||
| * | | | | | | | | | | | | Python 3: Convert some unicode/bytes uses (#3569) | Amber Brown | 2018-08-02 | 14 | -48/+96 |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #3634 from matrix-org/rav/wtf_is_a_replication_layer | Richard van der Hoff | 2018-08-01 | 1 | -14/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | rename replication_layer to federation_client | ||||
| | * | | | | | | | | | | | rename replication_layer to federation_client | Richard van der Hoff | 2018-07-31 | 1 | -14/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I have HAD ENOUGH of trying to remember wtf a replication layer is in terms of classes. | ||||
| * | | | | | | | | | | | | Merge pull request #3384 from matrix-org/rav/rewrite_cachedlist_decorator | Richard van der Hoff | 2018-08-01 | 1 | -67/+64 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | Rewrite cache list decorator | ||||
| | * | | | | | | | | | | | fix invalidation | Richard van der Hoff | 2018-07-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Rewrite cache list decorator | Richard van der Hoff | 2018-07-27 | 1 | -67/+64 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because it was complicated and annoyed me. I suspect this will be more efficient too. | ||||
| * | | | | | | | | | | | | Merge pull request #3628 from turt2live/travis/goodby-pdu-failures | Travis Ralston | 2018-07-31 | 5 | -96/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | Remove pdu_failures from transactions | ||||
| | * | | | | | | | | | | | Remove pdu_failures from transactions | Travis Ralston | 2018-07-30 | 5 | -96/+7 |
| | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | The field is never read from, and all the opportunities given to populate it are not utilized. It should be very safe to remove this. | ||||
| * | | | | | | | | | | | Merge pull request #3612 from matrix-org/rav/store_heirarchy | Richard van der Hoff | 2018-07-31 | 6 | -6/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | Make EventStore inherit from EventFederationStore | ||||
| | * | | | | | | | | | | reinstate explicit include of EventsWorkerStore | Richard van der Hoff | 2018-07-31 | 1 | -1/+3 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Make EventStore inherit from EventFederationStore | Richard van der Hoff | 2018-07-26 | 6 | -7/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (since it uses methods therein) Turns out that we had a bunch of things which were incorrectly importing EventWorkerStore from events.py rather than events_worker.py, which broke once I removed the import into events.py. | ||||
* | | | | | | | | | | | | clean up | Neil Johnson | 2018-08-01 | 1 | -15/+3 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | fix comment | Neil Johnson | 2018-08-01 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | api into monthly_active_users table | Neil Johnson | 2018-07-31 | 5 | -2/+118 |
|/ / / / / / / / / / / | |||||
* | / / / / / / / / / | Only import secrets when available | Krombel | 2018-07-30 | 1 | -4/+3 |
| |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | secrets got introduced in python 3.6 so this class is not available in 3.5 and before. This now checks for the current running version and only tries using secrets if the version is 3.6 or above Signed-Off-By: Matthias Kesler <krombel@krombel.de> | ||||
* | | | | | | | | | | make /context lazyload & filter aware (#3567) | Matthew Hodgson | 2018-07-27 | 4 | -7/+42 |
| |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | make /context lazyload & filter aware. | ||||
* | | | | | | | | | Merge pull request #3391 from t3chguy/t3chguy/default_inviter_display_name_3pid | Richard van der Hoff | 2018-07-27 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | if inviter_display_name == ""||None then default to inviter MXID | ||||
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Michael Telatynski | 2018-07-24 | 332 | -10409/+26535 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t3chguy/default_inviter_display_name_3pid | ||||
| * | | | | | | | | | if inviter_display_name == ""||None then default to inviter MXID | Michael Telatynski | 2018-06-13 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to prevent email invite from "None" | ||||
* | | | | | | | | | | Merge pull request #3616 from matrix-org/travis/event_id_send_leave | Richard van der Hoff | 2018-07-26 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Update the send_leave path to be an event_id | ||||
| * | | | | | | | | | | Update the send_leave path to be an event_id | Travis Ralston | 2018-07-26 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's still not used, however the parameter is an event ID not a transaction ID. | ||||
* | | | | | | | | | | | Merge pull request #3614 from matrix-org/rav/stop_populating_event_content | Richard van der Hoff | 2018-07-26 | 3 | -2/+98 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Stop populating events.content | ||||
| * | | | | | | | | | | | Create the column nullable | Richard van der Hoff | 2018-07-26 | 2 | -9/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no real point in ever making the column non-nullable, and doing so breaks the sytests. | ||||
| * | | | | | | | | | | | Stop populating events.content | Richard van der Hoff | 2018-07-26 | 2 | -1/+93 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This field is no longer read from, so we should stop populating it. Once we're happy that this doesn't break everything, and a rollback is unlikely, we can think about dropping the column. | ||||
* | | | | | | | | | | | | Deduplicate redundant lazy-loaded members (#3331) | Matthew Hodgson | 2018-07-26 | 2 | -25/+71 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * attempt at deduplicating lazy-loaded members as per the proposal; we can deduplicate redundant lazy-loaded members which are sent in the same sync sequence. we do this heuristically rather than requiring the client to somehow tell us which members it has chosen to cache, by instead caching the last N members sent to a client, and not sending them again. For now we hardcode N to 100. Each cache for a given (user,device) tuple is in turn cached for up to X minutes (to avoid the caches building up). For now we hardcode X to 30. * add include_redundant_members filter option & make it work * remove stale todo * add tests for _get_some_state_from_cache * incorporate review | ||||
* | | | | | | | | | | | | Merge pull request #3613 from matrix-org/rav/stop_using_event_edges_room_id | Richard van der Hoff | 2018-07-26 | 2 | -8/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | Remove some redundant joins on event_edges.room_id | ||||
| * | | | | | | | | | | | Remove some redundant joins on event_edges.room_id | Richard van der Hoff | 2018-07-26 | 2 | -8/+6 |
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We've long passed the point where it's possible to have the same event_id in different tables, so these join conditions are redundant: we can just join on event_id. event_edges is of non-trivial size, and the room_id column is wasteful, so let's stop reading from it. In future, we can stop writing to it, and then drop it. | ||||
* | | | | | | | | | | | Merge pull request #3610 from matrix-org/rav/fix_looping_calls | Richard van der Hoff | 2018-07-26 | 12 | -15/+23 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | Fix some looping_call calls which were broken in #3604 | ||||
| * | | | | | | | | | | Fix some looping_call calls which were broken in #3604 | Richard van der Hoff | 2018-07-26 | 12 | -15/+23 |
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that looping_call does check the deferred returned by its callback, and (at least in the case of client_ips), we were relying on this, and I broke it in #3604. Update run_as_background_process to return the deferred, and make sure we return it to clock.looping_call. | ||||
* / | | | | | | | | | comment on event_edges | Richard van der Hoff | 2018-07-26 | 1 | -1/+2 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge pull request #2970 from matrix-org/matthew/filter_members | Matthew Hodgson | 2018-07-26 | 3 | -62/+212 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Implement the lazy_load_members room state filter parameter | ||||
| * | | | | | | | | | switch missing_types to be a bool | Matthew Hodgson | 2018-07-25 | 1 | -4/+4 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-25 | 23 | -231/+349 |
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | incorporate more review. | Matthew Hodgson | 2018-07-25 | 1 | -16/+14 |
| | | | | | | | | | | |||||
| * | | | | | | | | | handle the edge case for _get_some_state_from_cache where types is [] | Matthew Hodgson | 2018-07-24 | 1 | -1/+7 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-24 | 1 | -12/+4 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | clarify comment on p_ids | Matthew Hodgson | 2018-07-24 | 1 | -1/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | consider non-filter_type types as wildcards, thus missing from the ↵ | Matthew Hodgson | 2018-07-24 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | state-group-cache | ||||
| * | | | | | | | | | | rather than adding ll_ids, remove them from p_ids | Matthew Hodgson | 2018-07-24 | 1 | -5/+6 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-24 | 13 | -316/+409 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | incorporate more review | Matthew Hodgson | 2018-07-24 | 2 | -30/+18 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | handle case where types is [] on postgres correctly | Matthew Hodgson | 2018-07-23 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-23 | 25 | -274/+646 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | incorporate review | Matthew Hodgson | 2018-07-23 | 2 | -52/+35 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | fix thinkos; unbreak tests | Matthew Hodgson | 2018-07-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | incorporate review | Matthew Hodgson | 2018-07-19 | 2 | -20/+31 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | add a filtered_types param to limit filtering to specific types | Matthew Hodgson | 2018-07-19 | 2 | -82/+96 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | merge develop pydoc for _get_state_for_groups | Matthew Hodgson | 2018-07-19 | 271 | -2455/+3532 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-06-10 | 20 | -124/+176 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-06-04 | 54 | -166/+398 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | more comments | Matthew Hodgson | 2018-06-04 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | add lazy_load_members to the filter json schema | Matthew Hodgson | 2018-05-29 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | pep8 | Matthew Hodgson | 2018-05-29 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | disable CPUMetrics if no /proc/self/stat | Matthew Hodgson | 2018-05-29 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes build on macOS again | ||||
| * | | | | | | | | | | | | | | | add pydoc | Matthew Hodgson | 2018-05-29 | 2 | -27/+67 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | merge develop | Matthew Hodgson | 2018-05-29 | 186 | -2989/+5608 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | make lazy_load_members configurable in filters | Matthew Hodgson | 2018-03-19 | 2 | -9/+15 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | reshuffle todo & comments | Matthew Hodgson | 2018-03-19 | 1 | -2/+10 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | only get member state IDs for incremental syncs if we're filtering | Matthew Hodgson | 2018-03-18 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | remove stale import | Matthew Hodgson | 2018-03-16 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | remove debug | Matthew Hodgson | 2018-03-16 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | fix tsm search again | Matthew Hodgson | 2018-03-16 | 1 | -5/+4 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | add state_ids for timeline entries | Matthew Hodgson | 2018-03-16 | 1 | -4/+14 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | simplify timeline_start_members | Matthew Hodgson | 2018-03-16 | 1 | -14/+13 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Replace some ujson with simplejson to make it work | Erik Johnston | 2018-03-16 | 4 | -4/+5 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | make incr syncs work | Matthew Hodgson | 2018-03-16 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-03-14 | 10 | -144/+711 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | pep8 | Matthew Hodgson | 2018-03-14 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | add copyright to nudge CI | Matthew Hodgson | 2018-03-14 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | oops | Matthew Hodgson | 2018-03-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | make it work | Matthew Hodgson | 2018-03-13 | 2 | -7/+9 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | remove comment now #2969 is fixed | Matthew Hodgson | 2018-03-13 | 1 | -6/+0 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | merge proper fix to bug 2969 | Matthew Hodgson | 2018-03-13 | 34 | -301/+515 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | typoe | Matthew Hodgson | 2018-03-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | disable optimisation for searching for state groups | Matthew Hodgson | 2018-03-13 | 1 | -3/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when type filter includes wildcards on state_key |