summary refs log tree commit diff
path: root/synapse/handlers (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Add store-and-forward direct-to-device messagingMark Haines2016-08-251-1/+42
|
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/paginationErik Johnston2016-08-241-2/+12
|\
| * Pass through user-supplied content in /join/$room_idKegan Dougal2016-08-231-2/+12
| | | | | | | | | | | | | | It was always intended to allow custom keys on the join event, but this has at some point been lost. Restore it. If the user specifies keys like "avatar_url" then they will be clobbered.
* | Add None checks to backfillErik Johnston2016-08-241-2/+2
|/
* defer.returnValue must not be called within MeasureErik Johnston2016-08-191-7/+7
|
* Merge pull request #1026 from matrix-org/paul/thirdpartylookupPaul Evans2016-08-181-0/+24
|\ | | | | 3rd party entity lookup
| * Move validation logic for AS 3PE query response into ApplicationServiceApi ↵Paul "LeoNerd" Evans2016-08-181-44/+2
| | | | | | | | class, to keep the handler logic neater
| * More warnings about invalid results from AS 3PE queryPaul "LeoNerd" Evans2016-08-181-2/+7
| |
| * Avoid so much copypasta between 3PU and 3PL query by unifying around a ↵Paul "LeoNerd" Evans2016-08-181-26/+9
| | | | | | | | ThirdPartyEntityKind enumeration
| * Minor syntax neateningsPaul "LeoNerd" Evans2016-08-181-14/+8
| |
| * Appease pep8Paul "LeoNerd" Evans2016-08-181-0/+2
| |
| * Copypasta the 3PU support code to also do 3PLPaul "LeoNerd" Evans2016-08-181-3/+30
| |
| * Log a warning if an AS yields an invalid 3PU lookup resultPaul "LeoNerd" Evans2016-08-181-1/+6
| |
| * Scattergather the call out to ASes; validate received resultsPaul "LeoNerd" Evans2016-08-181-7/+34
| |
| * Filter 3PU lookups by only ASes that declare knowledge of that protocolPaul "LeoNerd" Evans2016-08-181-2/+4
| |
| * Merge remote-tracking branch 'origin/develop' into paul/thirdpartylookupPaul "LeoNerd" Evans2016-08-185-62/+82
| |\
| * | Extend individual list results into the main return list, don't appendPaul "LeoNerd" Evans2016-08-181-1/+1
| | |
| * | Thread 3PU lookup through as far as the AS API object; which currently noöps itPaul "LeoNerd" Evans2016-08-171-0/+21
| | |
* | | Add appservice workerErik Johnston2016-08-181-38/+51
| |/ |/|
* | Make AppserviceHandler stream events from databaseErik Johnston2016-08-181-21/+44
| | | | | | | | | | | | | | | | | | This is for two reasons: 1. Suppresses duplicates correctly, as the notifier doesn't do any duplicate suppression. 2. Makes it easier to connect the AppserviceHandler to the replication stream.
* | Make notify_interested_services fasterErik Johnston2016-08-171-23/+8
| |
* | Measure notify_interested_servicesErik Johnston2016-08-171-19/+22
| |
* | Merge pull request #1012 from matrix-org/erikj/limit_backfill_uriErik Johnston2016-08-161-4/+5
|\ \ | | | | | | Limit number of extremeties in backfill request
| * | 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.
* | | Refactor user_delete_access_tokens. Invalidate get_user_by_access_token to ↵Erik Johnston2016-08-151-3/+3
|/ / | | | | | | slaves.
* | Merge pull request #1009 from matrix-org/erikj/event_splitErik Johnston2016-08-152-11/+19
|\ \ | |/ |/| Split out /events to synchrotron
| * Make synchrotron accept /eventsErik Johnston2016-08-122-11/+19
| |
* | Log the value which is observed in the first place.Daniel Ehlers2016-08-141-1/+1
| | | | | | | | | | | | | | | | The name 'result' is of bool type and has no len property, resulting in a TypeError. Futhermore in the flow control conn.response is observed and hence should be reported. Signed-off-by: Daniel Ehlers <sargon@toppoint.de>
* | Fix AttributeError when bind_dn is not defined.Daniel Ehlers2016-08-141-1/+1
| | | | | | | | | | | | | | | | | | In case one does not define bind_dn in ldap configuration, filter attribute is not declared. Since auth code only uses ldap_filter attribute when according LDAP mode is selected, it is safe to only declare the attribute in that case. Signed-off-by: Daniel Ehlers <sargon@toppoint.de>
* | Only process one local membership event per room at a timeErik Johnston2016-08-121-1/+1
|/
* Merge pull request #997 from Half-Shot/developErik Johnston2016-08-111-3/+6
|\ | | | | Don't change status_msg on /sync
| * Don't change status_msg on /syncWill Hunt2016-08-101-3/+6
| |
* | 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
|/
* /login: Respond with a 403 when we get an invalid m.login.tokenRichard van der Hoff2016-08-091-3/+3
|
* Fix login with m.login.tokenRichard van der Hoff2016-08-081-13/+4
| | | | | login with token (as used by CAS auth) was broken by 067596d, such that it always returned a 401.
* Fix backfill auth eventsErik Johnston2016-08-051-21/+50
|
* keys/query: Omit device displayname if nullRichard van der Hoff2016-08-041-3/+4
| | | | ... which makes it more consistent with user displaynames.
* Include device name in /keys/query responseRichard van der Hoff2016-08-031-3/+8
| | | | Add an 'unsigned' section which includes the device display name.
* keys/query: return all users which were asked forRichard van der Hoff2016-08-031-3/+6
| | | | | | In the situation where all of a user's devices get deleted, we want to indicate this to a client, so we want to return an empty dictionary, rather than nothing at all.
* Merge branch 'rav/null_default_device_displayname' into developRichard van der Hoff2016-08-031-1/+1
|\
| * PEP8Richard van der Hoff2016-08-031-1/+1
| |
| * Default device_display_name to nullRichard van der Hoff2016-08-031-1/+1
| | | | | | | | | | | | It turns out that it's more useful to return a null device display name (and let clients decide how to handle it: eg, falling back to device_id) than using a constant string like "unknown device".
* | E2eKeysHandler: minor tweaksRichard van der Hoff2016-08-031-5/+3
| | | | | | | | PR feedback
* | Merge branch 'develop' into rav/refactor_device_queryMark Haines2016-08-033-9/+4
|\|
| * Merge pull request #940 from matrix-org/erikj/fed_state_cacheErik Johnston2016-08-023-9/+4
| |\ | | | | | | Cache federation state responses
| | * Cache federation state responsesErik Johnston2016-07-213-9/+4
| | |
* | | E2E keys: Make federation query share code with client queryRichard van der Hoff2016-08-021-25/+90
| | | | | | | | | | | | | | | Refactor the e2e query handler to separate out the local query, and then make the federation handler use it.
* | | Move e2e query logic into a handlerRichard van der Hoff2016-08-011-0/+67
|/ /
* | Merge pull request #958 from matrix-org/paul/SYN-738Paul Evans2016-07-291-0/+7
|\ \ | | | | | | Forbid non-ASes from registering users whose names begin with '_'
| * | Forbid non-ASes from registering users whose names begin with '_' (SYN-738)Paul "LeoNerd" Evans2016-07-271-0/+7
| | |
* | | 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
| | |
* | | Delete e2e keys on device deleteRichard van der Hoff2016-07-271-0/+4
|/ /
* | Add `create_requester` functionRichard van der Hoff2016-07-264-29/+32
| | | | | | | | | | Wrap the `Requester` constructor with a function which provides sensible defaults, and use it throughout
* | Delete refresh tokens when deleting devicesRichard van der Hoff2016-07-261-2/+4
| |
* | Implement updating devicesRichard van der Hoff2016-07-261-0/+24
| | | | | | | | You can update the displayname of devices now.
* | Implement deleting devicesRichard van der Hoff2016-07-262-3/+46
| |
* | Use get to avoid KeyErrorsDavid Baker2016-07-221-1/+1
| |
* | Log the hostname the reCAPTCHA was completed onDavid Baker2016-07-221-2/+11
| | | | | | | | This could be useful information to have in the logs. Also comment about how & why we don't verify the hostname.
* | make /devices return a listRichard van der Hoff2016-07-211-5/+5
| | | | | | | | Turns out I specced this to return a list of devices rather than a dict of them
* | Fix PEP8 errorsRichard van der Hoff2016-07-211-1/+1
| |
* | Implement GET /device/{deviceId}Richard van der Hoff2016-07-211-9/+37
| |
* | GET /devices endpointRichard van der Hoff2016-07-201-0/+27
|/ | | | | | | implement a GET /devices endpoint which lists all of the user's devices. It also returns the last IP where we saw that device, so there is some dancing to fish that out of the user_ips table.
* Merge pull request #935 from matrix-org/erikj/backfill_notifsErik Johnston2016-07-201-5/+6
|\ | | | | Don't notify pusher pool for backfilled events
| * Don't notify pusher pool for backfilled eventsErik Johnston2016-07-201-5/+6
| |
* | Merge pull request #933 from matrix-org/rav/type_annotationsRichard van der Hoff2016-07-202-0/+8
|\ \ | | | | | | Type annotations
| * | Type annotationsRichard van der Hoff2016-07-192-0/+8
| | | | | | | | | | | | | | | Add some type annotations to help PyCharm (in particular) to figure out the types of a bunch of things.
* | | Merge pull request #932 from matrix-org/rav/register_refactorDavid Baker2016-07-201-5/+8
|\ \ \ | |_|/ |/| | Further registration refactoring
| * | Further registration refactoringRichard van der Hoff2016-07-191-5/+8
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * `RegistrationHandler.appservice_register` no longer issues an access token: instead it is left for the caller to do it. (There are two of these, one in `synapse/rest/client/v1/register.py`, which now simply calls `AuthHandler.issue_access_token`, and the other in `synapse/rest/client/v2_alpha/register.py`, which is covered below). * In `synapse/rest/client/v2_alpha/register.py`, move the generation of access_tokens into `_create_registration_details`. This means that the normal flow no longer needs to call `AuthHandler.issue_access_token`; the shared-secret flow can tell `RegistrationHandler.register` not to generate a token; and the appservice flow continues to work despite the above change.
* | Merge pull request #922 from matrix-org/erikj/file_api2Erik Johnston2016-07-201-4/+12
|\ \ | |/ |/| Feature: Add filter to /messages. Add 'contains_url' to filter.
| * Add filter param to /messages APIErik Johnston2016-07-141-4/+12
| |
* | Merge pull request #929 from matrix-org/rav/support_deviceid_in_loginRichard van der Hoff2016-07-192-8/+82
|\ \ | | | | | | Add device_id support to /login
| * | Add device_id support to /loginRichard van der Hoff2016-07-182-8/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a 'devices' table to the storage, as well as a 'device_id' column to refresh_tokens. Allow the client to pass a device_id, and initial_device_display_name, to /login. If login is successful, then register the device in the devices table if it wasn't known already. If no device_id was supplied, make one up. Associate the device_id with the access token and refresh token, so that we can get at it again later. Ensure that the device_id is copied from the refresh token to the access_token when the token is refreshed.
* | | Summary lineMark Haines2016-07-191-2/+1
| | |
* | | Update docstring on Handlers.Mark Haines2016-07-191-3/+15
|/ / | | | | | | To indicate it is deprecated.
* | Refactor login flowRichard van der Hoff2016-07-181-47/+59
| | | | | | | | | | | | | | | | | | | | Make sure that we have the canonical user_id *before* calling get_login_tuple_for_user_id. Replace login_with_password with a method which just validates the password, and have the caller call get_login_tuple_for_user_id. This brings the password flow into line with the other flows, and will give us a place to register the device_id if necessary.
* | Fix a doc-commentRichard van der Hoff2016-07-181-1/+1
| | | | | | | | The `store` in a handler is a generic DataStore, not just an events.StateStore.
* | Merge pull request #919 from matrix-org/erikj/auth_fixErik Johnston2016-07-151-2/+6
|\ \ | | | | | | Various auth.py fixes.
| * | CommentErik Johnston2016-07-151-0/+4
| | |
| * | Check sender signed eventErik Johnston2016-07-141-2/+2
| |/
* / Bug fix: expire invalid access tokensNegar Fazeli2016-07-132-5/+6
|/
* Merge branch 'erikj/shared_secret' into erikj/test2Erik Johnston2016-07-063-17/+34
|\
| * Add an admin option to shared secret registrationErik Johnston2016-07-051-1/+3
| |
| * Merge pull request #904 from ↵David Baker2016-07-051-14/+27
| |\ | | | | | | | | | | | | matrix-org/dbkr/register_email_no_untrusted_id_server requestToken update
| | * requestToken updateDavid Baker2016-06-301-14/+27
| | | | | | | | | | | | | | | | | | Don't send requestToken request to untrusted ID servers Also correct the THREEPID_IN_USE error to add the M_ prefix. This is a backwards incomaptible change, but the only thing using this is the angular client which is now unmaintained, so it's probably better to just do this now.
| * | Fix password configKent Shikama2016-07-051-2/+2
| | |
| * | Fix pep8Kent Shikama2016-07-051-1/+2
| | |
| * | Add pepper to password hashingKent Shikama2016-07-051-2/+3
| | | | | | | | | | | | Signed-off-by: Kent Shikama <kent@kentshikama.com>
* | | Add ReadWriteLock for pagination and history pruneErik Johnston2016-07-051-34/+36
| | |
* | | Add purge_history APIErik Johnston2016-07-052-1/+14
|/ /
* | Fix style violationsKent Shikama2016-07-041-1/+2
| | | | | | | | Signed-off-by: Kent Shikama <kent@kentshikama.com>
* | Optionally include password hash in createUser endpointKent Shikama2016-07-031-2/+2
|/ | | | Signed-off-by: Kent Shikama <kent@kentshikama.com>
* Rework ldap integration with ldap3Martin Weinelt2016-06-221-33/+170
| | | | | | | | | | | | | | | | | | | Use the pure-python ldap3 library, which eliminates the need for a system dependency. Offer both a `search` and `simple_bind` mode, for more sophisticated ldap scenarios. - `search` tries to find a matching DN within the `user_base` while employing the `user_filter`, then tries the bind when a single matching DN was found. - `simple_bind` tries the bind against a specific DN by combining the localpart and `user_base` Offer support for STARTTLS on a plain connection. The configuration was changed to reflect these new possibilities. Signed-off-by: Martin Weinelt <hexa@darmstadt.ccc.de>
* Add a comment on why we don't create a profile for upgrading usersMark Haines2016-06-171-0/+1
|
* Remove registered_users from the distributor.Mark Haines2016-06-172-20/+10
| | | | | | | | | | The only place that was observed was to set the profile. I've made it so that the profile is set within store.register in the same transaction that creates the user. This required some slight changes to the registration code for upgrading guest users, since it previously relied on the distributor swallowing errors if the profile already existed.
* Only re-sign our own eventsErik Johnston2016-06-171-6/+9
|
* Fix TypeError in call to bcrypt.hashpwSalvatore LaMendola2016-06-161-1/+1
| | | | | | | | - At the very least, this TypeError caused logins to fail on my own running instance of Synapse, and the simple (explicit) UTF-8 conversion resolved login errors for me. Signed-off-by: Salvatore LaMendola <salvatore.lamendola@gmail.com>
* Correctly mark backfilled events as backfilledErik Johnston2016-06-151-14/+16
|
* Fix a bug caused by a change in auth_handler functionNegar Fazeli2016-06-081-2/+2
| | | | Fix the relevant unit test cases
* Pull full state for each room all at onceErik Johnston2016-06-081-16/+16
|
* Don't hit DB for noop replications queriesErik Johnston2016-06-081-0/+3
|
* 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.
* .values() returns list of setsErik Johnston2016-06-061-1/+2
|
* Fix typosErik Johnston2016-06-061-32/+36
|
* Fire after 30s not 8hErik Johnston2016-06-061-1/+1
|
* Merge pull request #832 from matrix-org/erikj/presence_coountErik Johnston2016-06-031-5/+9
|\ | | | | Change def of small delta in presence stream. Add metrics.
| * Change metric styleErik Johnston2016-06-031-5/+4
| |
| * Presence metrics. Change def of small deltaErik Johnston2016-06-031-5/+10
| |
* | Fix typoErik Johnston2016-06-031-1/+1
|/
* Merge pull request #829 from matrix-org/erikj/poke_notifierErik Johnston2016-06-031-4/+7
|\ | | | | Poke notifier on next reactor tick
| * Poke notifier on next reactor tickErik Johnston2016-06-031-4/+7
| |
* | Load push rules in storage layer, so that they get cachedErik Johnston2016-06-031-3/+2
|/
* Merge remote-tracking branch 'origin/dbkr/email_notif_string_fmt_error' into ↵David Baker2016-06-021-28/+36
|\ | | | | | | dbkr/email_unsubscribe
| * Store the typing users as user_id strings. (#819)Mark Haines2016-06-021-28/+36
| | | | | | Rather than storing them as UserID objects.
* | Merge remote-tracking branch 'origin/develop' into dbkr/email_unsubscribeDavid Baker2016-06-022-550/+716
|\|
| * Deduplicate presence entries in sync (#818)Mark Haines2016-06-021-0/+3
| |
| * Allow external processes to mark a user as syncing. (#812)Mark Haines2016-06-021-13/+106
| | | | | | | | | | | | | | | | | | | | | | | | * Add infrastructure to the presence handler to track sync requests in external processes * Expire stale entries for dead external processes * Add an http endpoint for making users as syncing Add some docstrings and comments. * Fixes
| * Merge pull request #817 from matrix-org/dbkr/split_out_auth_handlerDavid Baker2016-06-022-3/+1
| |\ | | | | | | Split out the auth handler
| * \ Merge pull request #800 from matrix-org/erikj/sync_refactorErik Johnston2016-06-021-537/+607
| |\ \ | | | | | | | | Refactor SyncHandler
| | * | Change short circuit pathErik Johnston2016-05-241-16/+26
| | | |
| | * | Don't send down all ephemeral eventsErik Johnston2016-05-241-1/+3
| | | |
| | * | Only work out newly_joined_users for incremental syncErik Johnston2016-05-241-6/+9
| | | |
| | * | Only include non-offline presence in initial syncErik Johnston2016-05-241-0/+3
| | | |
| | * | Spell builder correctlyErik Johnston2016-05-241-63/+63
| | | |
| | * | Inline function. Make load_filtered_recents privateErik Johnston2016-05-241-17/+7
| | | |
| | * | Add commentsErik Johnston2016-05-241-7/+105
| | | |
| | * | Shuffle things roomErik Johnston2016-05-241-37/+33
| | | |
| | * | Add back concurrently_executeErik Johnston2016-05-231-25/+9
| | | |
| | * | Refactor SyncHandlerErik Johnston2016-05-231-497/+481
| | | |
* | | | Merge branch 'dbkr/split_out_auth_handler' into dbkr/email_unsubscribeDavid Baker2016-06-023-4/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | Split out the auth handlerDavid Baker2016-06-022-3/+1
| |/ /
| * | Fix room list spideringDavid Baker2016-06-011-1/+1
| | |
* | | Email unsubscribing that may in theory, workDavid Baker2016-06-021-0/+5
|/ / | | | | | | Were it not for that fact that you can't use the base handler in the pusher because it pulls in the world. Comitting while I fix that on a different branch.
* | Merge remote-tracking branch 'origin/develop' into dbkr/room_list_spiderDavid Baker2016-06-013-22/+7
|\ \
| * | Move the AS handler out of the Handlers object.Mark Haines2016-05-313-22/+7
| | | | | | | | | | | | | | | | | | Access it directly from the homeserver itself. It already wasn't inheriting from BaseHandler storing it on the Handlers object was already somewhat dubious.
* | | Add cache to remote room listsDavid Baker2016-05-311-4/+30
| | | | | | | | | | | | Poll for updates from remote servers, waiting for the poll if there's no cache entry.
* | | Basic, un-cached support for secondary_directory_serversDavid Baker2016-05-311-1/+32
|/ /
* | Split out the room list handlerDavid Baker2016-05-311-2/+1
| | | | | | | | So I can use it from federation bits without pulling in all the handlers.
* | Send down correct error response if user not foundErik Johnston2016-05-271-2/+7
| |
* | Fix set profile error with Requester.Negi Fazeli2016-05-231-4/+5
|/ | | | | Replace flush_user with delete access token due to function removal Add a new test case for if the user is already registered
* Move typing handler out of the Handlers objectMark Haines2016-05-172-20/+15
|
* Merge remote-tracking branch 'origin/develop' into markjh/liberate_sync_handlerMark Haines2016-05-171-15/+0
|\
| * Remove unused get_joined_rooms_for_userMark Haines2016-05-171-15/+0
| |
| * Merge branch 'develop' into markjh/member_cleanupMark Haines2016-05-175-25/+25
| |\
| | * Merge pull request #787 from matrix-org/markjh/liberate_presence_handlerMark Haines2016-05-175-25/+25
| | |\ | | | | | | | | Move the presence handler out of the Handlers object
* | | | Move SyncHandler out of the Handlers objectMark Haines2016-05-162-7/+5
| | | |
* | | | Merge branch 'markjh/liberate_presence_handler' into ↵Mark Haines2016-05-165-25/+25
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| markjh/liberate_sync_handler
| * | Don't inherit PresenceHandler from BaseHandler, remove references to self.hs ↵Mark Haines2016-05-161-19/+21
| | | | | | | | | | | | from presence handler
| * | Move the presence handler out of the Handlers objectMark Haines2016-05-165-7/+5
| | |
* | | Remove get_joined_rooms_for_user from RoomMemberHandlerMark Haines2016-05-163-11/+4
| | |
* | | Replaces calls to fetch_room_distributions_into with get_joined_hosts_for_roomMark Haines2016-05-163-67/+27
| |/ |/|
* | Spell "domain" correctlyMark Haines2016-05-163-8/+8
|/ | | | s/domian/domain/g
* Merge pull request #741 from negzi/create_user_with_expiryErik Johnston2016-05-132-2/+55
|\ | | | | Create user with expiry
| * Create user with expiryNegi Fazeli2016-05-132-2/+55
| | | | | | | | | | | | - Add unittests for client, api and handler Signed-off-by: Negar Fazeli <negar.fazeli@ericsson.com>
* | missed a spotMark Haines2016-05-121-1/+1
| |
* | move filter_events_for_client out of base handlerMark Haines2016-05-115-204/+29
| |
* | Shuffle when we get the signing_key attribute.Mark Haines2016-05-111-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.
* | Merge pull request #775 from matrix-org/erikj/password_hashErik Johnston2016-05-111-1/+4
|\ \ | | | | | | Correctly handle NULL password hashes from the database
| * | Correctly handle NULL password hashes from the databaseErik Johnston2016-05-111-1/+4
| |/
* | Fix typoMark Haines2016-05-111-1/+1
| |
* | Move _create_new_client_event and handle_new_client_event out of base handlerMark Haines2016-05-114-204/+214
|/
* Merge pull request #759 from matrix-org/dbkr/email_notifsMatthew Hodgson2016-05-105-12/+12
|\ | | | | Send email notifications for missed messages
| * Merge remote-tracking branch 'origin/develop' into dbkr/email_notifsDavid Baker2016-05-103-16/+10
| |\
| * \ Merge remote-tracking branch 'origin/develop' into dbkr/email_notifsDavid Baker2016-04-291-1/+1
| |\ \
| * | | Run filter_events_for_clientDavid Baker2016-04-275-12/+12
| | | | | | | | | | | | | | | | so we don't accidentally mail out events people shouldn't see
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_userErik Johnston2016-05-093-15/+9
|\ \ \ \ | | |_|/ | |/| |
| * | | Add and use get_domian_from_idErik Johnston2016-05-093-15/+9
| | | |
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_userErik Johnston2016-05-091-1/+1
|\| | |
| * | | Reduce database inserts when sending transactionsErik Johnston2016-05-061-1/+1
| | |/ | |/|
* | | Add bulk fetch storage APIErik Johnston2016-05-052-8/+4
| | |
* | | Implement basic ignore userErik Johnston2016-05-042-6/+42
|/ /
* / fix typoMatthew Hodgson2016-04-281-1/+1
|/
* Simplify _check_passwordErik Johnston2016-04-151-5/+9
|
* Fix check_password rather than inverting the meaning of ↵Mark Haines2016-04-141-9/+12
| | | | _check_local_password (#730)
* Fix login to error for nonexistent usersDavid Baker2016-04-141-1/+1
| | | | Fixes SYN-680
* Merge pull request #718 from matrix-org/erikj/public_room_listErik Johnston2016-04-131-5/+8
|\ | | | | Don't return empty public rooms
| * Don't return empty public roomsErik Johnston2016-04-121-5/+8
| |
* | Don't auto log failed auth checksErik Johnston2016-04-132-9/+31
|/
* 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-113-6/+32
|\ | | | | Change pushers to use the event_actions table
| * Add comments on min_stream_idDavid Baker2016-04-071-0/+1
| | | | | | | | saying that the min stream id won't be completely accurate all the time
| * Merge remote-tracking branch 'origin/develop' into ↵David Baker2016-04-073-12/+49
| |\ | | | | | | | | | dbkr/pushers_use_event_actions
| * | Send badge count pushes.David Baker2016-04-071-4/+17
| | | | | | | | | | | | Also fix bugs with retrying.
| * | Make pushers use the event_push_actions table instead of listening on an ↵David Baker2016-04-062-2/+14
| | | | | | | | | | | | | | | | | | | | | event stream & running the rules again. Sytest passes, but remaining to do: * Make badges work again * Remove old, unused code
* | | Merge pull request #707 from matrix-org/markjh/remove_changed_presencelike_dataErik Johnston2016-04-081-15/+0
|\ \ \ | | | | | | | | changed_presencelike_data isn't observed anywhere so can be removed
| * | | changed_presencelike_data isn't observed anywhere in synapse so can be removedMark Haines2016-04-081-15/+0
| | | |
* | | | Remove some unused functions (#711)Mark Haines2016-04-082-42/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove some unused functions * get_room_events_stream is only used in tests * is_exclusive_room might actually be something we want
* | | | Move all the wrapper functions for distributor.fireMark Haines2016-04-084-38/+3
|/ / / | | | | | | | | | | | | | | | | | | 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 #708 from matrix-org/markjh/remove_collect_presencelike_dataMark Haines2016-04-082-37/+1
|\ \ \ | | | | | | | | Call profile handler get_displayname directly
| * | | Call profile handler get_displayname directly rather than using ↵Mark Haines2016-04-072-37/+1
| | | | | | | | | | | | | | | | collect_presencelike_data
* | | | Merge pull request #701 from DoubleMalt/ldap-authErik Johnston2016-04-071-9/+77
|\ \ \ \ | |/ / / |/| | | Add LDAP authentication
| * | | fix check for failed authenticationChristoph Witzany2016-04-061-2/+4
| | | |
| * | | remove lineChristoph Witzany2016-04-061-1/+0
| | | |
| * | | make tests for ldap more specific to not be fooled by MocksChristoph Witzany2016-04-061-3/+3
| | | |
| * | | output ldap version for info and to pacify pep8Christoph Witzany2016-04-061-0/+2
| | | |
| * | | conditionally import ldapChristoph Witzany2016-04-061-2/+5
| | | |
| * | | fix pep8Christoph Witzany2016-04-061-2/+1
| | | |
| * | | fix exception handlingChristoph Witzany2016-04-061-2/+2
| | | |
| * | | code styleChristoph Witzany2016-04-061-6/+13
| | | |
| * | | add tls property and twist my head around twistedChristoph Witzany2016-04-061-15/+29
| | | |
| * | | move LDAP authentication to AuthenticationHandlerChristoph Witzany2016-04-061-6/+48
| | | |
* | | | Merge pull request #700 from matrix-org/erikj/deduplicate_joinsErik Johnston2016-04-071-0/+31
|\ \ \ \ | |_|_|/ |/| | | Deduplicate membership changes
| * | | Deduplicate joinsErik Johnston2016-04-071-0/+31
| | | |
* | | | Set profile information when joining rooms remotelyErik Johnston2016-04-071-0/+5
|/ / /
* / / Let users see their own leave eventsRichard van der Hoff2016-04-061-11/+40
|/ / | | | | | | | | | | | | ... otherwise clients get confused. Fixes https://matrix.org/jira/browse/SYN-662, https://github.com/vector-im/vector-web/issues/368
* | 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-052-15/+37
|\ \ | | | | | | Fix stuck invites
| * | Fix stuck invitesErik Johnston2016-04-052-15/+37
| | | | | | | | | | | | | | | | | | | | | | | | 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 #690 from matrix-org/erikj/memberErik Johnston2016-04-051-1/+4
|\| | | | | | | | Store invites in a separate table.
| * | Docs and indentsErik Johnston2016-04-041-1/+4
| | |
| * | Store invites in a separate table.Erik Johnston2016-04-041-1/+1
| | |
* | | Merge pull request #689 from matrix-org/erikj/memberErik Johnston2016-04-043-149/+169
|\| | | | | | | | Do checks for memberships before creating events
| * | Use computed prev event idsErik Johnston2016-04-013-13/+25
| | |
| * | Remove state hack from _create_new_client_eventErik Johnston2016-04-011-43/+0
| | |
| * | Do checks for memberships before creating eventsErik Johnston2016-04-011-93/+144
| | |
* | | Merge pull request #686 from matrix-org/markjh/doc_stringsMark Haines2016-04-015-72/+101
|\ \ \ | |/ / |/| | Use google style doc strings.
| * | Use google style doc strings.Mark Haines2016-04-015-72/+101
| | | | | | | | | | | | | | | | | | | | | 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.
* | | Add concurrently_execute functionErik Johnston2016-04-013-74/+51
| | |
* | | Filter rooms list before chunkingErik Johnston2016-04-011-6/+12
| | |
* | | Remove outlier parameter from compute_event_contextMark Haines2016-03-312-9/+5
|/ / | | | | | | Use event.internal_metadata.is_outlier instead.
* | Merge pull request #680 from matrix-org/markjh/remove_is_new_stateMark Haines2016-03-311-16/+4
|\ \ | | | | | | Remove the is_new_state argument to persist event.
| * | 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.
* / Split out RoomMemberHandlerErik Johnston2016-03-313-603/+651
|/
* Line lengthErik Johnston2016-03-311-1/+3
|
* Only forget room if you were in the roomErik Johnston2016-03-301-1/+2
|
* Require user to have left room to forget roomErik Johnston2016-03-301-6/+16
| | | | | This dramatically simplifies the forget API code - in particular it no longer generates a leave event.
* Add a response cache for getting the public room listMark Haines2016-03-241-1/+11
|
* Deduplicate identical /sync requestsMark Haines2016-03-241-1/+15
|
* Ensure all old public rooms have aliasesErik Johnston2016-03-231-4/+5
|
* Ensure published rooms have public join rulesErik Johnston2016-03-231-0/+7
|
* CommentErik Johnston2016-03-231-0/+3
|
* Don't require alias in public room list.Erik Johnston2016-03-231-14/+13
| | | | | | | Rooms now no longer require an alias to be published. Also, changes the way we pull out state of each room to not require fetching all state events.
* Merge pull request #657 from matrix-org/erikj/roomlistErik Johnston2016-03-221-0/+22
|\ | | | | Add published room list edit API
| * Doc stringErik Johnston2016-03-221-0/+6
| |
| * an invalide is something else...Matthew Hodgson2016-03-221-1/+1
| |
| * Add published room list edit APIErik Johnston2016-03-211-0/+16
| |
* | 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
|/
* Merge pull request #652 from matrix-org/erikj/delete_aliasErik Johnston2016-03-181-6/+47
|\ | | | | Update aliases event after deletion
| * Check canonical alias event existsErik Johnston2016-03-171-1/+2
| |
| * Update aliases event after deletionErik Johnston2016-03-171-6/+46
| | | | | | | | | | | | | | | | Attempt to update the appropriate `m.room.aliases` event after deleting an alias. This may fail due to the deleter not being in the room. Will also check if the canonical alias of the event is set to the deleted alias, and if so will attempt to delete it.