Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | make FederationHandler.send_invite async | Richard van der Hoff | 2020-02-03 | 1 | -3/+2 |
| | |||||
* | s/get_room_version/get_room_version_id/ | Richard van der Hoff | 2020-01-31 | 1 | -3/+5 |
| | | | | | ... to make way for a forthcoming get_room_version which returns a RoomVersion object. | ||||
* | Pass room version object into event_auth.check and check_redaction (#6788) | Richard van der Hoff | 2020-01-28 | 1 | -2/+6 |
| | | | | | | | These are easier to work with than the strings and we normally have one around. This fixes `FederationHander._persist_auth_tree` which was passing a RoomVersion object into event_auth.check instead of a string. | ||||
* | Remove unused hashes and depths from create_event params | Richard van der Hoff | 2020-01-06 | 1 | -16/+5 |
| | |||||
* | Remove unused hashes and depths from create_new_client_event params | Richard van der Hoff | 2020-01-06 | 1 | -12/+14 |
| | |||||
* | replace get_prev_events_and_hashes_for_room with get_prev_events_for_room in ↵ | Richard van der Hoff | 2020-01-06 | 1 | -9/+3 |
| | | | | create_new_client_event | ||||
* | rename get_prev_events_for_room to get_prev_events_and_hashes_for_room | Richard van der Hoff | 2020-01-06 | 1 | -2/+4 |
| | | | | ... to make way for a new method which just returns the event ids | ||||
* | Change EventContext to use the Storage class (#6564) | Erik Johnston | 2019-12-20 | 1 | -5/+5 |
| | |||||
* | Prevent redacted events from appearing in message search (#6377) | Andrew Morgan | 2019-12-11 | 1 | -2/+3 |
| | |||||
* | Pull out room_invite_state_types config option once. | Erik Johnston | 2019-12-09 | 1 | -1/+3 |
| | | | | Pulling things out of config is currently surprisingly expensive. | ||||
* | Add ephemeral messages support (MSC2228) (#6409) | Brendan Abolivier | 2019-12-03 | 1 | -1/+122 |
| | | | | | | | | Implement part [MSC2228](https://github.com/matrix-org/matrix-doc/pull/2228). The parts that differ are: * the feature is hidden behind a configuration flag (`enable_ephemeral_messages`) * self-destruction doesn't happen for state events * only implement support for the `m.self_destruct_after` field (not the `m.self_destruct` one) * doesn't send synthetic redactions to clients because for this specific case we consider the clients to be able to destroy an event themselves, instead we just censor it (by pruning its JSON) in the database | ||||
* | Discard retention policies when retrieving state | Brendan Abolivier | 2019-11-28 | 1 | -1/+1 |
| | | | | | | | | Purge jobs don't delete the latest event in a room in order to keep the forward extremity and not break the room. On the other hand, get_state_events, when given an at_token argument calls filter_events_for_client to know if the user can see the event that matches that (sync) token. That function uses the retention policies of the events it's given to filter out those that are too old from a client's view. Some clients, such as Riot, when loading a room, request the list of members for the latest sync token it knows about, and get confused to the point of refusing to send any message if the server tells it that it can't get that information. This can happen very easily with the message retention feature turned on and a room with low activity so that the last event sent becomes too old according to the room's retention policy. An easy and clean fix for that issue is to discard the room's retention policies when retrieving state. | ||||
* | Implement per-room message retention policies | Brendan Abolivier | 2019-11-04 | 1 | -2/+2 |
| | |||||
* | Update black to 19.10b0 (#6304) | Amber Brown | 2019-11-01 | 1 | -6/+8 |
| | | | * update version of black and also fix the mypy config being overridden | ||||
* | Merge pull request #6294 from matrix-org/erikj/add_state_storage | Erik Johnston | 2019-10-31 | 1 | -4/+6 |
|\ | | | | | Add StateGroupStorage interface | ||||
| * | Port to use state storage | Erik Johnston | 2019-10-30 | 1 | -4/+6 |
| | | |||||
* | | Remove usage of deprecated logger.warn method from codebase (#6271) | Andrew Morgan | 2019-10-31 | 1 | -1/+1 |
|/ | | | Replace every instance of `logger.warn` with `logger.warning` as the former is deprecated. | ||||
* | Use new EventPersistenceStore | Erik Johnston | 2019-10-23 | 1 | -1/+2 |
| | |||||
* | Fix dummy event insertion consent bug (#6053) | Neil Johnson | 2019-09-26 | 1 | -27/+72 |
| | | | Fixes #5905 | ||||
* | Fix comments | Erik Johnston | 2019-09-11 | 1 | -1/+1 |
| | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | ||||
* | Fix how we check for self redaction | Erik Johnston | 2019-09-11 | 1 | -4/+18 |
| | |||||
* | Allow use of different ratelimits for admin redactions. | Erik Johnston | 2019-09-11 | 1 | -1/+7 |
| | | | | | This is useful to allow room admins to quickly deal with a large number of abusive messages. | ||||
* | Apply suggestions from code review | Will Hunt | 2019-08-23 | 1 | -2/+2 |
| | | | Co-Authored-By: Erik Johnston <erik@matrix.org> | ||||
* | Exempt bot users | Half-Shot | 2019-08-23 | 1 | -1/+1 |
| | |||||
* | Return user_type in get_user_by_id | Half-Shot | 2019-08-23 | 1 | -1/+4 |
| | |||||
* | Deny redaction of events in a different room. | Erik Johnston | 2019-07-31 | 1 | -1/+3 |
| | | | | | We already correctly filter out such redactions, but we should also deny them over the CS API. | ||||
* | Stop trying to fetch events with event_id=None. (#5753) | Richard van der Hoff | 2019-07-24 | 1 | -1/+7 |
| | | | | | | | `None` is not a valid event id, so queuing up a database fetch for it seems like a silly thing to do. I considered making `get_event` return `None` if `event_id is None`, but then its interaction with `allow_none` seemed uninituitive, and strong typing ftw. | ||||
* | Replace returnValue with return (#5736) | Amber Brown | 2019-07-23 | 1 | -17/+15 |
| | |||||
* | Ignore redactions of m.room.create events (#5701) | Richard van der Hoff | 2019-07-17 | 1 | -9/+24 |
| | |||||
* | Move logging utilities out of the side drawer of util/ and into logging/ (#5606) | Amber Brown | 2019-07-04 | 1 | -1/+1 |
| | |||||
* | Run Black. (#5482) | Amber Brown | 2019-06-20 | 1 | -158/+100 |
| | |||||
* | Run as background process and fix comments | Erik Johnston | 2019-06-19 | 1 | -2/+5 |
| | |||||
* | Add experimental option to reduce extremities. | Erik Johnston | 2019-06-18 | 1 | -1/+71 |
| | | | | | | | Adds new config option `cleanup_extremities_with_dummy_events` which periodically sends dummy events to rooms with more than 10 extremities. THIS IS REALLY EXPERIMENTAL. | ||||
* | Add plugin APIs for implementations of custom event rules. | Brendan Abolivier | 2019-06-14 | 1 | -2/+12 |
| | |||||
* | Merge pull request #5220 from matrix-org/erikj/dont_bundle_live_events | Erik Johnston | 2019-05-24 | 1 | -0/+3 |
|\ | | | | | Don't bundle aggregations with events in /sync or /events or state queries | ||||
| * | Don't bundle aggs for /state and /members etc APIs | Erik Johnston | 2019-05-24 | 1 | -0/+3 |
| | | |||||
* | | Fix words | Erik Johnston | 2019-05-21 | 1 | -3/+3 |
| | | |||||
* | | Block attempts to annotate the same event twice | Erik Johnston | 2019-05-20 | 1 | -1/+15 |
|/ | |||||
* | Allow client event serialization to be async | Erik Johnston | 2019-05-14 | 1 | -3/+4 |
| | |||||
* | Do checks on aliases for incoming m.room.aliases events (#5128) | Brendan Abolivier | 2019-05-08 | 1 | -0/+30 |
| | | | | | 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. | ||||
* | Fix grammar and document get_current_users_in_room (#4998) | Andrew Morgan | 2019-04-03 | 1 | -1/+1 |
| | |||||
* | Collect room-version variations into one place (#4969) | Richard van der Hoff | 2019-04-01 | 1 | -2/+5 |
| | | | | 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. | ||||
* | Revert spurious delete | Erik Johnston | 2019-03-20 | 1 | -0/+4 |
| | |||||
* | Use flags | Erik Johnston | 2019-03-20 | 1 | -13/+5 |
| | |||||
* | Move requester check into assert_accepted_privacy_policy | Erik Johnston | 2019-03-20 | 1 | -5/+8 |
| | |||||
* | Only require consent for events with an associated request | Erik Johnston | 2019-03-20 | 1 | -1/+5 |
| | | | | | | | | | There are a number of instances where a server or admin may puppet a user to join/leave rooms, which we don't want to fail if the user has not consented to the privacy policy. We fix this by adding a check to test if the requester has an associated access_token, which is used as a proxy to answer the question of whether the action is being done on behalf of a real request from the user. | ||||
* | fix test_auto_create_auto_join_where_no_consent (#4886) | Neil Johnson | 2019-03-19 | 1 | -3/+10 |
| | |||||
* | Fix incorrect log about not persisting duplicate state event. (#4776) | Richard van der Hoff | 2019-03-01 | 1 | -3/+4 |
| | | | We were logging this when it was not true. | ||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-01-29 | 1 | -28/+6 |
|\ | | | | | | | erikj/redactions_eiah | ||||
| * | Correctly set context.app_service | Erik Johnston | 2019-01-29 | 1 | -0/+2 |
| | | |||||
| * | Refactor event building into EventBuilder | Erik Johnston | 2019-01-29 | 1 | -29/+5 |
| | | | | | | | | | | This is so that everything is done in one place, making it easier to change the event format based on room version | ||||
* | | Implement rechecking of redactions | Erik Johnston | 2019-01-29 | 1 | -1/+5 |
|/ | |||||
* | Merge pull request #4494 from matrix-org/erikj/fixup_event_validator | Erik Johnston | 2019-01-29 | 1 | -1/+3 |
|\ | | | | | Split up event validation between event and builder | ||||
| * | Split up event validation between event and builder | Erik Johnston | 2019-01-28 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | The validator was being run on the EventBuilder objects, and so the validator only checked a subset of fields. With the upcoming EventBuilder refactor even fewer fields will be there to validate. To get around this we split the validation into those that can be run against an EventBuilder and those run against a fully fledged event. | ||||
* | | Correctly use default room version if none is set | Erik Johnston | 2019-01-28 | 1 | -2/+2 |
| | | |||||
* | | Pass through room version to event auth | Erik Johnston | 2019-01-25 | 1 | -1/+6 |
|/ | |||||
* | Require event format version to parse or create events | Erik Johnston | 2019-01-25 | 1 | -1/+9 |
| | |||||
* | Revert "Require event format version to parse or create events" | Erik Johnston | 2019-01-25 | 1 | -9/+1 |
| | |||||
* | Require event format version to parse or create events | Erik Johnston | 2019-01-23 | 1 | -1/+9 |
| | |||||
* | Log some bits about event creation (#4121) | Richard van der Hoff | 2018-10-31 | 1 | -0/+3 |
| | | | | I found these helpful in debugging my room upgrade tests. | ||||
* | Refactor state group lookup to reduce DB hits (#4011) | Erik Johnston | 2018-10-25 | 1 | -12/+8 |
| | | | | | | | | Currently when fetching state groups from the data store we make two hits two the database: once for members and once for non-members (unless request is filtered to one or the other). This adds needless load to the datbase, so this PR refactors the lookup to make only a single database hit. | ||||
* | Remove redundant run_as_background_process() from pusherpool | Richard van der Hoff | 2018-10-22 | 1 | -1/+1 |
| | | | | | | | `on_new_notifications` and `on_new_receipts` in `HttpPusher` and `EmailPusher` now always return synchronously, so we can remove the `defer.gatherResults` on their results, and the `run_as_background_process` wrappers can be removed too because the PusherPool methods will now complete quickly enough. | ||||
* | Avoid reraise, to improve stacktraces | Richard van der Hoff | 2018-10-01 | 1 | -12/+13 |
| | |||||
* | Merge pull request #3710 from matrix-org/rav/logcontext_for_pusher_updates | Richard van der Hoff | 2018-08-17 | 1 | -5/+2 |
|\ | | | | | Fix logcontexts for running pushers | ||||
| * | Fix logcontexts for running pushers | Richard van der Hoff | 2018-08-17 | 1 | -5/+2 |
| | | | | | | | | | | | | | | First of all, avoid resetting the logcontext before running the pushers, to fix the "Starting db txn 'get_all_updated_receipts' from sentinel context" warning. Instead, give them their own "background process" logcontexts. | ||||
* | | block event creation and room creation on hitting resource limits | Neil Johnson | 2018-08-16 | 1 | -1/+5 |
|/ | |||||
* | speed up /members and add at= and membership params (#3568) | Matthew Hodgson | 2018-08-15 | 1 | -12/+76 |
| | |||||
* | Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678) | Amber Brown | 2018-08-10 | 1 | -1/+1 |
| | |||||
* | Use new helper base class for ReplicationSendEventRestServlet | Erik Johnston | 2018-07-31 | 1 | -7/+4 |
| | |||||
* | Merge branch 'develop' into erikj/client_apis_move | Erik Johnston | 2018-07-24 | 1 | -12/+19 |
|\ | |||||
| * | Fix missing attributes on workers. | Erik Johnston | 2018-07-23 | 1 | -2/+3 |
| | | | | | | | | | | This was missed during the transition from attribute to getter for getting state from context. | ||||
| * | Use new getters | Erik Johnston | 2018-07-23 | 1 | -10/+16 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-07-23 | 1 | -2/+2 |
|\| | | | | | | | erikj/client_apis_move | ||||
| * | Combine Limiter and Linearizer | Richard van der Hoff | 2018-07-20 | 1 | -2/+2 |
| | | | | | | | | | | Linearizer was effectively a Limiter with max_count=1, so rather than maintaining two sets of code, let's combine them. | ||||
| * | Improvements to the Limiter | Richard van der Hoff | 2018-07-20 | 1 | -1/+1 |
| | | | | | | | | | | * give them names, to improve logging * use a deque rather than a list for efficiency | ||||
* | | Move PaginationHandler to its own file | Erik Johnston | 2018-07-20 | 1 | -240/+2 |
| | | |||||
* | | Move check_in_room_or_world_readable to Auth | Erik Johnston | 2018-07-20 | 1 | -34/+6 |
| | | |||||
* | | Split MessageHandler into read only and writers | Erik Johnston | 2018-07-18 | 1 | -131/+150 |
|/ | | | | | This will let us call the read only parts from workers, and so be able to move some APIs off of master, e.g. the `/state` API. | ||||
* | s/becuase/because/g | Matthew Hodgson | 2018-07-10 | 1 | -1/+1 |
| | |||||
* | run isort | Amber Brown | 2018-07-09 | 1 | -13/+10 |
| | |||||
* | Attempt to be more performant on PyPy (#3462) | Amber Brown | 2018-06-28 | 1 | -3/+2 |
| | |||||
* | allow non-consented users to still part rooms (to let us autopart them) | Matthew Hodgson | 2018-06-25 | 1 | -2/+6 |
| | |||||
* | Remove all global reactor imports & pass it around explicitly (#3424) | Amber Brown | 2018-06-25 | 1 | -2/+2 |
| | |||||
* | Pass around the reactor explicitly (#3385) | Amber Brown | 2018-06-22 | 1 | -0/+1 |
| | |||||
* | Remove run_on_reactor (#3395) | Amber Brown | 2018-06-14 | 1 | -3/+1 |
| | |||||
* | Exempt AS-registered users from doing gdpr | Richard van der Hoff | 2018-05-29 | 1 | -0/+3 |
| | |||||
* | Misc. py3 fixes | Adrian Tschira | 2018-05-24 | 1 | -4/+5 |
| | | | | Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
* | Merge branch 'release-v0.30.0' into rav/localpart_in_consent_uri | Richard van der Hoff | 2018-05-23 | 1 | -1/+4 |
|\ | |||||
| * | Support for putting %(consent_uri)s in messages | Richard van der Hoff | 2018-05-23 | 1 | -1/+4 |
| | | | | | | | | | | Make it possible to put the URI in the error message and the server notice that get sent by the server | ||||
* | | Use the localpart in the consent uri | Richard van der Hoff | 2018-05-23 | 1 | -1/+3 |
|/ | | | | ... because it's shorter. | ||||
* | Reject attempts to send event before privacy consent is given | Richard van der Hoff | 2018-05-22 | 1 | -1/+85 |
| | | | | | | Returns an M_CONSENT_NOT_GIVEN error (cf https://github.com/matrix-org/matrix-doc/issues/1252) if consent is not yet given. | ||||
* | Make purge_history operate on tokens | Erik Johnston | 2018-05-15 | 1 | -6/+6 |
| | | | | As we're soon going to change how topological_ordering works | ||||
* | Merge branch 'release-v0.28.1' into develop | Richard van der Hoff | 2018-05-01 | 1 | -1/+5 |
|\ | |||||
| * | Apply some limits to depth to counter abuse | Richard van der Hoff | 2018-05-01 | 1 | -1/+5 |
| | | | | | | | | | | | | | | * When creating a new event, cap its depth to 2^63 - 1 * When receiving events, reject any without a sensible depth As per https://docs.google.com/document/d/1I3fi2S-XnpO45qrpCsowZv8P8dHcNZ4fsBsbOW7KABI | ||||
* | | pep8; remove spurious import | Richard van der Hoff | 2018-04-27 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/develop' into rav/use_run_in_background | Richard van der Hoff | 2018-04-27 | 1 | -13/+30 |
|\ \ | |||||
| * \ | Merge pull request #3142 from matrix-org/rav/reraise | Richard van der Hoff | 2018-04-27 | 1 | -7/+14 |
| |\ \ | | | | | | | | | reraise exceptions more carefully | ||||
| | * | | reraise exceptions more carefully | Richard van der Hoff | 2018-04-27 | 1 | -7/+14 |
| | |/ | | | | | | | | | | | | | | | | | | | We need to be careful (under python 2, at least) that when we reraise an exception after doing some error handling, we actually reraise the original exception rather than anything that might have been raised (and handled) during the error handling. | ||||
| * / | Improve exception handling for background processes | Richard van der Hoff | 2018-04-27 | 1 | -6/+16 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were a bunch of places where we fire off a process to happen in the background, but don't have any exception handling on it - instead relying on the unhandled error being logged when the relevent deferred gets garbage-collected. This is unsatisfactory for a number of reasons: - logging on garbage collection is best-effort and may happen some time after the error, if at all - it can be hard to figure out where the error actually happened. - it is logged as a scary CRITICAL error which (a) I always forget to grep for and (b) it's not really CRITICAL if a background process we don't care about fails. So this is an attempt to add exception handling to everything we fire off into the background. | ||||
* / | Use run_in_background in preference to preserve_fn | Richard van der Hoff | 2018-04-27 | 1 | -2/+3 |
|/ | | | | | | While I was going through uses of preserve_fn for other PRs, I converted places which only use the wrapped function once to use run_in_background, to avoid creating the function object. | ||||
* | Avoid creating events with huge numbers of prev_events | Richard van der Hoff | 2018-04-16 | 1 | -34/+44 |
| | | | | | | In most cases, we limit the number of prev_events for a given event to 10 events. This fixes a particular code path which created events with huge numbers of prev_events. | ||||
* | Note why we're limiting concurrent event sends | Erik Johnston | 2018-04-10 | 1 | -0/+5 |
| | |||||
* | Limit concurrent event sends for a room | Erik Johnston | 2018-04-09 | 1 | -49/+50 |
| | |||||
* | Use static JSONEncoders | Richard van der Hoff | 2018-03-29 | 1 | -2/+2 |
| | | | | | using json.dumps with custom options requires us to create a new JSONEncoder on each call. It's more efficient to create one upfront and reuse it. | ||||
* | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2018-03-19 | 1 | -3/+3 |
|\ | |||||
| * | Replace ujson with simplejson | Erik Johnston | 2018-03-15 | 1 | -3/+3 |
| | | |||||
* | | extra_users is actually a list of UserIDs | Erik Johnston | 2018-03-13 | 1 | -1/+1 |
| | | |||||
* | | Add transactional API to history purge | Richard van der Hoff | 2018-03-12 | 1 | -5/+99 |
| | | | | | | | | Make the purge request return quickly, and allow scripts to poll for updates. | ||||
* | | Return an error when doing two purges on a room | Richard van der Hoff | 2018-03-12 | 1 | -3/+14 |
| | | | | | | | | Queuing up purges doesn't sound like a good thing. | ||||
* | | Provide a means to pass a timestamp to purge_history | Richard van der Hoff | 2018-03-05 | 1 | -9/+5 |
| | | |||||
* | | Check event auth on the worker | Erik Johnston | 2018-03-01 | 1 | -16/+16 |
| | | |||||
* | | Correctly send ratelimit and extra_users params | Erik Johnston | 2018-03-01 | 1 | -0/+2 |
| | | |||||
* | | Fixup comments | Erik Johnston | 2018-03-01 | 1 | -4/+4 |
| | | |||||
* | | Calculate push actions on worker | Erik Johnston | 2018-02-28 | 1 | -25/+61 |
| | | |||||
* | | Ensure that we delete staging push actions on errors | Erik Johnston | 2018-02-15 | 1 | -3/+9 |
| | | |||||
* | | Merge pull request #2854 from matrix-org/erikj/event_create_worker | Erik Johnston | 2018-02-13 | 1 | -6/+22 |
|\ \ | | | | | | | Create a worker for event creation | ||||
| * | | Move presence handling into handle_new_client_event | Erik Johnston | 2018-02-07 | 1 | -6/+6 |
| | | | | | | | | | | | | As we want to have it run on the main synapse instance | ||||
| * | | Add replication http endpoint for event sending | Erik Johnston | 2018-02-07 | 1 | -0/+16 |
| | | | |||||
* | | | Merge pull request #2858 from matrix-org/rav/purge_updates | Richard van der Hoff | 2018-02-09 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | delete_local_events for purge_room_history | ||||
| * | | delete_local_events for purge_history | Richard van der Hoff | 2018-02-09 | 1 | -2/+2 |
| | | | | | | | | | | | | Add a flag which makes the purger delete local events | ||||
| * | | rename delete_old_state -> purge_history | Richard van der Hoff | 2018-02-09 | 1 | -1/+1 |
| |/ | | | | | | | (beacause it deletes more than state) | ||||
* | | Remove pointless ratelimit check | Erik Johnston | 2018-02-07 | 1 | -5/+0 |
| | | | | | | | | | | | | The intention was for the check to be called as early as possible in the request, but actually was called just before the main ratelimit check, so was fairly pointless. | ||||
* | | Update copyright | Erik Johnston | 2018-02-06 | 1 | -1/+1 |
| | | |||||
* | | s/_create_new_client_event/create_new_client_event/ | Erik Johnston | 2018-02-06 | 1 | -3/+3 |
| | | |||||
* | | Split event creation into a separate handler | Erik Johnston | 2018-02-05 | 1 | -146/+160 |
|/ | |||||
* | replace 'except:' with 'except Exception:' | Richard van der Hoff | 2017-10-23 | 1 | -1/+1 |
| | | | | what could possibly go wrong | ||||
* | fix isinstance | David Baker | 2017-10-11 | 1 | -1/+1 |
| | |||||
* | Allow error strings from spam checker | David Baker | 2017-10-11 | 1 | -2/+6 |
| | |||||
* | Merge pull request #2466 from matrix-org/erikj/groups_merged | Erik Johnston | 2017-10-11 | 1 | -1/+2 |
|\ | | | | | Initial Group Implementation | ||||
| * | Merge branch 'develop' into erikj/groups_merged | David Baker | 2017-10-02 | 1 | -1/+53 |
| |\ | |||||
| * | | Split out profile handler to fix tests | Erik Johnston | 2017-08-25 | 1 | -1/+2 |
| | | | |||||
* | | | Merge pull request #2483 from jeremycline/unfreeze-ujson-dump | Erik Johnston | 2017-10-11 | 1 | -1/+2 |
|\ \ \ | |_|/ |/| | | Unfreeze event before serializing with ujson | ||||
| * | | Unfreeze event before serializing with ujson | Jeremy Cline | 2017-09-30 | 1 | -1/+2 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In newer versions of https://github.com/esnme/ultrajson, ujson does not serialize frozendicts (introduced in esnme/ultrajson@53f85b1). Although the PyPI version is still 1.35, Fedora ships with a build from commit esnme/ultrajson@2f1d487. This causes the serialization to fail if the distribution-provided package is used. This runs the event through the unfreeze utility before serializing it. Thanks to @ignatenkobrain for tracking down the root cause. fixes #2351 Signed-off-by: Jeremy Cline <jeremy@jcline.org> | ||||
* | | Fix /joined_members to work with AS users | Erik Johnston | 2017-09-28 | 1 | -11/+25 |
| | | |||||
* | | Fix bug where /joined_members didn't check user was in room | Erik Johnston | 2017-09-27 | 1 | -0/+31 |
| | | |||||
* | | Make the spam checker a module | David Baker | 2017-09-26 | 1 | -2/+3 |
| | | |||||
* | | PoC for filtering spammy events (#2456) | Richard van der Hoff | 2017-09-19 | 1 | -1/+7 |
|/ | | | Demonstration of how you might add some hooks to filter out spammy events. | ||||
* | Fix bug where pusherpool didn't start and broke some rooms | Erik Johnston | 2017-07-06 | 1 | -1/+3 |
| | | | | | | | | Since we didn't instansiate the PusherPool at start time it could fail at run time, which it did for some users. This may or may not fix things for those users, but it should happen at start time and stop the server from starting. | ||||
* | Remove unused variables | Erik Johnston | 2017-06-26 | 1 | -1/+1 |
| | |||||
* | Reject local events that don't round trip the DB | Erik Johnston | 2017-06-19 | 1 | -0/+9 |
| | |||||
* | Store ActionGenerator in HomeServer | Erik Johnston | 2017-05-19 | 1 | -2/+1 |
| | |||||
* | Faster push rule calculation via push specific cache | Erik Johnston | 2017-05-17 | 1 | -2/+3 |
| | | | | | We add a push rule specific cache that ensures that we can reuse calculated push rules appropriately when a user join/leaves. | ||||
* | Add per user ratelimiting overrides | Erik Johnston | 2017-05-10 | 1 | -13/+3 |
| | |||||
* | Add more granular event send metrics | Erik Johnston | 2017-05-02 | 1 | -2/+8 |
| | |||||
* | Fix invite state to always include all events | Erik Johnston | 2017-04-26 | 1 | -6/+3 |
| | |||||
* | Remove spurious yield | Richard van der Hoff | 2017-04-03 | 1 | -1/+1 |
| | | | | | In `MessageHandler`, remove `yield` on call to `Notifier.on_new_room_event`: it doesn't return anything anyway. | ||||
* | Don't clobber a displayname or avatar_url if provided by an m.room.member event | Paul "LeoNerd" Evans | 2017-01-24 | 1 | -2/+4 |
| | |||||
* | Comment | Erik Johnston | 2017-01-10 | 1 | -0/+2 |
| | |||||
* | Don't block messages sending on bumping presence | Erik Johnston | 2017-01-10 | 1 | -1/+1 |
| | |||||
* | Merge pull request #1620 from matrix-org/erikj/concurrent_room_access | Erik Johnston | 2016-12-12 | 1 | -27/+33 |
|\ | | | | | Limit the number of events that can be created on a given room concurrently | ||||
| * | Comments | Erik Johnston | 2016-11-11 | 1 | -0/+2 |
| | | |||||
| * | Limit the number of events that can be created on a given room concurretnly | Erik Johnston | 2016-11-10 | 1 | -27/+31 |
| | | |||||
* | | Handle sending events and device messages over federation | Erik Johnston | 2016-11-17 | 1 | -12/+1 |
|/ | |||||
* | Sample correctly | Erik Johnston | 2016-11-08 | 1 | -1/+3 |
| | |||||
* | Limit the number of prev_events of new events | Erik Johnston | 2016-11-08 | 1 | -0/+13 |
| | |||||
* | Fix incredubly slow back pagination query | Erik Johnston | 2016-10-24 | 1 | -2/+2 |
| | | | | | | | If a client didn't specify a from token when paginating backwards synapse would attempt to query the (global) maximum topological token. This a) doesn't make much sense since they're room specific and b) there are no indices that lets postgres do this efficiently. | ||||
* | Comment | Erik Johnston | 2016-10-19 | 1 | -0/+3 |
| | |||||
* | Check whether to ratelimit sooner to avoid work | Erik Johnston | 2016-10-19 | 1 | -1/+13 |
| | |||||
* | Support /initialSync in synchrotron worker | Erik Johnston | 2016-09-21 | 1 | -378/+3 |
| | |||||
* | Use get_joined_users_from_context instead of manually looking up hosts | Erik Johnston | 2016-09-05 | 1 | -38/+6 |
| | |||||
* | Correctly handle the difference between prev and current state | Erik Johnston | 2016-08-31 | 1 | -5/+5 |
| | |||||
* | Replace context.current_state with context.current_state_ids | Erik Johnston | 2016-08-25 | 1 | -22/+69 |
| | |||||
* | Preserve some logcontexts | Erik Johnston | 2016-08-24 | 1 | -15/+20 |
| | |||||
* | Add filter param to /messages API | Erik Johnston | 2016-07-14 | 1 | -4/+12 |
| | |||||
* | Add ReadWriteLock for pagination and history prune | Erik Johnston | 2016-07-05 | 1 | -34/+36 |
| | |||||
* | Add purge_history API | Erik Johnston | 2016-07-05 | 1 | -0/+13 |
| | |||||
* | Poke notifier on next reactor tick | Erik Johnston | 2016-06-03 | 1 | -4/+7 |
| | |||||
* | Merge pull request #787 from matrix-org/markjh/liberate_presence_handler | Mark Haines | 2016-05-17 | 1 | -2/+2 |
|\ | | | | | Move the presence handler out of the Handlers object | ||||
| * | Move the presence handler out of the Handlers object | Mark Haines | 2016-05-16 | 1 | -2/+2 |
| | | |||||
* | | Spell "domain" correctly | Mark Haines | 2016-05-16 | 1 | -2/+2 |
|/ | | | | s/domian/domain/g | ||||
* | move filter_events_for_client out of base handler | Mark Haines | 2016-05-11 | 1 | -8/+10 |
| | |||||
* | Shuffle when we get the signing_key attribute. | Mark Haines | 2016-05-11 | 1 | -2/+2 |
| | | | | | | | | Wait until we sign a message to get the signing key from the homeserver config. This means that the message handler can be created without having a signing key in the config which means that separate processes like the pusher that don't send messages and don't need to sign them can still access the handlers. | ||||
* | Move _create_new_client_event and handle_new_client_event out of base handler | Mark Haines | 2016-05-11 | 1 | -2/+197 |
| | |||||
* | Run filter_events_for_client | David Baker | 2016-04-27 | 1 | -4/+4 |
| | | | | so we don't accidentally mail out events people shouldn't see | ||||
* | Remove some unused functions (#711) | Mark Haines | 2016-04-08 | 1 | -29/+0 |
| | | | | | | | | * Remove some unused functions * get_room_events_stream is only used in tests * is_exclusive_room might actually be something we want | ||||
* | Call profile handler get_displayname directly rather than using ↵ | Mark Haines | 2016-04-07 | 1 | -9/+1 |
| | | | | collect_presencelike_data | ||||
* | Use computed prev event ids | Erik Johnston | 2016-04-01 | 1 | -1/+5 |
| | |||||
* | Add concurrently_execute function | Erik Johnston | 2016-04-01 | 1 | -8/+2 |
| | |||||
* | Merge pull request #618 from matrix-org/markjh/pushrule_stream | Mark Haines | 2016-03-04 | 1 | -2/+2 |
|\ | | | | | Add a stream for push rule updates | ||||
| * | Merge branch 'develop' into markjh/pushrule_stream | Mark Haines | 2016-03-04 | 1 | -3/+5 |
| |\ | |||||
| * | | Hook up the push rules to the notifier | Mark Haines | 2016-03-03 | 1 | -2/+2 |
| | | | |||||
* | | | Spelling | Erik Johnston | 2016-03-04 | 1 | -1/+1 |
| | | | |||||
* | | | Add profile information to invites | Erik Johnston | 2016-03-04 | 1 | -2/+15 |
| |/ |/| | |||||
* | | Pass whole requester to ratelimiting | Daniel Wagner-Hall | 2016-03-03 | 1 | -3/+5 |
|/ | | | | This will enable more detailed decisions | ||||
* | Merge pull request #582 from matrix-org/erikj/presence | Erik Johnston | 2016-02-19 | 1 | -11/+3 |
|\ | | | | | Rewrite presence for performance. | ||||
| * | Initial cut | Erik Johnston | 2016-02-17 | 1 | -11/+3 |
| | | |||||
* | | Review comments | Daniel Wagner-Hall | 2016-02-18 | 1 | -1/+1 |
| | | |||||
* | | Some cleanup | Daniel Wagner-Hall | 2016-02-16 | 1 | -4/+10 |
| | | |||||
* | | Branch off member and non member sends | Daniel Wagner-Hall | 2016-02-15 | 1 | -32/+34 |
| | | | | | | | | Unclean, needs tidy-up, but works | ||||
* | | Merge implementation of /join by alias or ID | Daniel Wagner-Hall | 2016-02-15 | 1 | -7/+13 |
|/ | | | | | This code is kind of rough (passing the remote servers down a long chain), but is a step towards improvement. | ||||
* | Allow paginating backwards from stream token | Erik Johnston | 2016-01-28 | 1 | -6/+9 |
| | |||||
* | Make it possible to paginate forwards from stream tokens | Richard van der Hoff | 2016-01-27 | 1 | -22/+21 |
| | | | | | In order that we can fill the gap after a /sync, make it possible to paginate forwards from a stream token. | ||||
* | Allow non-guests to peek on rooms using /events | Daniel Wagner-Hall | 2016-01-20 | 1 | -47/+46 |
| | |||||
* | Require unbanning before other membership changes | Daniel Wagner-Hall | 2016-01-15 | 1 | -12/+45 |
| | |||||
* | Skip, rather than erroring, invalid guest requests | Daniel Wagner-Hall | 2016-01-05 | 1 | -2/+2 |
| | | | | | | | | | | Erroring causes problems when people make illegal requests, because they don't know what limit parameter they should pass. This is definitely buggy. It leaks message counts for rooms people don't have permission to see, via tokens. But apparently we already consciously decided to allow that as a team, so this preserves that behaviour. | ||||
* | Move the doc string to the public facing method | Mark Haines | 2015-12-22 | 1 | -16/+17 |
| | |||||
* | Add a cache for initialSync responses that expires after 5 minutes | Mark Haines | 2015-12-22 | 1 | -1/+23 |
| | |||||
* | Make state updates in the C+S API idempotent | Mark Haines | 2015-12-02 | 1 | -0/+12 |
| | |||||
* | Fix typo in collect_presencelike_data | Mark Haines | 2015-12-02 | 1 | -1/+1 |
| | |||||
* | Wrap calls to distributor.fire in appropriately named functions so that ↵ | Mark Haines | 2015-12-01 | 1 | -4/+6 |
| | | | | static analysis can work out want is calling what | ||||
* | Add API for setting account_data globaly or on a per room basis | Mark Haines | 2015-12-01 | 1 | -6/+34 |
| | |||||
* | Merge pull request #375 from matrix-org/daniel/guestroominitialsync | Daniel Wagner-Hall | 2015-11-23 | 1 | -10/+15 |
|\ | | | | | Clean up room initialSync for guest users | ||||
| * | Clean up room initialSync for guest users | Daniel Wagner-Hall | 2015-11-13 | 1 | -10/+15 |
| | | |||||
* | | s/private_user_data/account_data/ | Mark Haines | 2015-11-18 | 1 | -6/+6 |
|/ | |||||
* | Merge pull request #367 from matrix-org/daniel/readafterleave | Daniel Wagner-Hall | 2015-11-12 | 1 | -10/+11 |
|\ | | | | | | | | | Merge pull request #367 from matrix-org/daniel/readafterleave Tweak guest access permissions | ||||
| * | Tweak guest access permissions | Daniel Wagner-Hall | 2015-11-12 | 1 | -10/+11 |
| | | | | | | | | | | | | * Allow world_readable rooms to be read by guests who have joined and left * Allow regular users to access world_readable rooms | ||||
* | | Merge pull request #360 from matrix-org/daniel/guestroominitialsync | Daniel Wagner-Hall | 2015-11-12 | 1 | -23/+32 |
|\ \ | |/ |/| | | | | | Merge pull request #360 from matrix-org/daniel/guestroominitialsync Allow guest access to room initialSync | ||||
| * | Allow guest access to room initialSync | Daniel Wagner-Hall | 2015-11-11 | 1 | -23/+32 |
| | | |||||
* | | Consider joined guest users as joined users | Daniel Wagner-Hall | 2015-11-12 | 1 | -12/+21 |
|/ | | | | | Otherwise they're inconveniently allowed to write events to the room but not to read them from the room. | ||||
* | Allow guest users to join and message rooms | Daniel Wagner-Hall | 2015-11-10 | 1 | -2/+2 |
| | |||||
* | Open up /events to anonymous users for room events only | Daniel Wagner-Hall | 2015-11-05 | 1 | -13/+34 |
| | | | | Squash-merge of PR #345 from daniel/anonymousevents | ||||
* | Allow guests to register and call /events?room_id= | Daniel Wagner-Hall | 2015-11-04 | 1 | -21/+25 |
| | | | | | | | This follows the same flows-based flow as regular registration, but as the only implemented flow has no requirements, it auto-succeeds. In the future, other flows (e.g. captcha) may be required, so clients should treat this like the regular registration flow choices. | ||||
* | Store room tag content and return the content in the m.tag event | Mark Haines | 2015-11-02 | 1 | -4/+2 |
| | |||||
* | Include tags in v1 room initial sync | Mark Haines | 2015-10-30 | 1 | -0/+11 |
| | |||||
* | Include room tags v1 /initialSync | Mark Haines | 2015-10-30 | 1 | -0/+12 |
| | |||||
* | Amalgamate _filter_events_for_client | Erik Johnston | 2015-10-16 | 1 | -50/+4 |
| | |||||
* | Remove unused room_id arg | Erik Johnston | 2015-10-14 | 1 | -5/+5 |
| | |||||
* | Add a flag to initial sync to indicate we want rooms that the user has left | Mark Haines | 2015-10-08 | 1 | -5/+8 |
| | |||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/invite_state | Erik Johnston | 2015-09-25 | 1 | -48/+158 |
|\ | |||||
| * | Clarify that room_initial_sync returns a python dict | Mark Haines | 2015-09-21 | 1 | -1/+1 |
| | | |||||
| * | Fix doc string to point at the right class | Mark Haines | 2015-09-21 | 1 | -2/+3 |
| | | |||||
| * | Add explicit "elif event.membership == Membership.LEAVE" for clarity | Mark Haines | 2015-09-21 | 1 | -1/+2 |
| | | |||||
| * | Clamp the "to" token for /rooms/{roomId}/messages to when the user left | Mark Haines | 2015-09-21 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | the room. There isn't a way for the client to learn a valid "to" token for a room that they have left in the C-S API but that doesn't stop a client making one up. | ||||
| * | Allow users to GET individual state events for rooms that they have left | Mark Haines | 2015-09-10 | 1 | -7/+13 |
| | | |||||
| * | Allow users that have left a room to get the messages that happend in the ↵ | Mark Haines | 2015-09-09 | 1 | -4/+27 |
| | | | | | | | | room before they left | ||||
| * | Remove undocumented and unimplemented 'feedback' parameter from the ↵ | Mark Haines | 2015-09-09 | 1 | -18/+3 |
| | | | | | | | | Client-Server API | ||||
| * | Allow rooms/{roomId}/state for a room that has been left | Mark Haines | 2015-09-09 | 1 | -5/+13 |
| | | |||||
| * | Allow room initialSync for users that have left the room, returning a ↵ | Mark Haines | 2015-09-09 | 1 | -9/+76 |
| | | | | | | | | snapshot of how the room was when they left it | ||||
| * | Include rooms that a user has left in an initialSync. Include the state and ↵ | Mark Haines | 2015-09-08 | 1 | -6/+21 |
| | | | | | | | | messages at the point they left the room | ||||
* | | Bundle in some room state in the unsigned bit of the invite when sending to ↵ | Erik Johnston | 2015-09-10 | 1 | -0/+4 |
|/ | | | | invited servers | ||||
* | Remove completely unused concepts from codebase | Daniel Wagner-Hall | 2015-08-25 | 1 | -6/+3 |
| | | | | | | | | | | Removes device_id and ClientInfo device_id is never actually written, and the matrix.org DB has no non-null entries for it. Right now, it's just cluttering up code. This doesn't remove the columns from the database, because that's fiddly. | ||||
* | Implement a batched presence_handler.get_state and use it | Erik Johnston | 2015-08-17 | 1 | -12/+6 |
| | |||||
* | Fix _filter_events_for_client | Erik Johnston | 2015-08-12 | 1 | -3/+1 |
| | |||||
* | Simplify staggered deferred lists | Erik Johnston | 2015-08-12 | 1 | -2/+2 |
| | |||||
* | Use list comprehension instead of filter | Erik Johnston | 2015-08-12 | 1 | -10/+3 |
| | |||||
* | Remove debug loggers | Erik Johnston | 2015-08-11 | 1 | -3/+0 |
| | |||||
* | Fix application of ACLs | Erik Johnston | 2015-08-11 | 1 | -4/+12 |
| | |||||
* | Don't be too enthusiatic with defer.gatherResults | Erik Johnston | 2015-08-07 | 1 | -4/+8 |
| | |||||
* | Speed up event filtering (for ACL) logic | Erik Johnston | 2015-08-04 | 1 | -1/+5 |
| | |||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts | Erik Johnston | 2015-07-13 | 1 | -1/+65 |
|\ | |||||
| * | Rename key and values for m.room.history_visibility. Support 'invited' value | Erik Johnston | 2015-07-06 | 1 | -4/+20 |
| | | |||||
| * | Make v1 initial syncs respect room history ACL | Erik Johnston | 2015-07-02 | 1 | -17/+34 |
| | | |||||
| * | Add basic impl for room history ACL on GET /messages client API | Erik Johnston | 2015-07-02 | 1 | -1/+32 |
| | | |||||
* | | Hook up receipts to v1 initialSync | Erik Johnston | 2015-07-08 | 1 | -3/+13 |
|/ | |||||
* | Use another deferred list | Erik Johnston | 2015-06-16 | 1 | -18/+27 |
| | |||||
* | Use DeferredList | Erik Johnston | 2015-06-16 | 1 | -9/+9 |
| | |||||
* | Don't do unecessary db ops in presence.get_state | Erik Johnston | 2015-06-16 | 1 | -0/+1 |
| | |||||
* | Merge pull request #144 from matrix-org/erikj/logging_context | Mark Haines | 2015-05-12 | 1 | -2/+3 |
|\ | | | | | Preserving logging contexts | ||||
| * | Unwrap defer.gatherResults failures | Erik Johnston | 2015-05-12 | 1 | -2/+3 |
| | | |||||
* | | Make get_current_token accept a direction parameter, which tells whether the ↵ | Erik Johnston | 2015-05-12 | 1 | -1/+3 |
| | | | | | | | | source whether we want a token for going 'forwards' or 'backwards' |