summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2649 from matrix-org/rav/fix_delta_on_state_resRichard van der Hoff2017-11-083-33/+58
|\ | | | | Fix bug in state group storage
| * s/items/iteritems/Richard van der Hoff2017-11-081-2/+2
| |
| * Update deltas when doing auth resolutionRichard van der Hoff2017-11-071-3/+7
| | | | | | | | | | Fixes a bug where the persisted state groups were different to those actually being used after auth resolution.
| * factor out _update_context_for_auth_eventsRichard van der Hoff2017-11-071-20/+42
| | | | | | | | This is duplicated, so let's factor it out before fixing it
| * move _state_group_cache to statestoreRichard van der Hoff2017-11-072-13/+12
| | | | | | | | this is internal to statestore, so let's keep it there.
* | Merge pull request #2643 from matrix-org/matthew/user_dir_typosMatthew Hodgson2017-11-076-14/+55
|\ \ | |/ |/| Fix various embarrassing typos around user_directory and add some doc.
| * create new indexes before dropping old ones to keep safetynet in placeMatthew Hodgson2017-11-071-2/+4
| |
| * s/users_in_pubic_room/users_in_public_rooms/gMatthew Hodgson2017-11-041-2/+2
| |
| * s/users_in_pubic_room/users_in_public_rooms/gMatthew Hodgson2017-11-042-10/+32
| |
| * fix copyright....Matthew Hodgson2017-11-041-1/+1
| |
| * s/popualte/populate/Matthew Hodgson2017-11-041-1/+1
| |
| * s/intial/initial/Matthew Hodgson2017-11-041-2/+2
| |
| * simplify instructions for regenerating user_dirMatthew Hodgson2017-11-041-0/+17
| |
* | Merge pull request #2636 from farialima/me-masterErik Johnston2017-11-071-13/+8
|\ \ | | | | | | Fix for #2635: correctly update rooms avatar/display name when modified by admin
| * | removed unused import flagged by flake8aFrancois Granade2017-11-031-1/+0
| | |
| * | Fix for issue 2635: correctly update rooms avatar/display name when modified ↵Francois Granade2017-11-031-12/+8
| | | | | | | | | | | | by admin
* | | Revert "Merge branch 'master' of github.com:matrix-org/synapse into develop"Erik Johnston2017-11-071-1/+10
| | | | | | | | | | | | | | | This reverts commit f9b255cd62fe724e16b2222f6af623b2d39282ab, reversing changes made to 1bd654dabde776bbb7ee365c115b307cd6a110b8.
* | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2017-11-071-10/+1
|\| |
| * | Merge pull request #2598 from matrix-org/revert-2596-erikj/attestation_jitterErik Johnston2017-10-271-12/+1
| |\ \ | | | | | | | | Revert "Add jitter to validity period of attestations"
| | * | Revert "Add jitter to validity period of attestations"Erik Johnston2017-10-271-12/+1
| |/ /
| * | Merge pull request #2596 from matrix-org/erikj/attestation_jitterErik Johnston2017-10-271-1/+12
| |\ \ | | | | | | | | Add jitter to validity period of attestations
* | \ \ Merge pull request #2647 from matrix-org/luke/get-group-users-is-privilegedLuke Barnard2017-11-072-3/+4
|\ \ \ \ | | | | | | | | | | Return whether a user is an admin within a group
| * | | | Remember to pick is_admin out of the dbLuke Barnard2017-11-071-1/+1
| | | | |
| * | | | Return whether a user is an admin within a groupLuke Barnard2017-11-071-2/+3
|/ / / /
* | | | Merge pull request #2576 from maximevaillancourt/exclude-noscript-url-previewMatthew Hodgson2017-11-071-1/+8
|\ \ \ \ | | | | | | | | | | Ignore <noscript> tags when generating URL preview descriptions
| * | | | Ignore noscript tags when generating URL previewsMaxime Vaillancourt2017-10-251-1/+8
| | | | |
* | | | | Merge pull request #2646 from matrix-org/rav/logging_for_limiterRichard van der Hoff2017-11-071-7/+17
|\ \ \ \ \ | |_|_|_|/ |/| | | | Logging and logcontext fixes for Limiter
| * | | | Logging and logcontext fixes for LimiterRichard van der Hoff2017-11-071-7/+17
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add some logging to the Limiter in a similar spirit to the Linearizer, to help debug issues. Also fix a logcontext leak. Also refactor slightly to avoid throwing exceptions.
* | | | Merge pull request #2630 from matrix-org/luke/fix-rooms-in-groupDavid Baker2017-11-021-3/+1
|\ \ \ \ | | | | | | | | | | Make the get_rooms_in_group API more sane
| * | | | Make the get_rooms_in_group API more saneLuke Barnard2017-11-021-3/+1
| | | | | | | | | | | | | | | | | | | | Return entries with is_public = True when they're public and is_public = False otherwise.
* | | | | Merge pull request #2629 from matrix-org/rav/register_inhibit_loginDavid Baker2017-11-021-12/+16
|\ \ \ \ \ | |/ / / / |/| | | | support inhibit_login in /register
| * | | | support inhibit_login in /registerRichard van der Hoff2017-11-021-12/+16
| | | | | | | | | | | | | | | | | | | | Allow things to pass inhibit_login when registering to ... inhibit logins.
* | | | | Merge pull request #2628 from matrix-org/rav/module_api_hooksDavid Baker2017-11-021-0/+34
|\ \ \ \ \ | | | | | | | | | | | | Add more hooks to ModuleApi
| * \ \ \ \ Merge remote-tracking branch 'origin/develop' into rav/module_api_hooksDavid Baker2017-11-023-45/+137
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #2627 from matrix-org/rav/custom_rest_endpointsDavid Baker2017-11-023-0/+74
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add a hook for custom rest endpoints
| * | | | | | Add a hook for custom rest endpointsRichard van der Hoff2017-11-023-0/+74
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Let the user specify custom modules which can be used for implementing extra endpoints.
* | | | | | Merge pull request #2626 from matrix-org/rav/refactor_module_apiDavid Baker2017-11-023-70/+83
|\ \ \ \ \ \ | | | | | | | | | | | | | | Factor _AccountHandler proxy out to ModuleApi
* \ \ \ \ \ \ Merge pull request #2625 from matrix-org/rav/named_resource_refactorDavid Baker2017-11-021-46/+64
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Factor out _configure_named_resource
| * | | | | | Factor out _configure_named_resourceRichard van der Hoff2017-11-021-46/+64
|/ / / / / / | | | | | | | | | | | | | | | | | | This was a bit of a code vomit, so let's factor it out to preserve some sanity
| | * / / / Add more hooks to ModuleApiRichard van der Hoff2017-11-021-0/+34
| |/ / / / | | | | | | | | | | | | | | | add `get_user_by_req` and `invalidate_access_token`
| * / / / Factor _AccountHandler proxy out to ModuleApiRichard van der Hoff2017-11-023-70/+83
|/ / / / | | | | | | | | | | | | | | | | We're going to need to use this from places that aren't password auth, so let's move it to a proper class.
* | | | Merge pull request #2624 from matrix-org/rav/password_provider_notify_logoutDavid Baker2017-11-023-7/+42
|\ \ \ \ | | | | | | | | | | Notify auth providers on logout
| * | | | Notify auth providers on logoutRichard van der Hoff2017-11-013-7/+42
| | | | | | | | | | | | | | | | | | | | Provide a hook by which auth providers can be notified of logouts.
* | | | | Merge pull request #2623 from matrix-org/rav/callbacks_for_auth_providersDavid Baker2017-11-023-7/+20
|\ \ \ \ \ | | | | | | | | | | | | Allow password_auth_providers to return a callback
| * | | | | Fix user-interactive password authRichard van der Hoff2017-11-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | this got broken in the previous commit
| * | | | | Allow password_auth_providers to return a callbackRichard van der Hoff2017-11-013-6/+17
| |/ / / / | | | | | | | | | | | | | | | ... so that they have a way to record access tokens.
* | | | | Merge pull request #2622 from matrix-org/rav/db_access_for_auth_providersDavid Baker2017-11-021-0/+16
|\ \ \ \ \ | |/ / / / |/| | | | Let auth providers get to the database
| * | | | Let auth providers get to the databaseRichard van der Hoff2017-10-311-0/+16
| | | | | | | | | | | | | | | | | | | | Somewhat open to abuse, but also somewhat unavoidable :/
* | | | | Merge pull request #2620 from matrix-org/rav/auth_non_passwordRichard van der Hoff2017-11-012-32/+139
|\ \ \ \ \ | | | | | | | | | | | | Let password auth providers handle arbitrary login types
| * | | | | Let password auth providers handle arbitrary login typesRichard van der Hoff2017-11-012-32/+139
| |/ / / / | | | | | | | | | | | | | | | | | | | | Provide a hook where password auth providers can say they know about other login types, and get passed the relevant parameters
* | | | | Merge pull request #2621 from matrix-org/rav/refactor_accesstoken_deleteDavid Baker2017-11-016-27/+62
|\ \ \ \ \ | | | | | | | | | | | | Move access token deletion into auth handler
| * \ \ \ \ Merge remote-tracking branch 'origin/develop' into ↵David Baker2017-11-0115-98/+65
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | rav/refactor_accesstoken_delete
| * | | | | | Move access token deletion into auth handlerRichard van der Hoff2017-11-016-27/+62
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge pull request #2617 from matrix-org/matthew/auto-displaynameMatthew Hodgson2017-11-011-2/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | automatically set default displayname on register
| * | | | | switch to setting default displayname in the storage layerMatthew Hodgson2017-11-012-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | to avoid clobbering guest user displaynames on registration
| * | | | | automatically set default displayname on registerMatthew Hodgson2017-11-011-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to avoid leaking ugly MXIDs and cluttering up the timeline with displayname changes as well as membership joins for autojoin rooms (e.g. the status autojoin rooms), automatically set the displayname to match the localpart of the mxid upon registration.
* | | | | | Merge pull request #2615 from matrix-org/rav/break_auth_device_depDavid Baker2017-11-013-13/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Break dependency of auth_handler on device_handler
| * | | | | | Break dependency of auth_handler on device_handlerRichard van der Hoff2017-11-013-13/+6
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge pull request #2613 from matrix-org/rav/kill_refresh_tokensDavid Baker2017-11-016-63/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove the last vestiges of refresh_tokens
| * | | | | | Fix tests for refresh_token removalRichard van der Hoff2017-11-011-3/+3
| | | | | | |
| * | | | | | Remove the last vestiges of refresh_tokensRichard van der Hoff2017-10-315-60/+14
| |/ / / / /
* | | | | | Merge pull request #2618 from matrix-org/dbkr/log_login_requestsDavid Baker2017-11-011-0/+10
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Log login requests
| * | | | | Apparently this is pythonDavid Baker2017-11-011-1/+1
| | | | | |
| * | | | | Log login requestsDavid Baker2017-11-011-0/+10
|/ / / / / | | | | | | | | | | | | | | | Carefully though, to avoid logging passwords
* | | | | Merge pull request #2612 from matrix-org/luke/groups-room-relationship-is-publicLuke Barnard2017-11-016-22/+32
|\ \ \ \ \ | |/ / / / |/| | | | Modify group room association API to allow modification of is_public
| * | | | Leave `is_public` as required argument of update_room_group_associationLuke Barnard2017-11-011-1/+1
| | | | |
| * | | | Update docs for updating room group associationLuke Barnard2017-11-012-2/+2
| | | | |
| * | | | Flake8Luke Barnard2017-10-312-5/+9
| | | | |
| * | | | Modify group room association API to allow modification of is_publicLuke Barnard2017-10-316-19/+25
| | | | | | | | | | | | | | | | | | | | also includes renamings to make things more consistent.
* | | | | Merge pull request #2610 from matrix-org/rav/schema_for_pw_providersRichard van der Hoff2017-10-314-0/+90
|\ \ \ \ \ | | | | | | | | | | | | DB schema interface for password auth providers
| * | | | | fix testsRichard van der Hoff2017-10-311-0/+1
| | | | | |
| * | | | | DB schema interface for password auth providersRichard van der Hoff2017-10-313-0/+89
| |/ / / / | | | | | | | | | | | | | | | | | | | | Provide an interface by which password auth providers can register db schema files to be run at startup
* | | | | Merge pull request #2611 from matrix-org/dbkr/port_script_drop_nulsRichard van der Hoff2017-10-311-7/+19
|\ \ \ \ \ | |/ / / / |/| | | | Make the port script drop NUL values in all tables
| * | | | Make the port script drop NUL values in all tablesDavid Baker2017-10-311-7/+19
|/ / / / | | | | | | | | | | | | | | | | | | | | Postgres doesn't support NULs in strings so it makes the script throw an exception and stop if any values contain \0. Drop them with appropriate warning.
* | | | Merge pull request #2609 from matrix-org/rav/refactor_loginDavid Baker2017-10-312-57/+78
|\ \ \ \ | | | | | | | | | | Refactor some logic from LoginRestServlet into AuthHandler
| * | | | Refactor some logic from LoginRestServlet into AuthHandlerRichard van der Hoff2017-10-312-57/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #2607 from matrix-org/rav/cleanup_ldap_hacksRichard van der Hoff2017-10-311-20/+19
|\ \ \ \ \ | | | | | | | | | | | | Clean up backwards-compat hacks for ldap
| * | | | | Clean up backwards-compat hacks for ldapRichard van der Hoff2017-10-311-20/+19
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | try to make the backwards-compat flows follow the same code paths as the modern impl. This commit should be non-functional.
* | | | | Merge pull request #2608 from matrix-org/rav/password_provider_docDavid Baker2017-10-311-0/+39
|\ \ \ \ \ | |/ / / / |/| | | | Start some documentation on password providers
| * | | | Start some documentation on password providersRichard van der Hoff2017-10-311-0/+39
|/ / / / | | | | | | | | | | | | Document the existing interface, before I start adding new stuff.
* | | | Merge pull request #2605 from matrix-org/luke/fix-group-creation-error-wordingRichard van der Hoff2017-10-301-1/+1
|\ \ \ \ | | | | | | | | | | Fix wording on group creation error
| * | | | Fix wording on group creation errorLuke Barnard2017-10-301-1/+1
|/ / / /
* | | | fix typoMatthew Hodgson2017-10-291-1/+1
| | | |
* | | | move url_previews to MD as RST does my head inMatthew Hodgson2017-10-291-0/+2
| | | |
* | | | Merge pull request #2599 from matrix-org/erikj/groups_inviteErik Johnston2017-10-271-1/+4
|\ \ \ \ | | | | | | | | | | Fix typo when checking if user is invited to group
| * | | | Fix typo when checking if user is invited to groupErik Johnston2017-10-271-1/+4
|/ / / /
* | | | Fix bad mergeErik Johnston2017-10-271-1/+3
| | | |
* | | | Merge branch 'erikj/attestation_jitter' of github.com:matrix-org/synapse ↵Erik Johnston2017-10-271-1/+11
|\ \ \ \ | | |_|/ | |/| | | | | | into develop
| * | | Add jitter to validity period of attestationsErik Johnston2017-10-271-1/+12
| | |/ | |/| | | | | | | | | | This helps ensure that the renewals of attestations are spread out more evenly.
* | | Merge branch 'erikj/attestation_local_fix' of github.com:matrix-org/synapse ↵Erik Johnston2017-10-273-9/+36
|\ \ \ | | | | | | | | | | | | into develop
| * | | Import loggerErik Johnston2017-10-271-0/+5
| | | |
| * | | FixupErik Johnston2017-10-272-5/+5
| | | |
| * | | Remove incorrect attestationsErik Johnston2017-10-272-0/+19
| | | |
| * | | Log if we try to do attestations for our own user and groupErik Johnston2017-10-271-2/+8
| | | |
| * | | Don't generate group attestations for local usersErik Johnston2017-10-271-2/+3
| |/ /
* | | Merge pull request #2595 from matrix-org/erikj/attestation_commnetErik Johnston2017-10-271-0/+22
|\ \ \ | | | | | | | | Add comment about attestations
| * | | Add comment about attestationsErik Johnston2017-10-271-0/+22
| | | |
* | | | Merge pull request #2591 from matrix-org/rav/device_delete_authRichard van der Hoff2017-10-271-5/+8
|\ \ \ \ | | | | | | | | | | Device deletion: check UI auth matches access token
| * | | | Device deletion: check UI auth matches access tokenRichard van der Hoff2017-10-271-5/+8
| | | | | | | | | | | | | | | | | | | | (otherwise there's no point in the UI auth)
* | | | | Merge pull request #2589 from matrix-org/rav/as_deactivate_accountRichard van der Hoff2017-10-272-17/+33
|\ \ \ \ \ | | | | | | | | | | | | Allow ASes to deactivate their own users
| * | | | | Allow ASes to deactivate their own usersRichard van der Hoff2017-10-272-17/+33
| | |_|_|/ | |/| | |
* | | | | Merge pull request #2582 from matrix-org/luke/group-is-publicLuke Barnard2017-10-276-98/+190
|\ \ \ \ \ | |_|_|/ / |/| | | | Add is_public to groups table to allow for private groups
| * | | | Request is_public from databaseLuke Barnard2017-10-271-1/+3
| | | | |
| * | | | group is dictLuke Barnard2017-10-271-1/+1
| | | | |
| * | | | Create groups with is_public = TrueLuke Barnard2017-10-271-0/+1
| | | | |
| * | | | Fix create_group to pass requester_user_idLuke Barnard2017-10-271-1/+1
| | | | |
| * | | | Correct logic for checking private group membershipLuke Barnard2017-10-271-1/+1
| | | | |
| * | | | Make it workLuke Barnard2017-10-261-1/+1
| | | | |
| * | | | Recreate groups table instead of adding columnLuke Barnard2017-10-261-2/+16
| | | | | | | | | | | | | | | | | | | | Adding a column with non-constant default not possible in sqlite3
| * | | | Awful hack to get default trueLuke Barnard2017-10-261-1/+2
| | | | |
| * | | | Add groups table to BOOLEAN_COLUMNS in synapse_port_dbLuke Barnard2017-10-261-0/+1
| | | | |
| * | | | Bump schema version to 46Luke Barnard2017-10-261-1/+1
| | | | |
| * | | | delintLuke Barnard2017-10-262-15/+67
| | | | |
| * | | | Add is_public to groups table to allow for private groupsLuke Barnard2017-10-263-95/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge pull request #2586 from matrix-org/rav/frontend_proxy_auth_headerRichard van der Hoff2017-10-272-28/+87
|\ \ \ \ \ | | | | | | | | | | | | Front-end proxy: pass through auth header
| * | | | | Docstring for post_urlencoded_get_jsonRichard van der Hoff2017-10-271-0/+11
| | | | | |
| * | | | | Front-end proxy: pass through auth headerRichard van der Hoff2017-10-261-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | So that access-token-in-an-auth-header works.
| * | | | | SimpleHTTPClient: add support for headersRichard van der Hoff2017-10-261-28/+69
| | | | | | | | | | | | | | | | | | | | | | | | Sometimes we need to pass headers into these methods
* | | | | | Merge pull request #2585 from matrix-org/rav/unstable_to_r0Richard van der Hoff2017-10-271-2/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Support /keys/upload on /r0 as well as /unstable
| * | | | | | Support /keys/upload on /r0 as well as /unstableRichard van der Hoff2017-10-261-2/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | (So that we can stop riot relying on it in /unstable)
* | | | | | Merge pull request #2584 from matrix-org/rav/fix_httpclient_logcontextsRichard van der Hoff2017-10-271-10/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix logcontext leaks in httpclient
| * | | | | | Fix logcontext leaks in httpclientRichard van der Hoff2017-10-261-10/+9
| |/ / / / / | | | | | | | | | | | | | | | | | | `preserve_context_over_fn` is borked
* | | | | | Merge pull request #2574 from matrix-org/erikj/room_list_fixesErik Johnston2017-10-274-11/+22
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Add logging and fix log contexts for publicRooms
| * | | | | Update room_list.pyErik Johnston2017-10-261-1/+1
| | | | | |
| * | | | | Do logcontexts outside ResponseCacheErik Johnston2017-10-255-13/+21
| | | | | |
| * | | | | Add logging and fix log contexts for publicRoomsErik Johnston2017-10-252-1/+4
| | | | | |
* | | | | | spell out need for libxml2 for lxml to workMatthew Hodgson2017-10-271-1/+3
| | | | | |
* | | | | | Merge pull request #2581 from matrix-org/rav/fix_init_with_no_logfileRichard van der Hoff2017-10-261-1/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Fix error when running synapse with no logfile
| * | | | | Fix error when running synapse with no logfileRichard van der Hoff2017-10-261-1/+5
| | |_|/ / | |/| | | | | | | | | | | | | Fixes 'UnboundLocalError: local variable 'sighup' referenced before assignment'
* | | | | Merge pull request #2579 from krombel/move_unstable_to_r0Richard van der Hoff2017-10-265-27/+13
|\ \ \ \ \ | |_|_|/ / |/| | | | register some /unstable endpoints in /r0 as well
| * | | | add release endpoints for /thirdpartyKrombel2017-10-261-7/+4
| | | | |
| * | | | register some /unstable endpoints in /r0 as wellKrombel2017-10-264-20/+9
|/ / / /
* | | | Merge pull request #2578 from matrix-org/rav/code_style_importsRichard van der Hoff2017-10-261-46/+113
|\ \ \ \ | | | | | | | | | | Code_style updates
| * | | | Document import rulesRichard van der Hoff2017-10-261-0/+44
| | | | |
| * | | | code_style: more formattingRichard van der Hoff2017-10-261-34/+57
| | | | |
| * | | | code_style.rst: a couple of tidyupsRichard van der Hoff2017-10-261-9/+9
| |/ / /
* | | | Merge pull request #2577 from matrix-org/erikj/fix_portErik Johnston2017-10-261-0/+1
|\ \ \ \ | |/ / / |/| | | Fix port script
| * | | Fix port scriptErik Johnston2017-10-261-0/+1
| | |/ | |/| | | | | | | | | | | | | | | | We changed _simple_update_one_txn to use _simple_update_txn but didn't yank it out in the port script. Fixes #2565
* | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2017-10-252-1/+9
|\| |
| * | Merge branch 'release-v0.24.1' of github.com:matrix-org/synapse v0.24.1Erik Johnston2017-10-2464-159/+219
| |\ \
| | * | Bump version and changelog github/release-v0.24.1 release-v0.24.1Erik Johnston2017-10-242-1/+9
| | |/
* | / tip for generating tls_fingerprintsMatthew Hodgson2017-10-241-0/+6
| |/ |/|
* | Merge pull request #2567 from matrix-org/erikj/group_fed_update_profileErik Johnston2017-10-242-11/+31
|\ \ | | | | | | Correctly wire in update group profile over federation
| * \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2017-10-2457-135/+171
| |\ \ | |/ / |/| | | | | erikj/group_fed_update_profile
* | | Merge pull request #2568 from matrix-org/rav/pep8Richard van der Hoff2017-10-2355-100/+97
|\ \ \ | | | | | | | | PEP8 fixes
| * | | fix vars named `l`Richard van der Hoff2017-10-232-7/+4
| | | | | | | | | | | | | | | | E741 says "do not use variables named ‘l’, ‘O’, or ‘I’".
| * | | replace 'except:' with 'except Exception:'Richard van der Hoff2017-10-2354-93/+93
|/ / / | | | | | | | | | what could possibly go wrong
* | | Merge pull request #2566 from matrix-org/rav/media_logcontext_leakRichard van der Hoff2017-10-231-1/+4
|\ \ \ | | | | | | | | Fix a logcontext leak in the media repo
| * | | Fix a logcontext leak in the media repoRichard van der Hoff2017-10-231-1/+4
| | | |
* | | | Merge pull request #2561 from matrix-org/rav/id_checkingRichard van der Hoff2017-10-234-34/+70
|\ \ \ \ | |/ / / |/| | | Updates to ID checking
| * | | Validate group ids when parsingRichard van der Hoff2017-10-213-17/+45
| | | | | | | | | | | | | | | | | | | | May as well do it whenever we parse a Group ID. We check the sigil and basic structure here so it makes sense to check the grammar in the same place.
| * | | Allow = in mxids and groupidsRichard van der Hoff2017-10-203-5/+4
| | | | | | | | | | | | | | | | ... because the spec says we should.
| * | | Disallow capital letters in useridsRichard van der Hoff2017-10-203-16/+25
| | | | | | | | | | | | | | | | | | | | Factor out a common function for checking user ids and group ids, which forbids capitals.
| | * | Correctly wire in update group profile over federationErik Johnston2017-10-232-11/+31
| |/ / |/| |
* | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2017-10-233-1/+45
|\ \ \ | | |/ | |/|
| * | Merge branch 'release-v0.24.0' of github.com:matrix-org/synapse v0.24.0Erik Johnston2017-10-2383-571/+6538
| |\ \
| | * | Bump version and changelog github/release-v0.24.0 release-v0.24.0Erik Johnston2017-10-232-1/+7
| | | |
| | * | Correctly bump version v0.24.0-rc1Erik Johnston2017-10-191-1/+1
| | | |
| | * | Update changelogErik Johnston2017-10-191-0/+1
| | | |
| | * | Bump version and changelogErik Johnston2017-10-192-1/+36
| | |/
| * | Merge pull request #2540 from 4nd3r/patch-1Richard van der Hoff2017-10-161-0/+2
| |\ \ | | | | | | | | make it absolutely clear that purge doesn't remove everything
| | * | make it absolutely clear that Purge History API does not remove all traces ↵Ander Punnar2017-10-141-0/+2
| |/ / | | | | | | | | | | | | | | | | | | of events and message contents because this topic pops up too often #890 #1621 #1730 #2260 #2315 and so on
* | | Merge pull request #2560 from matrix-org/rav/kill_pointless_methodRichard van der Hoff2017-10-236-12/+8
|\ \ \ | |_|/ |/| | Remove pointless create() method
| * | Remove pointless create() methodRichard van der Hoff2017-10-206-12/+8
|/ / | | | | | | | | It just calls the constructor, so we may as well kill it rather than having random codepaths.
* | Merge pull request #2559 from matrix-org/erikj/group_id_validationErik Johnston2017-10-193-3/+46
|\ \ | | | | | | Add config to enable group creation
| * | Flake8Erik Johnston2017-10-192-6/+4
| | |
| * | Add missing file...Erik Johnston2017-10-191-0/+36
| | |
| * | Add config to enable group creationErik Johnston2017-10-192-3/+12
| | |
* | | Merge pull request #2558 from matrix-org/erikj/group_id_validationErik Johnston2017-10-191-1/+19
|\| | | | | | | | Enforce sensible group IDs
| * | Enforce sensible group IDsErik Johnston2017-10-191-1/+19
|/ /
* | Fix typoErik Johnston2017-10-191-1/+1
| |
* | Fix typo in group attestation handlingErik Johnston2017-10-192-2/+3
| |
* | Merge pull request #2557 from matrix-org/erikj/media_tumbnailsErik Johnston2017-10-191-2/+5
|\ \ | | | | | | Fix typo in thumbnail generation
| * | Fix typo in thumbnail generationErik Johnston2017-10-191-2/+5
|/ /
* | Fix typoErik Johnston2017-10-191-1/+1
| |
* | Merge pull request #2553 from matrix-org/rav/fix_500_on_event_sendRichard van der Hoff2017-10-181-1/+0
|\ \ | | | | | | Fix 500 error when we get an error handling a PDU
| * | Fix 500 error when we get an error handling a PDURichard van der Hoff2017-10-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FederationServer doesn't have a send_failure (and nor does its subclass, ReplicationLayer), so this was failing. I'm not really sure what the idea behind send_failure is, given (a) we don't do anything at the other end with it except log it, and (b) we also send back the failure via the transaction response. I suspect there's a whole lot of dead code around it, but for now I'm just removing the broken bit.
* | | Merge pull request #2552 from matrix-org/rav/fix_500_on_dodgy_powerlevelsRichard van der Hoff2017-10-171-3/+3
|\ \ \ | |/ / |/| | Fix 500 error when fields missing from power_levels event
| * | Fix 500 error when fields missing from power_levels eventRichard van der Hoff2017-10-171-3/+3
| | | | | | | | | | | | | | | If the users or events keys were missing from a power_levels event, then we would throw 500s when trying to auth them.
* | | Doc some more dynamic Homeserver methodsRichard van der Hoff2017-10-171-0/+8
| | |
* | | Merge pull request #2550 from krombel/fix_thumbnail_2548Erik Johnston2017-10-171-2/+2
|\ \ \ | |/ / |/| | fix thumbnailing (#2548)
| * | fix thumbnailing (#2548)Krombel2017-10-171-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>
* | | Improve error handling for missing files (#2551)Richard van der Hoff2017-10-173-17/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `os.path.exists` doesn't allow us to distinguish between permissions errors and the path actually not existing, which repeatedly confuses people. It also means that we try to overwrite existing key files, which is super-confusing. (cf issues #2455, #2379). Use os.stat instead. Also, don't recomemnd the the use of --generate-config, which screws everything up if you're using debian (cf #2455).
* | | Merge pull request #2546 from matrix-org/rav/remove_dead_event_injectorRichard van der Hoff2017-10-171-76/+0
|\ \ \ | | | | | | | | Remove dead class
| * | | Remove dead classRichard van der Hoff2017-10-171-76/+0
| |/ / | | | | | | | | | This isn't used anywhere.
* | | Merge pull request #2547 from matrix-org/rav/test_make_deferred_yieldableRichard van der Hoff2017-10-171-0/+38
|\ \ \ | | | | | | | | Add some tests for make_deferred_yieldable
| * | | Fix name of test_logcontextRichard van der Hoff2017-10-171-0/+0
| | | | | | | | | | | | | | | | The file under test is logcontext.py, not log_context.py
| * | | Add some tests for make_deferred_yieldableRichard van der Hoff2017-10-171-0/+38
| |/ /
* | | Merge pull request #2549 from matrix-org/rav/event_persist_logcontextsRichard van der Hoff2017-10-172-7/+22
|\ \ \ | | | | | | | | Fix logcontext handling for persist_events
| * | | Fix logcontext handling for persist_eventsRichard van der Hoff2017-10-172-7/+22
| |/ / | | | | | | | | | | | | | | | | | | | | | * don't use preserve_context_over_deferred, which is known broken. * remove a redundant preserve_fn. * add/improve some comments
* | | Merge pull request #2545 from matrix-org/dbkr/auto_join_roomsDavid Baker2017-10-173-0/+42
|\ \ \ | |/ / |/| | Add config option to auto-join new users to rooms
| * | Fix testDavid Baker2017-10-171-0/+1
| | |
| * | pep8David Baker2017-10-171-1/+2
| | |
| * | Add config option to auto-join new users to roomsDavid Baker2017-10-162-0/+40
| | | | | | | | | | | | | | | New users who register on the server will be dumped into all rooms in auto_join_rooms in the config.
* | | Merge pull request #2544 from matrix-org/luke/groups-invited-usersLuke Barnard2017-10-166-1/+102
|\ \ \ | | | | | | | | Implement GET /groups/$groupId/invited_users
| * | | DelintLuke Barnard2017-10-163-1/+3
| | | |
| * | | Make it work. Warn about lack of user profileLuke Barnard2017-10-161-2/+2
| | | |
| * | | _create_rererouter for get_invited_users_in_groupLuke Barnard2017-10-161-17/+2
| | | |
| * | | Merge branch 'develop' into luke/groups-invited-usersLuke Barnard2017-10-161-1/+1
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #2543 from matrix-org/luke/fix-on-group-invite-no-profileLuke Barnard2017-10-161-2/+5
|\ \ \ \ | |_|/ / |/| | | Log a warning when no profile for invited member
* | | | Merge pull request #2542 from matrix-org/dbkr/room_notif_no_globDavid Baker2017-10-161-1/+1
|\ \ \ \ | | | | | | | | | | Omit the *s for @room notifications
| * | | | Omit the *s for @room notificationsDavid Baker2017-10-161-1/+1
|/ / / / | | | | | | | | | | | | They're just redundant
| | * / Implement GET /groups/$groupId/invited_usersLuke Barnard2017-10-166-1/+115
| |/ /
| * / Log a warning when no profile for invited memberLuke Barnard2017-10-161-2/+5
|/ / | | | | | | And return empty profile
* | Merge pull request #2538 from matrix-org/erikj/media_backupErik Johnston2017-10-136-200/+309
|\ \ | | | | | | Basic implementation of backup media store
| * | Add try/finally block to close t_byte_sourceErik Johnston2017-10-131-24/+41
| | |
| * | Remove old commentErik Johnston2017-10-131-1/+0
| | |
| * | Don't reuse source but instead copy from primary media store to backupErik Johnston2017-10-132-22/+9
| | |
| * | PEP8Erik Johnston2017-10-131-1/+1
| | |
| * | Move type into keyErik Johnston2017-10-131-3/+3
| | |
| * | CommentErik Johnston2017-10-131-1/+1
| | |
| * | Remove spurious additionErik Johnston2017-10-131-4/+0
| | |
| * | Don't needlessly rename variableErik Johnston2017-10-131-13/+13
| | |
| * | Add paths back in...Erik Johnston2017-10-131-4/+4
| | |
| * | Remove unnecessary diffErik Johnston2017-10-131-3/+1
| | |
| * | Make things be absolute paths againErik Johnston2017-10-131-7/+7
| | |
| * | s/write_to_file/write_to_file_and_backup/Erik Johnston2017-10-131-5/+5
| | |
| * | Fix upErik Johnston2017-10-132-43/+32
| | |
| * | Fix up thumbnailing functionErik Johnston2017-10-133-75/+73
| | |
| * | Fix typoErik Johnston2017-10-131-1/+1
| | |
| * | Fix up commentsErik Johnston2017-10-131-2/+26
| | |
| * | Move makedirs to threadErik Johnston2017-10-131-2/+1
| | |
| * | Use make_deferred_yieldableErik Johnston2017-10-131-7/+7
| | |
| * | Fix commentsErik Johnston2017-10-122-1/+4
| | |
| * | Don't close prematurely..Erik Johnston2017-10-121-2/+5
| | |
| * | getvalue closes bufferErik Johnston2017-10-121-11/+10
| | |
| * | Get len before closeErik Johnston2017-10-121-6/+11
| | |
| * | Don't close file prematurelyErik Johnston2017-10-122-8/+18
| | |
| * | Copy everything to backupErik Johnston2017-10-125-77/+151
| | |
| * | TypoErik Johnston2017-10-121-1/+1
| | |
| * | Remove dead codeErik Johnston2017-10-121-3/+0
| | |
| * | Fix typosErik Johnston2017-10-121-20/+26
| | |
| * | Fix typoErik Johnston2017-10-121-1/+1
| | |
| * | Basic implementation of backup media storeErik Johnston2017-10-124-126/+131
| | |
* | | oopsMatthew Hodgson2017-10-131-1/+1
| | |
* | | fix copyright to companies which actually exist(ed)Matthew Hodgson2017-10-131-1/+1
|/ /
* | log when we get an exception handling replication updateshera2017-10-121-1/+5
| |
* | Merge pull request #2531 from matrix-org/dbkr/spamcheck_error_messagesDavid Baker2017-10-121-2/+6
|\ \ | | | | | | Allow error strings from spam checker
| * | fix isinstanceDavid Baker2017-10-111-1/+1
| | |
| * | Allow error strings from spam checkerDavid Baker2017-10-111-2/+6
| | |
* | | Merge pull request #2532 from matrix-org/rav/fix_linearizerRichard van der Hoff2017-10-112-6/+46
|\ \ \ | | | | | | | | Fix stackoverflow and logcontexts from linearizer
| * | | Fix stackoverflow and logcontexts from linearizerRichard van der Hoff2017-10-112-6/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. make it not blow out the stack when there are more than 50 things waiting for a lock. Fixes https://github.com/matrix-org/synapse/issues/2505. 2. Make it not mess up the log contexts.
* | | | Merge pull request #2529 from matrix-org/rav/fix_transaction_failure_handlingRichard van der Hoff2017-10-111-2/+3
|\ \ \ \ | | | | | | | | | | log pdu_failures from incoming transactions
| * | | | log pdu_failures from incoming transactionsRichard van der Hoff2017-10-111-2/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | ... even if we have no EDUs. This appears to have been introduced in 476899295f5fd6cff64799bcbc84cd4bf9005e33.
* | | | Merge pull request #2515 from matrix-org/rav/fix_receipt_logcontextRichard van der Hoff2017-10-111-0/+51
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | A logformatter which includes the stack when the exception was caught when logging exceptions.
| * | | | logformatter: fix AttributeErrorRichard van der Hoff2017-10-111-3/+11
| | | | | | | | | | | | | | | | | | | | make sure we have the relevant fields before we try to log them.
| * | | | Fancy logformatter to format exceptions betterRichard van der Hoff2017-10-091-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a bit of an experimental change at this point; the idea is to see if it helps us track down where our stack overflows are coming from by logging the stack when the exception was caught and turned into a Failure. (We'll also need https://github.com/richvdh/twisted/commit/edf27044200e74680ea67c525768e36dc9d9af2b). If we deploy this, we'll be able to enable it via the log config yaml.
* | | | | Fix fetching remote summariesErik Johnston2017-10-111-2/+2
| | | | |
* | | | | Merge pull request #2533 from matrix-org/erikj/fix_group_replErik Johnston2017-10-111-7/+7
|\ \ \ \ \ | | | | | | | | | | | | Fix group stream replication
| * | | | | peeeeeeeeep8888888888888888888888888888Erik Johnston2017-10-111-1/+1
| | | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-22 03:56:32 +0000