Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | hide_profile: false should mean not to hide the profile :/ github/matthew/red_list matthew/red_list | Matthew Hodgson | 2018-12-12 | 1 | -1/+1 |
| | |||||
* | pull in profile_handler correctly | Matthew Hodgson | 2018-11-04 | 1 | -0/+2 |
| | |||||
* | add im.vector.hide_profile to user account_data | Matthew Hodgson | 2018-11-04 | 1 | -0/+5 |
| | |||||
* | merge master into dinsic, again... | Matthew Hodgson | 2018-11-03 | 16 | -112/+525 |
|\ | |||||
| * | Refactor state group lookup to reduce DB hits (#4011) | Erik Johnston | 2018-10-25 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | Currently when fetching state groups from the data store we make two hits two the database: once for members and once for non-members (unless request is filtered to one or the other). This adds needless load to the datbase, so this PR refactors the lookup to make only a single database hit. | ||||
| * | Fix a number of flake8 errors | Richard van der Hoff | 2018-10-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Broadly three things here: * disable W504 which seems a bit whacko * remove a bunch of `as e` expressions from exception handlers that don't use them * use `r""` for strings which include backslashes Also, we don't use pep8 any more, so we can get rid of the duplicate config there. | ||||
| * | Clean up room alias creation | Erik Johnston | 2018-10-19 | 1 | -32/+5 |
| | | |||||
| * | missed one | David Baker | 2018-10-12 | 1 | -0/+1 |
| | | |||||
| * | Don't mangle exceptions | David Baker | 2018-10-12 | 1 | -4/+2 |
| | | |||||
| * | Split /room_keys/version into 2 servlets | David Baker | 2018-10-12 | 1 | -9/+21 |
| | | |||||
| * | PR feedback pt. 1 | David Baker | 2018-10-12 | 1 | -1/+1 |
| | | |||||
| * | isort | David Baker | 2018-10-09 | 1 | -1/+1 |
| | | |||||
| * | Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups | David Baker | 2018-10-09 | 13 | -77/+144 |
| |\ | |||||
| | * | Merge pull request #3835 from krombel/fix_3821 | Amber Brown | 2018-09-12 | 1 | -1/+5 |
| | |\ | | | | | | | | | fix VOIP crashes under Python 3 | ||||
| | | * | fix VOIP crashes under Python 3 (#3821) | Krombel | 2018-09-10 | 1 | -1/+5 |
| | | | | |||||
| | * | | Port rest/ to Python 3 (#3823) | Amber Brown | 2018-09-12 | 9 | -55/+60 |
| | |/ | |||||
| | * | Merge pull request #3790 from matrix-org/rav/respect_event_format_in_filter | Richard van der Hoff | 2018-09-05 | 1 | -13/+38 |
| | |\ | | | | | | | | | Implement 'event_format' filter param in /sync | ||||
| | | * | Implement 'event_format' filter param in /sync | Richard van der Hoff | 2018-09-04 | 1 | -13/+38 |
| | | | | | | | | | | | | | | | | | | | | This has been specced and part-implemented; let's implement it for /sync (but no other endpoints yet :/). | ||||
| | * | | improve human readable error message | Neil Johnson | 2018-09-04 | 1 | -1/+2 |
| | | | | |||||
| | * | | improve human readable error messages | Neil Johnson | 2018-09-04 | 2 | -7/+20 |
| | |/ | |||||
| | * | move threepid checker to config, add missing yields | Neil Johnson | 2018-08-31 | 2 | -5/+7 |
| | | | |||||
| | * | ensure post registration auth checks do not fail erroneously | Neil Johnson | 2018-08-31 | 2 | -0/+8 |
| | | | |||||
| | * | fix bug where preserved threepid user comes to sign up and server is mau blocked | Neil Johnson | 2018-08-31 | 2 | -1/+10 |
| | | | |||||
| * | | WIP e2e key backups | David Baker | 2018-09-13 | 1 | -4/+10 |
| | | | | | | | | | | | | | | | | | | | | | Continues from uhoreg's branch This just fixed the errcode on /room_keys/version if no backup and updates the schema delta to be on the latest so it gets run | ||||
| * | | try to make flake8 and isort happy | Hubert Chathi | 2018-09-06 | 1 | -1/+4 |
| | | | |||||
| * | | Merge branch 'develop' into e2e_backups | Hubert Chathi | 2018-08-24 | 8 | -68/+74 |
| |\| | |||||
| | * | Allow guests to access /rooms/:roomId/event/:eventId | Will Hunt | 2018-08-20 | 1 | -1/+1 |
| | | | |||||
| * | | missing import | Matthew Hodgson | 2018-08-12 | 1 | -1/+1 |
| | | | |||||
| * | | use parse_string | Matthew Hodgson | 2018-08-12 | 1 | -3/+3 |
| | | | |||||
| * | | support DELETE /version with no args | Matthew Hodgson | 2018-08-12 | 1 | -2/+3 |
| | | | |||||
| * | | implement remaining tests and make them work | Matthew Hodgson | 2018-08-12 | 1 | -0/+6 |
| | | | |||||
| * | | improve docstring | Matthew Hodgson | 2018-08-12 | 1 | -1/+5 |
| | | | |||||
| * | | add a tonne of docstring; make upload_room_keys properly assert version | Matthew Hodgson | 2018-08-12 | 1 | -1/+10 |
| | | | |||||
| * | | more docstring for the e2e_room_keys rest | Matthew Hodgson | 2018-08-12 | 1 | -0/+51 |
| | | | |||||
| * | | blindly incorporate PR review - needs testing & fixing | Matthew Hodgson | 2018-08-12 | 1 | -0/+2 |
| | | | |||||
| * | | make /room_keys/version work | Matthew Hodgson | 2018-08-12 | 1 | -1/+8 |
| | | | |||||
| * | | implement /room_keys/version too (untested) | Matthew Hodgson | 2018-08-12 | 1 | -0/+47 |
| | | | |||||
| * | | document the API | Matthew Hodgson | 2018-08-12 | 1 | -0/+133 |
| | | | |||||
| * | | make it work and fix pep8 | Matthew Hodgson | 2018-08-12 | 1 | -13/+20 |
| | | | |||||
| * | | interim WIP checkin; doesn't build yet | Matthew Hodgson | 2018-08-12 | 1 | -4/+33 |
| | | | |||||
| * | | total WIP skeleton for /room_keys API | Matthew Hodgson | 2018-08-12 | 1 | -0/+56 |
| | | | |||||
* | | | Merge pull request #4047 from ↵ | Michael Kaye | 2018-11-02 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | matrix-org/michaelkaye/dinsic_allow_user_directory_url user_directory.defer_to_id_server should be an URL, not a hostname | ||||
| * | | | Allow us to configure http vs https for user_directory | Michael Kaye | 2018-10-17 | 1 | -1/+1 |
| | | | | |||||
* | | | | merge in master | Matthew Hodgson | 2018-10-22 | 13 | -96/+285 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| * | | Port over enough to get some sytests running on Python 3 (#3668) | Amber Brown | 2018-08-20 | 1 | -1/+1 |
| | | | |||||
| * | | Integrate presence from hotfixes (#3694) | Amber Brown | 2018-08-18 | 1 | -1/+2 |
| | | | |||||
| * | | Remove v1/register's broken shared secret functionality (#3703) | Amber Brown | 2018-08-18 | 1 | -54/+0 |
| | | | |||||
| * | | lazyload aware /messages (#3589) | Matthew Hodgson | 2018-08-16 | 1 | -1/+12 |
| | | | |||||
| * | | initial cut at a room summary API (#3574) | Matthew Hodgson | 2018-08-16 | 1 | -0/+1 |
| | | | |||||
| * | | speed up /members and add at= and membership params (#3568) | Matthew Hodgson | 2018-08-15 | 1 | -3/+29 |
| | | | |||||
| * | | Merge pull request #3667 from matrix-org/erikj/fixup_unbind | Erik Johnston | 2018-08-15 | 2 | -6/+27 |
| |\ \ | | | | | | | | | Don't fail requests to unbind 3pids for non supporting ID servers | ||||
| | * | | Don't fail requests to unbind 3pids for non supporting ID servers | Erik Johnston | 2018-08-08 | 2 | -6/+27 |
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Older identity servers may not support the unbind 3pid request, so we shouldn't fail the requests if we received one of 400/404/501. The request still fails if we receive e.g. 500 responses, allowing clients to retry requests on transient identity server errors that otherwise do support the API. Fixes #3661 | ||||
| * / | Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678) | Amber Brown | 2018-08-10 | 1 | -1/+1 |
| |/ | |||||
| * | Merge branch 'master' into develop | Richard van der Hoff | 2018-08-02 | 2 | -2/+2 |
| |\ | |||||
| | * | Check room visibility for /event/ requests | Richard van der Hoff | 2018-08-02 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Make sure that the user has permission to view the requeseted event for /event/{eventId} and /room/{roomId}/event/{eventId} requests. Also check that the event is in the given room for /room/{roomId}/event/{eventId}, for sanity. | ||||
| * | | Merge pull request #3620 from fuzzmz/return-404-room-not-found | Richard van der Hoff | 2018-08-01 | 1 | -2/+2 |
| |\ \ | | | | | | | | | return 404 if room not found | ||||
| | * | | return NotFoundError if room not found | Serban Constantin | 2018-07-31 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per the Client-Server API[0] we should return `M_NOT_FOUND` if the room isn't found instead of generic SynapseError. This ensures that /directory/list API returns 404 for room not found instead of 400. [0]: https://matrix.org/docs/spec/client_server/unstable.html#get-matrix-client-r0-directory-list-room-roomid Signed-off-by: Serban Constantin <serban.constantin@gmail.com> | ||||
| * | | | Python 3: Convert some unicode/bytes uses (#3569) | Amber Brown | 2018-08-02 | 2 | -13/+21 |
| |/ / | |||||
| * | | make /context lazyload & filter aware (#3567) | Matthew Hodgson | 2018-07-27 | 1 | -0/+9 |
| | | | | | | | | | make /context lazyload & filter aware. | ||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-07-23 | 5 | -4/+172 |
| |\ \ | | | | | | | | | | | | | erikj/client_apis_move | ||||
| | * | | Admin API for creating new users (#3415) | Amber Brown | 2018-07-20 | 1 | -0/+122 |
| | | | | |||||
| | * | | Move v1-only APIs into their own module & isolate deprecated ones (#3460) | Amber Brown | 2018-07-19 | 4 | -4/+50 |
| | |/ | |||||
| * | | Move RoomContextHandler out of Handlers | Erik Johnston | 2018-07-18 | 1 | -2/+2 |
| | | | | | | | | | | | | This is in preparation for moving GET /context/ to a worker | ||||
| * | | Split MessageHandler into read only and writers | Erik Johnston | 2018-07-18 | 2 | -15/+13 |
| |/ | | | | | | | | | This will let us call the read only parts from workers, and so be able to move some APIs off of master, e.g. the `/state` API. | ||||
* | | fix missing import and run isort dinsic_2018-07-20 | Matthew Hodgson | 2018-07-20 | 2 | -2/+4 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into dinsic | David Baker | 2018-07-19 | 34 | -324/+298 |
|\| | |||||
| * | Refactor REST API tests to use explicit reactors (#3351) | Amber Brown | 2018-07-17 | 1 | -1/+1 |
| | | |||||
| * | check isort by travis | Krombel | 2018-07-16 | 3 | -4/+4 |
| | | |||||
| * | Fix develop because I broke it :( (#3535) | Amber Brown | 2018-07-14 | 1 | -2/+2 |
| | | |||||
| * | Merge pull request #3534 from krombel/use_parse_and_asserts_from_servlet | Amber Brown | 2018-07-14 | 11 | -133/+82 |
| |\ | | | | | | | Use parse and asserts from http.servlet | ||||
| | * | fix sytests | Amber Brown | 2018-07-14 | 1 | -1/+1 |
| | | | |||||
| | * | add changelog | Krombel | 2018-07-13 | 1 | -1/+1 |
| | | | |||||
| | * | rename assert_params_in_request to assert_params_in_dict | Krombel | 2018-07-13 | 9 | -30/+30 |
| | | | | | | | | | | | | | | | | | | the method "assert_params_in_request" does handle dicts and not requests. A request body has to be parsed to json before this method can be used | ||||
| | * | Use parse_{int,str} and assert from http.servlet | Krombel | 2018-07-13 | 10 | -126/+75 |
| | | | | | | | | | | | | | | | | | | | | | parse_integer and parse_string can take a request and raise errors in case we have wrong or missing params. This PR tries to use them more to deduplicate some code and make it better readable | ||||
| * | | Make auth & transactions more testable (#3499) | Amber Brown | 2018-07-14 | 7 | -35/+31 |
| |/ | |||||
| * | Merge branch 'develop' into rav/enforce_report_api | Richard van der Hoff | 2018-07-12 | 33 | -187/+207 |
| |\ | |||||
| | * | run isort | Amber Brown | 2018-07-09 | 32 | -156/+164 |
| | | | |||||
| * | | Enforce the specified API for report_event | Richard van der Hoff | 2018-05-31 | 1 | -2/+23 |
| | | | | | | | | | | | | | | | as per https://matrix.org/docs/spec/client_server/unstable.html#post-matrix-client-r0-rooms-roomid-report-eventid | ||||
* | | | More run_on_reactor | David Baker | 2018-07-19 | 1 | -2/+0 |
| | | | |||||
* | | | run_on_reactor is dead | David Baker | 2018-07-19 | 1 | -2/+0 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/master' into dinsic | David Baker | 2018-07-17 | 7 | -29/+44 |
|\ \ \ | | |/ | |/| | |||||
| * | | Attempt to be more performant on PyPy (#3462) | Amber Brown | 2018-06-28 | 3 | -3/+4 |
| | | | |||||
| * | | update doc for deactivate API | Matthew Hodgson | 2018-06-26 | 1 | -1/+1 |
| | | | |||||
| * | | add GDPR erase param to deactivate API | Matthew Hodgson | 2018-06-26 | 1 | -1/+12 |
| | | | |||||
| * | | Revert "Revert "Merge pull request #3431 from ↵ | Erik Johnston | 2018-06-25 | 2 | -3/+14 |
| | | | | | | | | | | | | | | | | | | matrix-org/rav/erasure_visibility"" This reverts commit 1d009013b3c3e814177afc59f066e02a202b21cd. | ||||
| * | | Revert "Merge pull request #3431 from matrix-org/rav/erasure_visibility" | Richard van der Hoff | 2018-06-22 | 2 | -14/+3 |
| | | | | | | | | | | | | | | | This reverts commit ce0d911156b355c5bf452120bfb08653dad96497, reversing changes made to b4a5d767a94f1680d07edfd583aae54ce422573e. | ||||
| * | | Merge pull request #3431 from matrix-org/rav/erasure_visibility | Erik Johnston | 2018-06-22 | 2 | -3/+14 |
| |\ \ | | | | | | | | | Support hiding events from deleted users | ||||
| | * | | mark accounts as erased when requested | Richard van der Hoff | 2018-06-12 | 2 | -3/+14 |
| | | | | |||||
| * | | | Remove run_on_reactor (#3395) | Amber Brown | 2018-06-14 | 3 | -17/+0 |
| |/ / | |||||
| * | | Merge pull request #3276 from matrix-org/dbkr/unbind | David Baker | 2018-06-11 | 1 | -3/+10 |
| |\ \ | | | | | | | | | Remove email addresses / phone numbers from ID servers when they're removed from synapse | ||||
| | * | | Merge remote-tracking branch 'origin/develop' into dbkr/unbind | David Baker | 2018-05-24 | 1 | -3/+5 |
| | |\| | |||||
| | * | | pep8 | David Baker | 2018-05-24 | 1 | -1/+1 |
| | | | | |||||
| | * | | Unbind 3pids when they're deleted too | David Baker | 2018-05-24 | 1 | -3/+10 |
| | | | | |||||
| * | | | fix log | Richard van der Hoff | 2018-06-07 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix event-purge-by-ts admin API | Richard van der Hoff | 2018-06-07 | 1 | -6/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | This got completely broken in 0.30. Fixes #3300. | ||||
* | | | | improve domain matches | Matthew Hodgson | 2018-07-10 | 1 | -2/+2 |
| | | | | |||||
* | | | | fix bounds error | Matthew Hodgson | 2018-07-10 | 1 | -1/+1 |
| | | | | |||||
* | | | | tweak dinsic display names | Matthew Hodgson | 2018-07-10 | 1 | -2/+10 |
| | | | | |||||
* | | | | Merge tag 'v0.31.2' into dinsic | Michael Kaye | 2018-06-22 | 12 | -59/+86 |
|\| | | | |||||
| * | | | Consistently use six's iteritems and wrap lazy keys/values in list() if ↵ | Amber Brown | 2018-05-31 | 1 | -1/+1 |
| | |/ | |/| | | | | | | | they're not meant to be lazy (#3307) | ||||
| * | | Merge pull request #3243 from NotAFile/py3-six-3 | Erik Johnston | 2018-05-24 | 1 | -3/+5 |
| |\ \ | | |/ | |/| | Replace some more comparisons with six | ||||
| | * | Replace some more comparisons with six | Adrian Tschira | 2018-05-19 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | plus a bonus b"" string I missed last time Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
| * | | Stub out ServerNoticesSender on the workers | Richard van der Hoff | 2018-05-22 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | ... and have the sync endpoints call it directly rather than obsure indirection via PresenceHandler | ||||
| * | | Fix logcontext leak in HttpTransactionCache | Richard van der Hoff | 2018-05-21 | 1 | -25/+21 |
| | | | | | | | | | | | | ONE DAY I WILL PURGE THE WORLD OF THIS EVIL | ||||
| * | | Stop the transaction cache caching failures | Richard van der Hoff | 2018-05-21 | 1 | -9/+13 |
| |/ | | | | | | | | | | | The transaction cache has some code which tries to stop it caching failures, but if the callback function failed straight away, then things would happen backwards and we'd end up with the failure stuck in the cache. | ||||
| * | Merge pull request #3221 from matrix-org/erikj/purge_token | Erik Johnston | 2018-05-18 | 1 | -7/+10 |
| |\ | | | | | | | Make purge_history operate on tokens | ||||
| | * | Make purge_history operate on tokens | Erik Johnston | 2018-05-15 | 1 | -7/+10 |
| | | | | | | | | | | | | As we're soon going to change how topological_ordering works | ||||
| * | | Move RoomCreationHandler out of synapse.handlers.Handlers | Richard van der Hoff | 2018-05-17 | 2 | -5/+4 |
| |/ | | | | | | | | | | | | | Handlers is deprecated nowadays, so let's move this out before I add a new dependency on it. Also fix the docstrings on create_room. | ||||
| * | Set Server header in SynapseRequest | Richard van der Hoff | 2018-05-10 | 2 | -3/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | (instead of everywhere that writes a response. Or rather, the subset of places which write responses where we haven't forgotten it). This also means that we don't have to have the mysterious version_string attribute in anything with a request handler. Unfortunately it does mean that we have to pass the version string wherever we instantiate a SynapseSite, which has been c&ped 150 times, but that is code that ought to be cleaned up anyway really. | ||||
| * | notifications: Convert next_token to string according to the spec | Konstantinos Sideris | 2018-05-05 | 1 | -1/+1 |
| | | | | | | | | | | | | Currently the parameter is serialized as an integer. Signed-off-by: Konstantinos Sideris <sideris.konstantin@gmail.com> | ||||
| * | Burminate v1auth | Adrian Tschira | 2018-04-30 | 2 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This closes #2602 v1auth was created to account for the differences in status code between the v1 and v2_alpha revisions of the protocol (401 vs 403 for invalid tokens). However since those protocols were merged, this makes the r0 version/endpoint internally inconsistent, and violates the specification for the r0 endpoint. This might break clients that rely on this inconsistency with the specification. This is said to affect the legacy angular reference client. However, I feel that restoring parity with the spec is more important. Either way, it is critical to inform developers about this change, in case they rely on the illegal behaviour. Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
| * | add guard for None on purge_history api | Krombel | 2018-04-30 | 1 | -1/+14 |
| | | |||||
| * | Merge pull request #3156 from NotAFile/py3-hmac-bytes | Richard van der Hoff | 2018-04-30 | 2 | -11/+15 |
| |\ | | | | | | | Construct HMAC as bytes on py3 | ||||
| | * | Construct HMAC as bytes on py3 | Adrian Tschira | 2018-04-29 | 2 | -11/+15 |
| | | | | | | | | | | | | Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
| * | | Use six.moves.urlparse | Adrian Tschira | 2018-04-15 | 2 | -5/+6 |
| |/ | | | | | | | | | | | The imports were shuffled around a bunch in py3 Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
* | | fix user in user regexp | Matthew Hodgson | 2018-05-04 | 1 | -1/+1 |
| | | |||||
* | | fix strip_invalid_mxid_characters | Matrix | 2018-05-03 | 1 | -2/+2 |
| | | |||||
* | | unbreak 3pid deletion | Matrix | 2018-05-03 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'dinsic' into matthew/derive-mxid-from-3pid | Matthew Hodgson | 2018-05-03 | 1 | -0/+6 |
|\ \ | |||||
| * | | add option to disable changes to the 3PIDs for an account. | Matthew Hodgson | 2018-05-03 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | This only considers the /account/3pid API, which should be sufficient as currently we can't change emails associated with push notifs (which are provisioned at registration), and we can't directly create mappings for accounts in an IS other than by answering an invite | ||||
* | | | special case msisdns when deriving mxids from 3pids | Matthew Hodgson | 2018-05-03 | 1 | -7/+11 |
| | | | |||||
* | | | improve mxid & displayname selection for register_mxid_from_3pid | Matthew Hodgson | 2018-05-03 | 1 | -5/+45 |
| | | | | | | | | | | | | | | | | | | | | | | | | * [x] strip invalid characters from generated mxid * [x] append numbers to disambiguate clashing mxids * [x] generate displayanames from 3pids using a dodgy heuristic * [x] get rid of the create_profile_with_localpart and instead explicitly set displaynames so they propagate correctly | ||||
* | | | Merge branch 'dinsic' into matthew/derive-mxid-from-3pid | Matthew Hodgson | 2018-05-03 | 3 | -7/+17 |
|\| | | |||||
| * | | Fix spelling & add experimental API comment | David Baker | 2018-04-25 | 1 | -1/+1 |
| | | | |||||
| * | | Option to defer to an ID server for user_directory | David Baker | 2018-04-19 | 1 | -0/+10 |
| | | | |||||
| * | | Merge branch 'develop' into dinsic | Matthew Hodgson | 2018-04-12 | 6 | -44/+43 |
| |\| | |||||
| * | | Merge branch 'develop' into matthew/dinsic_3pid_check | Matthew Hodgson | 2018-03-14 | 3 | -28/+146 |
| |\ \ | |||||
| * | | | add yields | Matthew Hodgson | 2018-03-13 | 2 | -7/+7 |
| | | | | |||||
| * | | | fix thinko on 3pid whitelisting | Matthew Hodgson | 2018-01-24 | 1 | -2/+2 |
| | | | | |||||
* | | | | turn @'s to -'s rather than .'s | Matthew Hodgson | 2018-04-17 | 1 | -1/+1 |
| | | | | |||||
* | | | | handle medium checks correctly | Matthew Hodgson | 2018-04-12 | 1 | -3/+12 |
| | | | | |||||
* | | | | add the register_mxid_from_3pid setting (untested) | Matthew Hodgson | 2018-04-12 | 1 | -8/+28 |
| |_|/ |/| | | |||||
* | | | Merge pull request #3079 from matrix-org/erikj/limit_concurrent_sends | Erik Johnston | 2018-04-10 | 1 | -6/+1 |
|\ \ \ | | | | | | | | | Limit concurrent event sends for a room | ||||
| * | | | Use create_and_send_nonmember_event everywhere | Erik Johnston | 2018-04-09 | 1 | -6/+1 |
| | | | | |||||
* | | | | Merge pull request #2996 from krombel/allow_auto_join_rooms | Richard van der Hoff | 2018-04-10 | 1 | -32/+0 |
|\ \ \ \ | | | | | | | | | | | move handling of auto_join_rooms to RegisterHandler | ||||
| * \ \ \ | Merge branch 'develop' of into allow_auto_join_rooms | Krombel | 2018-03-28 | 2 | -2/+2 |
| |\ \ \ \ | |||||
| * | | | | | move handling of auto_join_rooms to RegisterHandler | Krombel | 2018-03-14 | 1 | -32/+0 |
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the handling of auto_join_rooms only works when a user registers itself via public register api. Registrations via registration_shared_secret and ModuleApi do not work This auto_joins the users in the registration handler which enables the auto join feature for all 3 registration paths. This is related to issue #2725 Signed-Off-by: Matthias Kesler <krombel@krombel.de> | ||||
* | | | | | Merge pull request #3061 from NotAFile/add-some-byte-strings | Richard van der Hoff | 2018-04-09 | 1 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Add b prefixes to some strings that are bytes in py3 | ||||
| * | | | | | Add b prefixes to some strings that are bytes in py3 | Adrian Tschira | 2018-04-04 | 1 | -2/+2 |
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | This has no effect on python2 Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
* | | | | | Merge pull request #2938 from dklug/develop | Richard van der Hoff | 2018-04-09 | 1 | -1/+4 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Return 401 for invalid access_token on logout | ||||
| * | | | | Return 401 for invalid access_token on logout | dklug | 2018-03-02 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Duncan Klug <dklug@ucmerced.edu> | ||||
* | | | | | Merge pull request #2986 from jplatte/join_reponse_room_id | Richard van der Hoff | 2018-04-05 | 1 | -1/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | Add room_id to the response of `rooms/{roomId}/join` | ||||
| * | | | | | Add room_id to the response of `rooms/{roomId}/join` | Jonas Platte | 2018-03-13 | 1 | -1/+6 |
| | |_|/ / | |/| | | | | | | | | | | | | | Fixes #2349 | ||||
* | | | | | Use "/settings/" (plural) | Luke Barnard | 2018-04-05 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Use join_policy API instead of joinable | Luke Barnard | 2018-04-03 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The API is now under /groups/$group_id/setting/m.join_policy and expects a JSON blob of the shape ```json { "m.join_policy": { "type": "invite" } } ``` where "invite" could alternatively be "open". | ||||
* | | | | | This should probably be a PUT | David Baker | 2018-03-28 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Add joinability for groups | David Baker | 2018-03-28 | 1 | -0/+28 |
| |_|/ / |/| | | | | | | | | | | | | | | | Adds API to set the 'joinable' flag, and corresponding flag in the table. | ||||
* | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2018-03-19 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Replace ujson with simplejson | Erik Johnston | 2018-03-15 | 2 | -2/+2 |
| | | | | | |||||
* | | | | | Replace some ujson with simplejson to make it work | Erik Johnston | 2018-03-16 | 1 | -1/+1 |
| |/ / / |/| | | | |||||
* | | | | RoomMembershipRestServlet doesn't handle /forget | Erik Johnston | 2018-03-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Due to the order we register the REST handlers `/forget` was handled by the correct handler. | ||||
* | | | | Add transactional API to history purge | Richard van der Hoff | 2018-03-12 | 1 | -3/+35 |
| | | | | | | | | | | | | | | | | Make the purge request return quickly, and allow scripts to poll for updates. | ||||
* | | | | Provide a means to pass a timestamp to purge_history | Richard van der Hoff | 2018-03-05 | 1 | -3/+55 |
| |/ / |/| | | |||||
* | | | Move RoomMemberHandler out of Handlers | Erik Johnston | 2018-03-01 | 3 | -13/+15 |
| | | | |||||
* | | | Merge pull request #2854 from matrix-org/erikj/event_create_worker | Erik Johnston | 2018-02-13 | 1 | -1/+0 |
|\ \ \ | | | | | | | | | Create a worker for event creation | ||||
| * | | | Add event_creator worker | Erik Johnston | 2018-02-07 | 1 | -1/+0 |
| | | | | |||||
* | | | | Fix typos in purge api & doc | Richard van der Hoff | 2018-02-13 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | | * It's supposed to be purge_local_events, not ..._history * Fix the doc to have valid json | ||||
* | | | | Merge pull request #2858 from matrix-org/rav/purge_updates | Richard van der Hoff | 2018-02-09 | 1 | -1/+10 |
|\ \ \ \ | |/ / / |/| | | | delete_local_events for purge_room_history | ||||
| * | | | delete_local_events for purge_history | Richard van der Hoff | 2018-02-09 | 1 | -1/+10 |
| | | | | | | | | | | | | | | | | Add a flag which makes the purger delete local events | ||||
* | | | | Update copyright | Erik Johnston | 2018-02-06 | 2 | -0/+2 |
| | | | | |||||
* | | | | Update places where we create events | Erik Johnston | 2018-02-05 | 2 | -9/+11 |
| | | | | |||||
* | | | | Merge branch 'develop' into travis/admin-list-media | Travis Ralston | 2018-02-01 | 4 | -28/+113 |
|\ \ \ \ | |||||
| * | | | | fix thinko on 3pid whitelisting | Matthew Hodgson | 2018-01-24 | 1 | -2/+2 |
| | |_|/ | |/| | | |||||
| * | | | add ?ts massaging for ASes (#2754) | Matthew Hodgson | 2018-01-23 | 1 | -6/+11 |
| | | | | | | | | | | | | blindly implement ?ts for AS. untested | ||||
| * | | | fix typo (thanks sytest) | Matthew Hodgson | 2018-01-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | oops, check all login types | Matthew Hodgson | 2018-01-19 | 1 | -14/+11 |
| | | | | |||||
| * | | | trailing commas | Matthew Hodgson | 2018-01-19 | 2 | -7/+7 |
| | | | | |||||
| * | | | rewrite based on PR feedback: | Matthew Hodgson | 2018-01-19 | 4 | -76/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [ ] split config options into allowed_local_3pids and registrations_require_3pid * [ ] simplify and comment logic for picking registration flows * [ ] fix docstring and move check_3pid_allowed into a new util module * [ ] use check_3pid_allowed everywhere @erikjohnston PTAL | ||||
| * | | | fix up v1, and improve errors | Matthew Hodgson | 2018-01-19 | 3 | -19/+53 |
| | | | | |||||
| * | | | fix pep8 | Matthew Hodgson | 2018-01-19 | 1 | -2/+1 |
| | | | | |||||
| * | | | add registrations_require_3pid | Matthew Hodgson | 2018-01-19 | 3 | -13/+96 |
| |/ / | | | | | | | | | | | | | lets homeservers specify a whitelist for 3PIDs that users are allowed to associate with. Typically useful for stopping people from registering with non-work emails | ||||
* / / | Add an admin route to get all the media in a room | Travis Ralston | 2018-01-20 | 1 | -0/+22 |
|/ / | | | | | | | | | This is intended to be used by administrators to monitor the media that is passing through their server, if they wish. Signed-off-by: Travis Ralston <travpc@gmail.com> | ||||
* | | Add /room/{id}/event/{id} to synapse | Richard van der Hoff | 2018-01-09 | 1 | -3/+26 |
| | | | | | | | | | | | | Turns out that there is a valid usecase for retrieving event by id (notably having received a push), but event ids should be scoped to room, so /event/{id} is wrong. | ||||
* | | Better logging when login can't find a 3pid | Richard van der Hoff | 2017-12-20 | 1 | -4/+10 |
|/ | |||||
* | Fix error when deleting devices | Richard van der Hoff | 2017-12-05 | 1 | -1/+1 |
| | | | | This was introduced in d7ea8c4 / PR #2728 | ||||
* | Factor out a validate_user_via_ui_auth method | Richard van der Hoff | 2017-12-05 | 2 | -74/+59 |
| | | | | Collect together all the places that validate a logged-in user via UI auth. | ||||
* | Refactor UI auth implementation | Richard van der Hoff | 2017-12-05 | 4 | -27/+51 |
| | | | | | Instead of returning False when auth is incomplete, throw an exception which can be caught with a wrapper. | ||||
* | Delete devices in various logout situations | Richard van der Hoff | 2017-11-29 | 1 | -2/+25 |
| | | | | | | | | | | | | | Make sure that we delete devices whenever a user is logged out due to any of the following situations: * /logout * /logout_all * change password * deactivate account (by the user or by an admin) * invalidate access token from a dynamic module Fixes #2672. | ||||
* | Move set_password into its own handler | Richard van der Hoff | 2017-11-29 | 2 | -3/+4 |
| | | | | | | Non-functional refactoring to move set_password. This means that we'll be able to properly deactivate devices and access tokens without introducing a dependency loop. | ||||
* | Move deactivate_account into its own handler | Richard van der Hoff | 2017-11-29 | 2 | -5/+6 |
| | | | | | | Non-functional refactoring to move deactivate_account. This means that we'll be able to properly deactivate devices and access tokens without introducing a dependency loop. | ||||
* | Allow guest access to group APIs for reading | Luke Barnard | 2017-11-28 | 1 | -11/+11 |
| | |||||
* | Declare support for r0.3.0 | Richard van der Hoff | 2017-11-15 | 1 | -0/+1 |
| | |||||
* | Remove redundent call | Travis Ralston | 2017-11-13 | 1 | -2/+0 |
| | | | Signed-off-by: Travis Ralston <travpc@gmail.com> | ||||
* | Add a route for determining who you are | Travis Ralston | 2017-11-12 | 1 | -0/+17 |
| | | | | | Useful for applications which may have an access token, but no idea as to who owns it. Signed-off-by: Travis Ralston <travpc@gmail.com> | ||||
* | Add some more comments appservice user registration | Richard van der Hoff | 2017-11-10 | 1 | -1/+4 |
| | | | | Explain why we don't validate userids registered via app services | ||||
* | Downcase userids for shared-secret registration | Richard van der Hoff | 2017-11-10 | 2 | -3/+21 |
| | |||||
* | Downcase userid on registration | Richard van der Hoff | 2017-11-09 | 1 | -1/+7 |
| | | | | | | Force username to lowercase before attempting to register https://github.com/matrix-org/synapse/issues/2660 | ||||
* | Register group servlet | Erik Johnston | 2017-11-09 | 1 | -0/+1 |
| | |||||
* | Have an explicit API to update room config | Erik Johnston | 2017-11-08 | 1 | -0/+27 |
| | |||||
* | Revert "Modify group room association API to allow modification of is_public" | Erik Johnston | 2017-11-08 | 1 | -2/+2 |
| | |||||
* | support inhibit_login in /register | Richard van der Hoff | 2017-11-02 | 1 | -12/+16 |
| | | | | Allow things to pass inhibit_login when registering to ... inhibit logins. | ||||
* | Allow password_auth_providers to return a callback | Richard van der Hoff | 2017-11-01 | 1 | -1/+4 |
| | | | | ... so that they have a way to record access tokens. | ||||
* | Merge remote-tracking branch 'origin/develop' into ↵ | David Baker | 2017-11-01 | 3 | -6/+12 |
|\ | | | | | | | rav/refactor_accesstoken_delete | ||||
| * | Merge pull request #2615 from matrix-org/rav/break_auth_device_dep | David Baker | 2017-11-01 | 2 | -4/+0 |
| |\ | | | | | | | Break dependency of auth_handler on device_handler | ||||
| | * | Break dependency of auth_handler on device_handler | Richard van der Hoff | 2017-11-01 | 2 | -4/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm going to need to make the device_handler depend on the auth_handler, so I need to break this dependency to avoid a cycle. It turns out that the auth_handler was only using the device_handler in one place which was an edge case which we can more elegantly handle by throwing an error rather than fixing it up. | ||||
| * | | Apparently this is python | David Baker | 2017-11-01 | 1 | -1/+1 |
| | | | |||||
| * | | Log login requests | David Baker | 2017-11-01 | 1 | -0/+10 |
| | | | | | | | | | | | | Carefully though, to avoid logging passwords | ||||
| * | | Modify group room association API to allow modification of is_public | Luke Barnard | 2017-10-31 | 1 | -2/+2 |
| |/ | | | | | | | also includes renamings to make things more consistent. | ||||
* / | Move access token deletion into auth handler | Richard van der Hoff | 2017-11-01 | 3 | -22/+10 |
|/ | | | | | | | Also move duplicated deactivation code into the auth handler. I want to add some hooks when we deactivate an access token, so let's bring it all in here so that there's somewhere to put it. | ||||
* | Refactor some logic from LoginRestServlet into AuthHandler | Richard van der Hoff | 2017-10-31 | 1 | -29/+26 |
| | | | | | | | | | | | | | | I'm going to need some more flexibility in handling login types in password auth providers, so as a first step, move some stuff from LoginRestServlet into AuthHandler. In particular, we pass everything other than SAML, JWT and token logins down to the AuthHandler, which now has responsibility for checking the login type and fishing the password out of the login dictionary, as well as qualifying the user_id if need be. Ideally SAML, JWT and token would go that way too, but there's no real need for it right now and I'm trying to minimise impact. This commit *should* be non-functional. | ||||
* | Merge pull request #2591 from matrix-org/rav/device_delete_auth | Richard van der Hoff | 2017-10-27 | 1 | -5/+8 |
|\ | | | | | Device deletion: check UI auth matches access token | ||||
| * | Device deletion: check UI auth matches access token | Richard van der Hoff | 2017-10-27 | 1 | -5/+8 |
| | | | | | | | | (otherwise there's no point in the UI auth) | ||||
* | | Merge pull request #2589 from matrix-org/rav/as_deactivate_account | Richard van der Hoff | 2017-10-27 | 1 | -16/+32 |
|\ \ | | | | | | | Allow ASes to deactivate their own users | ||||
| * | | Allow ASes to deactivate their own users | Richard van der Hoff | 2017-10-27 | 1 | -16/+32 |
| | | | |||||
* | | | Merge pull request #2582 from matrix-org/luke/group-is-public | Luke Barnard | 2017-10-27 | 1 | -40/+53 |
|\ \ \ | |_|/ |/| | | Add is_public to groups table to allow for private groups | ||||
| * | | delint | Luke Barnard | 2017-10-26 | 1 | -4/+17 |
| | | | |||||
| * | | Add is_public to groups table to allow for private groups | Luke Barnard | 2017-10-26 | 1 | -40/+40 |
| |/ | | | | | | | | | | | Prevent group API access to non-members for private groups Also make all the group code paths consistent with `requester_user_id` always being the User ID of the requesting user. | ||||
* | | add release endpoints for /thirdparty | Krombel | 2017-10-26 | 1 | -7/+4 |
| | | |||||
* | | register some /unstable endpoints in /r0 as well | Krombel | 2017-10-26 | 4 | -20/+9 |
|/ | |||||
* | replace 'except:' with 'except Exception:' | Richard van der Hoff | 2017-10-23 | 7 | -10/+10 |
| | | | | what could possibly go wrong | ||||
* | Remove pointless create() method | Richard van der Hoff | 2017-10-20 | 2 | -4/+4 |
| | | | | | It just calls the constructor, so we may as well kill it rather than having random codepaths. | ||||
* | Merge pull request #2545 from matrix-org/dbkr/auto_join_rooms | David Baker | 2017-10-17 | 1 | -0/+34 |
|\ | | | | | Add config option to auto-join new users to rooms | ||||
| * | Add config option to auto-join new users to rooms | David Baker | 2017-10-16 | 1 | -0/+34 |
| | | | | | | | | | | New users who register on the server will be dumped into all rooms in auto_join_rooms in the config. | ||||
* | | Delint | Luke Barnard | 2017-10-16 | 1 | -0/+1 |
| | | |||||
* | | Implement GET /groups/$groupId/invited_users | Luke Barnard | 2017-10-16 | 1 | -0/+21 |
|/ | |||||
* | Merge branch 'develop' into erikj/groups_merged | David Baker | 2017-10-02 | 1 | -10/+6 |
|\ | |||||
| * | Fix /joined_members to work with AS users | Erik Johnston | 2017-09-28 | 1 | -2/+1 |
| | | |||||
| * | Fix bug where /joined_members didn't check user was in room | Erik Johnston | 2017-09-27 | 1 | -10/+7 |
| | | |||||
* | | Add remove room API | Erik Johnston | 2017-09-26 | 1 | -0/+11 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/groups_merged | Erik Johnston | 2017-09-19 | 3 | -14/+13 |
|\| | |||||
| * | Add left section to /keys/changes | Erik Johnston | 2017-09-08 | 1 | -4/+2 |
| | | |||||
| * | Send down device list change notif when member leaves/rejoins room | Erik Johnston | 2017-09-07 | 1 | -1/+2 |
| | | |||||
| * | fix english | hera | 2017-08-04 | 1 | -7/+7 |
| | | |||||
| * | typo | hera | 2017-08-04 | 1 | -1/+1 |
| | | |||||
| * | Reduce spammy log line in synchrotrons | Erik Johnston | 2017-08-02 | 1 | -1/+1 |
| | | |||||
* | | Split out profile handler to fix tests | Erik Johnston | 2017-08-25 | 1 | -9/+9 |
| | | |||||
* | | Fixup | Erik Johnston | 2017-08-11 | 1 | -0/+1 |
| | | |||||
* | | Add bulk group publicised lookup API | Erik Johnston | 2017-08-09 | 1 | -0/+54 |
| | | |||||
* | | Allow update group publicity | Erik Johnston | 2017-08-08 | 1 | -0/+28 |
| | | |||||
* | | Merge pull request #2378 from matrix-org/erikj/group_sync_support | Erik Johnston | 2017-07-21 | 1 | -0/+5 |
|\ \ | | | | | | | Add groups to sync stream | ||||
| * | | Add groups to sync stream | Erik Johnston | 2017-07-20 | 1 | -0/+5 |
| | | | |||||
* | | | Remove spurious content param | Erik Johnston | 2017-07-20 | 1 | -1/+1 |
| | | | |||||
* | | | Add update group profile API | Erik Johnston | 2017-07-20 | 1 | -0/+12 |
|/ / | |||||
* | | Comments | Erik Johnston | 2017-07-18 | 1 | -1/+3 |
| | | |||||
* | | Comments | Erik Johnston | 2017-07-18 | 1 | -103/+48 |
| | | |||||
* | | Add local group server support | Erik Johnston | 2017-07-17 | 1 | -0/+642 |
|/ | |||||
* | split out reducing stuff; just make encode_* static | Krombel | 2017-07-11 | 1 | -35/+27 |
| | |||||
* | fix test | Krombel | 2017-07-10 | 1 | -1/+3 |
| | |||||
* | encode sync-response statically; omit empty objects from sync-response | Krombel | 2017-07-10 | 1 | -33/+48 |
| | |||||
* | Fix bug where pusherpool didn't start and broke some rooms | Erik Johnston | 2017-07-06 | 1 | -8/+6 |
| | | | | | | | | 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. | ||||
* | Add API to quarantine media | Erik Johnston | 2017-06-19 | 1 | -0/+25 |
| | |||||
* | Remove unused import | Erik Johnston | 2017-06-19 | 1 | -1/+1 |
| | |||||
* | Change to create new room and join other users | Erik Johnston | 2017-06-19 | 1 | -6/+53 |
| | |||||
* | Forget room | Erik Johnston | 2017-06-19 | 1 | -0/+2 |
| | |||||
* | Add shutdown room API | Erik Johnston | 2017-06-19 | 1 | -1/+66 |
| | |||||
* | Include users who share room with requester in user directory | Erik Johnston | 2017-06-15 | 1 | -2/+6 |
| | |||||
* | Add comments | Erik Johnston | 2017-05-31 | 1 | -0/+16 |
| | |||||
* | Use POST | Erik Johnston | 2017-05-31 | 1 | -1/+1 |
| | |||||
* | Add REST API | Erik Johnston | 2017-05-31 | 1 | -0/+59 |
| | |||||
* | Add count of one time keys to sync stream | Erik Johnston | 2017-05-19 | 1 | -0/+1 |
| |