summary refs log tree commit diff
path: root/synapse/handlers/federation.py (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fix that states is a dict of dictsErik Johnston2018-05-221-1/+4
|
* get_domains_from_state returns list of tuplesErik Johnston2018-05-221-2/+12
|
* Make sure we reject attempts to invite the notices userRichard van der Hoff2018-05-181-0/+8
|
* Merge pull request #3153 from NotAFile/py3-httplibRichard van der Hoff2018-04-301-3/+3
|\ | | | | move httplib import to six
| * move httplib import to sixAdrian Tschira2018-04-281-3/+3
| |
* | Merge remote-tracking branch 'origin/develop' into rav/use_run_in_backgroundRichard van der Hoff2018-04-271-6/+10
|\|
| * reraise exceptions more carefullyRichard van der Hoff2018-04-271-6/+10
| | | | | | | | | | | | | | 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.
* | Use run_in_background in preference to preserve_fnRichard van der Hoff2018-04-271-6/+10
|/ | | | | | 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.
* Merge pull request #3118 from matrix-org/rav/reject_prev_eventsRichard van der Hoff2018-04-231-7/+71
|\ | | | | Reject events which have lots of prev_events
| * Remove spurious paramRichard van der Hoff2018-04-231-1/+0
| |
| * accept stupid events over backfillRichard van der Hoff2018-04-201-4/+9
| |
| * Add some commentsRichard van der Hoff2018-04-181-3/+12
| |
| * Check events on backfill tooRichard van der Hoff2018-04-181-15/+42
| |
| * Reject events which have too many auth_events or prev_eventsRichard van der Hoff2018-04-181-4/+28
| | | | | | | | | | ... this should protect us from being dossed by people making silly events (deliberately or otherwise)
* | Refactor store.have_eventsRichard van der Hoff2018-04-201-19/+12
|/ | | | | | It turns out that most of the time we were calling have_events, we were only using half of the result. Replace have_events with have_seen_events and get_rejection_reasons, so that we can see what's going on a bit more clearly.
* s/replication_client/federation_client/Erik Johnston2018-03-131-1/+1
|
* Split replication layer into twoErik Johnston2018-03-131-3/+1
|
* Move RoomMemberHandler out of HandlersErik Johnston2018-03-011-2/+2
|
* Delete from push_actions_staging in federation tooErik Johnston2018-02-201-9/+17
|
* Merge pull request #2847 from matrix-org/erikj/separate_event_creationErik Johnston2018-02-061-10/+9
|\ | | | | Split event creation into a separate handler
| * Update copyrightErik Johnston2018-02-061-0/+1
| |
| * s/_create_new_client_event/create_new_client_event/Erik Johnston2018-02-061-5/+5
| |
| * Update places where we create eventsErik Johnston2018-02-051-10/+8
| |
* | Store state groups separately from events (#2784)Erik Johnston2018-02-061-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_eventsRichard van der Hoff2018-02-011-6/+5
| | | | (to make way for a method that actually just does the state group resolution)
* Add federation_domain_whitelist option (#2820)Matthew Hodgson2018-01-221-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 Hoff2017-11-081-2/+2
|
* Update deltas when doing auth resolutionRichard van der Hoff2017-11-071-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_eventsRichard van der Hoff2017-11-071-20/+42
| | | | This is duplicated, so let's factor it out before fixing it
* replace 'except:' with 'except Exception:'Richard van der Hoff2017-10-231-8/+8
| | | | what could possibly go wrong
* Merge pull request #2490 from matrix-org/erikj/drop_left_room_eventsErik Johnston2017-10-101-0/+22
|\ | | | | Ignore incoming events for rooms that we have left
| * Update commentsErik Johnston2017-10-031-1/+1
| |
| * Remove spurious line feedErik Johnston2017-10-031-1/+0
| |
| * Ignore incoming events for rooms that we have leftErik Johnston2017-10-031-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.pyRichard van der Hoff2017-10-061-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_inviteDavid Baker2017-10-051-5/+7
| |
* | pass room id tooDavid Baker2017-10-031-1/+1
| |
* | Fix param name & lintDavid Baker2017-10-031-2/+4
| |
* | Allow spam checker to reject invites tooDavid Baker2017-10-031-0/+4
|/
* Add a config option to block all room invites (#2457)Richard van der Hoff2017-09-191-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_requestRichard van der Hoff2017-09-191-0/+11
|
* Fix overzealous kicking of guest users (#2453)Richard van der Hoff2017-09-191-1/+1
| | | We should only kick guest users if the guest access event is authorised.
* Don't compute push actions for backfilled eventsErik Johnston2017-07-111-1/+1
|
* Fix bug where pusherpool didn't start and broke some roomsErik Johnston2017-07-061-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 federationMark Haines2017-06-301-2/+17
|
* Add shutdown room APIErik Johnston2017-06-191-0/+4
|
* CommentErik Johnston2017-06-091-0/+2
|
* Mark remote invite rejections as outliersErik Johnston2017-06-091-0/+1
|
* Only store event_auth for state eventsErik Johnston2017-05-241-6/+14
|
* Store ActionGenerator in HomeServerErik Johnston2017-05-191-3/+2
|
* Remove redundant reset of destination timersErik Johnston2017-05-051-7/+0
|
* Merge together redundant calculations/loggingErik Johnston2017-05-031-9/+2
|
* FixupErik Johnston2017-04-281-10/+4
|
* Remove unncessary call in _get_missing_events_for_pduErik Johnston2017-04-281-13/+11
|
* Don't fetch state for missing events that we fetchedErik Johnston2017-04-281-0/+6
|
* TypoErik Johnston2017-04-271-1/+1
|
* Add some extra logging for edge cases of federationErik Johnston2017-04-271-2/+22
|
* Remove redundant try/except clausesRichard van der Hoff2017-04-211-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 developErik Johnston2017-04-111-4/+4
|\
| * When we do an invite rejection, save the signed leave event to the dbRichard van der Hoff2017-04-071-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_preservesRichard van der Hoff2017-04-031-24/+19
|\ \ | |/ |/| Cull spurious PreserveLoggingContexts
| * Remove more spurious `PreserveLoggingContext`sRichard van der Hoff2017-04-031-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 serversRichard van der Hoff2017-04-031-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_leaksRichard van der Hoff2017-03-201-2/+3
|\ | | | | A few fixes to logcontext things
| * Stop preserve_fn leaking context into the reactorRichard van der Hoff2017-03-181-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 cleanupsRichard van der Hoff2017-03-171-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 progressRichard van der Hoff2017-03-151-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 FederationHandlerRichard van der Hoff2017-03-091-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 throwingErik Johnston2017-02-281-1/+1
|
* Pop rather than del from dictErik Johnston2017-02-271-1/+1
|
* Derive current_state_events from state groupsErik Johnston2017-01-201-1/+0
|
* Merge pull request #1822 from matrix-org/erikj/statE_loggingErik Johnston2017-01-181-1/+1
|\ | | | | Change resolve_state_groups call site logging to DEBUG
| * Change resolve_state_groups call site logging to DEBUGErik Johnston2017-01-171-1/+1
| |
* | Fix couple of federation state bugsErik Johnston2017-01-171-1/+1
| |
* | Optimise state resolutionErik Johnston2017-01-171-1/+1
|/
* Fix caseMatthew Hodgson2017-01-051-1/+1
|
* add logging for all the places we call resolve_state_groups. my kingdom for ↵Matthew Hodgson2017-01-051-0/+1
| | | | a backtrace that actually works.
* Only send events that originate on this server.Mark Haines2017-01-051-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.
* CommentErik Johnston2016-12-141-0/+2
|
* Fix /backfill returning events it shouldn'tErik Johnston2016-12-141-2/+3
|
* Shuffle receipt handler around so that worker apps don't need to load itErik Johnston2016-11-231-1/+0
|
* Remove explicit calls to send_pduErik Johnston2016-11-211-53/+0
|
* Use new federation_sender DIErik Johnston2016-11-161-3/+4
|
* Add commentsErik Johnston2016-09-221-0/+3
|
* Allow invites via 3pid to bypass sender sig checkErik Johnston2016-09-221-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 entriesErik Johnston2016-09-141-0/+4
|
* Use get_joined_users_from_context instead of manually looking up hostsErik Johnston2016-09-051-8/+11
|
* Merge pull request #1064 from matrix-org/erikj/on_receive_checkErik Johnston2016-09-021-6/+18
|\ | | | | Only check if host is in room if we have state and auth_chain
| * Comment on when auth chain and state are NoneErik Johnston2016-09-021-0/+3
| |
| * CommentErik Johnston2016-09-021-0/+3
| |
| * Only check if host is in room if we have state and auth_chainErik Johnston2016-09-021-6/+12
| |
* | DocstringsErik Johnston2016-09-021-0/+4
| |
* | Only pull out IDs from DB for /state_ids/ requestErik Johnston2016-09-021-0/+26
|/
* Correctly handle the difference between prev and current stateErik Johnston2016-08-311-9/+22
|
* Measure _filter_events_for_serverErik Johnston2016-08-261-0/+2
|
* Don't pull out full state for _filter_events_for_serverErik Johnston2016-08-261-1/+25
|
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_idsErik Johnston2016-08-261-1/+3
|\
| * Fix None check in backfillErik Johnston2016-08-251-1/+3
| |
* | Replace context.current_state with context.current_state_idsErik Johnston2016-08-251-48/+64
| |
* | Pull out event ids rather than full events for stateErik Johnston2016-08-251-0/+12
|/
* Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2016-08-241-2/+2
|\ | | | | | | erikj/preserve_log_contexts
| * Add None checks to backfillErik Johnston2016-08-241-2/+2
| |
* | Preserve some logcontextsErik Johnston2016-08-241-13/+15
|/
* Limit number of extremeties in backfill requestErik Johnston2016-08-161-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 roomErik Johnston2016-08-101-2/+7
|
* Correctly auth /event/ requestsErik Johnston2016-08-101-5/+6
|
* Only resign our own eventsErik Johnston2016-08-101-9/+10
|
* Fix backfill auth eventsErik Johnston2016-08-051-21/+50
|
* Merge pull request #940 from matrix-org/erikj/fed_state_cacheErik Johnston2016-08-021-6/+1
|\ | | | | Cache federation state responses
| * Cache federation state responsesErik Johnston2016-07-211-6/+1
| |
* | Mention that func will fetch auth eventsErik Johnston2016-07-291-0/+2
| |
* | Update docstringErik Johnston2016-07-291-0/+6
| |
* | Handle the case of missing auth events when joining a roomErik Johnston2016-07-281-4/+23
|/
* Don't notify pusher pool for backfilled eventsErik Johnston2016-07-201-5/+6
|
* CommentErik Johnston2016-07-151-0/+4
|
* Check sender signed eventErik Johnston2016-07-141-2/+2
|
* Add purge_history APIErik Johnston2016-07-051-1/+1
|
* Only re-sign our own eventsErik Johnston2016-06-171-6/+9
|
* Correctly mark backfilled events as backfilledErik Johnston2016-06-151-14/+16
|
* Remove dead code.Mark Haines2016-06-071-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" correctlyMark Haines2016-05-161-4/+4
| | | | s/domian/domain/g
* missed a spotMark Haines2016-05-121-1/+1
|
* Move _create_new_client_event and handle_new_client_event out of base handlerMark Haines2016-05-111-5/+12
|
* Add and use get_domian_from_idErik Johnston2016-05-091-8/+4
|
* Don't auto log failed auth checksErik Johnston2016-04-131-8/+26
|
* More commentsErik Johnston2016-04-121-0/+9
|
* More commentsErik Johnston2016-04-121-0/+6
|
* Don't append to unused listErik Johnston2016-04-121-4/+0
|
* Add back backfilled parameter that was removedErik Johnston2016-04-121-1/+3
|
* Add commentErik Johnston2016-04-121-0/+1
|
* Check if we've already backfilled eventsErik Johnston2016-04-121-7/+20
|
* Merge pull request #705 from matrix-org/dbkr/pushers_use_event_actionsDavid Baker2016-04-111-1/+7
|\ | | | | Change pushers to use the event_actions table
| * Merge remote-tracking branch 'origin/develop' into ↵David Baker2016-04-071-1/+4
| |\ | | | | | | | | | dbkr/pushers_use_event_actions
| * | Make pushers use the event_push_actions table instead of listening on an ↵David Baker2016-04-061-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.fireMark Haines2016-04-081-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_selfErik Johnston2016-04-051-1/+4
|\ \ | |/ |/| Don't backfill from self
| * Don't backfill from selfErik Johnston2016-04-051-1/+4
| |
* | Merge pull request #691 from matrix-org/erikj/memberErik Johnston2016-04-051-11/+23
|\ \ | | | | | | Fix stuck invites
| * | Fix stuck invitesErik Johnston2016-04-051-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_stringsMark Haines2016-04-011-10/+13
|\ \ \ | |/ / |/| | Use google style doc strings.
| * | Use google style doc strings.Mark Haines2016-04-011-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_contextMark Haines2016-03-311-7/+4
|/ / | | | | | | Use event.internal_metadata.is_outlier instead.
* / Remove the is_new_state argument to persist event.Mark Haines2016-03-311-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_eventMark Haines2016-03-211-23/+15
|
* remove unused current_state variable from on_receive_pduMark Haines2016-03-211-2/+0
|
* Remove needless PreserveLoggingContextErik Johnston2016-03-151-5/+4
|
* Persist rejection of invites over federationErik Johnston2016-03-151-1/+17
|
* Use syntax that works on both py2.7 and py3Mark Haines2016-03-071-1/+1
|
* Pass whole requester to ratelimitingDaniel Wagner-Hall2016-03-031-2/+2
| | | | This will enable more detailed decisions
* Allow third_party_signed to be specified on /joinDaniel Wagner-Hall2016-02-231-21/+72
|
* Branch off member and non member sendsDaniel Wagner-Hall2016-02-151-2/+2
| | | | Unclean, needs tidy-up, but works
* Atomically persit push actions when we persist the eventErik Johnston2016-02-091-6/+6
|
* Fix up logcontextsErik Johnston2016-02-081-45/+5
|
* Federation: drop events which cause SynapseErrorsRichard van der Hoff2016-01-271-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 Johnston2016-01-191-1/+1
| | | | receipts, and are on that server
* Re-enable urnead notificationsErik Johnston2016-01-181-7/+6
|
* Require unbanning before other membership changesDaniel Wagner-Hall2016-01-151-2/+2
|
* Temporarily disable notification branchErik Johnston2016-01-131-6/+7
|
* Merge pull request #456 from matrix-org/store_event_actionsDavid Baker2016-01-081-0/+8
|\ | | | | Send unread notification counts
| * Add is_guest flag to users db to track whether a user is a guest user or ↵David Baker2016-01-061-3/+3
| | | | | | | | not. Use this so we can run _filter_events_for_client when calculating event_push_actions.
| * Address minor PR issuesDavid Baker2016-01-041-2/+2
| |
| * Merge remote-tracking branch 'origin/develop' into store_event_actionsDavid Baker2015-12-211-7/+48
| |\
| * | Only run pushers for users on this hs!David Baker2015-12-211-1/+1
| | |
| * | Having consulted The Erikle, this should go at the end of on_receive_pdu, ↵David Baker2015-12-101-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 Baker2015-12-101-1/+14
| | | | | | | | | | | | store them yet. Not very efficient.
* | | copyrightsMatthew Hodgson2016-01-071-1/+1
| |/ |/|
* | Add display_name to 3pid invite in m.room.member invitesDaniel Wagner-Hall2015-12-171-1/+31
| |
* | Strip address and such out of 3pid invitesDaniel Wagner-Hall2015-12-171-1/+12
| | | | | | | | We're not meant to leak that into the graph
* | Ensure that the event that gets persisted is the one that was signedPaul "LeoNerd" Evans2015-12-101-6/+6
|/
* Use the context returned by _handle_new_eventMark Haines2015-12-021-4/+1
|
* Add commentsMark Haines2015-12-021-0/+3
|
* Merge branch 'develop' into markjh/edu_frequencyMark Haines2015-12-021-11/+8
|\ | | | | | | | | | | Conflicts: synapse/handlers/federation.py synapse/handlers/room.py
| * Wrap calls to distributor.fire in appropriately named functions so that ↵Mark Haines2015-12-011-11/+8
| | | | | | | | static analysis can work out want is calling what
* | Only fire user_joined_room if the membership has changedMark Haines2015-12-011-3/+8
|/
* Fix missing profile data in federation joinsErik Johnston2015-11-121-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 roomsDaniel Wagner-Hall2015-11-101-5/+5
|
* Exchange 3pid invites for m.room.member invitesDaniel Wagner-Hall2015-11-051-18/+81
|
* Remove the LockManager class because it wasn't being usedMark Haines2015-11-041-2/+0
|
* Allow rejecting invitesDaniel Wagner-Hall2015-10-201-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/3pidinvitesDaniel Wagner-Hall2015-10-151-1/+1
|\
| * Remove unused room_id argErik Johnston2015-10-141-1/+1
| |
* | Remove unnecessary class-wrappingDaniel Wagner-Hall2015-10-131-6/+7
| |
* | Re-add accidentally removed codeDaniel Wagner-Hall2015-10-131-1/+1
| |
* | Move event contents into third_party_layout fieldDaniel Wagner-Hall2015-10-131-2/+3
| |
* | Revert "Revert "Merge pull request #283 from ↵Daniel Wagner-Hall2015-10-061-76/+131
| | | | | | | | | | | | matrix-org/erikj/atomic_join_federation"" This reverts commit 34d26d36874ab0bc7fa4dab0db08bd37ba4936ae.
* | Merge branch 'develop' into daniel/3pidinvitesDaniel Wagner-Hall2015-10-061-1/+2
|\|
| * Explicitly add Create event as auth eventErik Johnston2015-10-021-2/+3
| |
* | Revert "Merge pull request #283 from matrix-org/erikj/atomic_join_federation"Daniel Wagner-Hall2015-10-051-131/+76
| | | | | | | | | | This reverts commit 5879edbb097d19c2b5f5e064841909e67d6018fe, reversing changes made to b43930d4c9479973fb7225818e2e51bec022c4e6.
* | Merge branch 'develop' into daniel/3pidinvitesDaniel Wagner-Hall2015-10-051-76/+131
|\|
| * Merge pull request #283 from matrix-org/erikj/atomic_join_federationErik Johnston2015-10-021-76/+131
| |\ | | | | | | Atomically persist events when joining a room over federation/
| | * CommentErik Johnston2015-09-301-0/+8
| | |
| | * Rename varErik Johnston2015-09-301-3/+3
| | |
| | * Fix getting an event for a room the server forgot it was inErik Johnston2015-09-171-47/+59
| | |
| | * Also persist stateErik Johnston2015-09-171-1/+1
| | |
| | * Capture errErik Johnston2015-09-171-2/+2
| | |
| | * Also handle stateErik Johnston2015-09-171-3/+3
| | |
| | * Don't bail out of joining if we encounter a rejected eventErik Johnston2015-09-171-13/+20
| | |
| | * Refactor do_invite_joinErik Johnston2015-09-171-28/+56
| | |
* | | Implement third party identifier invitesDaniel Wagner-Hall2015-10-011-4/+12
|/ /
* / synapse/handlers/federation.py:_handle_auth_events was unusedMark Haines2015-09-231-49/+0
|/
* Add missing param in store.get_state_groups invocationErik Johnston2015-08-211-1/+1
|
* Remove pointless mapErik Johnston2015-08-131-7/+3
|
* Fix application of ACLsErik Johnston2015-08-111-6/+5
|
* Use dictionary cache to do group -> state fetchingErik Johnston2015-08-051-1/+1
|
* Speed up event filtering (for ACL) logicErik Johnston2015-08-041-1/+5
|
* Merge pull request #193 from matrix-org/erikj/bulk_persist_eventErik Johnston2015-07-141-106/+121
|\ | | | | Add bulk insert events API
| * Add bulk insert events APIErik Johnston2015-06-251-106/+121
| |
* | Add commentErik Johnston2015-07-091-0/+4
| |
* | Rename key and values for m.room.history_visibility. Support 'invited' valueErik Johnston2015-07-061-14/+20
| |
* | Filter and redact events that the other server doesn't have permission to ↵Erik Johnston2015-07-031-0/+44
|/ | | | see during backfill
* Merge pull request #176 from matrix-org/erikj/backfill_authErik Johnston2015-06-031-1/+46
|\ | | | | Improve backfill.
| * Add a timeoutErik Johnston2015-06-021-0/+1
| |
| * Handle the fact we might be missing auth eventsErik Johnston2015-06-021-15/+19
| |
| * Add some loggingErik Johnston2015-06-021-0/+5
| |
| * Correctly look up auth_eventsErik Johnston2015-06-021-9/+12
| |
| * Don't process events we've already processed. Remember to process state eventsErik Johnston2015-06-021-0/+22
| |
| * Correctly pass in auth_eventsErik Johnston2015-06-011-1/+11
| |
* | Don't needlessly compute contextErik Johnston2015-06-031-2/+4
|/
* Actually fetch state for new backwards extremeties when backfilling.Erik Johnston2015-05-201-61/+103
|
* Don't apply new room join hack if depth > 5Erik Johnston2015-05-191-3/+6
|
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perfErik Johnston2015-05-191-10/+15
|\
| * Merge branch 'notifier_unify' into notifier_performanceMark Haines2015-05-141-0/+2
| |\
| * | Don't bother checking for updates if the stream token hasn't advanced for a userMark Haines2015-05-131-10/+15
| | |
* | | Do work in parellel when joining a roomErik Johnston2015-05-181-19/+50
| |/ |/|
* | Don't talk to yourself when backfillingErik Johnston2015-05-121-0/+2
|/
* Merge pull request #144 from matrix-org/erikj/logging_contextMark Haines2015-05-121-13/+19
|\ | | | | Preserving logging contexts
| * Unwrap defer.gatherResults failuresErik Johnston2015-05-121-1/+2
| |
| * Fix up leak. Add warnings.Erik Johnston2015-05-081-12/+17
| |
* | s/backfil/backfill/Erik Johnston2015-05-121-4/+4
| |
* | Typos everywhereErik Johnston2015-05-121-1/+1
| |
* | And another typo.Erik Johnston2015-05-121-3/+3
| |
* | Err, gatherResults doesn't take a dict...Erik Johnston2015-05-121-4/+7
| |
* | Handle the case where the other side is unreachable when backfillingErik Johnston2015-05-121-14/+42
| |
* | Initial hack at wiring together pagination and backfillErik Johnston2015-05-111-2/+106
|/
* That wasn't a deferredErik Johnston2015-05-011-1/+1
|
* Remove inlineCallbacks from non-generatorErik Johnston2015-05-011-2/+0
|
* Remove some run_on_reactorsErik Johnston2015-05-011-2/+0
|
* Merge branch 'develop' of github.com:matrix-org/synapse into mysqlErik Johnston2015-04-081-4/+36
|\
| * typoErik Johnston2015-04-081-1/+1
| |
| * Don't yield on notifying all listenersErik Johnston2015-04-081-4/+36
| |
* | Sanitize TransactionStoreErik Johnston2015-03-231-1/+1
|/
* Clean out event_forward_extremities table when the server rejoins the roomErik Johnston2015-03-181-0/+2
|
* Remove concept of context.auth_events, instead use context.current_stateErik Johnston2015-03-161-5/+3
|
* Merge branch 'develop' of github.com:matrix-org/synapse into batched_get_pduErik Johnston2015-02-231-1/+1
|\
| * Add missing comma so that it generates a dict and not a setErik Johnston2015-02-201-1/+1
| |
* | Implement and use new batched get missing pduErik Johnston2015-02-231-0/+23
| |
* | Initial stab at implementing a batched get_missing_pdus requestErik Johnston2015-02-191-4/+5
|/
* Change some debug logging to infoErik Johnston2015-02-171-2/+4
|
* resolve_events expect lists, not dictsErik Johnston2015-02-151-1/+1
|
* Fix wrong variable nameErik Johnston2015-02-131-1/+1
|