Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update copyrights | Brendan Abolivier | 2019-11-05 | 2 | -1/+5 |
| | |||||
* | Merge pull request #6301 from matrix-org/babolivier/msc2326 | Brendan Abolivier | 2019-11-01 | 2 | -2/+20 |
|\ | | | | | Implement MSC2326 (label based filtering) | ||||
| * | Incorporate review | Brendan Abolivier | 2019-11-01 | 2 | -2/+2 |
| | | |||||
| * | Lint | Brendan Abolivier | 2019-11-01 | 1 | -0/+1 |
| | | |||||
| * | Incorporate review | Brendan Abolivier | 2019-11-01 | 2 | -3/+8 |
| | | |||||
| * | Add unit tests | Brendan Abolivier | 2019-10-30 | 1 | -1/+1 |
| | | |||||
| * | Implement filtering | Brendan Abolivier | 2019-10-30 | 1 | -2/+11 |
| | | |||||
| * | Store labels for new events | Brendan Abolivier | 2019-10-30 | 1 | -0/+3 |
| | | |||||
* | | Remove usage of deprecated logger.warn method from codebase (#6271) | Andrew Morgan | 2019-10-31 | 1 | -1/+1 |
|/ | | | Replace every instance of `logger.warn` with `logger.warning` as the former is deprecated. | ||||
* | Option to suppress resource exceeded alerting (#6173) | Neil Johnson | 2019-10-24 | 2 | -3/+16 |
| | | | | The expected use case is to suppress MAU limiting on small instances | ||||
* | Remove Auth.check method (#6217) | Richard van der Hoff | 2019-10-18 | 1 | -18/+1 |
| | | | This method was somewhat redundant, and confusing. | ||||
* | Merge branch 'uhoreg/e2e_cross-signing_merged' into develop | Hubert Chathi | 2019-10-18 | 1 | -0/+1 |
|\ | |||||
| * | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged | Hubert Chathi | 2019-10-18 | 3 | -5/+18 |
| |\ | |||||
| * \ | Merge branch 'develop' into cross-signing_keys | Hubert Chathi | 2019-09-04 | 1 | -8/+7 |
| |\ \ | |||||
| * \ \ | Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keys | Hubert Chathi | 2019-08-28 | 3 | -2/+8 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'cross-signing_hidden' into cross-signing_keys | Hubert Chathi | 2019-08-01 | 2 | -48/+26 |
| |\ \ \ \ | |||||
| * | | | | | allow uploading keys for cross-signing | Hubert Chathi | 2019-07-25 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | rip out some unreachable code | Richard van der Hoff | 2019-10-17 | 1 | -2/+0 |
| |_|_|_|/ |/| | | | | | | | | | | | | | | The only possible rejection reason is AUTH_ERROR, so all of this is unreachable. | ||||
* | | | | | Fix up some typechecking (#6150) | Amber Brown | 2019-10-02 | 2 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * type checking fixes * changelog | ||||
* | | | | | Add device and appservice tags | Erik Johnston | 2019-09-25 | 1 | -0/+3 |
| | | | | | |||||
* | | | | | Don't create new span for get_user_by_req | Erik Johnston | 2019-09-25 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't actually care about what happens in `get_user_by_req` and having it as a separate span means that the entity tag isn't added to the servlet spans, making it harder to search. | ||||
* | | | | | Ensure support users can be registered even if MAU limit is reached | Jason Robinson | 2019-09-11 | 1 | -2/+9 |
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows support users to be created even on MAU limits via the admin API. Support users are excluded from MAU after creation, so it makes sense to exclude them in creation - except if the whole host is in disabled state. Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
* | | | | Remove double return statements (#5962) | Andrew Morgan | 2019-09-03 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove all the "double return" statements which were a result of us removing all the instances of ``` defer.returnValue(...) return ``` statements when we switched to python3 fully. | ||||
* | | | | Remove unnecessary parentheses around return statements (#5931) | Andrew Morgan | 2019-08-30 | 1 | -7/+7 |
| |_|/ |/| | | | | | | | | | | | Python will return a tuple whether there are parentheses around the returned values or not. I'm just sick of my editor complaining about this all over the place :) | ||||
* | | | Add bot type | Half-Shot | 2019-08-23 | 1 | -1/+2 |
| | | | |||||
* | | | Opentracing misc (#5856) | Jorik Schellekens | 2019-08-16 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add authenticated_entity and servlet_names tags. Functionally: - Add a tag for authenticated_entity - Add a tag for servlet_names Stylistically: Moved to importing methods directly from opentracing. | ||||
* | | | Change user deactivated errcode to USER_DEACTIVATED and use it (#5686) | Andrew Morgan | 2019-07-31 | 1 | -1/+2 |
| |/ |/| | | | | | | | This is intended as an amendment to #5674 as using M_UNKNOWN as the errcode makes it hard for clients to differentiate between an invalid password and a deactivated user (the problem we were trying to solve in the first place). M_UNKNOWN was originally chosen as it was presumed than an MSC would have to be carried out to add a new code, but as Synapse often is the testing bed for new MSC implementations, it makes sense to try it out first in the wild and then add it into the spec if it is successful. Thus this PR return a new M_USER_DEACTIVATED code when a deactivated user attempts to login. | ||||
* | | Remove non-functional 'expire_access_token' setting (#5782) | Richard van der Hoff | 2019-07-30 | 1 | -23/+5 |
| | | | | | | | | | | | | | | | | The `expire_access_token` didn't do what it sounded like it should do. What it actually did was make Synapse enforce the 'time' caveat on macaroons used as access tokens, but since our access token macaroons never contained such a caveat, it was always a no-op. (The code to add 'time' caveats was removed back in v0.18.5, in #1656) | ||||
* | | Replace returnValue with return (#5736) | Amber Brown | 2019-07-23 | 2 | -25/+21 |
|/ | |||||
* | Ignore redactions of m.room.create events (#5701) | Richard van der Hoff | 2019-07-17 | 1 | -15/+0 |
| | |||||
* | Return a different error from Invalid Password when a user is deactivated ↵ | Andrew Morgan | 2019-07-15 | 1 | -0/+16 |
| | | | | | (#5674) Return `This account has been deactivated` instead of `Invalid password` when a user is deactivated. | ||||
* | Implement access token expiry (#5660) | Richard van der Hoff | 2019-07-12 | 2 | -1/+19 |
| | | | | Record how long an access token is valid for, and raise a soft-logout once it expires. | ||||
* | Clean up exception handling for access_tokens (#5656) | Richard van der Hoff | 2019-07-11 | 2 | -89/+71 |
| | | | | | | | | | | | | | | | | First of all, let's get rid of `TOKEN_NOT_FOUND_HTTP_STATUS`. It was a hack we did at one point when it was possible to return either a 403 or a 401 if the creds were missing. We always return a 401 in these cases now (thankfully), so it's not needed. Let's also stop abusing `AuthError` for these cases. Honestly they have nothing that relates them to the other places that `AuthError` is used, other than the fact that they are loosely under the 'Auth' banner. It makes no sense for them to share exception classes. Instead, let's add a couple of new exception classes: `InvalidClientTokenError` and `MissingClientTokenError`, for the `M_UNKNOWN_TOKEN` and `M_MISSING_TOKEN` cases respectively - and an `InvalidClientCredentialsError` base class for the two of them. | ||||
* | Run Black. (#5482) | Amber Brown | 2019-06-20 | 7 | -337/+231 |
| | |||||
* | Merge pull request #5363 from ↵ | Brendan Abolivier | 2019-06-10 | 1 | -2/+13 |
|\ | | | | | | | | | matrix-org/babolivier/account_validity_send_mail_auth Don't check whether the user's account is expired on /send_mail requests | ||||
| * | Better wording | Brendan Abolivier | 2019-06-10 | 1 | -1/+1 |
| | | |||||
| * | Doc | Brendan Abolivier | 2019-06-10 | 1 | -0/+5 |
| | | |||||
| * | Don't check whether the user's account is expired on /send_mail requests | Brendan Abolivier | 2019-06-05 | 1 | -2/+8 |
| | | |||||
* | | Add ability to perform password reset via email without trusting the ↵ | Andrew Morgan | 2019-06-06 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | identity server (#5377) Sends password reset emails from the homeserver instead of proxying to the identity server. This is now the default behaviour for security reasons. If you wish to continue proxying password reset requests to the identity server you must now enable the email.trust_identity_server_for_password_resets option. This PR is a culmination of 3 smaller PRs which have each been separately reviewed: * #5308 * #5345 * #5368 | ||||
* | | Implement room v5 which enforces signing key validity | Richard van der Hoff | 2019-06-05 | 1 | -5/+5 |
| | | | | | | | | | | Implements [MSC2077](https://github.com/matrix-org/matrix-doc/pull/2077) and fixes #5247 and #4364. | ||||
* | | Add a test room version where we enforce key validity (#5348) | Richard van der Hoff | 2019-06-05 | 1 | -7/+13 |
| | | |||||
* | | Implement the SHHS complexity API (#5216) | Amber Brown | 2019-05-30 | 1 | -0/+1 |
| | | |||||
* | | Add config option for setting homeserver's default room version (#5223) | Andrew Morgan | 2019-05-23 | 1 | -4/+0 |
| | | | | | | | | | | Replaces DEFAULT_ROOM_VERSION constant with a method that first checks the config, then returns a hardcoded value if the option is not present. That hardcoded value is now located in the server.py config file. | ||||
* | | Room Statistics (#4338) | Amber Brown | 2019-05-21 | 1 | -0/+1 |
| | | |||||
* | | Introduce room v4 which updates event ID format. (#5217) | Richard van der Hoff | 2019-05-21 | 1 | -4/+4 |
| | | | | | | Implements https://github.com/matrix-org/matrix-doc/pull/2002. | ||||
* | | Fix error handling for rooms whose versions are unknown. (#5219) | Richard van der Hoff | 2019-05-21 | 1 | -1/+15 |
| | | | | | | | | | | | | | | If we remove support for a particular room version, we should behave more gracefully. This should make client requests fail with a 400 rather than a 500, and will ignore individiual PDUs in a federation transaction, rather than the whole transaction. | ||||
* | | Add a test room version which updates event ID format (#5210) | Richard van der Hoff | 2019-05-20 | 1 | -2/+11 |
| | | | | | | Implements MSC1884 | ||||
* | | Rename relation types to match MSC | Erik Johnston | 2019-05-20 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #5209 from matrix-org/erikj/reactions_base | Erik Johnston | 2019-05-20 | 1 | -0/+8 |
|\ \ | | | | | | | Land basic reaction and edit support. | ||||
| * | | Add simple send_relation API and track in DB | Erik Johnston | 2019-05-15 | 1 | -0/+8 |
| | | | |||||
* | | | Limit UserIds to a length that fits in a state key (#5198) | ReidAnderson | 2019-05-20 | 1 | -0/+3 |
| |/ |/| | |||||
* | | Drop support for v2_alpha API prefix (#5190) | Richard van der Hoff | 2019-05-15 | 1 | -2/+1 |
|/ | |||||
* | Do checks on aliases for incoming m.room.aliases events (#5128) | Brendan Abolivier | 2019-05-08 | 1 | -0/+3 |
| | | | | | Follow-up to #5124 Also added a bunch of checks to make sure everything (both the stuff added on #5124 and this PR) works as intended. | ||||
* | Factor out an "assert_requester_is_admin" function (#5120) | Richard van der Hoff | 2019-05-02 | 1 | -1/+1 |
| | | | | Rather than copying-and-pasting the same four lines hundreds of times | ||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-04-17 | 4 | -43/+95 |
|\ | | | | | | | babolivier/account_expiration | ||||
| * | Merge pull request #5047 from matrix-org/babolivier/account_expiration | Brendan Abolivier | 2019-04-17 | 1 | -2/+3 |
| |\ | | | | | | | Send out emails with links to extend an account's validity period | ||||
| * | | Remove periods from copyright headers (#5046) | Andrew Morgan | 2019-04-11 | 3 | -3/+3 |
| | | | |||||
| * | | Merge pull request #5027 from matrix-org/babolivier/account_expiration | Brendan Abolivier | 2019-04-09 | 2 | -0/+13 |
| |\ \ | | | | | | | | | Add time-based account expiration | ||||
| * | | | Transfer related groups on room upgrade (#4990) | Andrew Morgan | 2019-04-02 | 1 | -0/+1 |
| | | | | | | | | | | | | Transfers the m.room.related_groups state event on room upgrade. | ||||
| * | | | Collect room-version variations into one place (#4969) | Richard van der Hoff | 2019-04-01 | 2 | -40/+91 |
| | | | | | | | | | | | | | | | | Collect all the things that make room-versions different to one another into one place, so that it's easier to define new room versions. | ||||
* | | | | Add management endpoints for account validity | Brendan Abolivier | 2019-04-17 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | Send out emails with links to extend an account's validity period | Brendan Abolivier | 2019-04-17 | 1 | -2/+3 |
| |/ |/| | |||||
* | | Add account expiration feature | Brendan Abolivier | 2019-04-09 | 2 | -0/+13 |
|/ | |||||
* | Support 3PID login in password providers (#4931) | Andrew Morgan | 2019-03-26 | 1 | -11/+11 |
| | | | | | Adds a new method, check_3pid_auth, which gives password providers the chance to allow authentication with third-party identifiers such as email or msisdn. | ||||
* | Enforce hs_disabled_message correctly | Richard van der Hoff | 2019-03-19 | 1 | -3/+5 |
| | | | | | Fixes a bug where hs_disabled_message was not enforced for 3pid-based requests if there was no server_notices_mxid configured. | ||||
* | Add ratelimiting on login (#4821) | Brendan Abolivier | 2019-03-15 | 1 | -0/+12 |
| | | | Add two ratelimiters on login (per-IP address and per-userID). | ||||
* | Add rate-limiting on registration (#4735) | Brendan Abolivier | 2019-03-05 | 1 | -15/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Rate-limiting for registration * Add unit test for registration rate limiting * Add config parameters for rate limiting on auth endpoints * Doc * Fix doc of rate limiting function Co-Authored-By: babolivier <contact@brendanabolivier.com> * Incorporate review * Fix config parsing * Fix linting errors * Set default config for auth rate limiting * Fix tests * Add changelog * Advance reactor instead of mocked clock * Move parameters to registration specific config and give them more sensible default values * Remove unused config options * Don't mock the rate limiter un MAU tests * Rename _register_with_store into register_with_store * Make CI happy * Remove unused import * Update sample config * Fix ratelimiting test for py2 * Add non-guest test | ||||
* | Merge remote-tracking branch 'origin/release-v0.99.0' into develop | Richard van der Hoff | 2019-01-30 | 1 | -1/+1 |
|\ | |||||
| * | Update constants.py | Neil Johnson | 2019-01-30 | 1 | -1/+1 |
| | | | | | | remove trailing , | ||||
* | | by default include m.room.encryption on invites (#3902) | Matthew Hodgson | 2019-01-30 | 1 | -0/+1 |
|/ | | | | | | | | * by default include m.room.encryption on invites * fix constant * changelog | ||||
* | Merge branch 'develop' into neilj/room_capabilities | Neil Johnson | 2019-01-30 | 3 | -20/+43 |
|\ | |||||
| * | Enable room version v3 | Erik Johnston | 2019-01-29 | 1 | -1/+2 |
| | | |||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-01-29 | 2 | -12/+3 |
| |\ | | | | | | | | | | erikj/redactions_eiah | ||||
| | * | Implement event format v2 | Erik Johnston | 2019-01-29 | 1 | -0/+2 |
| | | | |||||
| | * | Remove dead function | Erik Johnston | 2019-01-29 | 1 | -11/+0 |
| | | | |||||
| | * | Replace usage of builder.user_id with builder.sender | Erik Johnston | 2019-01-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | `.user_id` is proxed to `.sender` in FrozenEvent, so this has no functional change | ||||
| * | | Drop vdh support | Erik Johnston | 2019-01-29 | 1 | -2/+0 |
| | | | |||||
| * | | Finish comment... | Erik Johnston | 2019-01-29 | 1 | -1/+1 |
| | | | |||||
| * | | Implement rechecking of redactions | Erik Johnston | 2019-01-29 | 1 | -2/+2 |
| | | | |||||
| * | | Add RoomVersions.V3 constant, without enabling it | Erik Johnston | 2019-01-29 | 1 | -0/+1 |
| |/ | | | | | | | | | | | We add the constant, but don't add it to the known room versions. This lets us start adding V3 logic, but the servers will never join or create V3 rooms | ||||
| * | Pass through room version to event auth | Erik Johnston | 2019-01-25 | 1 | -4/+10 |
| | | |||||
| * | Merge pull request #4415 from matrix-org/anoa/full_search_upgraded_rooms | Andrew Morgan | 2019-01-25 | 1 | -0/+14 |
| |\ | | | | | | | Ability to search entire room history after upgrading room | ||||
| | * | Update synapse/api/filtering.py | Richard van der Hoff | 2019-01-24 | 1 | -1/+1 |
| | | | | | | | | | Co-Authored-By: anoadragon453 <1342360+anoadragon453@users.noreply.github.com> | ||||
| | * | Ensure new filter is actually created | Andrew Morgan | 2019-01-22 | 1 | -1/+1 |
| | | | |||||
| | * | Fix a bug with single-room search searching all rooms | Andrew Morgan | 2019-01-22 | 1 | -2/+13 |
| | | | | | | | | | | | | | | | * Create a new method for getting predecessor rooms * Remove formatting change | ||||
| | * | Search for messages across predecessor rooms | Andrew Morgan | 2019-01-18 | 1 | -0/+3 |
| | | | | | | | | | | | | Signed-off-by: Andrew Morgan <andrew@amorgan.xyz> | ||||
| * | | Merge pull request #4437 from matrix-org/erikj/event_format_version_v2 | Erik Johnston | 2019-01-24 | 1 | -0/+13 |
| |\ \ | | | | | | | | | Add support for persisting event format versions | ||||
| | * | | Add support for persisting event format versions | Erik Johnston | 2019-01-23 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we only have the one event format version defined, but this adds the necessary infrastructure to persist and fetch the format versions alongside the events. We specify the format version rather than the room version as: 1. We don't necessarily know the room version, existing events may be either v1 or v2. 2. We'd need to be careful to prevent/handle correctly if different events in the same room reported to be of different versions, which sounds annoying. | ||||
* | | | | define room dispositions for use in exposing room capabilities | Neil Johnson | 2019-01-30 | 1 | -0/+5 |
| | | | | |||||
* | | | | reflect that rooms v3 is a stable room version | Neil Johnson | 2019-01-30 | 1 | -0/+1 |
| | | | | |||||
* | | | | backout v3 | Neil Johnson | 2019-01-25 | 1 | -1/+0 |
| | | | | |||||
* | | | | track unstable room v3 | Neil Johnson | 2019-01-25 | 1 | -0/+2 |
|/ / / | |||||
* / / | Fix None guard in config.server.is_threepid_reserved | Neil Johnson | 2019-01-22 | 1 | -1/+3 |
|/ / | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-01-21 | 1 | -1/+2 |
|\ \ | | | | | | | | | | erikj/fed_v2_invite_server | ||||
| * \ | Merge pull request #4390 from matrix-org/erikj/versioned_fed_apis | Erik Johnston | 2019-01-21 | 1 | -1/+2 |
| |\ \ | | | | | | | | | Add groundwork for new versions of federation APIs | ||||
| * | | | Migrate encryption state on room upgrade (#4411) | Andrew Morgan | 2019-01-21 | 1 | -0/+1 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | * Migrate encryption state on room upgrade Signed-off-by: Andrew Morgan <andrew@amorgan.xyz> * Add changelog file | ||||
| * | | ALL_USER_TYPES should be a tuple | Neil Johnson | 2019-01-15 | 1 | -1/+1 |
| | | | |||||
* | | | Add /v2/invite federation API | Erik Johnston | 2019-01-15 | 1 | -0/+1 |
| |/ |/| | |||||
* | | Add groundwork for new versions of federation APIs | Erik Johnston | 2019-01-15 | 1 | -1/+2 |
|/ | |||||
* | Merge branch rav/macaroon_key_fix_0.34 into rav/macaroon_key_fix_0.34.1 | Richard van der Hoff | 2019-01-10 | 1 | -38/+27 |
|\ | | | | | | | Fixes #4371 | ||||
| * | Merge branch 'rav/macaroon_key_fix' into rav/macaroon_key_fix_0.34 | Richard van der Hoff | 2019-01-10 | 1 | -38/+27 |
| |\ | |||||
| | * | Skip macaroon check for access tokens in the db | Richard van der Hoff | 2019-01-10 | 1 | -38/+27 |
| | | | |||||
* | | | Refactor request sending to have better excpetions (#4358) | Erik Johnston | 2019-01-08 | 1 | -0/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Correctly retry and back off if we get a HTTPerror response * Refactor request sending to have better excpetions MatrixFederationHttpClient blindly reraised exceptions to the caller without differentiating "expected" failures (e.g. connection timeouts etc) versus more severe problems (e.g. programming errors). This commit adds a RequestSendFailed exception that is raised when "expected" failures happen, allowing the TransactionQueue to log them as warnings while allowing us to log other exceptions as actual exceptions. | ||||
* | | | fix the check for whether `is_url` to match all the other ones in codebase ↵ | Michael Telatynski | 2019-01-06 | 1 | -3/+8 |
| | | | | | | | | | | | | | | | | | | (#3405) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | ||||
* | | | Merge pull request #4307 from matrix-org/erikj/v2_rooms | Richard van der Hoff | 2018-12-24 | 1 | -0/+2 |
|\ \ \ | | | | | | | | | Add v2 room version | ||||
| * | | | Add v2 room version | Erik Johnston | 2018-12-18 | 1 | -0/+2 |
| | | | | |||||
* | | | | create support user (#4141) | Neil Johnson | 2018-12-14 | 2 | -2/+11 |
| |/ / |/| | | | | | | | | | | | | | | Allow for the creation of a support user. A support user can access the server, join rooms, interact with other users, but does not appear in the user directory nor does it contribute to monthly active user limits. | ||||
* | | | Add an option to enable recording IPs for appservice users (#3831) | Travis Ralston | 2018-12-04 | 1 | -9/+20 |
|/ / | |||||
* | | Merge pull request #4004 from matrix-org/travis/login-terms | Travis Ralston | 2018-11-01 | 1 | -0/+1 |
|\ \ | | | | | | | Add m.login.terms to the registration flow | ||||
| * \ | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-31 | 2 | -1/+1 |
| |\ \ | |||||
| * \ \ | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-24 | 1 | -1/+4 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-15 | 1 | -0/+15 |
| |\ \ \ \ | |||||
| * | | | | | Incorporate Dave's work for GDPR login flows | Travis Ralston | 2018-10-03 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | As per https://github.com/vector-im/riot-web/issues/7168#issuecomment-419996117 | ||||
* | | | | | | Add STATE_V2_TEST room version | Erik Johnston | 2018-11-01 | 1 | -1/+6 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Remove deprecated v1 key exchange endpoint (#4119) | Amber Brown | 2018-10-31 | 1 | -1/+0 |
| | | | | | |||||
* | | | | | Basic initial support for room upgrades | Richard van der Hoff | 2018-10-25 | 1 | -0/+1 |
| |_|/ / |/| | | | | | | | | | | | | | | | Currently just creates a new, empty, room, and sends a tombstone in the old room. | ||||
* | | | | Allow backslashes in event field filters | Richard van der Hoff | 2018-10-24 | 1 | -1/+4 |
| |/ / |/| | | | | | | | | | | | | | | | | | | | | Fixes a bug introduced in https://github.com/matrix-org/synapse/pull/1783 which meant that single backslashes were not allowed in event field filters. The intention here is to allow single-backslashes, but disallow double-backslashes. | ||||
* | | | PR feedback pt. 1 | David Baker | 2018-10-12 | 1 | -8/+0 |
| | | | |||||
* | | | Fix mergefail | David Baker | 2018-10-09 | 1 | -1/+1 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups | David Baker | 2018-10-09 | 4 | -9/+23 |
|\| | | |||||
| * | | Fix userconsent on Python 3 (#3938) | Amber Brown | 2018-10-02 | 1 | -1/+1 |
| | | | |||||
| * | | Replaced all occurences of e.message with str(e) | Schnuffle | 2018-09-27 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Schnuffle <schnuffle@github.com> | ||||
| * | | Implement 'event_format' filter param in /sync | Richard van der Hoff | 2018-09-04 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | This has been specced and part-implemented; let's implement it for /sync (but no other endpoints yet :/). | ||||
| * | | assert rather than warn hhs-4 | Neil Johnson | 2018-08-31 | 1 | -3/+2 |
| | | | |||||
| * | | move threepid checker to config, add missing yields | Neil Johnson | 2018-08-31 | 1 | -2/+11 |
| | | | |||||
| * | | fix reference to is_threepid_reserved | Neil Johnson | 2018-08-31 | 1 | -1/+1 |
| | | | |||||
| * | | ensure post registration auth checks do not fail erroneously | Neil Johnson | 2018-08-31 | 1 | -5/+2 |
| | | | |||||
| * | | fix bug where preserved threepid user comes to sign up and server is mau blocked | Neil Johnson | 2018-08-31 | 1 | -1/+9 |
| | | | |||||
| * | | Change admin_uri to admin_contact in config and errors | Erik Johnston | 2018-08-24 | 2 | -5/+5 |
| | | | |||||
* | | | try to make flake8 and isort happy | Hubert Chathi | 2018-09-06 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'develop' into e2e_backups | Hubert Chathi | 2018-08-24 | 4 | -12/+113 |
|\| | | |||||
| * | | Implement trail users | Erik Johnston | 2018-08-23 | 1 | -1/+5 |
| | | | |||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-22 | 3 | -11/+15 |
| |\ \ | | | | | | | | | | | | | neilj/server_notices_on_blocking | ||||
| | * \ | Merge pull request #3673 from matrix-org/erikj/refactor_state_handler | Erik Johnston | 2018-08-22 | 1 | -2/+7 |
| | |\ \ | | | | | | | | | | | Refactor state module to support multiple room versions | ||||
| | | * \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-20 | 2 | -8/+48 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | erikj/refactor_state_handler | ||||
| | | * | | | Add constants for room versions | Erik Johnston | 2018-08-09 | 1 | -2/+7 |
| | | | | | | |||||
| | * | | | | Port over enough to get some sytests running on Python 3 (#3668) | Amber Brown | 2018-08-20 | 2 | -8/+8 |
| | | |/ / | | |/| | | |||||
| * | | | | Update notice format | Erik Johnston | 2018-08-22 | 1 | -2/+4 |
| | | | | | |||||
| * | | | | rename error code | Neil Johnson | 2018-08-18 | 2 | -4/+4 |
| | | | | | |||||
| * | | | | special case server_notices_mxid | Neil Johnson | 2018-08-18 | 1 | -0/+6 |
| | | | | | |||||
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-17 | 2 | -6/+28 |
| |\| | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking | ||||
| | * | | | Merge branch 'develop' into neilj/limit_exceeded_error | Neil Johnson | 2018-08-17 | 1 | -1/+2 |
| | |\ \ \ | |||||
| | * | | | | add new error type ResourceLimit | Neil Johnson | 2018-08-16 | 2 | -6/+27 |
| | | | | | | |||||
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-17 | 1 | -1/+1 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | neilj/server_notices_on_blocking | ||||
| | * | | | | call reap on start up and fix under reaping bug | Neil Johnson | 2018-08-16 | 1 | -1/+1 |
| | |/ / / | |||||
| * | | | | 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 |
| |\| | |||||
| * | | 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 |
| | | | |||||
* | | | blindly incorporate PR review - needs testing & fixing | Matthew Hodgson | 2018-08-12 | 1 | -3/+8 |
| | | | |||||
* | | | implement /room_keys/version too (untested) | Matthew Hodgson | 2018-08-12 | 1 | -0/+25 |
| |/ |/| | |||||
* | | 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. | ||||
* | | 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. |