Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2847 from matrix-org/erikj/separate_event_creation | Erik Johnston | 2018-02-06 | 1 | -10/+9 |
|\ | | | | | Split event creation into a separate handler | ||||
| * | Update copyright | Erik Johnston | 2018-02-06 | 1 | -0/+1 |
| | | |||||
| * | s/_create_new_client_event/create_new_client_event/ | Erik Johnston | 2018-02-06 | 1 | -5/+5 |
| | | |||||
| * | Update places where we create events | Erik Johnston | 2018-02-05 | 1 | -10/+8 |
| | | |||||
* | | Store state groups separately from events (#2784) | Erik Johnston | 2018-02-06 | 1 | -7/+17 |
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Split state group persist into seperate storage func * Add per database engine code for state group id gen * Move store_state_group to StateReadStore This allows other workers to use it, and so resolve state. * Hook up store_state_group * Fix tests * Rename _store_mult_state_groups_txn * Rename StateGroupReadStore * Remove redundant _have_persisted_state_group_txn * Update comments * Comment compute_event_context * Set start val for state_group_id_seq ... otherwise we try to recreate old state groups * Update comments * Don't store state for outliers * Update comment * Update docstring as state groups are ints | ||||
* | Rename resolve_state_groups -> resolve_state_groups_for_events | Richard van der Hoff | 2018-02-01 | 1 | -6/+5 |
| | | | | (to make way for a method that actually just does the state group resolution) | ||||
* | Add federation_domain_whitelist option (#2820) | Matthew Hodgson | 2018-01-22 | 1 | -0/+4 |
| | | | | | | Add federation_domain_whitelist gives a way to restrict which domains your HS is allowed to federate with. useful mainly for gracefully preventing a private but internet-connected HS from trying to federate to the wider public Matrix network | ||||
* | s/items/iteritems/ | Richard van der Hoff | 2017-11-08 | 1 | -2/+2 |
| | |||||
* | Update deltas when doing auth resolution | Richard van der Hoff | 2017-11-07 | 1 | -3/+7 |
| | | | | | Fixes a bug where the persisted state groups were different to those actually being used after auth resolution. | ||||
* | factor out _update_context_for_auth_events | Richard van der Hoff | 2017-11-07 | 1 | -20/+42 |
| | | | | This is duplicated, so let's factor it out before fixing it | ||||
* | replace 'except:' with 'except Exception:' | Richard van der Hoff | 2017-10-23 | 1 | -8/+8 |
| | | | | what could possibly go wrong | ||||
* | Merge pull request #2490 from matrix-org/erikj/drop_left_room_events | Erik Johnston | 2017-10-10 | 1 | -0/+22 |
|\ | | | | | Ignore incoming events for rooms that we have left | ||||
| * | Update comments | Erik Johnston | 2017-10-03 | 1 | -1/+1 |
| | | |||||
| * | Remove spurious line feed | Erik Johnston | 2017-10-03 | 1 | -1/+0 |
| | | |||||
| * | Ignore incoming events for rooms that we have left | Erik Johnston | 2017-10-03 | 1 | -0/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When synapse receives an event for a room its not in over federation, it double checks with the remote server to see if it is in fact in the room. This is done so that if the server has forgotten about the room (usually as a result of the database being dropped) it can recover from it. However, in the presence of state resets in large rooms, this can cause a lot of work for servers that have legitimately left. As a hacky solution that supports both cases we drop incoming events for rooms that we have explicitly left. This means that we no longer support the case of servers having forgotten that they've rejoined a room, but that is sufficiently rare that we're not going to support it for now. | ||||
* | | Fix up deferred handling in federation.py | Richard van der Hoff | 2017-10-06 | 1 | -24/+21 |
| | | | | | | | | | | | | | | * Avoid preserve_context_over_deferred, which is broken * set consumeErrors=True on defer.gatherResults, to avoid spurious "unhandled failure" erros | ||||
* | | Spam checking: add the invitee to user_may_invite | David Baker | 2017-10-05 | 1 | -5/+7 |
| | | |||||
* | | pass room id too | David Baker | 2017-10-03 | 1 | -1/+1 |
| | | |||||
* | | Fix param name & lint | David Baker | 2017-10-03 | 1 | -2/+4 |
| | | |||||
* | | Allow spam checker to reject invites too | David Baker | 2017-10-03 | 1 | -0/+4 |
|/ | |||||
* | Add a config option to block all room invites (#2457) | Richard van der Hoff | 2017-09-19 | 1 | -0/+3 |
| | | | | | - allows sysadmins the ability to lock down their servers so that people can't send their users room invites. | ||||
* | add some comments to on_exchange_third_party_invite_request | Richard van der Hoff | 2017-09-19 | 1 | -0/+11 |
| | |||||
* | Fix overzealous kicking of guest users (#2453) | Richard van der Hoff | 2017-09-19 | 1 | -1/+1 |
| | | | We should only kick guest users if the guest access event is authorised. | ||||
* | Don't compute push actions for backfilled events | Erik Johnston | 2017-07-11 | 1 | -1/+1 |
| | |||||
* | Fix bug where pusherpool didn't start and broke some rooms | Erik Johnston | 2017-07-06 | 1 | -1/+2 |
| | | | | | | | | 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. | ||||
* | Improve the error handling for bad invites received over federation | Mark Haines | 2017-06-30 | 1 | -2/+17 |
| | |||||
* | Add shutdown room API | Erik Johnston | 2017-06-19 | 1 | -0/+4 |
| | |||||
* | Comment | Erik Johnston | 2017-06-09 | 1 | -0/+2 |
| | |||||
* | Mark remote invite rejections as outliers | Erik Johnston | 2017-06-09 | 1 | -0/+1 |
| | |||||
* | Only store event_auth for state events | Erik Johnston | 2017-05-24 | 1 | -6/+14 |
| | |||||
* | Store ActionGenerator in HomeServer | Erik Johnston | 2017-05-19 | 1 | -3/+2 |
| | |||||
* | Remove redundant reset of destination timers | Erik Johnston | 2017-05-05 | 1 | -7/+0 |
| | |||||
* | Merge together redundant calculations/logging | Erik Johnston | 2017-05-03 | 1 | -9/+2 |
| | |||||
* | Fixup | Erik Johnston | 2017-04-28 | 1 | -10/+4 |
| | |||||
* | Remove unncessary call in _get_missing_events_for_pdu | Erik Johnston | 2017-04-28 | 1 | -13/+11 |
| | |||||
* | Don't fetch state for missing events that we fetched | Erik Johnston | 2017-04-28 | 1 | -0/+6 |
| | |||||
* | Typo | Erik Johnston | 2017-04-27 | 1 | -1/+1 |
| | |||||
* | Add some extra logging for edge cases of federation | Erik Johnston | 2017-04-27 | 1 | -2/+22 |
| | |||||
* | Remove redundant try/except clauses | Richard van der Hoff | 2017-04-21 | 1 | -23/+11 |
| | | | | | | | | | | The `except SynapseError` clauses were pointless because the wrapped functions would never throw a `SynapseError` (they either throw a `CodeMessageException` or a `RuntimeError`). The `except CodeMessageException` is now also pointless because the caller treats all exceptions equally, so we may as well just throw the `CodeMessageException`. | ||||
* | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2017-04-11 | 1 | -4/+4 |
|\ | |||||
| * | When we do an invite rejection, save the signed leave event to the db | Richard van der Hoff | 2017-04-07 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | During a rejection of an invite received over federation, we ask a remote server to make us a `leave` event, then sign it, then send that with `send_leave`. We were saving the *unsigned* version of the event (which has a different event id to the signed version) to our db (and sending it to the clients), whereas other servers in the room will have seen the *signed* version. We're not aware of any actual problems that caused, except that it makes the database confusing to look at and generally leaves the room in a weird state. | ||||
* | | Merge pull request #2095 from matrix-org/rav/cull_log_preserves | Richard van der Hoff | 2017-04-03 | 1 | -24/+19 |
|\ \ | |/ |/| | Cull spurious PreserveLoggingContexts | ||||
| * | Remove more spurious `PreserveLoggingContext`s | Richard van der Hoff | 2017-04-03 | 1 | -24/+19 |
| | | | | | | | | | | Remove `PreserveLoggingContext` around calls to `Notifier.on_new_room_event`; there is no problem if the logcontext is set when calling it. | ||||
* | | Accept join events from all servers | Richard van der Hoff | 2017-04-03 | 1 | -3/+13 |
|/ | | | | | | | Make sure that we accept join events from any server, rather than just the origin server, to make the federation join dance work correctly. (Fixes #1893). | ||||
* | Merge pull request #2027 from matrix-org/rav/logcontext_leaks | Richard van der Hoff | 2017-03-20 | 1 | -2/+3 |
|\ | | | | | A few fixes to logcontext things | ||||
| * | Stop preserve_fn leaking context into the reactor | Richard van der Hoff | 2017-03-18 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | Fix a bug in ``logcontext.preserve_fn`` which made it leak context into the reactor, and add a test for it. Also, get rid of ``logcontext.reset_context_after_deferred``, which tried to do the same thing but had its own, different, set of bugs. | ||||
* | | Refactoring and cleanups | Richard van der Hoff | 2017-03-17 | 1 | -0/+10 |
|/ | | | | | | | | | | | | A few non-functional changes: * A bunch of docstrings to document types * Split `EventsStore._persist_events_txn` up a bit. Hopefully it's a bit more readable. * Rephrase `EventFederationStore._update_min_depth_for_room_txn` to avoid mind-bending conditional. * Rephrase rejected/outlier conditional in `_update_outliers_txn` to avoid mind-bending conditional. | ||||
* | Queue up federation PDUs while a room join is in progress | Richard van der Hoff | 2017-03-15 | 1 | -24/+44 |
| | | | | | | | This just takes the existing `room_queues` logic and moves it out to `on_receive_pdu` instead of `_process_received_pdu`, which ensures that we don't start trying to fetch prev_events and whathaveyou until the join has completed. | ||||
* | Move FederationServer._handle_new_pdu to FederationHandler | Richard van der Hoff | 2017-03-09 | 1 | -5/+197 |
| | | | | | | | | | | | Unfortunately this significantly increases the size of the already-rather-big FederationHandler, but the code fits more naturally here, and it paves the way for the tighter integration that I need between handling incoming PDUs and doing the join dance. Other than renaming the existing `FederationHandler.on_receive_pdu` to `_process_received_pdu` to make way for it, this just consists of the move, and replacing `self.handler` with `self` and `self` with `self.replication_layer`. | ||||
* | Pop with default value to stop throwing | Erik Johnston | 2017-02-28 | 1 | -1/+1 |
| | |||||
* | Pop rather than del from dict | Erik Johnston | 2017-02-27 | 1 | -1/+1 |
| | |||||
* | Derive current_state_events from state groups | Erik Johnston | 2017-01-20 | 1 | -1/+0 |
| | |||||
* | Merge pull request #1822 from matrix-org/erikj/statE_logging | Erik Johnston | 2017-01-18 | 1 | -1/+1 |
|\ | | | | | Change resolve_state_groups call site logging to DEBUG | ||||
| * | Change resolve_state_groups call site logging to DEBUG | Erik Johnston | 2017-01-17 | 1 | -1/+1 |
| | | |||||
* | | Fix couple of federation state bugs | Erik Johnston | 2017-01-17 | 1 | -1/+1 |
| | | |||||
* | | Optimise state resolution | Erik Johnston | 2017-01-17 | 1 | -1/+1 |
|/ | |||||
* | Fix case | Matthew Hodgson | 2017-01-05 | 1 | -1/+1 |
| | |||||
* | add logging for all the places we call resolve_state_groups. my kingdom for ↵ | Matthew Hodgson | 2017-01-05 | 1 | -0/+1 |
| | | | | a backtrace that actually works. | ||||
* | Only send events that originate on this server. | Mark Haines | 2017-01-05 | 1 | -0/+4 |
| | | | | | | Or events that are sent via the federation "send_join" API. This should match the behaviour from before v0.18.5 and #1635 landed. | ||||
* | Comment | Erik Johnston | 2016-12-14 | 1 | -0/+2 |
| | |||||
* | Fix /backfill returning events it shouldn't | Erik Johnston | 2016-12-14 | 1 | -2/+3 |
| | |||||
* | Shuffle receipt handler around so that worker apps don't need to load it | Erik Johnston | 2016-11-23 | 1 | -1/+0 |
| | |||||
* | Remove explicit calls to send_pdu | Erik Johnston | 2016-11-21 | 1 | -53/+0 |
| | |||||
* | Use new federation_sender DI | Erik Johnston | 2016-11-16 | 1 | -3/+4 |
| | |||||
* | Add comments | Erik Johnston | 2016-09-22 | 1 | -0/+3 |
| | |||||
* | Allow invites via 3pid to bypass sender sig check | Erik Johnston | 2016-09-22 | 1 | -6/+6 |
| | | | | | | | | | | | | | | When a server sends a third party invite another server may be the one that the inviting user registers with. In this case it is that remote server that will issue an actual invitation, and wants to do it "in the name of" the original invitee. However, the new proper invite will not be signed by the original server, and thus other servers would reject the invite if it was seen as coming from the original user. To fix this, a special case has been added to the auth rules whereby another server can send an invite "in the name of" another server's user, so long as that user had previously issued a third party invite that is now being accepted. | ||||
* | Ensure we don't mutate state cache entries | Erik Johnston | 2016-09-14 | 1 | -0/+4 |
| | |||||
* | Use get_joined_users_from_context instead of manually looking up hosts | Erik Johnston | 2016-09-05 | 1 | -8/+11 |
| | |||||
* | Merge pull request #1064 from matrix-org/erikj/on_receive_check | Erik Johnston | 2016-09-02 | 1 | -6/+18 |
|\ | | | | | Only check if host is in room if we have state and auth_chain | ||||
| * | Comment on when auth chain and state are None | Erik Johnston | 2016-09-02 | 1 | -0/+3 |
| | | |||||
| * | Comment | Erik Johnston | 2016-09-02 | 1 | -0/+3 |
| | | |||||
| * | Only check if host is in room if we have state and auth_chain | Erik Johnston | 2016-09-02 | 1 | -6/+12 |
| | | |||||
* | | Docstrings | Erik Johnston | 2016-09-02 | 1 | -0/+4 |
| | | |||||
* | | Only pull out IDs from DB for /state_ids/ request | Erik Johnston | 2016-09-02 | 1 | -0/+26 |
|/ | |||||
* | Correctly handle the difference between prev and current state | Erik Johnston | 2016-08-31 | 1 | -9/+22 |
| | |||||
* | Measure _filter_events_for_server | Erik Johnston | 2016-08-26 | 1 | -0/+2 |
| | |||||
* | Don't pull out full state for _filter_events_for_server | Erik Johnston | 2016-08-26 | 1 | -1/+25 |
| | |||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_ids | Erik Johnston | 2016-08-26 | 1 | -1/+3 |
|\ | |||||
| * | Fix None check in backfill | Erik Johnston | 2016-08-25 | 1 | -1/+3 |
| | | |||||
* | | Replace context.current_state with context.current_state_ids | Erik Johnston | 2016-08-25 | 1 | -48/+64 |
| | | |||||
* | | Pull out event ids rather than full events for state | Erik Johnston | 2016-08-25 | 1 | -0/+12 |
|/ | |||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2016-08-24 | 1 | -2/+2 |
|\ | | | | | | | erikj/preserve_log_contexts | ||||
| * | Add None checks to backfill | Erik Johnston | 2016-08-24 | 1 | -2/+2 |
| | | |||||
* | | Preserve some logcontexts | Erik Johnston | 2016-08-24 | 1 | -13/+15 |
|/ | |||||
* | Limit number of extremeties in backfill request | Erik Johnston | 2016-08-16 | 1 | -4/+5 |
| | | | | | This works around a bug where if we make a backfill request with too many extremeties it causes the request URI to be too long. | ||||
* | Also check if server is in the room | Erik Johnston | 2016-08-10 | 1 | -2/+7 |
| | |||||
* | Correctly auth /event/ requests | Erik Johnston | 2016-08-10 | 1 | -5/+6 |
| | |||||
* | Only resign our own events | Erik Johnston | 2016-08-10 | 1 | -9/+10 |
| | |||||
* | Fix backfill auth events | Erik Johnston | 2016-08-05 | 1 | -21/+50 |
| | |||||
* | Merge pull request #940 from matrix-org/erikj/fed_state_cache | Erik Johnston | 2016-08-02 | 1 | -6/+1 |
|\ | | | | | Cache federation state responses | ||||
| * | Cache federation state responses | Erik Johnston | 2016-07-21 | 1 | -6/+1 |
| | | |||||
* | | Mention that func will fetch auth events | Erik Johnston | 2016-07-29 | 1 | -0/+2 |
| | | |||||
* | | Update docstring | Erik Johnston | 2016-07-29 | 1 | -0/+6 |
| | | |||||
* | | Handle the case of missing auth events when joining a room | Erik Johnston | 2016-07-28 | 1 | -4/+23 |
|/ | |||||
* | Don't notify pusher pool for backfilled events | Erik Johnston | 2016-07-20 | 1 | -5/+6 |
| | |||||
* | Comment | Erik Johnston | 2016-07-15 | 1 | -0/+4 |
| | |||||
* | Check sender signed event | Erik Johnston | 2016-07-14 | 1 | -2/+2 |
| | |||||
* | Add purge_history API | Erik Johnston | 2016-07-05 | 1 | -1/+1 |
| | |||||
* | Only re-sign our own events | Erik Johnston | 2016-06-17 | 1 | -6/+9 |
| | |||||
* | Correctly mark backfilled events as backfilled | Erik Johnston | 2016-06-15 | 1 | -14/+16 |
| | |||||
* | Remove dead code. | Mark Haines | 2016-06-07 | 1 | -13/+0 |
| | | | | | | | | | | | Loading push rules now happens in the datastore, so we can remove the methods that loaded them outside the datastore. The ``waiting_for_join_list`` in federation handler is populated by anything, so can be removed. The ``_get_members_events_txn`` method isn't called from anywhere so can be removed. | ||||
* | Spell "domain" correctly | Mark Haines | 2016-05-16 | 1 | -4/+4 |
| | | | | s/domian/domain/g | ||||
* | missed a spot | Mark Haines | 2016-05-12 | 1 | -1/+1 |
| | |||||
* | Move _create_new_client_event and handle_new_client_event out of base handler | Mark Haines | 2016-05-11 | 1 | -5/+12 |
| | |||||
* | Add and use get_domian_from_id | Erik Johnston | 2016-05-09 | 1 | -8/+4 |
| | |||||
* | Don't auto log failed auth checks | Erik Johnston | 2016-04-13 | 1 | -8/+26 |
| | |||||
* | More comments | Erik Johnston | 2016-04-12 | 1 | -0/+9 |
| | |||||
* | More comments | Erik Johnston | 2016-04-12 | 1 | -0/+6 |
| | |||||
* | Don't append to unused list | Erik Johnston | 2016-04-12 | 1 | -4/+0 |
| | |||||
* | Add back backfilled parameter that was removed | Erik Johnston | 2016-04-12 | 1 | -1/+3 |
| | |||||
* | Add comment | Erik Johnston | 2016-04-12 | 1 | -0/+1 |
| | |||||
* | Check if we've already backfilled events | Erik Johnston | 2016-04-12 | 1 | -7/+20 |
| | |||||
* | Merge pull request #705 from matrix-org/dbkr/pushers_use_event_actions | David Baker | 2016-04-11 | 1 | -1/+7 |
|\ | | | | | Change pushers to use the event_actions table | ||||
| * | Merge remote-tracking branch 'origin/develop' into ↵ | David Baker | 2016-04-07 | 1 | -1/+4 |
| |\ | | | | | | | | | | dbkr/pushers_use_event_actions | ||||
| * | | Make pushers use the event_push_actions table instead of listening on an ↵ | David Baker | 2016-04-06 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | | event stream & running the rules again. Sytest passes, but remaining to do: * Make badges work again * Remove old, unused code | ||||
* | | | Move all the wrapper functions for distributor.fire | Mark Haines | 2016-04-08 | 1 | -4/+1 |
| |/ |/| | | | | | | | | | | | Move the functions inside the distributor and import them where needed. This reduces duplication and makes it possible for flake8 to detect when the functions aren't used in a given file. | ||||
* | | Merge pull request #693 from matrix-org/erikj/backfill_self | Erik Johnston | 2016-04-05 | 1 | -1/+4 |
|\ \ | |/ |/| | Don't backfill from self | ||||
| * | Don't backfill from self | Erik Johnston | 2016-04-05 | 1 | -1/+4 |
| | | |||||
* | | Merge pull request #691 from matrix-org/erikj/member | Erik Johnston | 2016-04-05 | 1 | -11/+23 |
|\ \ | | | | | | | Fix stuck invites | ||||
| * | | Fix stuck invites | Erik Johnston | 2016-04-05 | 1 | -11/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | If rejecting a remote invite fails with an error response don't fail the entire request; instead mark the invite as locally rejected. This fixes the bug where users can get stuck invites which they can neither accept nor reject. | ||||
* | | | Merge pull request #686 from matrix-org/markjh/doc_strings | Mark Haines | 2016-04-01 | 1 | -10/+13 |
|\ \ \ | |/ / |/| | | Use google style doc strings. | ||||
| * | | Use google style doc strings. | Mark Haines | 2016-04-01 | 1 | -10/+13 |
| | | | | | | | | | | | | | | | | | | | | | pycharm supports them so there is no need to use the other format. Might as well convert the existing strings to reduce the risk of people accidentally cargo culting the wrong doc string format. | ||||
* | | | Remove outlier parameter from compute_event_context | Mark Haines | 2016-03-31 | 1 | -7/+4 |
|/ / | | | | | | | Use event.internal_metadata.is_outlier instead. | ||||
* / | Remove the is_new_state argument to persist event. | Mark Haines | 2016-03-31 | 1 | -16/+4 |
|/ | | | | | | | | | Move the checks for whether an event is new state inside persist event itself. This was harder than expected because there wasn't enough information passed to persist event to correctly handle invites from remote servers for new rooms. | ||||
* | Remove unused backfilled parameter from persist_event | Mark Haines | 2016-03-21 | 1 | -23/+15 |
| | |||||
* | remove unused current_state variable from on_receive_pdu | Mark Haines | 2016-03-21 | 1 | -2/+0 |
| | |||||
* | Remove needless PreserveLoggingContext | Erik Johnston | 2016-03-15 | 1 | -5/+4 |
| | |||||
* | Persist rejection of invites over federation | Erik Johnston | 2016-03-15 | 1 | -1/+17 |
| | |||||
* | Use syntax that works on both py2.7 and py3 | Mark Haines | 2016-03-07 | 1 | -1/+1 |
| | |||||
* | Pass whole requester to ratelimiting | Daniel Wagner-Hall | 2016-03-03 | 1 | -2/+2 |
| | | | | This will enable more detailed decisions | ||||
* | Allow third_party_signed to be specified on /join | Daniel Wagner-Hall | 2016-02-23 | 1 | -21/+72 |
| | |||||
* | Branch off member and non member sends | Daniel Wagner-Hall | 2016-02-15 | 1 | -2/+2 |
| | | | | Unclean, needs tidy-up, but works | ||||
* | Atomically persit push actions when we persist the event | Erik Johnston | 2016-02-09 | 1 | -6/+6 |
| | |||||
* | Fix up logcontexts | Erik Johnston | 2016-02-08 | 1 | -45/+5 |
| | |||||
* | Federation: drop events which cause SynapseErrors | Richard van der Hoff | 2016-01-27 | 1 | -1/+7 |
| | | | | | ... rather than rejecting any attempt to federate channels which contain such events. | ||||
* | Add regex cache. Only caculate push actions for users that have sent read ↵ | Erik Johnston | 2016-01-19 | 1 | -1/+1 |
| | | | | receipts, and are on that server | ||||
* | Re-enable urnead notifications | Erik Johnston | 2016-01-18 | 1 | -7/+6 |
| | |||||
* | Require unbanning before other membership changes | Daniel Wagner-Hall | 2016-01-15 | 1 | -2/+2 |
| | |||||
* | Temporarily disable notification branch | Erik Johnston | 2016-01-13 | 1 | -6/+7 |
| | |||||
* | Merge pull request #456 from matrix-org/store_event_actions | David Baker | 2016-01-08 | 1 | -0/+8 |
|\ | | | | | Send unread notification counts | ||||
| * | Add is_guest flag to users db to track whether a user is a guest user or ↵ | David Baker | 2016-01-06 | 1 | -3/+3 |
| | | | | | | | | not. Use this so we can run _filter_events_for_client when calculating event_push_actions. | ||||
| * | Address minor PR issues | David Baker | 2016-01-04 | 1 | -2/+2 |
| | | |||||
| * | Merge remote-tracking branch 'origin/develop' into store_event_actions | David Baker | 2015-12-21 | 1 | -7/+48 |
| |\ | |||||
| * | | Only run pushers for users on this hs! | David Baker | 2015-12-21 | 1 | -1/+1 |
| | | | |||||
| * | | Having consulted The Erikle, this should go at the end of on_receive_pdu, ↵ | David Baker | 2015-12-10 | 1 | -11/+6 |
| | | | | | | | | | | | | otherwise it will be triggered whenever we backfill too. | ||||
| * | | Very first cut of calculating actions for events as they come in. Doesn't ↵ | David Baker | 2015-12-10 | 1 | -1/+14 |
| | | | | | | | | | | | | store them yet. Not very efficient. | ||||
* | | | copyrights | Matthew Hodgson | 2016-01-07 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Add display_name to 3pid invite in m.room.member invites | Daniel Wagner-Hall | 2015-12-17 | 1 | -1/+31 |
| | | |||||
* | | Strip address and such out of 3pid invites | Daniel Wagner-Hall | 2015-12-17 | 1 | -1/+12 |
| | | | | | | | | We're not meant to leak that into the graph | ||||
* | | Ensure that the event that gets persisted is the one that was signed | Paul "LeoNerd" Evans | 2015-12-10 | 1 | -6/+6 |
|/ | |||||
* | Use the context returned by _handle_new_event | Mark Haines | 2015-12-02 | 1 | -4/+1 |
| | |||||
* | Add comments | Mark Haines | 2015-12-02 | 1 | -0/+3 |
| | |||||
* | Merge branch 'develop' into markjh/edu_frequency | Mark Haines | 2015-12-02 | 1 | -11/+8 |
|\ | | | | | | | | | | | Conflicts: synapse/handlers/federation.py synapse/handlers/room.py | ||||
| * | Wrap calls to distributor.fire in appropriately named functions so that ↵ | Mark Haines | 2015-12-01 | 1 | -11/+8 |
| | | | | | | | | static analysis can work out want is calling what | ||||
* | | Only fire user_joined_room if the membership has changed | Mark Haines | 2015-12-01 | 1 | -3/+8 |
|/ | |||||
* | Fix missing profile data in federation joins | Erik Johnston | 2015-11-12 | 1 | -4/+7 |
| | | | | | There was a regression where we stopped including profile data in initial joins for rooms joined over federation. | ||||
* | Allow guest users to join and message rooms | Daniel Wagner-Hall | 2015-11-10 | 1 | -5/+5 |
| | |||||
* | Exchange 3pid invites for m.room.member invites | Daniel Wagner-Hall | 2015-11-05 | 1 | -18/+81 |
| | |||||
* | Remove the LockManager class because it wasn't being used | Mark Haines | 2015-11-04 | 1 | -2/+0 |
| | |||||
* | Allow rejecting invites | Daniel Wagner-Hall | 2015-10-20 | 1 | -41/+168 |
| | | | | | This is done by using the same /leave flow as you would use if you had already accepted the invite and wanted to leave. | ||||
* | Merge branch 'develop' into daniel/3pidinvites | Daniel Wagner-Hall | 2015-10-15 | 1 | -1/+1 |
|\ | |||||
| * | Remove unused room_id arg | Erik Johnston | 2015-10-14 | 1 | -1/+1 |
| | | |||||
* | | Remove unnecessary class-wrapping | Daniel Wagner-Hall | 2015-10-13 | 1 | -6/+7 |
| | | |||||
* | | Re-add accidentally removed code | Daniel Wagner-Hall | 2015-10-13 | 1 | -1/+1 |
| | | |||||
* | | Move event contents into third_party_layout field | Daniel Wagner-Hall | 2015-10-13 | 1 | -2/+3 |
| | | |||||
* | | Revert "Revert "Merge pull request #283 from ↵ | Daniel Wagner-Hall | 2015-10-06 | 1 | -76/+131 |
| | | | | | | | | | | | | matrix-org/erikj/atomic_join_federation"" This reverts commit 34d26d36874ab0bc7fa4dab0db08bd37ba4936ae. | ||||
* | | Merge branch 'develop' into daniel/3pidinvites | Daniel Wagner-Hall | 2015-10-06 | 1 | -1/+2 |
|\| | |||||
| * | Explicitly add Create event as auth event | Erik Johnston | 2015-10-02 | 1 | -2/+3 |
| | | |||||
* | | Revert "Merge pull request #283 from matrix-org/erikj/atomic_join_federation" | Daniel Wagner-Hall | 2015-10-05 | 1 | -131/+76 |
| | | | | | | | | | | This reverts commit 5879edbb097d19c2b5f5e064841909e67d6018fe, reversing changes made to b43930d4c9479973fb7225818e2e51bec022c4e6. | ||||
* | | Merge branch 'develop' into daniel/3pidinvites | Daniel Wagner-Hall | 2015-10-05 | 1 | -76/+131 |
|\| | |||||
| * | Merge pull request #283 from matrix-org/erikj/atomic_join_federation | Erik Johnston | 2015-10-02 | 1 | -76/+131 |
| |\ | | | | | | | Atomically persist events when joining a room over federation/ | ||||
| | * | Comment | Erik Johnston | 2015-09-30 | 1 | -0/+8 |
| | | | |||||
| | * | Rename var | Erik Johnston | 2015-09-30 | 1 | -3/+3 |
| | | | |||||
| | * | Fix getting an event for a room the server forgot it was in | Erik Johnston | 2015-09-17 | 1 | -47/+59 |
| | | | |||||
| | * | Also persist state | Erik Johnston | 2015-09-17 | 1 | -1/+1 |
| | | | |||||
| | * | Capture err | Erik Johnston | 2015-09-17 | 1 | -2/+2 |
| | | | |||||
| | * | Also handle state | Erik Johnston | 2015-09-17 | 1 | -3/+3 |
| | | | |||||
| | * | Don't bail out of joining if we encounter a rejected event | Erik Johnston | 2015-09-17 | 1 | -13/+20 |
| | | | |||||
| | * | Refactor do_invite_join | Erik Johnston | 2015-09-17 | 1 | -28/+56 |
| | | | |||||
* | | | Implement third party identifier invites | Daniel Wagner-Hall | 2015-10-01 | 1 | -4/+12 |
|/ / | |||||
* / | synapse/handlers/federation.py:_handle_auth_events was unused | Mark Haines | 2015-09-23 | 1 | -49/+0 |
|/ | |||||
* | Add missing param in store.get_state_groups invocation | Erik Johnston | 2015-08-21 | 1 | -1/+1 |
| | |||||
* | Remove pointless map | Erik Johnston | 2015-08-13 | 1 | -7/+3 |
| | |||||
* | Fix application of ACLs | Erik Johnston | 2015-08-11 | 1 | -6/+5 |
| | |||||
* | Use dictionary cache to do group -> state fetching | Erik Johnston | 2015-08-05 | 1 | -1/+1 |
| | |||||
* | Speed up event filtering (for ACL) logic | Erik Johnston | 2015-08-04 | 1 | -1/+5 |
| | |||||
* | Merge pull request #193 from matrix-org/erikj/bulk_persist_event | Erik Johnston | 2015-07-14 | 1 | -106/+121 |
|\ | | | | | Add bulk insert events API | ||||
| * | Add bulk insert events API | Erik Johnston | 2015-06-25 | 1 | -106/+121 |
| | | |||||
* | | Add comment | Erik Johnston | 2015-07-09 | 1 | -0/+4 |
| | | |||||
* | | Rename key and values for m.room.history_visibility. Support 'invited' value | Erik Johnston | 2015-07-06 | 1 | -14/+20 |
| | | |||||
* | | Filter and redact events that the other server doesn't have permission to ↵ | Erik Johnston | 2015-07-03 | 1 | -0/+44 |
|/ | | | | see during backfill | ||||
* | Merge pull request #176 from matrix-org/erikj/backfill_auth | Erik Johnston | 2015-06-03 | 1 | -1/+46 |
|\ | | | | | Improve backfill. | ||||
| * | Add a timeout | Erik Johnston | 2015-06-02 | 1 | -0/+1 |
| | | |||||
| * | Handle the fact we might be missing auth events | Erik Johnston | 2015-06-02 | 1 | -15/+19 |
| | | |||||
| * | Add some logging | Erik Johnston | 2015-06-02 | 1 | -0/+5 |
| | | |||||
| * | Correctly look up auth_events | Erik Johnston | 2015-06-02 | 1 | -9/+12 |
| | | |||||
| * | Don't process events we've already processed. Remember to process state events | Erik Johnston | 2015-06-02 | 1 | -0/+22 |
| | | |||||
| * | Correctly pass in auth_events | Erik Johnston | 2015-06-01 | 1 | -1/+11 |
| | | |||||
* | | Don't needlessly compute context | Erik Johnston | 2015-06-03 | 1 | -2/+4 |
|/ | |||||
* | Actually fetch state for new backwards extremeties when backfilling. | Erik Johnston | 2015-05-20 | 1 | -61/+103 |
| | |||||
* | Don't apply new room join hack if depth > 5 | Erik Johnston | 2015-05-19 | 1 | -3/+6 |
| | |||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf | Erik Johnston | 2015-05-19 | 1 | -10/+15 |
|\ | |||||
| * | Merge branch 'notifier_unify' into notifier_performance | Mark Haines | 2015-05-14 | 1 | -0/+2 |
| |\ | |||||
| * | | Don't bother checking for updates if the stream token hasn't advanced for a user | Mark Haines | 2015-05-13 | 1 | -10/+15 |
| | | | |||||
* | | | Do work in parellel when joining a room | Erik Johnston | 2015-05-18 | 1 | -19/+50 |
| |/ |/| | |||||
* | | Don't talk to yourself when backfilling | Erik Johnston | 2015-05-12 | 1 | -0/+2 |
|/ | |||||
* | Merge pull request #144 from matrix-org/erikj/logging_context | Mark Haines | 2015-05-12 | 1 | -13/+19 |
|\ | | | | | Preserving logging contexts | ||||
| * | Unwrap defer.gatherResults failures | Erik Johnston | 2015-05-12 | 1 | -1/+2 |
| | | |||||
| * | Fix up leak. Add warnings. | Erik Johnston | 2015-05-08 | 1 | -12/+17 |
| | | |||||
* | | s/backfil/backfill/ | Erik Johnston | 2015-05-12 | 1 | -4/+4 |
| | | |||||
* | | Typos everywhere | Erik Johnston | 2015-05-12 | 1 | -1/+1 |
| | | |||||
* | | And another typo. | Erik Johnston | 2015-05-12 | 1 | -3/+3 |
| | | |||||
* | | Err, gatherResults doesn't take a dict... | Erik Johnston | 2015-05-12 | 1 | -4/+7 |
| | | |||||
* | | Handle the case where the other side is unreachable when backfilling | Erik Johnston | 2015-05-12 | 1 | -14/+42 |
| | | |||||
* | | Initial hack at wiring together pagination and backfill | Erik Johnston | 2015-05-11 | 1 | -2/+106 |
|/ | |||||
* | That wasn't a deferred | Erik Johnston | 2015-05-01 | 1 | -1/+1 |
| | |||||
* | Remove inlineCallbacks from non-generator | Erik Johnston | 2015-05-01 | 1 | -2/+0 |
| | |||||
* | Remove some run_on_reactors | Erik Johnston | 2015-05-01 | 1 | -2/+0 |
| | |||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into mysql | Erik Johnston | 2015-04-08 | 1 | -4/+36 |
|\ | |||||
| * | typo | Erik Johnston | 2015-04-08 | 1 | -1/+1 |
| | | |||||
| * | Don't yield on notifying all listeners | Erik Johnston | 2015-04-08 | 1 | -4/+36 |
| | | |||||
* | | Sanitize TransactionStore | Erik Johnston | 2015-03-23 | 1 | -1/+1 |
|/ | |||||
* | Clean out event_forward_extremities table when the server rejoins the room | Erik Johnston | 2015-03-18 | 1 | -0/+2 |
| | |||||
* | Remove concept of context.auth_events, instead use context.current_state | Erik Johnston | 2015-03-16 | 1 | -5/+3 |
| | |||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into batched_get_pdu | Erik Johnston | 2015-02-23 | 1 | -1/+1 |
|\ | |||||
| * | Add missing comma so that it generates a dict and not a set | Erik Johnston | 2015-02-20 | 1 | -1/+1 |
| | | |||||
* | | Implement and use new batched get missing pdu | Erik Johnston | 2015-02-23 | 1 | -0/+23 |
| | | |||||
* | | Initial stab at implementing a batched get_missing_pdus request | Erik Johnston | 2015-02-19 | 1 | -4/+5 |
|/ | |||||
* | Change some debug logging to info | Erik Johnston | 2015-02-17 | 1 | -2/+4 |
| | |||||
* | resolve_events expect lists, not dicts | Erik Johnston | 2015-02-15 | 1 | -1/+1 |
| | |||||
* | Fix wrong variable name | Erik Johnston | 2015-02-13 | 1 | -1/+1 |
| | |||||
* | pyflakes | Erik Johnston | 2015-02-13 | 1 | -1/+1 |
| | |||||
* | When we see a difference in current state, actually use state conflict ↵ | Erik Johnston | 2015-02-13 | 1 | -0/+34 |
| | | | | resolution algorithm | ||||
* | Remove more debug logging | Erik Johnston | 2015-02-11 | 1 | -2/+0 |
| | |||||
* | Remove debug logging | Erik Johnston | 2015-02-11 | 1 | -10/+0 |
| | |||||
* | Don't unfreeze when using FreezeEvent.get_dict, as we are using a ↵ | Erik Johnston | 2015-02-11 | 1 | -1/+14 |
| | | | | JSONEncoder that understands FrozenDict | ||||
* | Explicitly list the RejectedReasons that we can prove | Erik Johnston | 2015-02-06 | 1 | -1/+6 |
| | |||||
* | Don't query auth if the only difference is events that were rejected due to ↵ | Erik Johnston | 2015-02-06 | 1 | -56/+72 |
| | | | | auth. | ||||
* | Make seen_ids a set | Erik Johnston | 2015-02-06 | 1 | -1/+3 |
| | |||||
* | Handle the fact the list.remove raises if element doesn't exist | Erik Johnston | 2015-02-06 | 1 | -4/+10 |
| | |||||
* | Pass through list of room hosts from room alias query to federation so that ↵ | Erik Johnston | 2015-02-05 | 1 | -7/+13 |
| | | | | it can retry against different room hosts | ||||
* | Merge branch 'signature_failures' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-02-04 | 1 | -1/+3 |
|\ | | | | | | | federation_client_retries | ||||
| * | Change context.auth_events to what the auth_events would be bases on ↵ | Erik Johnston | 2015-02-04 | 1 | -1/+3 |
| | | | | | | | | context.current_state, rather than based on the auth_events from the event. | ||||
* | | Apply sanity to the transport client interface. Convert 'make_join' and ↵ | Erik Johnston | 2015-02-04 | 1 | -2/+2 |
|/ | | | | 'send_join' to accept iterables of destinations | ||||
* | Rearrange persist_event so that do all the queries that need to be done ↵ | Erik Johnston | 2015-02-04 | 1 | -0/+2 |
| | | | | before returning early if we have already persisted that event. | ||||
* | Neaten the handling of state and auth_chain up a bit | Erik Johnston | 2015-02-03 | 1 | -27/+30 |
| | |||||
* | Don't completely die if get auth_chain or querying auth_chain requests fail | Erik Johnston | 2015-02-03 | 1 | -63/+72 |
| | |||||
* | Set combinations is | and not + | Erik Johnston | 2015-02-03 | 1 | -2/+2 |
| | |||||
* | Spelling | Erik Johnston | 2015-02-03 | 1 | -1/+1 |
| | |||||
* | Give exception better message | Erik Johnston | 2015-02-03 | 1 | -1/+1 |
| |