Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
* | Pass through room version to event auth | Erik Johnston | 2019-01-25 | 1 | -4/+10 |
| | |||||
* | Fix None guard in config.server.is_threepid_reserved | Neil Johnson | 2019-01-22 | 1 | -1/+3 |
| | |||||
* | 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 |
| | | | |||||
* | | | create support user (#4141) | Neil Johnson | 2018-12-14 | 1 | -2/+3 |
|/ / | | | | | | | | | | | 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 |
| | | |||||
* | | 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 | 1 | -2/+2 |
| | | |||||
* | | 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 | 1 | -7/+7 |
|\ \ | | | | | | | | | | neilj/server_notices_on_blocking | ||||
| * | | Port over enough to get some sytests running on Python 3 (#3668) | Amber Brown | 2018-08-20 | 1 | -7/+7 |
| | | | |||||
* | | | rename error code | Neil Johnson | 2018-08-18 | 1 | -2/+2 |
| | | | |||||
* | | | special case server_notices_mxid | Neil Johnson | 2018-08-18 | 1 | -0/+6 |
|/ / | |||||
* | | Merge branch 'develop' into neilj/limit_exceeded_error | Neil Johnson | 2018-08-17 | 1 | -1/+2 |
|\ \ | |||||
| * | | call reap on start up and fix under reaping bug | Neil Johnson | 2018-08-16 | 1 | -1/+1 |
| | | | |||||
* | | | add new error type ResourceLimit | Neil Johnson | 2018-08-16 | 1 | -4/+6 |
|/ / | |||||
* | | replace admin_email with admin_uri for greater flexibility | Neil Johnson | 2018-08-15 | 1 | -5/+5 |
| | | |||||
* | | 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 |
| | | | |||||
| * | | 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 |
| | | | |||||
* | | | support admin_email config and pass through into blocking errors, return ↵ | Neil Johnson | 2018-08-13 | 1 | -2/+6 |
| | | | | | | | | | | | | AuthError in all cases | ||||
* | | | Revert "support admin_email config and pass through into blocking errors, ↵ | Neil Johnson | 2018-08-13 | 1 | -6/+2 |
| | | | | | | | | | | | | | | | | | | 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 | 1 | -2/+6 |
|/ / | | | | | | | AuthError in all cases | ||||
* | | 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 | 1 | -0/+4 |
|/ / | |||||
* | | wip commit - tests failing | Neil Johnson | 2018-08-03 | 1 | -2/+4 |
| | | |||||
* | | 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 |
|/ | |||||
* | Python 3: Convert some unicode/bytes uses (#3569) | Amber Brown | 2018-08-02 | 1 | -2/+2 |
| | |||||
* | Merge branch 'develop' into erikj/client_apis_move | Erik Johnston | 2018-07-24 | 1 | -2/+4 |
|\ | |||||
| * | Use new getters | Erik Johnston | 2018-07-23 | 1 | -2/+4 |
| | | |||||
* | | Move check_in_room_or_world_readable to Auth | Erik Johnston | 2018-07-20 | 1 | -0/+34 |
|/ | |||||
* | Make auth & transactions more testable (#3499) | Amber Brown | 2018-07-14 | 1 | -62/+62 |
| | |||||
* | run isort | Amber Brown | 2018-07-09 | 1 | -3/+4 |
| | |||||
* | add ip_range_whitelist parameter to limit where ASes can connect from | Matthew Hodgson | 2018-06-28 | 1 | -0/+6 |
| | |||||
* | 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 | ||||
* | Consistently use six's iteritems and wrap lazy keys/values in list() if ↵ | Amber Brown | 2018-05-31 | 1 | -1/+3 |
| | | | | they're not meant to be lazy (#3307) | ||||
* | replacing portions | Amber Brown | 2018-05-21 | 1 | -1/+1 |
| | |||||
* | 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> | ||||
* | 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) | ||||
* | 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. | ||||
* | 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. | ||||
* | | Remove redundant list of known caveat prefixes | Richard van der Hoff | 2016-11-24 | 1 | -26/+8 |
|/ | | | | Also add some comments. | ||||
* | 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 | ||||
* | | 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 | ||||
* | | 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 |
| | |||||
* | 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 | ||||
* | 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 |
| | | |||||
* | | Bug fix: expire invalid access tokens | Negar Fazeli | 2016-07-13 | 1 | -0/+3 |
|/ | |||||
* | Fix bug where we did not correctly explode when multiple user_ids were set ↵ | Erik Johnston | 2016-07-07 | 1 | -5/+10 |
| | | | | in macaroon | ||||
* | 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> | ||||
* | Add and use get_domian_from_id | Erik Johnston | 2016-05-09 | 1 | -8/+8 |
| | |||||
* | 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 |
| | |||||
* | Fix up logcontexts | Erik Johnston | 2016-02-08 | 1 | -1/+3 |
| | |||||
* | 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 |
| | |||||
* | 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 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. | ||||
* | Allow guests to upgrade their accounts | Daniel Wagner-Hall | 2016-01-05 | 1 | -3/+3 |
| | |||||
* | 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 | ||||
* | 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 | 1 | -8/+17 |
|\ | |||||
| * | 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 |
| | |||||
* | 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 |
| | |||||
* | Allow guests to register and call /events?room_id= | Daniel Wagner-Hall | 2015-11-04 | 1 | -41/+54 |
| | | | | | | | 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. | ||||
* | Reject events which are too large | Daniel Wagner-Hall | 2015-10-22 | 1 | -1/+21 |
| | | | | SPEC-222 | ||||
* | 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 |
| | |||||
* | 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 |
| | |||||
* | 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 | 1 | -1/+24 |
|\ | |||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable | Erik Johnston | 2015-10-02 | 1 | -3/+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 | 1 | -1/+32 |
| |_|_|/ |/| | | | |||||
* | | | | Merge pull request #276 from ↵ | Mark Haines | 2015-09-21 | 1 | -0/+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 |
| | | | | | |||||
| * | | | | 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. | ||||
* | 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 branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-07-13 | 1 | -1/+2 |
|\ | | | | | | | 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 |
| | | |||||
* | | 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 pull request #126 from matrix-org/csauth | Mark Haines | 2015-04-28 | 1 | -19/+27 |
|\ | | | | | Client / Server Auth Refactor | ||||
| * | Merge branch 'develop' into csauth | David Baker | 2015-04-24 | 1 | -58/+30 |
| |\ | | | | | | | | | | | | | Conflicts: synapse/http/server.py | ||||
| * | | Add an error code to 'missing token' response. | David Baker | 2015-04-23 | 1 | -1/+2 |
| | | | |||||
| * | | Merge branch 'develop' into csauth | David Baker | 2015-04-17 | 1 | -14/+11 |
| |\ \ | |||||
| * | | | 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 | 1 | -36/+12 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | 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 |
| | | | | |||||
* | | | | 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 |
|/ / / | |||||
* | | | 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) | ||||
* | | 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) | ||||
* | | 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. | ||||
* | @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 |
| | |||||
* | 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 | 1 | -0/+12 |
| | | | | | | | | | | | | 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. | ||||
* | | 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. | ||||
* | 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. | ||||
* | 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 | ||||
* | Fix bug where we superfluously asked for current state. Change API of ↵ | Erik Johnston | 2015-01-30 | 1 | -0/+2 |
| | | | | /query_auth/ so that we don't duplicate events in the response. | ||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into rejections | Erik Johnston | 2015-01-30 | 1 | -3/+8 |
|\ | | | | | | | | | | | Conflicts: synapse/storage/__init__.py synapse/storage/schema/delta/v12.sql | ||||
| * | Rename ClientID to ClientInfo since it is a pair of IDs rather than a single ↵ | Mark Haines | 2015-01-28 | 1 | -2/+2 |
| | | | | | | | | identifier | ||||
| * | Add a : to the doc string after the type of the return value | Mark Haines | 2015-01-28 | 1 | -1/+1 |
| | | |||||
| * | Extract the id token of the token when authing users, include the token and ↵ | Mark Haines | 2015-01-28 | 1 | -3/+5 |
| | | | | | | | | device_id in the internal meta data for the event along with the transaction id when sending events | ||||
| * | Return the device_id from get_auth_by_req | Mark Haines | 2015-01-28 | 1 | -2/+5 |
| | | |||||
* | | Start implementing auth conflict res | Erik Johnston | 2015-01-28 | 1 | -17/+21 |
|/ | |||||
* | Replace hs.parse_userid with UserID.from_string | Mark Haines | 2015-01-23 | 1 | -4/+5 |
| | |||||
* | SYN-154: Tweak how the m.room.create check is done. | Kegan Dougal | 2015-01-07 | 1 | -10/+1 |
| | | | | | Don't perform the check in auth.is_host_in_room but instead do it in _do_join and also assert that there are no m.room.members in the room before doing so. | ||||
* | SYN-154: Better error messages when joining an unknown room by ID. | Kegan Dougal | 2015-01-07 | 1 | -1/+10 |
| | | | | | | The simple fix doesn't work here because room creation also involves unknown room IDs. The check relies on the presence of m.room.create for rooms being created, whereas bogus room IDs have no state events at all. | ||||
* | Update copyright notices | Mark Haines | 2015-01-06 | 1 | -1/+1 |
| | |||||
* | Make auth module use EventTypes constants | Erik Johnston | 2014-12-12 | 1 | -27/+23 |
| | |||||
* | Fix stream test. Make sure we add join to auth_events for invitiations | Erik Johnston | 2014-12-12 | 1 | -0/+6 |
| | |||||
* | Remove unused import | Erik Johnston | 2014-12-08 | 1 | -1/+0 |
| | |||||
* | Various typos and bug fixes. | Erik Johnston | 2014-12-08 | 1 | -7/+9 |
| | |||||
* | Start making more things use EventContext rather than event.* | Erik Johnston | 2014-12-05 | 1 | -13/+20 |
| | |||||
* | Begin converting things to use the new Event structure | Erik Johnston | 2014-12-04 | 1 | -9/+2 |
| | |||||
* | WIP for new way of managing events. | Erik Johnston | 2014-12-03 | 1 | -6/+7 |
| | |||||
* | Fix bugs when joining a remote room that has dodgy event graphs. This should ↵ | Erik Johnston | 2014-11-27 | 1 | -2/+8 |
| | | | | also fix the number of times a HS will trigger a GET /event/ | ||||
* | Fix bugs in invite/join dances. | Erik Johnston | 2014-11-25 | 1 | -70/+68 |
| | | | | | We now do more implement more of the auth on the events so that we don't reject valid events. | ||||
* | Add missing None check | Erik Johnston | 2014-11-24 | 1 | -1/+1 |
| | |||||
* | Fix pep8 codestyle warnings | Mark Haines | 2014-11-20 | 1 | -1/+1 |
| | |||||
* | Only users can set state events which have their own user_id | Erik Johnston | 2014-11-19 | 1 | -0/+20 |
| | |||||
* | Null check when determining default power levels | Mark Haines | 2014-11-18 | 1 | -1/+2 |
| | |||||
* | Fix auth to correctly handle initial creation of rooms | Erik Johnston | 2014-11-18 | 1 | -3/+21 |
| | |||||
* | Fix bugs with invites/joins across federatiom. | Erik Johnston | 2014-11-12 | 1 | -3/+16 |
| | | | | | Both in terms of auth and not trying to fetch missing PDUs for invites, joins etc. | ||||
* | Add an EventValidator. Fix bugs in auth ++ storage | Erik Johnston | 2014-11-10 | 1 | -5/+11 |
| | |||||
* | PEP8 | Erik Johnston | 2014-11-10 | 1 | -2/+1 |
| | |||||
* | Fix backfill to work. Add auth to backfill request | Erik Johnston | 2014-11-10 | 1 | -0/+6 |
| | |||||
* | Notify users about invites. | Erik Johnston | 2014-11-10 | 1 | -7/+9 |
| | |||||
* | Fix invite auth | Erik Johnston | 2014-11-10 | 1 | -3/+5 |
| | |||||
* | Fix joining over federation | Erik Johnston | 2014-11-07 | 1 | -2/+51 |
| | |||||
* | Start implementing auth chains | Erik Johnston | 2014-11-07 | 1 | -2/+1 |
| | |||||
* | Neaten things up a bit | Erik Johnston | 2014-11-07 | 1 | -5/+2 |
| | |||||
* | Amalgamate all power levels. | Erik Johnston | 2014-11-06 | 1 | -149/+72 |
| | | | | | Remove concept of reqired power levels, something similiar can be done using the new power level event. | ||||
* | Fix auth checks to all use the given old_event_state | Erik Johnston | 2014-11-05 | 1 | -24/+31 |
| | |||||
* | Fix bug in redaction auth. | Erik Johnston | 2014-10-31 | 1 | -2/+2 |
| | | | | | This caused a 500 when sending a redaction due to a typo in a method invocation. | ||||
* | Fix bug where people could join private rooms | Erik Johnston | 2014-10-17 | 1 | -39/+47 |
| | |||||
* | Use state groups to get current state. Make join dance actually work. | Erik Johnston | 2014-10-17 | 1 | -0/+5 |
| |