Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | | | |||||
| * | | | | Allow room initialSync for users that have left the room, returning a ↵ | Mark Haines | 2015-09-09 | 1 | -0/+49 |
| | | | | | | | | | | | | | | | | | | | | snapshot of how the room was when they left it | ||||
* | | | | | Merge pull request #256 from matrix-org/auth | Daniel Wagner-Hall | 2015-09-14 | 1 | -3/+89 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Attempt to validate macaroons | ||||
| * | | | | s/user_id/user/g for consistency | Daniel Wagner-Hall | 2015-09-01 | 1 | -10/+10 |
| | | | | | |||||
| * | | | | Attempt to validate macaroons | Daniel Wagner-Hall | 2015-08-26 | 1 | -9/+95 |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A couple of weird caveats: * If we can't validate your macaroon, we fall back to checking that your access token is in the DB, and ignoring the failure * Even if we can validate your macaroon, we still have to hit the DB to get the access token ID, which we pretend is a device ID all over the codebase. This mostly adds the interesting code, and points out the two pieces we need to delete (and necessary conditions) in order to fix the above caveats. | ||||
* | | | | Merge pull request #265 from matrix-org/erikj/check_room_exists | Erik Johnston | 2015-09-14 | 1 | -0/+8 |
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | Check room exists when authenticating an event | ||||
| * | | Fix tests | Erik Johnston | 2015-09-01 | 1 | -1/+1 |
| | | | |||||
| * | | Check room exists when authenticating an event, by asserting they reference ↵ | Erik Johnston | 2015-09-01 | 1 | -0/+8 |
| |/ | | | | | | | a creation event | ||||
* | | Check domain of events properly | Daniel Wagner-Hall | 2015-09-01 | 1 | -1/+3 |
| | | | | | | | | Federated servers still need to delegate authority to owning servers | ||||
* | | Allow users to redact their own events | Daniel Wagner-Hall | 2015-08-28 | 1 | -8/+25 |
|/ | |||||
* | Stop looking up "admin", which we never read | Daniel Wagner-Hall | 2015-08-25 | 1 | -3/+1 |
| | |||||
* | Re-wrap line | Daniel Wagner-Hall | 2015-08-25 | 1 | -3/+1 |
| | |||||
* | Remove completely unused concepts from codebase | Daniel Wagner-Hall | 2015-08-25 | 1 | -10/+7 |
| | | | | | | | | | | Removes device_id and ClientInfo device_id is never actually written, and the matrix.org DB has no non-null entries for it. Right now, it's just cluttering up code. This doesn't remove the columns from the database, because that's fiddly. | ||||
* | Merge branch 'develop' into refresh | Daniel Wagner-Hall | 2015-08-20 | 2 | -0/+3 |
|\ | | | | | | | | | Conflicts: synapse/rest/client/v1/login.py | ||||
| * | Add m.room.avatar to default power levels. Change default required power ↵ | Erik Johnston | 2015-08-20 | 1 | -0/+1 |
| | | | | | | | | levels of such events to 50 | ||||
| * | Merge pull request #233 from matrix-org/erikj/canonical_alias | Erik Johnston | 2015-08-20 | 1 | -0/+1 |
| |\ | | | | | | | Add server side support for canonical aliases | ||||
| | * | Add canonical alias to the default power levels | Erik Johnston | 2015-08-19 | 1 | -0/+1 |
| | | | |||||
| * | | Merge pull request #211 from matrix-org/email_in_use | Mark Haines | 2015-08-20 | 1 | -0/+1 |
| |\ \ | | |/ | |/| | Changes for unique emails | ||||
| | * | Add endpoint that proxies ID server request token and errors if the given ↵ | David Baker | 2015-08-04 | 1 | -0/+1 |
| | | | | | | | | | | | | email is in use on this Home Server. | ||||
* | | | s/by_token/by_access_token/g | Daniel Wagner-Hall | 2015-08-20 | 1 | -3/+3 |
|/ / | | | | | | | We're about to have two kinds of token, access and refresh | ||||
* | | Set request.authenticated_entity for application services | Erik Johnston | 2015-08-18 | 1 | -0/+3 |
| | | |||||
* | | Add missing space because linter | Daniel Wagner-Hall | 2015-08-11 | 1 | -1/+1 |
| | | |||||
* | | Minor docs cleanup | Daniel Wagner-Hall | 2015-08-11 | 1 | -2/+7 |
| | | |||||
* | | Remove redundant if-guard | Daniel Wagner-Hall | 2015-08-11 | 1 | -13/+12 |
|/ | | | | The startswith("@") does the job | ||||
* | Merge pull request #203 from matrix-org/erikj/room_creation_presets | Erik Johnston | 2015-07-16 | 1 | -0/+5 |
|\ | | | | | Implement presets at room creation | ||||
| * | Capitalize contants | Erik Johnston | 2015-07-14 | 1 | -2/+2 |
| | | |||||
| * | Implement presets at room creation | Erik Johnston | 2015-07-13 | 1 | -0/+5 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-07-13 | 2 | -1/+4 |
|\| | | | | | | | erikj/power_level_sanity | ||||
| * | Add m.room.history_visibility to newly created rooms' m.room.power_levels | Erik Johnston | 2015-07-06 | 1 | -0/+1 |
| | | |||||
| * | Add m.room.history_visibility to list of auth events | Erik Johnston | 2015-07-03 | 1 | -1/+1 |
| | | |||||
| * | Add basic impl for room history ACL on GET /messages client API | Erik Johnston | 2015-07-02 | 1 | -0/+2 |
| | | |||||
* | | Sanitize power level checks | Erik Johnston | 2015-07-10 | 1 | -15/+21 |
| | | |||||
* | | You shouldn't be able to ban/kick users with higher power levels | Erik Johnston | 2015-07-10 | 1 | -2/+5 |
|/ | |||||
* | Log more when we have processed the request | Erik Johnston | 2015-06-15 | 1 | -0/+2 |
| | |||||
* | Typo | Erik Johnston | 2015-05-01 | 1 | -1/+1 |
| | |||||
* | Remove some run_on_reactors | Erik Johnston | 2015-05-01 | 1 | -3/+0 |
| | |||||
* | Don't log all auth events every time we call auth.check | Erik Johnston | 2015-05-01 | 1 | -1/+4 |
| | |||||
* | Don't wait for storage of access_token | Erik Johnston | 2015-05-01 | 1 | -1/+1 |
| | |||||
* | Merge branch 'develop' into key_distribution | Mark Haines | 2015-04-29 | 3 | -19/+40 |
|\ | | | | | | | | | Conflicts: synapse/config/homeserver.py | ||||
| * | Merge pull request #126 from matrix-org/csauth | Mark Haines | 2015-04-28 | 3 | -19/+32 |
| |\ | | | | | | | Client / Server Auth Refactor | ||||
| | * | Merge branch 'develop' into csauth | David Baker | 2015-04-24 | 2 | -60/+32 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: synapse/http/server.py | ||||
| | * | | Dedicated error code for failed 3pid auth verification | David Baker | 2015-04-23 | 1 | -0/+1 |
| | | | | |||||
| | * | | Add an error code to 'missing token' response. | David Baker | 2015-04-23 | 2 | -1/+3 |
| | | | | |||||
| | * | | Merge branch 'develop' into csauth | David Baker | 2015-04-17 | 1 | -14/+11 |
| | |\ \ | |||||
| | * | | | Dummy login so we can do the first POST request to get login flows without ↵ | David Baker | 2015-04-15 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | it just succeeding | ||||
| | * | | | Add app service auth back in to v2 register | David Baker | 2015-04-02 | 1 | -3/+1 |
| | | | | | |||||
| | * | | | Add shared secret auth into register v2 and switch the script over. | David Baker | 2015-04-02 | 1 | -1/+3 |
| | | | | | |||||
| | * | | | New registration for C/S API v2. Only ReCAPTCHA working currently. | David Baker | 2015-03-30 | 1 | -0/+2 |
| | | | | | |||||
| | * | | | unused import | David Baker | 2015-03-24 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | 1) Pushers are now associated with an access token | David Baker | 2015-03-24 | 1 | -18/+25 |
| | | | | | | | | | | | | | | | | | | | | 2) Change places where we mean unauthenticated to 401, not 403, in C/S v2: hack so it stays as 403 in v1 because web client relies on it. | ||||
| * | | | | Merge branch 'develop' into invite_power_level | Paul "LeoNerd" Evans | 2015-04-27 | 2 | -38/+14 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | Also remember to check 'invite' level for changes | Paul "LeoNerd" Evans | 2015-04-21 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Initial implementation of an 'invite' power_level | Paul "LeoNerd" Evans | 2015-04-21 | 1 | -0/+7 |
| | | | | | |||||
* | | | | | Merge branch 'develop' into key_distribution | Mark Haines | 2015-04-24 | 2 | -60/+32 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | No commas here, otherwise our error string constants become tuples. | David Baker | 2015-04-24 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Neater fetching of user's auth level in a room - squash to int() at access ↵ | Paul "LeoNerd" Evans | 2015-04-22 | 1 | -35/+12 |
| | | | | | | | | | | | | | | | | | | | | time (SYN-353) | ||||
| * | | | | Appease pep8 | Paul "LeoNerd" Evans | 2015-04-22 | 1 | -1/+0 |
| |/ / / | |||||
| * | | | Much neater fetching of defined powerlevels from m.room.power_levels state event | Paul "LeoNerd" Evans | 2015-04-21 | 1 | -31/+21 |
| | | | | |||||
| * | | | Remove debugging print statement accidentally committed | Paul "LeoNerd" Evans | 2015-04-21 | 1 | -1/+0 |
| | | | | |||||
| * | | | Sanitise a user's powerlevel to an int() before numerical comparison, ↵ | Paul "LeoNerd" Evans | 2015-04-21 | 1 | -0/+7 |
| | |/ | |/| | | | | | | | because otherwise Python is "helpful" with it (SYN-351) | ||||
* | | | Merge branch 'develop' into key_distribution | Mark Haines | 2015-04-20 | 1 | -13/+10 |
|\| | | |||||
| * | | Neater implementation of membership change auth checks, ensuring we can't ↵ | Paul "LeoNerd" Evans | 2015-04-15 | 1 | -18/+10 |
| | | | | | | | | | | | | forget to check if the calling user is a member of the room | ||||
| * | | Ensure that non-room-members cannot ban others, even if they do have enough ↵ | Paul "LeoNerd" Evans | 2015-04-15 | 1 | -0/+5 |
| | | | | | | | | | | | | powerlevel (SYN-343) | ||||
* | | | Add a version 2 of the key server api | Mark Haines | 2015-04-14 | 1 | -0/+1 |
|/ / | |||||
* / | Fix a bug which causes a send event level of 0 to not be honoured. | Kegan Dougal | 2015-04-07 | 1 | -1/+1 |
|/ | | | | | Caused by a bad if check, which incorrectly executes for both 0 and None, when None was the original intent. | ||||
* | Merge pull request #109 from matrix-org/default_registration | Erik Johnston | 2015-03-18 | 1 | -0/+1 |
|\ | | | | | Disable registration by default. Add script to register new users. | ||||
| * | Implement registering with shared secret. | Erik Johnston | 2015-03-13 | 1 | -0/+1 |
| | | |||||
* | | @cached() annotate get_user_by_token() - achieves a minor DB performance ↵ | Paul "LeoNerd" Evans | 2015-03-17 | 1 | -1/+1 |
| | | | | | | | | improvement | ||||
* | | Remove concept of context.auth_events, instead use context.current_state | Erik Johnston | 2015-03-16 | 1 | -6/+0 |
| | | |||||
* | | Make context.auth_events grap auth events from current state. Otherwise auth ↵ | Erik Johnston | 2015-03-16 | 1 | -1/+7 |
| | | | | | | | | is wrong. | ||||
* | | Respect ban membership | Erik Johnston | 2015-03-16 | 1 | -5/+17 |
|/ | |||||
* | Add RegisterFallbackResource to /_matrix/static/client/register | Kegan Dougal | 2015-02-23 | 1 | -0/+1 |
| | | | | | Try to keep both forms of registration logic (native/fallback) close together for sanity. | ||||
* | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-11 | 1 | -7/+14 |
|\ | |||||
| * | During room intial sync, only calculate current state once. | Erik Johnston | 2015-02-09 | 1 | -7/+14 |
| | | |||||
* | | Modify auth.get_user_by_req for authing appservices directly. | Kegan Dougal | 2015-02-09 | 1 | -18/+16 |
| | | | | | | | | | | | | Add logic to map the appservice token to the autogenned appservice user ID. Add unit tests for all forms of get_user_by_req (user/appservice, valid/bad/missing tokens) | ||||
* | | Grant ASes the ability to create alias in their own namespace. | Kegan Dougal | 2015-02-06 | 2 | -1/+14 |
| | | | | | | | | | | | | Add a new errcode type M_EXCLUSIVE when users try to create aliases inside AS namespaces, and when ASes try to create aliases outside their own namespace. | ||||
* | | Add m.login.application_service registration procedure. | Kegan Dougal | 2015-02-05 | 1 | -0/+1 |
| | | | | | | | | | | This allows known application services to register any user ID under their own user namespace(s). | ||||
* | | Fix unit tests. | Kegan Dougal | 2015-02-05 | 1 | -0/+6 |
| | | |||||
* | | Add CS extension for masquerading as users within the namespaces specified ↵ | Kegan Dougal | 2015-02-05 | 1 | -0/+23 |
| | | | | | | | | by the AS. | ||||
* | | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-05 | 2 | -9/+13 |
|\| | |||||
| * | Merge branch 'signature_failures' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-02-04 | 1 | -6/+6 |
| |\ | | | | | | | | | | federation_client_retries | ||||
| | * | Change context.auth_events to what the auth_events would be bases on ↵ | Erik Johnston | 2015-02-04 | 1 | -6/+6 |
| | | | | | | | | | | | | context.current_state, rather than based on the auth_events from the event. | ||||
| * | | Apply sanity to the transport client interface. Convert 'make_join' and ↵ | Erik Johnston | 2015-02-04 | 1 | -1/+7 |
| |/ | | | | | | | 'send_join' to accept iterables of destinations | ||||
| * | Keep around the old (buggy) version of the prune_event function so that we ↵ | Erik Johnston | 2015-02-03 | 1 | -2/+0 |
| | | | | | | | | can use it to check signatures for events on old servers | ||||
* | | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-02 | 4 | -20/+297 |
|\| | | | | | | | | | | | Conflicts: synapse/handlers/__init__.py synapse/storage/__init__.py | ||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into rejections | Erik Johnston | 2015-01-30 | 1 | -0/+229 |
| |\ | | | | | | | | | | | | | Conflicts: synapse/storage/schema/im.sql | ||||
| | * | Use 'in' to test if the key exists, remove unused _filters_for_user | Mark Haines | 2015-01-30 | 1 | -6/+2 |
| | | | |||||
| | * | Unused import | Mark Haines | 2015-01-30 | 1 | -2/+0 |
| | | | |||||
| | * | Create a separate filter object to do the actual filtering, so that we can | Mark Haines | 2015-01-29 | 1 | -112/+108 |
| | | | | | | | | | | | | | | | split the storage and management of filters from the actual filter code and don't have to load a filter from the db each time we filter an event | ||||
| | * | Merge branch 'develop' into client_v2_filter | Mark Haines | 2015-01-29 | 1 | -0/+1 |
| | |\ | |||||
| | * | | Fix code-style | Mark Haines | 2015-01-29 | 1 | -13/+6 |
| | | | | |||||
| | * | | Merge changes from develop | Mark Haines | 2015-01-29 | 2 | -3/+38 |
| | |\ \ | |||||
| | * | | | Add basic filtering public API unit tests. Use defers in the right places. | Kegan Dougal | 2015-01-29 | 1 | -4/+7 |
| | | | | | |||||
| | * | | | Implement filter algorithm. Add basic event type unit tests to assert it works. | Kegan Dougal | 2015-01-29 | 1 | -0/+49 |
| | | | | | |||||
| | * | | | Add filtering public API; outline filtering algorithm. | Kegan Dougal | 2015-01-29 | 1 | -8/+52 |
| | | | | | |||||
| | * | | | Add filtering.filter_events function, with stub passes_filter function. | Kegan Dougal | 2015-01-29 | 1 | -0/+15 |
| | | | | | |||||
| | * | | | Add filter JSON sanity checks. | Kegan Dougal | 2015-01-28 | 1 | -4/+105 |
| | | | | | |||||
| | * | | | Move storage of user filters into real datastore layer; now have to mock it ↵ | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -23/+4 |
| | | | | | | | | | | | | | | | | | | | | out in the REST-level tests |