Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix logcontext leak in media repo | Richard van der Hoff | 2018-05-02 | 2 | -1/+4 |
| | | | | Make FileResponder.write_to_consumer uphold the logcontext contract | ||||
* | add guard for None on purge_history api | Krombel | 2018-04-30 | 1 | -1/+14 |
| | |||||
* | Merge pull request #3155 from NotAFile/py3-bytes-1 | Richard van der Hoff | 2018-04-30 | 1 | -3/+3 |
|\ | | | | | more bytes strings | ||||
| * | more bytes strings | Adrian Tschira | 2018-04-29 | 1 | -3/+3 |
| | | | | | | | | Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
* | | Merge pull request #3140 from matrix-org/rav/use_run_in_background | Richard van der Hoff | 2018-04-30 | 1 | -2/+3 |
|\ \ | | | | | | | Use run_in_background in preference to preserve_fn | ||||
| * | | Merge remote-tracking branch 'origin/develop' into rav/use_run_in_background | Richard van der Hoff | 2018-04-27 | 1 | -2/+7 |
| |\| | |||||
| * | | Use run_in_background in preference to preserve_fn | Richard van der Hoff | 2018-04-27 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | While I was going through uses of preserve_fn for other PRs, I converted places which only use the wrapped function once to use run_in_background, to avoid creating the function object. | ||||
* | | | Merge pull request #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> | ||||
* | | | Merge pull request #3108 from NotAFile/py3-six-urlparse | Richard van der Hoff | 2018-04-30 | 4 | -7/+8 |
|\ \ \ | |/ / |/| | | Use six.moves.urlparse | ||||
| * | | Use six.moves.urlparse | Adrian Tschira | 2018-04-15 | 4 | -7/+8 |
| |/ | | | | | | | | | | | The imports were shuffled around a bunch in py3 Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
* / | Improve exception handling for background processes | Richard van der Hoff | 2018-04-27 | 1 | -2/+7 |
|/ | | | | | | | | | | | | | | | | | | There were a bunch of places where we fire off a process to happen in the background, but don't have any exception handling on it - instead relying on the unhandled error being logged when the relevent deferred gets garbage-collected. This is unsatisfactory for a number of reasons: - logging on garbage collection is best-effort and may happen some time after the error, if at all - it can be hard to figure out where the error actually happened. - it is logged as a scary CRITICAL error which (a) I always forget to grep for and (b) it's not really CRITICAL if a background process we don't care about fails. So this is an attempt to add exception handling to everything we fire off into the background. | ||||
* | 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 | 3 | -3/+3 |
| |\ \ | |||||
| * | | | 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 #3073 from NotAFile/use-six-reraise | Richard van der Hoff | 2018-04-09 | 1 | -1/+3 |
|\ \ \ \ | | | | | | | | | | | Replace old-style raise with six.reraise | ||||
| * | | | | Replace old-style raise with six.reraise | Adrian Tschira | 2018-04-06 | 1 | -1/+3 |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old style raise is invalid syntax in python3. As noted in the docs, this adds one more frame in the traceback, but I think this is acceptable: <ipython-input-7-bcc5cba3de3f> in <module>() 16 except: 17 pass ---> 18 six.reraise(*x) /usr/lib/python3.6/site-packages/six.py in reraise(tp, value, tb) 691 if value.__traceback__ is not tb: 692 raise value.with_traceback(tb) --> 693 raise value 694 finally: 695 value = None <ipython-input-7-bcc5cba3de3f> in <module>() 9 10 try: ---> 11 x() 12 except: 13 x = sys.exc_info() Also note that this uses six, which is not formally a dependency yet, but is included indirectly since most packages depend on it. 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 | 2 | -2/+2 |
|\ \ \ | |||||
| * | | | Replace ujson with simplejson | Erik Johnston | 2018-03-15 | 3 | -3/+3 |
| | | | | |||||
* | | | | 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 |
| | | |||||
* | | Make store_file use store_into_file | Erik Johnston | 2018-02-14 | 1 | -26/+11 |
| | | |||||
* | | 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 #2857 from matrix-org/erikj/upload_store | Erik Johnston | 2018-02-12 | 1 | -0/+6 |
|\ \ \ | | | | | | | | | Tell storage providers about new file so they can upload | ||||
| * | | | Tell storage providers about new file so they can upload | Erik Johnston | 2018-02-07 | 1 | -0/+6 |
| |/ / | |||||
* | | | 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 pull request #2791 from matrix-org/erikj/media_storage_refactor | Erik Johnston | 2018-02-05 | 3 | -12/+47 |
|\ \ \ | | | | | | | | | Ensure media is in local cache before thumbnailing | ||||
| * | | | Use better file consumer | Erik Johnston | 2018-01-18 | 1 | -5/+10 |
| | | | | |||||
| * | | | Ensure media is in local cache before thumbnailing | Erik Johnston | 2018-01-18 | 3 | -10/+40 |
| | | | | |||||
* | | | | Merge pull request #2845 from matrix-org/rav/urlcache_error_handling | Richard van der Hoff | 2018-02-02 | 1 | -21/+34 |
|\ \ \ \ | | | | | | | | | | | Handle url_previews with no content-type | ||||
| * | | | | Handle url_previews with no content-type | Richard van der Hoff | 2018-02-02 | 1 | -21/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | avoid failing with an exception if the remote server doesn't give us a Content-Type header. Also, clean up the exception handling a bit. | ||||
* | | | | | Merge branch 'develop' into travis/admin-list-media | Travis Ralston | 2018-02-01 | 6 | -30/+138 |
|\| | | | | |||||
| * | | | | 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 | ||||
| * | | | | Add federation_domain_whitelist option (#2820) | Matthew Hodgson | 2018-01-22 | 2 | -2/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add federation_domain_whitelist gives a way to restrict which domains your HS is allowed to federate with. useful mainly for gracefully preventing a private but internet-connected HS from trying to federate to the wider public Matrix network | ||||
| * | | | | Merge pull request #2813 from matrix-org/matthew/registrations_require_3pid | Matthew Hodgson | 2018-01-22 | 3 | -22/+102 |
| |\ \ \ \ | | | | | | | | | | | | | add registrations_require_3pid and allow_local_3pids | ||||
| | * | | | | 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> | ||||
* | | | | Merge pull request #2814 from matrix-org/rav/fix_urlcache_thumbs | Richard van der Hoff | 2018-01-19 | 1 | -0/+8 |
|\ \ \ \ | | | | | | | | | | | Use the right path for url_preview thumbnails | ||||
| * | | | | Use the right path for url_preview thumbnails | Richard van der Hoff | 2018-01-19 | 1 | -0/+8 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | This was introduced by #2627: we were overwriting the original media for url previews with the thumbnails :/ (fixes https://github.com/vector-im/riot-web/issues/6012, hopefully) | ||||
* | | | | Fix storage provider bug introduced when renamed to store_local | Erik Johnston | 2018-01-18 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #2812 from matrix-org/erikj/media_storage_provider_config | Erik Johnston | 2018-01-18 | 2 | -20/+27 |
|\ \ \ \ | | | | | | | | | | | Make storage providers configurable | ||||
| * | | | | Missing staticmethod | Erik Johnston | 2018-01-18 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Fixup comments | Erik Johnston | 2018-01-18 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Make storage providers more configurable | Erik Johnston | 2018-01-18 | 2 | -20/+26 |
| | |/ / | |/| | | |||||
* | | | | Fix typo in thumbnail resource causing access times to be incorrect | Erik Johnston | 2018-01-18 | 1 | -2/+2 |
| |/ / |/| | | |||||
* | | | Update last access time when thumbnails are viewed | Erik Johnston | 2018-01-17 | 1 | -0/+2 |
| | | | |||||
* | | | Keep track of last access time for local media | Erik Johnston | 2018-01-17 | 1 | -7/+25 |
|/ / | |||||
* | | Add docstring | Erik Johnston | 2018-01-17 | 1 | -1/+1 |
| | | |||||
* | | Use local vars | Erik Johnston | 2018-01-16 | 1 | -6/+2 |
| | | |||||
* | | Change _generate_thumbnails to take media_type | Erik Johnston | 2018-01-16 | 2 | -7/+10 |
| | | |||||
* | | Move setting of file_id up to caller | Erik Johnston | 2018-01-16 | 2 | -13/+14 |
| | | |||||
* | | Fix typo | Erik Johnston | 2018-01-16 | 1 | -7/+10 |
| | | |||||
* | | Fix up log lines | Erik Johnston | 2018-01-16 | 2 | -7/+10 |
| | | |||||
* | | Correctly use server_name/file_id when generating/fetching remote thumbnails | Erik Johnston | 2018-01-16 | 2 | -5/+8 |
| | | |||||
* | | Log when we respond with 404 | Erik Johnston | 2018-01-16 | 2 | -1/+8 |
| | | |||||
* | | Fix thumbnailing remote files | Erik Johnston | 2018-01-16 | 2 | -2/+30 |
| | | |||||
* | | Merge pull request #2767 from matrix-org/erikj/media_storage_refactor | Erik Johnston | 2018-01-16 | 7 | -346/+843 |
|\ \ | | | | | | | Refactor MediaRepository to separate out storage | ||||
| * | | Fix up comments | Erik Johnston | 2018-01-12 | 2 | -7/+16 |
| | | | |||||
| * | | Correctly reraise exception | Erik Johnston | 2018-01-12 | 1 | -2/+4 |
| | | | |||||
| * | | Make Responder a context manager | Erik Johnston | 2018-01-12 | 2 | -9/+10 |
| | | | |||||
| * | | Add missing class var | Erik Johnston | 2018-01-12 | 1 | -0/+3 |
| | | | |||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-01-12 | 1 | -3/+26 |
| |\ \ | | | | | | | | | | | | | erikj/media_storage_refactor | ||||
| * | | | Remove unnecessary condition | Erik Johnston | 2018-01-12 | 1 | -4/+1 |
| | | | | |||||
| * | | | Remove unused variables | Erik Johnston | 2018-01-12 | 1 | -3/+0 |
| | | | | |||||
| * | | | Make class var local | Erik Johnston | 2018-01-12 | 1 | -3/+3 |
| | | | | |||||
| * | | | Comments | Erik Johnston | 2018-01-12 | 3 | -15/+65 |
| | | | | |||||
| * | | | Add StorageProvider concept | Erik Johnston | 2018-01-09 | 3 | -9/+162 |
| | | | | |||||
| * | | | Make PreviewUrlResource use MediaStorage | Erik Johnston | 2018-01-09 | 2 | -8/+14 |
| | | | | |||||
| * | | | Make ThumbnailResource use MediaStorage | Erik Johnston | 2018-01-09 | 2 | -48/+68 |
| | | | | |||||
| * | | | Use MediaStorage for remote media | Erik Johnston | 2018-01-09 | 2 | -136/+156 |
| | | | | |||||
| * | | | Use MediaStorage for local files | Erik Johnston | 2018-01-09 | 2 | -119/+73 |
| | | | | |||||
| * | | | Add MediaStorage class | Erik Johnston | 2018-01-09 | 1 | -0/+198 |
| | | | | |||||
| * | | | Add some helper classes | Erik Johnston | 2018-01-09 | 1 | -0/+73 |
| | | | | |||||
| * | | | Split out add_file_headers | Erik Johnston | 2018-01-09 | 1 | -28/+42 |
| | | | | |||||
* | | | | Reinstate media download on thumbnail request | Richard van der Hoff | 2018-01-12 | 1 | -0/+5 |
| |/ / |/| | | | | | | | | | | | We need to actually download the remote media when we get a request for a thumbnail. | ||||
* | | | Merge pull request #2766 from matrix-org/rav/room_event | Richard van der Hoff | 2018-01-11 | 1 | -3/+26 |
|\ \ \ | |/ / |/| | | Add /room/{id}/event/{id} to synapse | ||||
| * | | 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. | ||||
* | | | Remove dead TODO | Erik Johnston | 2018-01-09 | 1 | -2/+0 |
| | | | |||||
* | | | Remove dead code related to default thumbnails | Erik Johnston | 2018-01-09 | 1 | -73/+3 |
|/ / | |||||
* / | 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 |
| | |||||
* | Merge pull request #2697 from matrix-org/rav/fix_urlcache_index_error | Richard van der Hoff | 2017-11-27 | 1 | -3/+7 |
|\ | | | | | Fix error on sqlite 3.7 | ||||
| * | Check database in has_completed_background_updates | Richard van der Hoff | 2017-11-22 | 1 | -1/+1 |
| | | | | | | | | so that the right thing happens on workers. | ||||
| * | Fix error on sqlite 3.7 | Richard van der Hoff | 2017-11-21 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | | | | | | | | Create the url_cache index on local_media_repository as a background update, so that we can detect whether we are on sqlite or not and create a partial or complete index accordingly. To avoid running the cleanup job before we have built the index, add a bailout which will defer the cleanup if the bg updates are still running. Fixes https://github.com/matrix-org/synapse/issues/2572. | ||||
* | | Fix OPTIONS on preview_url | Richard van der Hoff | 2017-11-23 | 1 | -1/+5 |
|/ | | | | Fixes #2706 | ||||
* | Declare support for r0.3.0 | Richard van der Hoff | 2017-11-15 | 1 | -0/+1 |
| | |||||
* | Merge pull request #2668 from turt2live/travis/whoami | Richard van der Hoff | 2017-11-14 | 1 | -0/+15 |
|\ | | | | | Add a route for determining who you are | ||||
| * | 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> | ||||
* | | Bit more logging | Richard van der Hoff | 2017-11-10 | 1 | -0/+2 |
| | | |||||
* | | Cache failures in url_preview handler | Richard van der Hoff | 2017-11-10 | 1 | -41/+45 |
|/ | | | | | Reshuffle the caching logic in the url_preview handler so that failures are cached (and to generally simplify things and fix the logcontext leaks). | ||||
* | 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 |
| | |||||
* | Merge pull request #2576 from maximevaillancourt/exclude-noscript-url-preview | Matthew Hodgson | 2017-11-07 | 1 | -1/+8 |
|\ | | | | | Ignore <noscript> tags when generating URL preview descriptions | ||||
| * | Ignore noscript tags when generating URL previews | Maxime Vaillancourt | 2017-10-25 | 1 | -1/+8 |
| | | |||||
* | | 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 | 11 | -16/+16 |
| | | | | what could possibly go wrong | ||||
* | Fix a logcontext leak in the media repo | Richard van der Hoff | 2017-10-23 | 1 | -1/+4 |
| | |||||
* | 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. | ||||
* | Fix typo in thumbnail generation | Erik Johnston | 2017-10-19 | 1 | -2/+5 |
| | |||||
* | Merge pull request #2550 from krombel/fix_thumbnail_2548 | Erik Johnston | 2017-10-17 | 1 | -2/+2 |
|\ | | | | | fix thumbnailing (#2548) | ||||
| * | fix thumbnailing (#2548) | Krombel | 2017-10-17 | 1 | -2/+2 |
| | | | | | | | | | | | | | | in commit 0e28281a the code for thumbnailing got refactored and the renaming of this variables was not done correctly. Signed-Off-by: Matthias Kesler <krombel@krombel.de> | ||||
* | | 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 |
|/ | |||||
* | Add try/finally block to close t_byte_source | Erik Johnston | 2017-10-13 | 1 | -24/+41 |
| | |||||
* | Remove old comment | Erik Johnston | 2017-10-13 | 1 | -1/+0 |
| | |||||
* | Don't reuse source but instead copy from primary media store to backup | Erik Johnston | 2017-10-13 | 2 | -22/+9 |
| | |||||
* | PEP8 | Erik Johnston | 2017-10-13 | 1 | -1/+1 |
| | |||||
* | Move type into key | Erik Johnston | 2017-10-13 | 1 | -3/+3 |
| | |||||
* | Comment | Erik Johnston | 2017-10-13 | 1 | -1/+1 |
| | |||||
* | Remove spurious addition | Erik Johnston | 2017-10-13 | 1 | -4/+0 |
| | |||||
* | Don't needlessly rename variable | Erik Johnston | 2017-10-13 | 1 | -13/+13 |
| | |||||
* | Add paths back in... | Erik Johnston | 2017-10-13 | 1 | -4/+4 |
| | |||||
* | Remove unnecessary diff | Erik Johnston | 2017-10-13 | 1 | -3/+1 |
| | |||||
* | Make things be absolute paths again | Erik Johnston | 2017-10-13 | 1 | -7/+7 |
| | |||||
* | s/write_to_file/write_to_file_and_backup/ | Erik Johnston | 2017-10-13 | 1 | -5/+5 |
| | |||||
* | Fix up | Erik Johnston | 2017-10-13 | 2 | -43/+32 |
| | |||||
* | Fix up thumbnailing function | Erik Johnston | 2017-10-13 | 3 | -75/+73 |
| | |||||
* | Fix typo | Erik Johnston | 2017-10-13 | 1 | -1/+1 |
| | |||||
* | Fix up comments | Erik Johnston | 2017-10-13 | 1 | -2/+26 |
| | |||||
* | Move makedirs to thread | Erik Johnston | 2017-10-13 | 1 | -2/+1 |
| | |||||
* | Use make_deferred_yieldable | Erik Johnston | 2017-10-13 | 1 | -7/+7 |
| | |||||
* | Fix comments | Erik Johnston | 2017-10-12 | 2 | -1/+4 |
| | |||||
* | Don't close prematurely.. | Erik Johnston | 2017-10-12 | 1 | -2/+5 |
| | |||||
* | getvalue closes buffer | Erik Johnston | 2017-10-12 | 1 | -11/+10 |
| | |||||
* | Get len before close | Erik Johnston | 2017-10-12 | 1 | -6/+11 |
| | |||||
* | Don't close file prematurely | Erik Johnston | 2017-10-12 | 2 | -8/+18 |
| | |||||
* | Copy everything to backup | Erik Johnston | 2017-10-12 | 4 | -76/+148 |
| | |||||
* | Typo | Erik Johnston | 2017-10-12 | 1 | -1/+1 |
| | |||||
* | Remove dead code | Erik Johnston | 2017-10-12 | 1 | -3/+0 |
| | |||||
* | Fix typos | Erik Johnston | 2017-10-12 | 1 | -20/+26 |
| | |||||
* | Fix typo | Erik Johnston | 2017-10-12 | 1 | -1/+1 |
| | |||||
* | Basic implementation of backup media store | Erik Johnston | 2017-10-12 | 3 | -126/+113 |
| | |||||
* | Merge branch 'develop' into erikj/groups_merged | David Baker | 2017-10-02 | 3 | -23/+196 |
|\ | |||||
| * | Only log if we've removed media | Erik Johnston | 2017-09-28 | 1 | -2/+4 |
| | | |||||
| * | Clear up expired url cache every 10s | Erik Johnston | 2017-09-28 | 1 | -1/+1 |
| | | |||||
| * | Actually assign result to variable | Erik Johnston | 2017-09-28 | 1 | -1/+1 |
| | | |||||
| * | Fix typo in url cache expiry timer | Erik Johnston | 2017-09-28 | 1 | -1/+1 |
| | | |||||
| * | Support new and old style media id formats | Erik Johnston | 2017-09-28 | 1 | -31/+81 |
| | | |||||
| * | Change expires column to expires_ts | Erik Johnston | 2017-09-28 | 1 | -2/+2 |
| | | |||||
| * | Delete expired url cache data | Erik Johnston | 2017-09-28 | 2 | -4/+129 |
| | | |||||
| * | 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 | 2 | -0/+644 |
|/ | |||||
* | 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. | ||||
* | Store URL cache preview downloads seperately | Erik Johnston | 2017-06-23 | 5 | -18/+72 |
| | | | | This makes it easier to clear old media out at a later date | ||||
* | Add API to quarantine media | Erik Johnston | 2017-06-19 | 4 | -3/+30 |
| | |||||
* | 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 |
| | |||||
* | Throw exception when not retrying when downloading media | Erik Johnston | 2017-06-13 | 1 | -0/+1 |
| | |||||
* | 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 | 2 | -0/+61 |
| | |||||
* | Merge pull request #2243 from matrix-org/matthew/fix-url-preview-length-again | Erik Johnston | 2017-05-23 | 1 | -0/+2 |
|\ | | | | | actually trim oversize og:description meta | ||||
| * | actually trim oversize og:description meta | Matthew Hodgson | 2017-05-22 | 1 | -0/+2 |
| | | |||||
* | | Add count of one time keys to sync stream | Erik Johnston | 2017-05-19 | 1 | -0/+1 |
|/ | |||||
* | Merge pull request #2221 from psaavedra/sync_timeline_limit_filter_by_name | Erik Johnston | 2017-05-15 | 3 | -0/+20 |
|\ | | | | | Configurable maximum number of events requested by /sync and /messages | ||||
| * | Fixed syntax nits | Pablo Saavedra | 2017-05-15 | 2 | -5/+6 |
| | | |||||
| * | Fixed implementation errors | Pablo Saavedra | 2017-05-15 | 2 | -3/+7 |
| | | | | | | | | | | * Added HS as property in SyncRestServlet * Fixed set_timeline_upper_limit function implementat¡ion | ||||
| * | Configurable maximum number of events requested by /sync and /messages (#2220) | Pablo Saavedra | 2017-05-13 | 3 | -0/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the limit on the returned events in the timeline in the get and sync operations. The default value is -1, means no upper limit. For example, using `filter_timeline_limit: 5000`: POST /_matrix/client/r0/user/user:id/filter { room: { timeline: { limit: 1000000000000000000 } } } GET /_matrix/client/r0/user/user:id/filter/filter:id { room: { timeline: { limit: 5000 } } } The server cuts down the room.timeline.limit. | ||||
* | | Don't log exceptions for NotRetryingDestination | Erik Johnston | 2017-05-15 | 1 | -1/+3 |
|/ | |||||
* | Modify register/available to be GET with query param | Luke Barnard | 2017-05-10 | 1 | -5/+4 |
| | | | | | | | - GET is now the method for register/available - a query parameter "username" is now used Also, empty usernames are now handled with an error message on registration or via register/available: `User ID cannot be empty` | ||||
* | Change register/available to POST (from GET) | Luke Barnard | 2017-05-10 | 1 | -1/+1 |
| | |||||
* | Merge pull request #2183 from matrix-org/luke/username-availability | Luke Barnard | 2017-05-04 | 1 | -0/+41 |
|\ | | | | | Implement username availability checker | ||||
| * | Appease the flake8 gods | Luke Barnard | 2017-05-03 | 1 | -5/+10 |
| | | |||||
| * | Implement username availability checker | Luke Barnard | 2017-05-03 | 1 | -0/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Outlined here: https://github.com/vector-im/riot-web/issues/3605#issuecomment-298679388 ```HTTP GET /_matrix/.../register/available { "username": "desiredlocalpart123" } ``` If available, the response looks like ```HTTP HTTP/1.1 200 OK { "available": true } ``` Otherwise, ```HTTP HTTP/1.1 429 { "errcode": "M_LIMIT_EXCEEDED", "error": "Too Many Requests", "retry_after_ms": 2000 } ``` or ```HTTP HTTP/1.1 400 { "errcode": "M_USER_IN_USE", "error": "User ID already taken." } ``` or ```HTTP HTTP/1.1 400 { "errcode": "M_INVALID_USERNAME", "error": "Some reason for username being invalid" } ``` | ||||
* | | Add more granular event send metrics | Erik Johnston | 2017-05-02 | 1 | -0/+1 |
|/ | |||||
* | Merge pull request #2163 from matrix-org/erikj/fix_invite_state | Erik Johnston | 2017-04-27 | 1 | -0/+1 |
|\ | | | | | Fix invite state to always include all events | ||||
| * | Comment and remove spurious logging | Erik Johnston | 2017-04-27 | 1 | -1/+0 |
| | | |||||
| * | Fix invite state to always include all events | Erik Johnston | 2017-04-26 | 1 | -0/+2 |
| | |