Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1049 from matrix-org/erikj/presence_users_in_room | Erik Johnston | 2016-08-30 | 6 | -13/+28 |
|\ | | | | | Use state handler instead of get_users_in_room/get_joined_hosts | ||||
| * | Use state handler instead of get_users_in_room/get_joined_hosts | Erik Johnston | 2016-08-26 | 6 | -13/+28 |
| | | |||||
* | | Merge remote-tracking branch 'origin/develop' into markjh/direct_to_device | Mark Haines | 2016-08-26 | 5 | -167/+309 |
|\| | |||||
| * | 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 | 2 | -1/+13 |
| |\ | |||||
| | * | Merge pull request #1043 from matrix-org/erikj/backfill_fix | Erik Johnston | 2016-08-26 | 1 | -1/+3 |
| | |\ | | | | | | | | | Fix None check in backfill | ||||
| | | * | Fix None check in backfill | Erik Johnston | 2016-08-25 | 1 | -1/+3 |
| | | | | |||||
| * | | | Make sync not pull out full state | Erik Johnston | 2016-08-25 | 1 | -34/+41 |
| | | | | |||||
| * | | | Replace context.current_state with context.current_state_ids | Erik Johnston | 2016-08-25 | 4 | -131/+226 |
| | | | | |||||
| * | | | Pull out event ids rather than full events for state | Erik Johnston | 2016-08-25 | 1 | -0/+12 |
| | |/ | |/| | |||||
* | | | Merge branch 'develop' into markjh/direct_to_device | Mark Haines | 2016-08-25 | 4 | -36/+57 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge pull request #1041 from matrix-org/paul/third-party-lookup | Paul Evans | 2016-08-25 | 1 | -0/+10 |
| |\ \ | | |/ | |/| | Extend 3PE lookup APIs for metadata query | ||||
| | * | Don't need toplevel cache on 3PE lookup metadata any more | Paul "LeoNerd" Evans | 2016-08-25 | 1 | -8/+0 |
| | | | |||||
| | * | Actually query over AS API for 3PE lookup metadata | Paul "LeoNerd" Evans | 2016-08-25 | 1 | -13/+1 |
| | | | |||||
| | * | Move static knowledge of protocol metadata into AS handler; cache the result | Paul "LeoNerd" Evans | 2016-08-24 | 1 | -2/+24 |
| | | | |||||
| | * | Initial hack at the 3PN protocols metadata lookup API | Paul "LeoNerd" Evans | 2016-08-24 | 1 | -0/+8 |
| | | | |||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2016-08-24 | 1 | -2/+2 |
| |\| | | | | | | | | | | erikj/preserve_log_contexts | ||||
| * | | Preserve some logcontexts | Erik Johnston | 2016-08-24 | 4 | -36/+47 |
| | | | |||||
* | | | Add store-and-forward direct-to-device messaging | Mark Haines | 2016-08-25 | 1 | -1/+42 |
| |/ |/| | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/pagination | Erik Johnston | 2016-08-24 | 1 | -2/+12 |
|\| | |||||
| * | Pass through user-supplied content in /join/$room_id | Kegan Dougal | 2016-08-23 | 1 | -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 backfill | Erik Johnston | 2016-08-24 | 1 | -2/+2 |
|/ | |||||
* | defer.returnValue must not be called within Measure | Erik Johnston | 2016-08-19 | 1 | -7/+7 |
| | |||||
* | Merge pull request #1026 from matrix-org/paul/thirdpartylookup | Paul Evans | 2016-08-18 | 1 | -0/+24 |
|\ | | | | | 3rd party entity lookup | ||||
| * | Move validation logic for AS 3PE query response into ApplicationServiceApi ↵ | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -44/+2 |
| | | | | | | | | class, to keep the handler logic neater | ||||
| * | More warnings about invalid results from AS 3PE query | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -2/+7 |
| | | |||||
| * | Avoid so much copypasta between 3PU and 3PL query by unifying around a ↵ | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -26/+9 |
| | | | | | | | | ThirdPartyEntityKind enumeration | ||||
| * | Minor syntax neatenings | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -14/+8 |
| | | |||||
| * | Appease pep8 | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -0/+2 |
| | | |||||
| * | Copypasta the 3PU support code to also do 3PL | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -3/+30 |
| | | |||||
| * | Log a warning if an AS yields an invalid 3PU lookup result | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -1/+6 |
| | | |||||
| * | Scattergather the call out to ASes; validate received results | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -7/+34 |
| | | |||||
| * | Filter 3PU lookups by only ASes that declare knowledge of that protocol | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -2/+4 |
| | | |||||
| * | Merge remote-tracking branch 'origin/develop' into paul/thirdpartylookup | Paul "LeoNerd" Evans | 2016-08-18 | 5 | -62/+82 |
| |\ | |||||
| * | | Extend individual list results into the main return list, don't append | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -1/+1 |
| | | | |||||
| * | | Thread 3PU lookup through as far as the AS API object; which currently noöps it | Paul "LeoNerd" Evans | 2016-08-17 | 1 | -0/+21 |
| | | | |||||
* | | | Add appservice worker | Erik Johnston | 2016-08-18 | 1 | -38/+51 |
| |/ |/| | |||||
* | | Make AppserviceHandler stream events from database | Erik Johnston | 2016-08-18 | 1 | -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 faster | Erik Johnston | 2016-08-17 | 1 | -23/+8 |
| | | |||||
* | | Measure notify_interested_services | Erik Johnston | 2016-08-17 | 1 | -19/+22 |
| | | |||||
* | | Merge pull request #1012 from matrix-org/erikj/limit_backfill_uri | Erik Johnston | 2016-08-16 | 1 | -4/+5 |
|\ \ | | | | | | | Limit number of extremeties in backfill request | ||||
| * | | 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. | ||||
* | | | Refactor user_delete_access_tokens. Invalidate get_user_by_access_token to ↵ | Erik Johnston | 2016-08-15 | 1 | -3/+3 |
|/ / | | | | | | | slaves. | ||||
* | | Merge pull request #1009 from matrix-org/erikj/event_split | Erik Johnston | 2016-08-15 | 2 | -11/+19 |
|\ \ | |/ |/| | Split out /events to synchrotron | ||||
| * | Make synchrotron accept /events | Erik Johnston | 2016-08-12 | 2 | -11/+19 |
| | | |||||
* | | Log the value which is observed in the first place. | Daniel Ehlers | 2016-08-14 | 1 | -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 Ehlers | 2016-08-14 | 1 | -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 time | Erik Johnston | 2016-08-12 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #997 from Half-Shot/develop | Erik Johnston | 2016-08-11 | 1 | -3/+6 |
|\ | | | | | Don't change status_msg on /sync | ||||
| * | Don't change status_msg on /sync | Will Hunt | 2016-08-10 | 1 | -3/+6 |
| | | |||||
* | | 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 |
|/ | |||||
* | /login: Respond with a 403 when we get an invalid m.login.token | Richard van der Hoff | 2016-08-09 | 1 | -3/+3 |
| | |||||
* | Fix login with m.login.token | Richard van der Hoff | 2016-08-08 | 1 | -13/+4 |
| | | | | | login with token (as used by CAS auth) was broken by 067596d, such that it always returned a 401. | ||||
* | Fix backfill auth events | Erik Johnston | 2016-08-05 | 1 | -21/+50 |
| | |||||
* | keys/query: Omit device displayname if null | Richard van der Hoff | 2016-08-04 | 1 | -3/+4 |
| | | | | ... which makes it more consistent with user displaynames. | ||||
* | Include device name in /keys/query response | Richard van der Hoff | 2016-08-03 | 1 | -3/+8 |
| | | | | Add an 'unsigned' section which includes the device display name. | ||||
* | keys/query: return all users which were asked for | Richard van der Hoff | 2016-08-03 | 1 | -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 develop | Richard van der Hoff | 2016-08-03 | 1 | -1/+1 |
|\ | |||||
| * | PEP8 | Richard van der Hoff | 2016-08-03 | 1 | -1/+1 |
| | | |||||
| * | Default device_display_name to null | Richard van der Hoff | 2016-08-03 | 1 | -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 tweaks | Richard van der Hoff | 2016-08-03 | 1 | -5/+3 |
| | | | | | | | | PR feedback | ||||
* | | Merge branch 'develop' into rav/refactor_device_query | Mark Haines | 2016-08-03 | 3 | -9/+4 |
|\| | |||||
| * | Merge pull request #940 from matrix-org/erikj/fed_state_cache | Erik Johnston | 2016-08-02 | 3 | -9/+4 |
| |\ | | | | | | | Cache federation state responses | ||||
| | * | Cache federation state responses | Erik Johnston | 2016-07-21 | 3 | -9/+4 |
| | | | |||||
* | | | E2E keys: Make federation query share code with client query | Richard van der Hoff | 2016-08-02 | 1 | -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 handler | Richard van der Hoff | 2016-08-01 | 1 | -0/+67 |
|/ / | |||||
* | | Merge pull request #958 from matrix-org/paul/SYN-738 | Paul Evans | 2016-07-29 | 1 | -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" Evans | 2016-07-27 | 1 | -0/+7 |
| | | | |||||
* | | | 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 |
| | | | |||||
* | | | Delete e2e keys on device delete | Richard van der Hoff | 2016-07-27 | 1 | -0/+4 |
|/ / | |||||
* | | Add `create_requester` function | Richard van der Hoff | 2016-07-26 | 4 | -29/+32 |
| | | | | | | | | | | Wrap the `Requester` constructor with a function which provides sensible defaults, and use it throughout | ||||
* | | Delete refresh tokens when deleting devices | Richard van der Hoff | 2016-07-26 | 1 | -2/+4 |
| | | |||||
* | | Implement updating devices | Richard van der Hoff | 2016-07-26 | 1 | -0/+24 |
| | | | | | | | | You can update the displayname of devices now. | ||||
* | | Implement deleting devices | Richard van der Hoff | 2016-07-26 | 2 | -3/+46 |
| | | |||||
* | | Use get to avoid KeyErrors | David Baker | 2016-07-22 | 1 | -1/+1 |
| | | |||||
* | | Log the hostname the reCAPTCHA was completed on | David Baker | 2016-07-22 | 1 | -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 list | Richard van der Hoff | 2016-07-21 | 1 | -5/+5 |
| | | | | | | | | Turns out I specced this to return a list of devices rather than a dict of them | ||||
* | | Fix PEP8 errors | Richard van der Hoff | 2016-07-21 | 1 | -1/+1 |
| | | |||||
* | | Implement GET /device/{deviceId} | Richard van der Hoff | 2016-07-21 | 1 | -9/+37 |
| | | |||||
* | | GET /devices endpoint | Richard van der Hoff | 2016-07-20 | 1 | -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_notifs | Erik Johnston | 2016-07-20 | 1 | -5/+6 |
|\ | | | | | Don't notify pusher pool for backfilled events | ||||
| * | Don't notify pusher pool for backfilled events | Erik Johnston | 2016-07-20 | 1 | -5/+6 |
| | | |||||
* | | Merge pull request #933 from matrix-org/rav/type_annotations | Richard van der Hoff | 2016-07-20 | 2 | -0/+8 |
|\ \ | | | | | | | Type annotations | ||||
| * | | Type annotations | Richard van der Hoff | 2016-07-19 | 2 | -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_refactor | David Baker | 2016-07-20 | 1 | -5/+8 |
|\ \ \ | |_|/ |/| | | Further registration refactoring | ||||
| * | | Further registration refactoring | Richard van der Hoff | 2016-07-19 | 1 | -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_api2 | Erik Johnston | 2016-07-20 | 1 | -4/+12 |
|\ \ | |/ |/| | Feature: Add filter to /messages. Add 'contains_url' to filter. | ||||
| * | Add filter param to /messages API | Erik Johnston | 2016-07-14 | 1 | -4/+12 |
| | | |||||
* | | Merge pull request #929 from matrix-org/rav/support_deviceid_in_login | Richard van der Hoff | 2016-07-19 | 2 | -8/+82 |
|\ \ | | | | | | | Add device_id support to /login | ||||
| * | | Add device_id support to /login | Richard van der Hoff | 2016-07-18 | 2 | -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 line | Mark Haines | 2016-07-19 | 1 | -2/+1 |
| | | | |||||
* | | | Update docstring on Handlers. | Mark Haines | 2016-07-19 | 1 | -3/+15 |
|/ / | | | | | | | To indicate it is deprecated. | ||||
* | | Refactor login flow | Richard van der Hoff | 2016-07-18 | 1 | -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-comment | Richard van der Hoff | 2016-07-18 | 1 | -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_fix | Erik Johnston | 2016-07-15 | 1 | -2/+6 |
|\ \ | | | | | | | Various auth.py fixes. | ||||
| * | | Comment | Erik Johnston | 2016-07-15 | 1 | -0/+4 |
| | | | |||||
| * | | Check sender signed event | Erik Johnston | 2016-07-14 | 1 | -2/+2 |
| |/ | |||||
* / | Bug fix: expire invalid access tokens | Negar Fazeli | 2016-07-13 | 2 | -5/+6 |
|/ | |||||
* | Merge branch 'erikj/shared_secret' into erikj/test2 | Erik Johnston | 2016-07-06 | 3 | -17/+34 |
|\ | |||||
| * | Add an admin option to shared secret registration | Erik Johnston | 2016-07-05 | 1 | -1/+3 |
| | | |||||
| * | Merge pull request #904 from ↵ | David Baker | 2016-07-05 | 1 | -14/+27 |
| |\ | | | | | | | | | | | | | matrix-org/dbkr/register_email_no_untrusted_id_server requestToken update | ||||
| | * | requestToken update | David Baker | 2016-06-30 | 1 | -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 config | Kent Shikama | 2016-07-05 | 1 | -2/+2 |
| | | | |||||
| * | | Fix pep8 | Kent Shikama | 2016-07-05 | 1 | -1/+2 |
| | | | |||||
| * | | Add pepper to password hashing | Kent Shikama | 2016-07-05 | 1 | -2/+3 |
| | | | | | | | | | | | | Signed-off-by: Kent Shikama <kent@kentshikama.com> | ||||
* | | | Add ReadWriteLock for pagination and history prune | Erik Johnston | 2016-07-05 | 1 | -34/+36 |
| | | | |||||
* | | | Add purge_history API | Erik Johnston | 2016-07-05 | 2 | -1/+14 |
|/ / | |||||
* | | Fix style violations | Kent Shikama | 2016-07-04 | 1 | -1/+2 |
| | | | | | | | | Signed-off-by: Kent Shikama <kent@kentshikama.com> | ||||
* | | Optionally include password hash in createUser endpoint | Kent Shikama | 2016-07-03 | 1 | -2/+2 |
|/ | | | | Signed-off-by: Kent Shikama <kent@kentshikama.com> | ||||
* | Rework ldap integration with ldap3 | Martin Weinelt | 2016-06-22 | 1 | -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 users | Mark Haines | 2016-06-17 | 1 | -0/+1 |
| | |||||
* | Remove registered_users from the distributor. | Mark Haines | 2016-06-17 | 2 | -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 events | Erik Johnston | 2016-06-17 | 1 | -6/+9 |
| | |||||
* | Fix TypeError in call to bcrypt.hashpw | Salvatore LaMendola | 2016-06-16 | 1 | -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 backfilled | Erik Johnston | 2016-06-15 | 1 | -14/+16 |
| | |||||
* | Fix a bug caused by a change in auth_handler function | Negar Fazeli | 2016-06-08 | 1 | -2/+2 |
| | | | | Fix the relevant unit test cases | ||||
* | Pull full state for each room all at once | Erik Johnston | 2016-06-08 | 1 | -16/+16 |
| | |||||
* | Don't hit DB for noop replications queries | Erik Johnston | 2016-06-08 | 1 | -0/+3 |
| | |||||
* | 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. | ||||
* | .values() returns list of sets | Erik Johnston | 2016-06-06 | 1 | -1/+2 |
| | |||||
* | Fix typos | Erik Johnston | 2016-06-06 | 1 | -32/+36 |
| | |||||
* | Fire after 30s not 8h | Erik Johnston | 2016-06-06 | 1 | -1/+1 |
| | |||||
* | Merge pull request #832 from matrix-org/erikj/presence_coount | Erik Johnston | 2016-06-03 | 1 | -5/+9 |
|\ | | | | | Change def of small delta in presence stream. Add metrics. | ||||
| * | Change metric style | Erik Johnston | 2016-06-03 | 1 | -5/+4 |
| | | |||||
| * | Presence metrics. Change def of small delta | Erik Johnston | 2016-06-03 | 1 | -5/+10 |
| | | |||||
* | | Fix typo | Erik Johnston | 2016-06-03 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #829 from matrix-org/erikj/poke_notifier | Erik Johnston | 2016-06-03 | 1 | -4/+7 |
|\ | | | | | Poke notifier on next reactor tick | ||||
| * | Poke notifier on next reactor tick | Erik Johnston | 2016-06-03 | 1 | -4/+7 |
| | | |||||
* | | Load push rules in storage layer, so that they get cached | Erik Johnston | 2016-06-03 | 1 | -3/+2 |
|/ | |||||
* | Merge remote-tracking branch 'origin/dbkr/email_notif_string_fmt_error' into ↵ | David Baker | 2016-06-02 | 1 | -28/+36 |
|\ | | | | | | | dbkr/email_unsubscribe | ||||
| * | Store the typing users as user_id strings. (#819) | Mark Haines | 2016-06-02 | 1 | -28/+36 |
| | | | | | | Rather than storing them as UserID objects. | ||||
* | | Merge remote-tracking branch 'origin/develop' into dbkr/email_unsubscribe | David Baker | 2016-06-02 | 2 | -550/+716 |
|\| | |||||
| * | Deduplicate presence entries in sync (#818) | Mark Haines | 2016-06-02 | 1 | -0/+3 |
| | | |||||
| * | Allow external processes to mark a user as syncing. (#812) | Mark Haines | 2016-06-02 | 1 | -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_handler | David Baker | 2016-06-02 | 2 | -3/+1 |
| |\ | | | | | | | Split out the auth handler | ||||
| * \ | Merge pull request #800 from matrix-org/erikj/sync_refactor | Erik Johnston | 2016-06-02 | 1 | -537/+607 |
| |\ \ | | | | | | | | | Refactor SyncHandler | ||||
| | * | | Change short circuit path | Erik Johnston | 2016-05-24 | 1 | -16/+26 |
| | | | | |||||
| | * | | Don't send down all ephemeral events | Erik Johnston | 2016-05-24 | 1 | -1/+3 |
| | | | | |||||
| | * | | Only work out newly_joined_users for incremental sync | Erik Johnston | 2016-05-24 | 1 | -6/+9 |
| | | | | |||||
| | * | | Only include non-offline presence in initial sync | Erik Johnston | 2016-05-24 | 1 | -0/+3 |
| | | | | |||||
| | * | | Spell builder correctly | Erik Johnston | 2016-05-24 | 1 | -63/+63 |
| | | | | |||||
| | * | | Inline function. Make load_filtered_recents private | Erik Johnston | 2016-05-24 | 1 | -17/+7 |
| | | | | |||||
| | * | | Add comments | Erik Johnston | 2016-05-24 | 1 | -7/+105 |
| | | | | |||||
| | * | | Shuffle things room | Erik Johnston | 2016-05-24 | 1 | -37/+33 |
| | | | | |||||
| | * | | Add back concurrently_execute | Erik Johnston | 2016-05-23 | 1 | -25/+9 |
| | | | | |||||
| | * | | Refactor SyncHandler | Erik Johnston | 2016-05-23 | 1 | -497/+481 |
| | | | | |||||
* | | | | Merge branch 'dbkr/split_out_auth_handler' into dbkr/email_unsubscribe | David Baker | 2016-06-02 | 3 | -4/+2 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Split out the auth handler | David Baker | 2016-06-02 | 2 | -3/+1 |
| |/ / | |||||
| * | | Fix room list spidering | David Baker | 2016-06-01 | 1 | -1/+1 |
| | | | |||||
* | | | Email unsubscribing that may in theory, work | David Baker | 2016-06-02 | 1 | -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_spider | David Baker | 2016-06-01 | 3 | -22/+7 |
|\ \ | |||||
| * | | Move the AS handler out of the Handlers object. | Mark Haines | 2016-05-31 | 3 | -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 lists | David Baker | 2016-05-31 | 1 | -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_servers | David Baker | 2016-05-31 | 1 | -1/+32 |
|/ / | |||||
* | | Split out the room list handler | David Baker | 2016-05-31 | 1 | -2/+1 |
| | | | | | | | | So I can use it from federation bits without pulling in all the handlers. | ||||
* | | Send down correct error response if user not found | Erik Johnston | 2016-05-27 | 1 | -2/+7 |
| | | |||||
* | | Fix set profile error with Requester. | Negi Fazeli | 2016-05-23 | 1 | -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 object | Mark Haines | 2016-05-17 | 2 | -20/+15 |
| | |||||
* | Merge remote-tracking branch 'origin/develop' into markjh/liberate_sync_handler | Mark Haines | 2016-05-17 | 1 | -15/+0 |
|\ | |||||
| * | Remove unused get_joined_rooms_for_user | Mark Haines | 2016-05-17 | 1 | -15/+0 |
| | | |||||
| * | Merge branch 'develop' into markjh/member_cleanup | Mark Haines | 2016-05-17 | 5 | -25/+25 |
| |\ | |||||
| | * | Merge pull request #787 from matrix-org/markjh/liberate_presence_handler | Mark Haines | 2016-05-17 | 5 | -25/+25 |
| | |\ | | | | | | | | | Move the presence handler out of the Handlers object | ||||
* | | | | Move SyncHandler out of the Handlers object | Mark Haines | 2016-05-16 | 2 | -7/+5 |
| | | | | |||||
* | | | | Merge branch 'markjh/liberate_presence_handler' into ↵ | Mark Haines | 2016-05-16 | 5 | -25/+25 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | markjh/liberate_sync_handler | ||||
| * | | Don't inherit PresenceHandler from BaseHandler, remove references to self.hs ↵ | Mark Haines | 2016-05-16 | 1 | -19/+21 |
| | | | | | | | | | | | | from presence handler | ||||
| * | | Move the presence handler out of the Handlers object | Mark Haines | 2016-05-16 | 5 | -7/+5 |
| | | | |||||
* | | | Remove get_joined_rooms_for_user from RoomMemberHandler | Mark Haines | 2016-05-16 | 3 | -11/+4 |
| | | | |||||
* | | | Replaces calls to fetch_room_distributions_into with get_joined_hosts_for_room | Mark Haines | 2016-05-16 | 3 | -67/+27 |
| |/ |/| | |||||
* | | Spell "domain" correctly | Mark Haines | 2016-05-16 | 3 | -8/+8 |
|/ | | | | s/domian/domain/g | ||||
* | Merge pull request #741 from negzi/create_user_with_expiry | Erik Johnston | 2016-05-13 | 2 | -2/+55 |
|\ | | | | | Create user with expiry | ||||
| * | Create user with expiry | Negi Fazeli | 2016-05-13 | 2 | -2/+55 |
| | | | | | | | | | | | | - Add unittests for client, api and handler Signed-off-by: Negar Fazeli <negar.fazeli@ericsson.com> | ||||
* | | missed a spot | Mark Haines | 2016-05-12 | 1 | -1/+1 |
| | | |||||
* | | move filter_events_for_client out of base handler | Mark Haines | 2016-05-11 | 5 | -204/+29 |
| | | |||||
* | | Shuffle when we get the signing_key attribute. | Mark Haines | 2016-05-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | Wait until we sign a message to get the signing key from the homeserver config. This means that the message handler can be created without having a signing key in the config which means that separate processes like the pusher that don't send messages and don't need to sign them can still access the handlers. | ||||
* | | Merge pull request #775 from matrix-org/erikj/password_hash | Erik Johnston | 2016-05-11 | 1 | -1/+4 |
|\ \ | | | | | | | Correctly handle NULL password hashes from the database | ||||
| * | | Correctly handle NULL password hashes from the database | Erik Johnston | 2016-05-11 | 1 | -1/+4 |
| |/ | |||||
* | | Fix typo | Mark Haines | 2016-05-11 | 1 | -1/+1 |
| | | |||||
* | | Move _create_new_client_event and handle_new_client_event out of base handler | Mark Haines | 2016-05-11 | 4 | -204/+214 |
|/ | |||||
* | Merge pull request #759 from matrix-org/dbkr/email_notifs | Matthew Hodgson | 2016-05-10 | 5 | -12/+12 |
|\ | | | | | Send email notifications for missed messages | ||||
| * | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs | David Baker | 2016-05-10 | 3 | -16/+10 |
| |\ | |||||
| * \ | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs | David Baker | 2016-04-29 | 1 | -1/+1 |
| |\ \ | |||||
| * | | | Run filter_events_for_client | David Baker | 2016-04-27 | 5 | -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_user | Erik Johnston | 2016-05-09 | 3 | -15/+9 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Add and use get_domian_from_id | Erik Johnston | 2016-05-09 | 3 | -15/+9 |
| | | | | |||||
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user | Erik Johnston | 2016-05-09 | 1 | -1/+1 |
|\| | | | |||||
| * | | | Reduce database inserts when sending transactions | Erik Johnston | 2016-05-06 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Add bulk fetch storage API | Erik Johnston | 2016-05-05 | 2 | -8/+4 |
| | | | |||||
* | | | Implement basic ignore user | Erik Johnston | 2016-05-04 | 2 | -6/+42 |
|/ / | |||||
* / | fix typo | Matthew Hodgson | 2016-04-28 | 1 | -1/+1 |
|/ | |||||
* | Simplify _check_password | Erik Johnston | 2016-04-15 | 1 | -5/+9 |
| | |||||
* | Fix check_password rather than inverting the meaning of ↵ | Mark Haines | 2016-04-14 | 1 | -9/+12 |
| | | | | _check_local_password (#730) | ||||
* | Fix login to error for nonexistent users | David Baker | 2016-04-14 | 1 | -1/+1 |
| | | | | Fixes SYN-680 | ||||
* | Merge pull request #718 from matrix-org/erikj/public_room_list | Erik Johnston | 2016-04-13 | 1 | -5/+8 |
|\ | | | | | Don't return empty public rooms | ||||
| * | Don't return empty public rooms | Erik Johnston | 2016-04-12 | 1 | -5/+8 |
| | | |||||
* | | Don't auto log failed auth checks | Erik Johnston | 2016-04-13 | 2 | -9/+31 |
|/ | |||||
* | 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 | 3 | -6/+32 |
|\ | | | | | Change pushers to use the event_actions table | ||||
| * | Add comments on min_stream_id | David Baker | 2016-04-07 | 1 | -0/+1 |
| | | | | | | | | saying that the min stream id won't be completely accurate all the time | ||||
| * | Merge remote-tracking branch 'origin/develop' into ↵ | David Baker | 2016-04-07 | 3 | -12/+49 |
| |\ | | | | | | | | | | dbkr/pushers_use_event_actions | ||||
| * | | Send badge count pushes. | David Baker | 2016-04-07 | 1 | -4/+17 |
| | | | | | | | | | | | | Also fix bugs with retrying. | ||||
| * | | Make pushers use the event_push_actions table instead of listening on an ↵ | David Baker | 2016-04-06 | 2 | -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_data | Erik Johnston | 2016-04-08 | 1 | -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 removed | Mark Haines | 2016-04-08 | 1 | -15/+0 |
| | | | | |||||
* | | | | Remove some unused functions (#711) | Mark Haines | 2016-04-08 | 2 | -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.fire | Mark Haines | 2016-04-08 | 4 | -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_data | Mark Haines | 2016-04-08 | 2 | -37/+1 |
|\ \ \ | | | | | | | | | Call profile handler get_displayname directly | ||||
| * | | | Call profile handler get_displayname directly rather than using ↵ | Mark Haines | 2016-04-07 | 2 | -37/+1 |
| | | | | | | | | | | | | | | | | collect_presencelike_data | ||||
* | | | | Merge pull request #701 from DoubleMalt/ldap-auth | Erik Johnston | 2016-04-07 | 1 | -9/+77 |
|\ \ \ \ | |/ / / |/| | | | Add LDAP authentication | ||||
| * | | | fix check for failed authentication | Christoph Witzany | 2016-04-06 | 1 | -2/+4 |
| | | | | |||||
| * | | | remove line | Christoph Witzany | 2016-04-06 | 1 | -1/+0 |
| | | | | |||||
| * | | | make tests for ldap more specific to not be fooled by Mocks | Christoph Witzany | 2016-04-06 | 1 | -3/+3 |
| | | | | |||||
| * | | | output ldap version for info and to pacify pep8 | Christoph Witzany | 2016-04-06 | 1 | -0/+2 |
| | | | | |||||
| * | | | conditionally import ldap | Christoph Witzany | 2016-04-06 | 1 | -2/+5 |
| | | | | |||||
| * | | | fix pep8 | Christoph Witzany | 2016-04-06 | 1 | -2/+1 |
| | | | | |||||
| * | | | fix exception handling | Christoph Witzany | 2016-04-06 | 1 | -2/+2 |
| | | | | |||||
| * | | | code style | Christoph Witzany | 2016-04-06 | 1 | -6/+13 |
| | | | | |||||
| * | | | add tls property and twist my head around twisted | Christoph Witzany | 2016-04-06 | 1 | -15/+29 |
| | | | | |||||
| * | | | move LDAP authentication to AuthenticationHandler | Christoph Witzany | 2016-04-06 | 1 | -6/+48 |
| | | | | |||||
* | | | | Merge pull request #700 from matrix-org/erikj/deduplicate_joins | Erik Johnston | 2016-04-07 | 1 | -0/+31 |
|\ \ \ \ | |_|_|/ |/| | | | Deduplicate membership changes | ||||
| * | | | Deduplicate joins | Erik Johnston | 2016-04-07 | 1 | -0/+31 |
| | | | | |||||
* | | | | Set profile information when joining rooms remotely | Erik Johnston | 2016-04-07 | 1 | -0/+5 |
|/ / / | |||||
* / / | Let users see their own leave events | Richard van der Hoff | 2016-04-06 | 1 | -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_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 | 2 | -15/+37 |
|\ \ | | | | | | | Fix stuck invites | ||||
| * | | Fix stuck invites | Erik Johnston | 2016-04-05 | 2 | -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/member | Erik Johnston | 2016-04-05 | 1 | -1/+4 |
|\| | | | | | | | | Store invites in a separate table. | ||||
| * | | Docs and indents | Erik Johnston | 2016-04-04 | 1 | -1/+4 |
| | | | |||||
| * | | Store invites in a separate table. | Erik Johnston | 2016-04-04 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #689 from matrix-org/erikj/member | Erik Johnston | 2016-04-04 | 3 | -149/+169 |
|\| | | | | | | | | Do checks for memberships before creating events | ||||
| * | | Use computed prev event ids | Erik Johnston | 2016-04-01 | 3 | -13/+25 |
| | | | |||||
| * | | Remove state hack from _create_new_client_event | Erik Johnston | 2016-04-01 | 1 | -43/+0 |
| | | | |||||
| * | | Do checks for memberships before creating events | Erik Johnston | 2016-04-01 | 1 | -93/+144 |
| | | | |||||
* | | | Merge pull request #686 from matrix-org/markjh/doc_strings | Mark Haines | 2016-04-01 | 5 | -72/+101 |
|\ \ \ | |/ / |/| | | Use google style doc strings. | ||||
| * | | Use google style doc strings. | Mark Haines | 2016-04-01 | 5 | -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 function | Erik Johnston | 2016-04-01 | 3 | -74/+51 |
| | | | |||||
* | | | Filter rooms list before chunking | Erik Johnston | 2016-04-01 | 1 | -6/+12 |
| | | | |||||
* | | | Remove outlier parameter from compute_event_context | Mark Haines | 2016-03-31 | 2 | -9/+5 |
|/ / | | | | | | | Use event.internal_metadata.is_outlier instead. | ||||
* | | Merge pull request #680 from matrix-org/markjh/remove_is_new_state | Mark Haines | 2016-03-31 | 1 | -16/+4 |
|\ \ | | | | | | | Remove the is_new_state argument to persist event. | ||||
| * | | 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. |