| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-15 | 2 | -9/+18 |
| |\ | | | | | | | neilj/server_notices_on_blocking | ||||
| | * | clean up AuthError | Neil Johnson | 2018-08-15 | 1 | -7/+3 |
| | | | |||||
| | * | update error codes for resource limiting | Neil Johnson | 2018-08-15 | 1 | -2/+1 |
| | | | |||||
| | * | replace admin_email with admin_uri for greater flexibility | Neil Johnson | 2018-08-15 | 2 | -7/+7 |
| | | | |||||
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_email | Neil Johnson | 2018-08-14 | 1 | -1/+11 |
| | |\ | |||||
| | | * | make comments clearer | Neil Johnson | 2018-08-14 | 1 | -1/+2 |
| | | | | |||||
| | * | | support admin_email config and pass through into blocking errors, return ↵ | Neil Johnson | 2018-08-13 | 2 | -4/+17 |
| | | | | | | | | | | | | | AuthError in all cases | ||||
| | * | | Revert "support admin_email config and pass through into blocking errors, ↵ | Neil Johnson | 2018-08-13 | 2 | -17/+4 |
| | | | | | | | | | | | | | | | | | | | return AuthError in all cases" This reverts commit 0d43f991a19840a224d3dac78d79f13d78212ee6. | ||||
| | * | | support admin_email config and pass through into blocking errors, return ↵ | Neil Johnson | 2018-08-13 | 2 | -4/+17 |
| | | | | | | | | | | | | | AuthError in all cases | ||||
| * | | | add new event types | Neil Johnson | 2018-08-15 | 1 | -0/+1 |
| | | | | |||||
| * | | | support server notice state events for resource limits | Neil Johnson | 2018-08-14 | 1 | -0/+2 |
| | |/ |/| | |||||
| * | | rename _user_last_seen_monthly_active | Neil Johnson | 2018-08-09 | 1 | -1/+1 |
| | | | |||||
| * | | fix errant parenthesis | Neil Johnson | 2018-08-09 | 1 | -1/+1 |
| | | | |||||
| * | | only block on sync where user is not part of the mau cohort | Neil Johnson | 2018-08-09 | 1 | -2/+11 |
| |/ | |||||
| * | fix pep8 too many lines | Neil Johnson | 2018-08-08 | 1 | -1/+0 |
| | | |||||
| * | Merge branch 'develop' into neilj/disable_hs | Neil Johnson | 2018-08-08 | 2 | -0/+34 |
| |\ | |||||
| | * | Merge pull request #3654 from matrix-org/rav/room_versions | Richard van der Hoff | 2018-08-08 | 2 | -0/+33 |
| | |\ | | | | | | | Support for room versioning | ||||
| | | * | Don't expose default_room_version as config opt | Richard van der Hoff | 2018-08-07 | 1 | -0/+3 |
| | | | | |||||
| | | * | Enforce compatibility when processing make_join requests | Richard van der Hoff | 2018-08-03 | 1 | -0/+22 |
| | | | | | | | | | | | | | | | | | | | Reject make_join requests from servers which do not support the room version. Also include the room version in the response. | ||||
| | | * | Basic support for room versioning | Richard van der Hoff | 2018-08-03 | 2 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This is the first tranche of support for room versioning. It includes: * setting the default room version in the config file * new room_version param on the createRoom API * storing the version of newly-created rooms in the m.room.create event * fishing the version of existing rooms out of the m.room.create event | ||||
| * | | | Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-06 | 1 | -4/+1 |
| |\| | | | | | | | | | | | neilj/disable_hs | ||||
| | * | | update comments to reflect new sig | Neil Johnson | 2018-08-06 | 1 | -4/+1 |
| | | | | |||||
| * | | | disable HS from config | Neil Johnson | 2018-08-04 | 2 | -0/+5 |
| |/ / | |||||
| * | | wip commit - tests failing | Neil Johnson | 2018-08-03 | 1 | -2/+4 |
| | | | |||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_tracker | Neil Johnson | 2018-08-03 | 1 | -53/+53 |
| |\| | |||||
| | * | Merge pull request #3639 from matrix-org/rav/refactor_error_handling | Richard van der Hoff | 2018-08-02 | 1 | -53/+53 |
| | |\ | | | | | | | Clean up handling of errors from outbound requests | ||||
| | | * | Kill off MatrixCodeMessageException | Richard van der Hoff | 2018-08-01 | 1 | -11/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code brings the SimpleHttpClient into line with the MatrixFederationHttpClient by having it raise HttpResponseExceptions when a request fails (rather than trying to parse for matrix errors and maybe raising MatrixCodeMessageException). Then, whenever we were checking for MatrixCodeMessageException and turning them into SynapseErrors, we now need to check for HttpResponseExceptions and call to_synapse_error. | ||||
| | | * | Refactor code for turning HttpResponseException into SynapseError | Richard van der Hoff | 2018-08-01 | 1 | -31/+53 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This commit replaces SynapseError.from_http_response_exception with HttpResponseException.to_synapse_error. The new method actually returns a ProxiedRequestError, which allows us to pass through additional metadata from the API call. | ||||
| | | * | Be more careful which errors we send back over the C-S API | Richard van der Hoff | 2018-08-01 | 1 | -11/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We really shouldn't be sending all CodeMessageExceptions back over the C-S API; it will include things like 401s which we shouldn't proxy. That means that we need to explicitly turn a few HttpResponseExceptions into SynapseErrors in the federation layer. The effect of the latter is that the matrix errcode will get passed through correctly to calling clients, which might help with some of the random M_UNKNOWN errors when trying to join rooms. | ||||
| * | | | do mau checks based on monthly_active_users table | Neil Johnson | 2018-08-02 | 1 | -0/+13 |
| | | | | |||||
| * | | | insertion into monthly_active_users | Neil Johnson | 2018-08-02 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #3630 from matrix-org/neilj/mau_sign_in_log_in_limits | Neil Johnson | 2018-08-01 | 1 | -0/+1 |
| |\ \ | |/ |/| | Initial impl of capping MAU | ||||
| | * | limit register and sign in on number of monthly users | Neil Johnson | 2018-07-30 | 1 | -0/+1 |
| | | | |||||
| * | | Python 3: Convert some unicode/bytes uses (#3569) | Amber Brown | 2018-08-02 | 1 | -2/+2 |
| |/ | |||||
| * | Deduplicate redundant lazy-loaded members (#3331) | Matthew Hodgson | 2018-07-26 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | | * attempt at deduplicating lazy-loaded members as per the proposal; we can deduplicate redundant lazy-loaded members which are sent in the same sync sequence. we do this heuristically rather than requiring the client to somehow tell us which members it has chosen to cache, by instead caching the last N members sent to a client, and not sending them again. For now we hardcode N to 100. Each cache for a given (user,device) tuple is in turn cached for up to X minutes (to avoid the caches building up). For now we hardcode X to 30. * add include_redundant_members filter option & make it work * remove stale todo * add tests for _get_some_state_from_cache * incorporate review | ||||
| * | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-24 | 1 | -0/+34 |
| |\ | |||||
| | * | Merge branch 'develop' into erikj/client_apis_move | Erik Johnston | 2018-07-24 | 1 | -2/+4 |
| | |\ | |||||
| | * | | Move check_in_room_or_world_readable to Auth | Erik Johnston | 2018-07-20 | 1 | -0/+34 |
| | | | | |||||
| * | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-23 | 1 | -2/+4 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Use new getters | Erik Johnston | 2018-07-23 | 1 | -2/+4 |
| | |/ | |||||
| * | | merge develop pydoc for _get_state_for_groups | Matthew Hodgson | 2018-07-19 | 5 | -75/+86 |
| |\| | |||||
| | * | Make auth & transactions more testable (#3499) | Amber Brown | 2018-07-14 | 1 | -62/+62 |
| | | | |||||
| | * | run isort | Amber Brown | 2018-07-09 | 4 | -13/+14 |
| | | | |||||
| | * | Implementation of server_acls | Richard van der Hoff | 2018-07-04 | 1 | -0/+2 |
| | | | | | | | | | | | ... as described at https://docs.google.com/document/d/1EttUVzjc2DWe2ciw4XPtNpUpIl9lWXGEsy2ewDS7rtw. | ||||
| | * | add ip_range_whitelist parameter to limit where ASes can connect from | Matthew Hodgson | 2018-06-28 | 1 | -0/+6 |
| | | | |||||
| | * | Attempt to be more performant on PyPy (#3462) | Amber Brown | 2018-06-28 | 2 | -2/+4 |
| | | | |||||
| | * | Don't print invalid access tokens in the logs | Travis Ralston | 2018-06-24 | 1 | -2/+2 |
| | | | | | | | | | | | Tokens shouldn't be appearing the logs, valid or invalid. Signed-off-by: Travis Ralston <travpc@gmail.com> | ||||
| | * | Refactor get_send_level to take a power_levels event | Richard van der Hoff | 2018-06-14 | 1 | -1/+1 |
| | | | | | | | | | it makes it easier for me to reason about | ||||
| * | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-06-04 | 2 | -2/+4 |
| |\| | |||||
| | * | Consistently use six's iteritems and wrap lazy keys/values in list() if ↵ | Amber Brown | 2018-05-31 | 2 | -2/+4 |
| | | | | | | | | | they're not meant to be lazy (#3307) | ||||
| * | | add lazy_load_members to the filter json schema | Matthew Hodgson | 2018-05-29 | 1 | -1/+4 |
| | | | |||||
| * | | merge develop | Matthew Hodgson | 2018-05-29 | 5 | -10/+94 |
| |\| | |||||
| | * | Merge remote-tracking branch 'origin/develop' into 3218-official-prom | Amber Brown | 2018-05-28 | 1 | -0/+1 |
| | |\ | |||||
| | | * | custom error code for not leaving server notices room | Richard van der Hoff | 2018-05-22 | 1 | -0/+1 |
| | | | | |||||
| | * | | Merge remote-tracking branch 'origin/develop' into 3218-official-prom | Amber Brown | 2018-05-22 | 2 | -1/+79 |
| | |\| | |||||
| | | * | Reject attempts to send event before privacy consent is given | Richard van der Hoff | 2018-05-22 | 2 | -1/+79 |
| | | | | | | | | | | | | | | | | | | | Returns an M_CONSENT_NOT_GIVEN error (cf https://github.com/matrix-org/matrix-doc/issues/1252) if consent is not yet given. | ||||
| | * | | replacing portions | Amber Brown | 2018-05-21 | 1 | -1/+1 |
| | |/ | |||||
| | * | Apply some limits to depth to counter abuse | Richard van der Hoff | 2018-05-01 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | * When creating a new event, cap its depth to 2^63 - 1 * When receiving events, reject any without a sensible depth As per https://docs.google.com/document/d/1I3fi2S-XnpO45qrpCsowZv8P8dHcNZ4fsBsbOW7KABI | ||||
| | * | Use six.itervalues in some places | Adrian Tschira | 2018-04-15 | 1 | -1/+2 |
| | | | | | | | | | | | | | There's more where that came from Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
| | * | Add b prefixes to some strings that are bytes in py3 | Adrian Tschira | 2018-04-04 | 1 | -5/+5 |
| | | | | | | | | | | | | | This has no effect on python2 Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
| | * | Use simplejson throughout | Richard van der Hoff | 2018-03-29 | 1 | -1/+2 |
| | | | | | | | | | Let's use simplejson rather than json, for consistency. | ||||
| | * | 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 | 1 | -1/+1 |
| | | | | |||||
| * | | | make lazy_load_members configurable in filters | Matthew Hodgson | 2018-03-19 | 1 | -0/+6 |
| |/ / | |||||
| * | | Add federation_domain_whitelist option (#2820) | Matthew Hodgson | 2018-01-22 | 1 | -0/+26 |
| | | | | | | | | | | | | | 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 | ||||
| * | | add registrations_require_3pid | Matthew Hodgson | 2018-01-19 | 1 | -0/+1 |
| |/ | | | | | 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 | ||||
| * | Refactor UI auth implementation | Richard van der Hoff | 2017-12-05 | 1 | -0/+16 |
| | | | | | | Instead of returning False when auth is incomplete, throw an exception which can be caught with a wrapper. | ||||
| * | Improve comments on get_user_by_access_token | Richard van der Hoff | 2017-11-29 | 1 | -1/+5 |
| | | | | | because I have to reverse-engineer this every time. | ||||
| * | Add a config option to block all room invites (#2457) | Richard van der Hoff | 2017-09-19 | 1 | -0/+8 |
| | | | | | | - allows sysadmins the ability to lock down their servers so that people can't send their users room invites. | ||||
| * | Merge pull request #2309 from matrix-org/erikj/user_ip_repl | Erik Johnston | 2017-07-06 | 1 | -1/+1 |
| |\ | | | | | Fix up user_ip replication commands | ||||
| | * | Fix up | Erik Johnston | 2017-06-27 | 1 | -1/+1 |
| | | | |||||
| * | | Cache macaroon parse and validation | Erik Johnston | 2017-06-29 | 1 | -13/+60 |
| |/ | | | | | | Turns out this can be quite expensive for requests, and is easily cachable. We don't cache the lookup to the DB so invalidation still works. | ||||
| * | Batch upsert user ips | Erik Johnston | 2017-06-27 | 1 | -2/+1 |
| | | |||||
| * | Change is_host_joined to use current_state table | Erik Johnston | 2017-06-09 | 1 | -11/+2 |
| | | | | | | | This bypasses a bug where using the state groups to figure out if a host is in a room sometimes errors if the servers isn't in the room. (For example when the server rejected an invite to a remote room) | ||||
| * | Use CodeMessageException subclass instead | David Baker | 2017-04-25 | 1 | -0/+11 |
| | | | | | | Parse json errors from get_json client methods and throw special errors. | ||||
| * | use jsonschema.FormatChecker for RoomID and UserID strings | pik | 2017-03-23 | 1 | -18/+27 |
| | | | | | | | * use a valid filter in rest/client/v2_alpha test Signed-off-by: pik <alexander.maznev@gmail.com> | ||||
| * | Add valid filter tests, flake8, fix typo | pik | 2017-03-23 | 1 | -5/+6 |
| | | | | | Signed-off-by: pik <alexander.maznev@gmail.com> | ||||
| * | check_valid_filter using JSONSchema | pik | 2017-03-23 | 1 | -93/+158 |
| | | | | | | | * add invalid filter tests Signed-off-by: pik <alexander.maznev@gmail.com> | ||||
| * | Fix a couple of logcontext leaks | Richard van der Hoff | 2017-03-23 | 1 | -3/+2 |
| | | | | | | Use preserve_fn to correctly manage the logcontexts around things we don't want to yield on. | ||||
| * | Comment | Erik Johnston | 2017-03-15 | 1 | -1/+3 |
| | | |||||
| * | Comment | Erik Johnston | 2017-03-15 | 1 | -0/+3 |
| | | |||||
| * | Format presence events on the edges instead of reformatting them multiple times | Erik Johnston | 2017-03-15 | 1 | -10/+22 |
| | | |||||
| * | Merge pull request #1994 from matrix-org/dbkr/msisdn_signin_2 | Erik Johnston | 2017-03-15 | 1 | -0/+2 |
| |\ | | | | | Phone number registration / login support v2 | ||||
| | * | Support registration / login with phone number | David Baker | 2017-03-13 | 1 | -0/+2 |
| | | | | | | | | | Changes from https://github.com/matrix-org/synapse/pull/1971 | ||||
| * | | Address review comments | Richard van der Hoff | 2017-03-14 | 1 | -5/+14 |
| | | | | | | | | | | | | | | | - don't blindly proxy all HTTPRequestExceptions - log unexpected exceptions at error - avoid `isinstance` - improve docs on `from_http_response_exception` | ||||
| * | | re-refactor exception heirarchy | Richard van der Hoff | 2017-03-14 | 1 | -16/+14 |
| | | | | | | | | | | | Give CodeMessageException back its `msg` attribute, and use that to hold the HTTP status message for HttpResponseException. | ||||
| * | | Fix routing loop when fetching remote media | Richard van der Hoff | 2017-03-13 | 1 | -7/+52 |
| |/ | | | | | | | | | | | When we proxy a media request to a remote server, add a query-param, which will tell the remote server to 404 if it doesn't recognise the server_name. This should fix a routing loop where the server keeps forwarding back to itself. Also improves the error handling on remote media fetches, so that we don't always return a rather obscure 502. | ||||
| * | Revert "Support registration & login with phone number" | Erik Johnston | 2017-03-13 | 1 | -2/+0 |
| | | |||||
| * | WIP support for msisdn 3pid proxy methods | David Baker | 2017-02-14 | 1 | -0/+2 |
| | | |||||
| * | Remove a few aspirational but unused constants | David Baker | 2017-02-08 | 1 | -3/+0 |
| | | | | | from the Kegan era | ||||
| * | Change resolve_state_groups call site logging to DEBUG | Erik Johnston | 2017-01-17 | 1 | -1/+1 |
| | | |||||
| * | Remove unused function | Erik Johnston | 2017-01-13 | 1 | -3/+0 |
| | | |||||
| * | Split event auth code into seperate module | Erik Johnston | 2017-01-13 | 1 | -645/+9 |
| | | |||||
| * | Split out static auth methods from Auth object | Erik Johnston | 2017-01-10 | 1 | -419/+495 |
| | | |||||
| * | Fix flake8 and update changelog v0.18.6-rc3 | Mark Haines | 2017-01-05 | 1 | -1/+1 |
| | | |||||
| * | add logging for all the places we call resolve_state_groups. my kingdom for ↵ | Matthew Hodgson | 2017-01-05 | 1 | -0/+1 |
| | | | | | a backtrace that actually works. | ||||
| * | Prevent user tokens being used as guest tokens (#1675) | Richard van der Hoff | 2016-12-06 | 1 | -15/+36 |
| | | | | | | Make sure that a user cannot pretend to be a guest by adding 'guest = True' caveats. | ||||
| * | Rip out more refresh_token code | Richard van der Hoff | 2016-11-30 | 1 | -3/+2 |
| | | | | | | | | | We might as well treat all refresh_tokens as invalid. Just return a 403 from /tokenrefresh, so that we don't have a load of dead, untestable code hanging around. Still TODO: removing the table from the schema. | ||||
| * | Merge pull request #1656 from matrix-org/rav/remove_time_caveat | Richard van der Hoff | 2016-11-30 | 1 | -3/+13 |
| |\ | | | | | Stop putting a time caveat on access tokens | ||||
| | * | Comments | Richard van der Hoff | 2016-11-30 | 1 | -3/+9 |
| | | | | | | | | | Update comments in verify_macaroon | ||||
| | * | Stop putting a time caveat on access tokens | Richard van der Hoff | 2016-11-29 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | The 'time' caveat on the access tokens was something of a lie, since we weren't enforcing it; more pertinently its presence stops us ever adding useful time caveats. Let's move in the right direction by not lying in our caveats. | ||||
| * | | Merge pull request #1653 from matrix-org/rav/guest_e2e | Richard van der Hoff | 2016-11-29 | 1 | -1/+5 |
| |\ \ | |/ |/| | Implement E2E for guests | ||||
| | * | Give guest users a device_id | Richard van der Hoff | 2016-11-25 | 1 | -1/+5 |
| | | | | | | | | | | | We need to create devices for guests so that they can use e2e, but we don't have anywhere to store it, so just use a fixed one. | ||||
| * | | Merge pull request #1655 from matrix-org/rav/remove_redundant_macaroon_checks | Richard van der Hoff | 2016-11-25 | 1 | -26/+8 |
| |\ \ | | | | | | | Remove redundant list of known caveat prefixes | ||||
| | * | | Remove redundant list of known caveat prefixes | Richard van der Hoff | 2016-11-24 | 1 | -26/+8 |
| | |/ | | | | | | | Also add some comments. | ||||
| * / | Return early on /sync code paths if a '*' filter is used | Kegan Dougal | 2016-11-22 | 1 | -0/+29 |
| |/ | | | | | | | | This is currently very conservative in that it only does this if there is no `since` token. This limits the risk to clients likely to be doing one-off syncs (like bridges), but does mean that normal human clients won't benefit from the time savings here. If the savings are large enough, I would consider generalising this to just check the filter. | ||||
| * | Merge pull request #1638 from matrix-org/kegan/sync-event-fields | Kegsay | 2016-11-22 | 1 | -0/+16 |
| |\ | | | | | Implement "event_fields" in filters | ||||
| | * | Glue only_event_fields into the sync rest servlet | Kegan Dougal | 2016-11-22 | 1 | -0/+1 |
| | | | |||||
| | * | Move event_fields filtering to serialize_event | Kegan Dougal | 2016-11-21 | 1 | -55/+1 |
| | | | | | | | | | Also make it an inclusive not exclusive filter, as the spec demands. | ||||
| | * | Add filter_event_fields and filter_field to FilterCollection | Kegan Dougal | 2016-11-21 | 1 | -0/+69 |
| | | | |||||
| * | | Fail with a coherent error message if `/sync?filter=` is invalid | Kegan Dougal | 2016-11-21 | 1 | -0/+1 |
| |/ | |||||
| * | Merge pull request #1098 from matrix-org/markjh/bearer_token | Mark Haines | 2016-10-25 | 1 | -9/+37 |
| |\ | | | | | Allow clients to supply access_tokens as headers | ||||
| | * | Fix unit tests | Mark Haines | 2016-09-12 | 1 | -1/+1 |
| | | | |||||
| | * | Allow clients to supply access_tokens as headers | Mark Haines | 2016-09-09 | 1 | -9/+37 |
| | | | | | | | | | | | | | | | | | | | | | Clients can continue to supply access tokens as query parameters or can supply the token as a header: Authorization: Bearer <access_token_goes_here> This matches the ouath2 format of https://tools.ietf.org/html/rfc6750#section-2.1 | ||||
| * | | Merge pull request #1175 from ↵ | Luke Barnard | 2016-10-20 | 1 | -7/+10 |
| |\ \ | | | | | | | | | | | | | matrix-org/luke/feature-configurable-as-rate-limiting Allow Configurable Rate Limiting Per AS | ||||
| | * | | Closing brace on following line | Luke Barnard | 2016-10-20 | 1 | -1/+2 |
| | | | | |||||
| | * | | as_user->app_service, less redundant comments, better positioned comments | Luke Barnard | 2016-10-20 | 1 | -3/+3 |
| | | | | |||||
| | * | | flake8 | Luke Barnard | 2016-10-20 | 1 | -1/+3 |
| | | | | |||||
| | * | | Use real AS object by passing it through the requester | Luke Barnard | 2016-10-20 | 1 | -7/+7 |
| | | | | | | | | | | | | | This means synapse does not have to check if the AS is interested, but instead it effectively re-uses what it already knew about the requesting user | ||||
| * | | | Check whether to ratelimit sooner to avoid work | Erik Johnston | 2016-10-19 | 1 | -5/+9 |
| |/ / | |||||
| * | | Merge pull request #1157 from Rugvip/nolimit | Erik Johnston | 2016-10-11 | 1 | -4/+3 |
| |\ \ | | | | | | | Remove rate limiting from app service senders and fix get_or_create_user requester | ||||
| | * | | storage/appservice: make appservice methods only relying on the cache ↵ | Patrik Oldsberg | 2016-10-06 | 1 | -4/+3 |
| | | | | | | | | | | | | | synchronous | ||||
| * | | | api/auth: fix for not being allowed to set your own state_key | Patrik Oldsberg | 2016-09-30 | 1 | -10/+0 |
| |/ / | | | | | | | Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com> | ||||
| * | | Update comments | Erik Johnston | 2016-09-22 | 1 | -2/+3 |
| | | | |||||
| * | | Add comments | Erik Johnston | 2016-09-22 | 1 | -0/+3 |
| | | | |||||
| * | | Shuffle things around to make unit tests work | Erik Johnston | 2016-09-22 | 1 | -14/+15 |
| | | | |||||
| * | | Allow invites via 3pid to bypass sender sig check | Erik Johnston | 2016-09-22 | 1 | -1/+16 |
| |/ | | | | | | | | | | | | | | When a server sends a third party invite another server may be the one that the inviting user registers with. In this case it is that remote server that will issue an actual invitation, and wants to do it "in the name of" the original invitee. However, the new proper invite will not be signed by the original server, and thus other servers would reject the invite if it was seen as coming from the original user. To fix this, a special case has been added to the auth rules whereby another server can send an invite "in the name of" another server's user, so long as that user had previously issued a third party invite that is now being accepted. | ||||
| * | Add helper function for getting access_tokens from requests | Mark Haines | 2016-09-09 | 1 | -7/+51 |
| | | | | | | | Rather than reimplementing the token parsing in the various places. This will make it easier to change the token parsing to allow access_tokens in HTTP headers. | ||||
| * | Handle the fact that workers can't generate state groups | Erik Johnston | 2016-08-31 | 1 | -2/+4 |
| | | |||||
| * | Correctly handle the difference between prev and current state | Erik Johnston | 2016-08-31 | 1 | -2/+2 |
| | | |||||
| * | Cache check_host_in_room | Erik Johnston | 2016-08-26 | 1 | -14/+6 |
| | | |||||
| * | Add measure on check_host_in_room | Erik Johnston | 2016-08-26 | 1 | -11/+12 |
| | | |||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_ids | Erik Johnston | 2016-08-26 | 2 | -1/+5 |
| |\ | |||||
| | * | Move ThirdPartyEntityKind into api.constants so the expectation becomes that ↵ | Paul "LeoNerd" Evans | 2016-08-25 | 1 | -0/+5 |
| | | | | | | | | | the value is significant | ||||
| | * | APP_SERVICE_PREFIX is never used; don't bother | Paul "LeoNerd" Evans | 2016-08-25 | 1 | -1/+0 |
| | | | |||||
| * | | Pull out full state less | Erik Johnston | 2016-08-25 | 1 | -6/+7 |
| | | | |||||
| * | | Replace context.current_state with context.current_state_ids | Erik Johnston | 2016-08-25 | 1 | -24/+44 |
| |/ | |||||
| * | Fix login with m.login.token | Richard van der Hoff | 2016-08-08 | 1 | -15/+30 |
| | | | | | | login with token (as used by CAS auth) was broken by 067596d, such that it always returned a 401. | ||||
| * | Merge pull request #952 from matrix-org/markjh/more_fixes | Mark Haines | 2016-07-26 | 1 | -0/+4 |
| |\ | | | | | Check if the user is banned when handling 3pid invites | ||||
| | * | Check if the user is banned when handling 3pid invites | Mark Haines | 2016-07-26 | 1 | -0/+4 |
| | | | |||||
| * | | Add `create_requester` function | Richard van der Hoff | 2016-07-26 | 1 | -13/+11 |
| |/ | | | | | Wrap the `Requester` constructor with a function which provides sensible defaults, and use it throughout | ||||
| * | Record device_id in client_ips | Richard van der Hoff | 2016-07-20 | 1 | -6/+23 |
| | | | | | | Record the device_id when we add a client ip; it's somewhat redundant as we could get it via the access_token, but it will make querying rather easier. | ||||
| * | More doc-comments | Richard van der Hoff | 2016-07-20 | 1 | -3/+2 |
| | | | | | Fix some more comments on some things | ||||
| * | Merge pull request #922 from matrix-org/erikj/file_api2 | Erik Johnston | 2016-07-20 | 1 | -3/+20 |
| |\ | | | | | Feature: Add filter to /messages. Add 'contains_url' to filter. | ||||
| | * | Add 'contains_url' to filter | Erik Johnston | 2016-07-14 | 1 | -3/+20 |
| | | | |||||
| * | | Fix 500 ISE when sending alias event without a state_key | Mark Haines | 2016-07-15 | 1 | -0/+5 |
| | | | |||||
| * | | Merge pull request #919 from matrix-org/erikj/auth_fix | Erik Johnston | 2016-07-15 | 1 | -1/+25 |
| |\ \ | | | | | | | Various auth.py fixes. | ||||
| | * | | Check sender signed event | Erik Johnston | 2016-07-14 | 1 | -2/+8 |
| | | | | |||||
| | * | | Check if alias event's state_key matches sender's domain | Erik Johnston | 2016-07-13 | 1 | -0/+11 |
| | | | | |||||
| | * | | Check creation event's room_id domain matches sender's | Erik Johnston | 2016-07-13 | 1 | -0/+7 |
| | | | | |||||
| * | | | Merge pull request #918 from negzi/bugfix_for_token_expiry | Erik Johnston | 2016-07-14 | 1 | -0/+3 |
| |\ \ \ | |_|/ |/| | | Bug fix: expire invalid access tokens | ||||
| | * | | Bug fix: expire invalid access tokens | Negar Fazeli | 2016-07-13 | 1 | -0/+3 |
| | |/ | |||||
| * / | Implement https://github.com/matrix-org/matrix-doc/pull/346/files | David Baker | 2016-07-08 | 1 | -0/+1 |
| |/ | |||||
| * | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-07-08 | 1 | -5/+10 |
| |\ | |||||
| | * | Fix bug where we did not correctly explode when multiple user_ids were set ↵ | Erik Johnston | 2016-07-07 | 1 | -5/+10 |
| | | | | | | | | | in macaroon | ||||
| * | | requestToken update | David Baker | 2016-06-30 | 1 | -1/+2 |
| |/ | | | | | | Don't send requestToken request to untrusted ID servers Also correct the THREEPID_IN_USE error to add the M_ prefix. This is a backwards incomaptible change, but the only thing using this is the angular client which is now unmaintained, so it's probably better to just do this now. | ||||
| * | Working unsubscribe links going straight to the HS | David Baker | 2016-06-02 | 1 | -0/+7 |
| | | | | | and authed by macaroons that let you delete pushers and nothing else | ||||
| * | Merge remote-tracking branch 'origin/develop' into dbkr/email_unsubscribe | David Baker | 2016-06-02 | 1 | -0/+18 |
| |\ | |||||
| | * | special case m.room.third_party_invite event auth to match invites, ↵ | Matthew Hodgson | 2016-06-01 | 1 | -0/+18 |
| | | | | | | | | | otherwise they get out of sync and you get https://github.com/vector-im/vector-web/issues/1208 | ||||
| * | | WIP on unsubscribing email notifs without logging in | David Baker | 2016-06-01 | 1 | -9/+16 |
| |/ | |||||
| * | Spell "domain" correctly | Mark Haines | 2016-05-16 | 1 | -8/+8 |
| | | | | | s/domian/domain/g | ||||
| * | Create user with expiry | Negi Fazeli | 2016-05-13 | 1 | -1/+2 |
| | | | | | | | - Add unittests for client, api and handler Signed-off-by: Negar Fazeli <negar.fazeli@ericsson.com> | ||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user | Erik Johnston | 2016-05-09 | 1 | -8/+8 |
| |\ | |||||
| | * | Add and use get_domian_from_id | Erik Johnston | 2016-05-09 | 1 | -8/+8 |
| | | | |||||
| * | | Implement basic ignore user | Erik Johnston | 2016-05-04 | 1 | -3/+5 |
| |/ | |||||
| * | Measure Auth.check | Erik Johnston | 2016-04-13 | 1 | -47/+50 |
| | | |||||
| * | Don't auto log failed auth checks | Erik Johnston | 2016-04-13 | 1 | -53/+45 |
| | | |||||
| * | Add published room list edit API | Erik Johnston | 2016-03-21 | 1 | -4/+50 |
| | | |||||
| * | Send the user ID matching the guest access token, since there is no Matrix ↵ | David Baker | 2016-03-07 | 1 | -2/+2 |
| | | | | | API to discover what user ID an access token is for. | ||||
| * | Allow third_party_signed to be specified on /join | Daniel Wagner-Hall | 2016-02-23 | 1 | -21/+36 |
| | | |||||
| * | Merge pull request #582 from matrix-org/erikj/presence | Erik Johnston | 2016-02-19 | 1 | -1/+0 |
| |\ | | | | | Rewrite presence for performance. | ||||
| | * | Check presence state is a valid one | Erik Johnston | 2016-02-18 | 1 | -1/+0 |
| | | | |||||
| * | | api/filtering: don't assume that event content will always be a dict | Patrik Oldsberg | 2016-02-17 | 1 | -1/+4 |
| |/ | | | | Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com> | ||||
| * | Revert "Merge two of the room join codepaths" | Daniel Wagner-Hall | 2016-02-12 | 1 | -5/+0 |
| | | | | | | | This reverts commit cf81375b94c4763766440471e632fc4b103450ab. It subtly violates a guest joining auth check | ||||
| * | Merge two of the room join codepaths | Daniel Wagner-Hall | 2016-02-12 | 1 | -0/+5 |
| | | | | | | | | | | | | | | There's at least one more to merge in. Side-effects: * Stop reporting None as displayname and avatar_url in some cases * Joining a room by alias populates guest-ness in join event * Remove unspec'd PUT version of /join/<room_id_or_alias> which has not been called on matrix.org according to logs * Stop recording access_token_id on /join/room_id - currently we don't record it on /join/room_alias; I can try to thread it through at some point. | ||||
| * | Fix up logcontexts | Erik Johnston | 2016-02-08 | 1 | -1/+3 |
| | | |||||
| * | Host /media/r0 as well as /media/v1 | Daniel Wagner-Hall | 2016-02-05 | 1 | -1/+2 |
| | | |||||
| * | Log more diagnostics for unrecognised access tokens | Daniel Wagner-Hall | 2016-02-02 | 1 | -0/+2 |
| | | |||||
| * | Fix flake8 warnings for new flake8 | Daniel Wagner-Hall | 2016-02-02 | 1 | -1/+1 |
| | | |||||
| * | Fix test | Erik Johnston | 2016-01-28 | 1 | -0/+5 |
| | | |||||
| * | Fix tests | Erik Johnston | 2016-01-25 | 1 | -1/+1 |
| | | |||||
| * | Move logic from rest/ to handlers/ | Erik Johnston | 2016-01-25 | 1 | -12/+10 |
| | | |||||
| * | Sanitize filters | Erik Johnston | 2016-01-22 | 1 | -21/+27 |
| | | |||||
| * | Don't error on AS non-ghost user use | Daniel Wagner-Hall | 2016-01-18 | 1 | -0/+2 |
| | | | | | | This will probably go away either when we fix our existing ASes, or when we kill the concept of non-ghost users. | ||||
| * | Pull out app service user lookup | Daniel Wagner-Hall | 2016-01-18 | 1 | -31/+28 |
| | | | | | I find this a lot simpler than nested try-catches and stuff | ||||
| * | Require unbanning before other membership changes | Daniel Wagner-Hall | 2016-01-15 | 1 | -0/+1 |
| | | |||||
| * | M_INVALID_USERNAME to be consistent with the parameter name | David Baker | 2016-01-15 | 1 | -1/+1 |
| | | |||||
| * | Add specific error code for invalid user names. | David Baker | 2016-01-14 | 1 | -0/+1 |
| | | |||||
| * | Require AS users to be registered before use | Daniel Wagner-Hall | 2016-01-13 | 1 | -0/+5 |
| | | |||||
| * | Introduce a Requester object | Daniel Wagner-Hall | 2016-01-11 | 1 | -3/+5 |
| | | | | | | | | | | This tracks data about the entity which made the request. This is instead of passing around a tuple, which requires call-site modifications every time a new piece of optional context is passed around. I tried to introduce a User object. I gave up. | ||||
| * | copyrights | Matthew Hodgson | 2016-01-07 | 6 | -6/+6 |
| | | |||||
| * | Guest users must be joined to a room to see it in /sync | Mark Haines | 2016-01-06 | 2 | -28/+0 |
| | | |||||
| * | Allow guests to upgrade their accounts | Daniel Wagner-Hall | 2016-01-05 | 1 | -3/+3 |
| | | |||||
| * | Include the list of bad room ids in the error | Mark Haines | 2015-12-22 | 1 | -0/+16 |
| | | |||||
| * | Merge remote-tracking branch 'origin/develop' into markjh/guest_access | Mark Haines | 2015-12-22 | 1 | -0/+5 |
| |\ | | | | | | | | | Conflicts: synapse/api/filtering.py | ||||
| | * | Add top level filters for filtering by room id | Mark Haines | 2015-12-22 | 1 | -33/+35 |
| | | | | | | | | | Documented by matrix-org/matrix-doc#246 | ||||
| * | | Allow guest access if the user provides a list of rooms in the filter | Mark Haines | 2015-12-22 | 1 | -0/+12 |
| | | | |||||
| * | | Add top level filtering by room id | Mark Haines | 2015-12-21 | 1 | -33/+30 |
| |/ | |||||
| * | Strip address and such out of 3pid invites | Daniel Wagner-Hall | 2015-12-17 | 1 | -1/+1 |
| | | | | | We're not meant to leak that into the graph | ||||
| * | Only include the archived rooms if a include_leave flag in set in the filter | Mark Haines | 2015-12-04 | 1 | -0/+4 |
| | | |||||
| * | Add API for setting account_data globaly or on a per room basis | Mark Haines | 2015-12-01 | 1 | -1/+8 |
| | | |||||
| * | Allow user to redact with an equal power | Erik Johnston | 2015-11-26 | 1 | -1/+1 |
| | | | | | | Users only need their power level to be equal to the redact level for them to be allowed to redact events. | ||||
| * | Merge branch 'develop' into daniel/forgetrooms | Paul "LeoNerd" Evans | 2015-11-19 | 2 | -13/+22 |
| |\ | |||||
| | * | Merge pull request #386 from matrix-org/markjh/rename_pud_to_account_data | Mark Haines | 2015-11-19 | 1 | -5/+5 |
| | |\ | | | | | | | s/private_user_data/account_data/ | ||||
| | | * | s/private_user_data/account_data/ | Mark Haines | 2015-11-18 | 1 | -5/+5 |
| | | | | |||||
| | * | | Take a boolean not a list of lambdas | Daniel Wagner-Hall | 2015-11-19 | 1 | -8/+17 |
| | |/ | |||||
| * / | Allow users to forget rooms | Daniel Wagner-Hall | 2015-11-17 | 1 | -0/+7 |
| |/ | |||||
| * | Always check guest = true in macaroons | Steven Hammerton | 2015-11-17 | 1 | -1/+2 |
| | | |||||
| * | Merge branch 'develop' into sh-cas-auth-via-homeserver | Steven Hammerton | 2015-11-17 | 1 | -0/+1 |
| |\ | |||||
| | * | Allow guest users to join and message rooms | Daniel Wagner-Hall | 2015-11-10 | 1 | -0/+1 |
| | | | |||||
| * | | Share more code between macaroon validation | Steven Hammerton | 2015-11-11 | 1 | -9/+10 |
| |/ | |||||
| * | Exchange 3pid invites for m.room.member invites | Daniel Wagner-Hall | 2015-11-05 | 1 | -35/+38 |
| | | |||||
| * | Merge pull request #347 from matrix-org/markjh/check_filter | Mark Haines | 2015-11-05 | 1 | -18/+2 |
| |\ | | | | | Remove fields that are both unspecified and unused from the filter checks | ||||
| | * | Remove fields that are both unspecified and unused from the filter checks, ↵ | Mark Haines | 2015-11-04 | 1 | -18/+2 |
| | | | | | | | | | check the right top level definitions in the filter | ||||
| * | | Allow guests to register and call /events?room_id= | Daniel Wagner-Hall | 2015-11-04 | 2 | -41/+55 |
| |/ | | | | | | | This follows the same flows-based flow as regular registration, but as the only implemented flow has no requirements, it auto-succeeds. In the future, other flows (e.g. captcha) may be required, so clients should treat this like the regular registration flow choices. | ||||
| * | Include room tags in v2 /sync | Mark Haines | 2015-11-02 | 1 | -0/+7 |
| | | |||||
| * | Merge pull request #323 from matrix-org/daniel/sizelimits | Daniel Wagner-Hall | 2015-10-23 | 2 | -1/+30 |
| |\ | | | | | Reject events which are too large | ||||
| | * | Reject events which are too large | Daniel Wagner-Hall | 2015-10-22 | 2 | -1/+30 |
| | | | | | | | | | SPEC-222 | ||||
| * | | Merge pull request #325 from matrix-org/markjh/filter_dicts | Mark Haines | 2015-10-22 | 1 | -3/+22 |
| |\ \ | | | | | | | Support filtering events represented as dicts. | ||||
| | * | | Don't assume that the event has a room_id or sender | Mark Haines | 2015-10-22 | 1 | -2/+2 |
| | | | | |||||
| | * | | Support filtering events represented as dicts. | Mark Haines | 2015-10-22 | 1 | -3/+22 |
| | | | | | | | | | | | | | | | | This is useful because the emphemeral events such as presence and typing are represented as dicts inside synapse. | ||||
| * | | | Filter room ids before hitting the database | Erik Johnston | 2015-10-21 | 1 | -0/+20 |
| |/ / | |||||
| * | | Docstring | Erik Johnston | 2015-10-20 | 1 | -0/+5 |
| | | | |||||
| * | | Refactor api.filtering to have a Filter API | Erik Johnston | 2015-10-20 | 1 | -98/+55 |
| |/ | |||||
| * | Allow rejecting invites | Daniel Wagner-Hall | 2015-10-20 | 1 | -1/+5 |
| | | | | | | This is done by using the same /leave flow as you would use if you had already accepted the invite and wanted to leave. | ||||
| * | Stuff signed data in a standalone object | Daniel Wagner-Hall | 2015-10-16 | 1 | -7/+14 |
| | | | | | | Makes both generating it in sydent, and verifying it here, simpler at the cost of some repetition | ||||
| * | Add signing host and keyname to signatures | Daniel Wagner-Hall | 2015-10-16 | 1 | -5/+9 |
| | | |||||
| * | Verify third party ID server certificates | Daniel Wagner-Hall | 2015-10-16 | 1 | -0/+11 |
| | | |||||
| * | Merge branch 'develop' into daniel/3pidinvites | Daniel Wagner-Hall | 2015-10-15 | 1 | -18/+44 |
| |\ | |||||
| | * | Update the v2 filters to support filtering presence and remove support for ↵ | Mark Haines | 2015-10-13 | 1 | -18/+44 |
| | | | | | | | | | public/private user data | ||||
| * | | Remove unnecessary class-wrapping | Daniel Wagner-Hall | 2015-10-13 | 1 | -3/+3 |
| | | | |||||
| * | | Add some docstring | Daniel Wagner-Hall | 2015-10-13 | 1 | -0/+15 |
| | | | |||||
| * | | Move event contents into third_party_layout field | Daniel Wagner-Hall | 2015-10-13 | 1 | -9/+12 |
| | | | |||||
| * | | Merge branch 'develop' into daniel/3pidinvites | Daniel Wagner-Hall | 2015-10-06 | 1 | -1/+0 |
| |\| | |||||
| | * | Remove log line that was generated whenever an error was created. We are now ↵ | Mark Haines | 2015-10-06 | 1 | -1/+0 |
| | | | | | | | | | creating error objects that aren't raised so it's probably a bit too confusing to keep | ||||
| * | | Add third party invites to auth_events for joins | Daniel Wagner-Hall | 2015-10-06 | 1 | -0/+5 |
| | | | |||||
| * | | Merge branch 'develop' into daniel/3pidinvites | Daniel Wagner-Hall | 2015-10-05 | 2 | -1/+25 |
| |\| | |||||
| | * | Add 'trusted_private_chat' to room creation presets | Erik Johnston | 2015-10-02 | 1 | -0/+1 |
| | | | |||||
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable | Erik Johnston | 2015-10-02 | 3 | -19/+140 |
| | |\ | |||||
| | * \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable | Erik Johnston | 2015-09-14 | 1 | -8/+27 |
| | |\ \ | |||||
| | * | | | Also check the domains for membership state_keys | Erik Johnston | 2015-09-01 | 1 | -0/+9 |
| | | | | | |||||
| | * | | | Merge branch 'erikj/check_room_exists' into erikj/unfederatable | Erik Johnston | 2015-09-01 | 1 | -0/+8 |
| | |\ \ \ | |||||
| | * | | | | Check against sender rather than event_id | Erik Johnston | 2015-09-01 | 1 | -3/+3 |
| | | | | | | |||||
| | * | | | | Add flag which disables federation of the room | Erik Johnston | 2015-09-01 | 1 | -1/+15 |
| | | | | | | |||||
| * | | | | | Implement third party identifier invites | Daniel Wagner-Hall | 2015-10-01 | 2 | -1/+33 |
| | |_|_|/ |/| | | | |||||
| * | | | | synapse/api/errors.py:RoomError was unused | Mark Haines | 2015-09-22 | 1 | -5/+0 |
| | | | | | |||||
| * | | | | Merge pull request #276 from ↵ | Mark Haines | 2015-09-21 | 2 | -11/+51 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | matrix-org/markjh/history_for_rooms_that_have_been_left SPEC-216: Allow users to view the history of rooms that they have left. | ||||
| | * | | | | Clarify which event is returned by check_user_was_in_room | Mark Haines | 2015-09-21 | 1 | -2/+3 |
| | | | | | | |||||
| | * | | | | Remove undocumented and unimplemented 'feedback' parameter from the ↵ | Mark Haines | 2015-09-09 | 1 | -11/+0 |
| | | | | | | | | | | | | | | | | | | | | | Client-Server API | ||||
| | * | | | | Allow rooms/{roomId}/state for a room that has been left | Mark Haines | 2015-09-09 | 1 | -1/+2 |
| | | | | | | |||||
 |
index : matrix/thirdparty/synapse.git | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summary refs log tree commit diff |