Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Unpack dictionary in for loop for nicer syntax | Steven Hammerton | 2015-10-12 | 1 | -4/+4 |
| | |||||
* | Remove not required parenthesis | Steven Hammerton | 2015-10-12 | 1 | -1/+1 |
| | |||||
* | Support multiple required attributes in CAS response, and in a nicer config ↵ | Steven Hammerton | 2015-10-12 | 1 | -7/+6 |
| | | | | format too | ||||
* | Allow optional config params for a required attribute and it's value, if ↵ | Steven Hammerton | 2015-10-12 | 1 | -1/+15 |
| | | | | specified any CAS user must have the given attribute and the value must equal | ||||
* | Parse both user and attributes from CAS response | Steven Hammerton | 2015-10-12 | 1 | -26/+38 |
| | |||||
* | Raise LoginError if CasResponse doensn't contain user | Steven Hammerton | 2015-10-10 | 1 | -1/+1 |
| | |||||
* | Fix my broken line splitting | Steven Hammerton | 2015-10-10 | 1 | -4/+6 |
| | |||||
* | Use UserId to create FQ user id | Steven Hammerton | 2015-10-10 | 1 | -1/+1 |
| | |||||
* | Add get_raw method to SimpleHttpClient, use this in CAS auth rather than ↵ | Steven Hammerton | 2015-10-10 | 1 | -5/+8 |
| | | | | requests | ||||
* | Formatting changes | Steven Hammerton | 2015-10-10 | 1 | -5/+12 |
| | |||||
* | Provide ability to login using CAS | Steven Hammerton | 2015-10-10 | 1 | -1/+63 |
| | |||||
* | Use 'true' rather than '1' for archived flag | Mark Haines | 2015-10-08 | 1 | -1/+1 |
| | |||||
* | Add a flag to initial sync to indicate we want rooms that the user has left | Mark Haines | 2015-10-08 | 1 | -1/+3 |
| | |||||
* | Validate the receipt type before passing it on to the receipt handler | Kegan Dougal | 2015-10-01 | 1 | -0/+4 |
| | |||||
* | Merge pull request #276 from ↵ | Mark Haines | 2015-09-21 | 2 | -9/+13 |
|\ | | | | | | | | | matrix-org/markjh/history_for_rooms_that_have_been_left SPEC-216: Allow users to view the history of rooms that they have left. | ||||
| * | Remove undocumented and unimplemented 'feedback' parameter from the ↵ | Mark Haines | 2015-09-09 | 2 | -4/+0 |
| | | | | | | | | Client-Server API | ||||
| * | Allow users that have left the room to view the member list from the point ↵ | Mark Haines | 2015-09-09 | 1 | -5/+13 |
| | | | | | | | | they left | ||||
* | | Merge pull request #274 from matrix-org/add_threepid_fix | David Baker | 2015-09-10 | 1 | -0/+1 |
|\ \ | |/ |/| | Fix adding threepids to an existing account | ||||
| * | Fix adding threepids to an existing account | David Baker | 2015-09-10 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'release-v0.10.0' into develop | Mark Haines | 2015-08-28 | 2 | -15/+51 |
|\| | | | | | | | | | | | | | Conflicts: synapse/handlers/auth.py synapse/python_dependencies.py synapse/rest/client/v1/login.py | ||||
| * | Consistency | Erik Johnston | 2015-08-27 | 1 | -3/+3 |
| | | |||||
| * | Check for an internationalised filename first | Erik Johnston | 2015-08-27 | 1 | -8/+14 |
| | | |||||
| * | None check the correct variable | Erik Johnston | 2015-08-27 | 1 | -2/+3 |
| | | |||||
| * | Check for None | Erik Johnston | 2015-08-27 | 1 | -1/+1 |
| | | |||||
| * | Give a sensible error message if the filename is invalid UTF-8 | Mark Haines | 2015-08-26 | 2 | -2/+8 |
| | | |||||
| * | Handle unicode filenames given when downloading or received over federation | Mark Haines | 2015-08-26 | 1 | -5/+21 |
| | | |||||
| * | Allow non-ascii filenames for attachments | Mark Haines | 2015-08-26 | 2 | -8/+15 |
| | | |||||
| * | When logging in fetch user by user_id case insensitively, *unless* there are ↵ | Erik Johnston | 2015-08-21 | 1 | -2/+3 |
| | | | | | | | | multiple case insensitive matches, in which case require the exact user_id | ||||
* | | Merge erikj/user_dedup to develop | Daniel Wagner-Hall | 2015-08-26 | 1 | -2/+3 |
| | | |||||
* | | Merge pull request #248 from matrix-org/deviceid | Daniel Wagner-Hall | 2015-08-25 | 16 | -45/+44 |
|\ \ | | | | | | | Remove completely unused concepts from codebase | ||||
| * | | Fix up one more reference | Daniel Wagner-Hall | 2015-08-25 | 1 | -3/+2 |
| | | | |||||
| * | | Remove completely unused concepts from codebase | Daniel Wagner-Hall | 2015-08-25 | 16 | -43/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | Remove syutil dependency in favour of smaller single-purpose libraries | Mark Haines | 2015-08-24 | 4 | -8/+9 |
|/ / | |||||
* | | Return fully qualified user_id as per spec | David Baker | 2015-08-20 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'develop' into refresh | Daniel Wagner-Hall | 2015-08-20 | 5 | -26/+207 |
|\| | | | | | | | | | Conflicts: synapse/rest/client/v1/login.py | ||||
| * | Remove spurious extra arg to set_password | David Baker | 2015-08-20 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #206 from matrix-org/erikj/generate_presice_thumbnails | Mark Haines | 2015-08-20 | 2 | -21/+167 |
| |\ | | | | | | | Always return a thumbnail of the requested size. | ||||
| | * | Merge remote-tracking branch 'origin/develop' into ↵ | Mark Haines | 2015-08-13 | 2 | -88/+116 |
| | |\ | | | | | | | | | | | | | erikj/generate_presice_thumbnails | ||||
| | * | | Add config option for setting the list of thumbnail sizes to precalculate | Mark Haines | 2015-08-12 | 1 | -16/+2 |
| | | | | |||||
| | * | | Make a config option for whether to generate new thumbnail sizes dynamically | Mark Haines | 2015-08-12 | 2 | -7/+19 |
| | | | | |||||
| | * | | Factor out thumbnail() | Erik Johnston | 2015-07-23 | 1 | -56/+40 |
| | | | | |||||
| | * | | Fix remote thumbnailing | Erik Johnston | 2015-07-23 | 2 | -7/+11 |
| | | | | |||||
| | * | | Always return a thumbnail of the requested size. | Erik Johnston | 2015-07-23 | 2 | -2/+162 |
| | | | | | | | | | | | | | | | | | | | | | | | | Before, we returned a thumbnail that was at least as big (if possible) as the requested size. Now, if we don't have a thumbnail of the given size we generate (and persist) one of that size. | ||||
| * | | | Comma comma comma comma comma chameleon | David Baker | 2015-08-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'develop' into email_login | David Baker | 2015-08-20 | 4 | -44/+80 |
| |\ \ \ | |||||
| | * \ \ | Merge pull request #211 from matrix-org/email_in_use | Mark Haines | 2015-08-20 | 1 | -0/+28 |
| | |\ \ \ | | | | | | | | | | | | | Changes for unique emails | ||||
| | | * | | | Check absent before trying to access keys | David Baker | 2015-08-12 | 1 | -3/+3 |
| | | | | | | |||||
| | | * | | | Just leaving off the $ is fine. r* == registerrrrrrrrr | David Baker | 2015-08-12 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Allow sign in using email address | David Baker | 2015-08-04 | 1 | -5/+12 |
| | |/ / / | |/| | | | |||||
| * | | | | Remember to yield: not much point testing is a deferred is not None | David Baker | 2015-08-04 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | splt long line | David Baker | 2015-08-04 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | Add endpoint that proxies ID server request token and errors if the given ↵ | David Baker | 2015-08-04 | 1 | -1/+26 |
| | |_|/ | |/| | | | | | | | | | | email is in use on this Home Server. | ||||
* | | | | /tokenrefresh POST endpoint | Daniel Wagner-Hall | 2015-08-20 | 3 | -2/+62 |
| |/ / |/| | | | | | | | | | | | | | | | | | | | | This allows refresh tokens to be exchanged for (access_token, refresh_token). It also starts issuing them on login, though no clients currently interpret them. | ||||
* | | | Merge pull request #208 from matrix-org/markjh/end-to-end-key-federation | Mark Haines | 2015-08-18 | 1 | -30/+70 |
|\ \ \ | | | | | | | | | Federation for end-to-end key requests. | ||||
| * | | | Merge remote-tracking branch 'origin/develop' into ↵ | Mark Haines | 2015-08-13 | 3 | -89/+118 |
| |\| | | | | | | | | | | | | | | markjh/end-to-end-key-federation | ||||
| * | | | Get the end-to-end key federation working | Mark Haines | 2015-07-24 | 1 | -5/+5 |
| | | | | |||||
| * | | | Add federation support for end-to-end key requests | Mark Haines | 2015-07-23 | 1 | -30/+70 |
| | | | | |||||
* | | | | Simplify LoginHander and AuthHandler | Daniel Wagner-Hall | 2015-08-12 | 3 | -10/+6 |
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | * Merge LoginHandler -> AuthHandler * Add a bunch of documentation * Improve some naming * Remove unused branches I will start merging the actual logic of the two handlers shortly | ||||
* | | | Don't try & check the username if we don't have one (which we won't if it's ↵ | David Baker | 2015-08-03 | 1 | -1/+2 |
| | | | | | | | | | | | | been saved in the auth layer) | ||||
* | | | Use the same reg paths as register v1 for ASes. | Kegan Dougal | 2015-07-29 | 1 | -4/+6 |
| | | | | | | | | | | | | Namely this means using registration_handler.appservice_register. | ||||
* | | | Fix v2_alpha registration. Add unit tests. | Kegan Dougal | 2015-07-28 | 1 | -54/+70 |
| | | | | | | | | | | | | | | | | | | | | | | | | V2 Registration forced everyone (including ASes) to create a password for a user, when ASes should be able to omit passwords. Also unbreak AS registration in general which checked too early if the given username was claimed by an AS; it was checked before knowing if the AS was the one doing the registration! Add unit tests for AS reg, user reg and disabled_registration flag. | ||||
* | | | Generate local thumbnails on a thread | Erik Johnston | 2015-07-23 | 1 | -34/+43 |
| |/ |/| | |||||
* | | Pick larger than desired thumbnail for 'crop' | Erik Johnston | 2015-07-23 | 1 | -1/+2 |
|/ | |||||
* | Query for all the ones we were asked about, not just the last... | David Baker | 2015-07-21 | 1 | -1/+1 |
| | |||||
* | s/take/claim/ for end to end key APIs | Mark Haines | 2015-07-20 | 1 | -5/+5 |
| | |||||
* | Remove semicolon. | Kegan Dougal | 2015-07-20 | 1 | -1/+1 |
| | |||||
* | Parse the ID given to /invite|ban|kick to make sure it looks like a user ID. | Kegan Dougal | 2015-07-20 | 1 | -0/+2 |
| | |||||
* | Merge pull request #199 from matrix-org/erikj/receipts | Erik Johnston | 2015-07-16 | 2 | -0/+57 |
|\ | | | | | Implement read receipts. | ||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts | Erik Johnston | 2015-07-13 | 3 | -1/+352 |
| |\ | |||||
| * \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts | Erik Johnston | 2015-07-08 | 4 | -15/+48 |
| |\ \ | |||||
| * | | | Wire together receipts and the notifer/federation | Erik Johnston | 2015-07-07 | 1 | -2/+1 |
| | | | | |||||
| * | | | Add a ReceiptServlet | Erik Johnston | 2015-07-07 | 2 | -1/+59 |
| | | | | |||||
* | | | | pep8 + debug line | David Baker | 2015-07-15 | 1 | -6/+8 |
| | | | | |||||
* | | | | Add back in support for remembering parameters submitted to a ↵ | David Baker | 2015-07-15 | 1 | -2/+9 |
| | | | | | | | | | | | | | | | | user-interactive auth call. | ||||
* | | | | bump up image quality a bit more as it looks crap | Matthew Hodgson | 2015-07-14 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | Merge pull request #198 from matrix-org/markjh/client-end-to-end-key-management | Erik Johnston | 2015-07-10 | 2 | -1/+279 |
|\ \ \ | | | | | | | | | Client end to end key management API | ||||
| * | | | Assume that each device for a user has only one of each type of key | Mark Haines | 2015-07-10 | 1 | -3/+3 |
| | | | | |||||
| * | | | Don't bother with a timeout for one time keys on the server. | Mark Haines | 2015-07-09 | 1 | -18/+7 |
| | | | | |||||
| * | | | Add client API for uploading and querying keys for end to end encryption | Mark Haines | 2015-07-06 | 2 | -1/+290 |
| | |/ | |/| | |||||
* | | | Small tweaks to SAML2 configuration. | Erik Johnston | 2015-07-10 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | - Add saml2 config docs to default config. - Use existence of saml2 config to indicate if saml2 should be enabled. | ||||
* | | | Merge pull request #201 from EricssonResearch/msba/saml2-develop | Erik Johnston | 2015-07-10 | 1 | -1/+74 |
|\ \ \ | |/ / |/| | | Integrate SAML2 basic authentication - uses pysaml2 | ||||
| * | | Make SAML2 optional and add some references/comments | Muthu Subramanian | 2015-07-09 | 1 | -4/+9 |
| | | | |||||
| * | | code beautify | Muthu Subramanian | 2015-07-09 | 1 | -9/+4 |
| | | | |||||
| * | | code beautify | Muthu Subramanian | 2015-07-08 | 1 | -10/+23 |
| | | | |||||
| * | | Integrate SAML2 basic authentication - uses pysaml2 | Muthu Subramanian | 2015-07-08 | 1 | -1/+61 |
| |/ | |||||
* | | If user supplies filename in URL when downloading from media repo, use that ↵ | Erik Johnston | 2015-07-03 | 3 | -9/+14 |
| | | | | | | | | name in Content Disposition | ||||
* | | Enforce ascii filenames for uploads | Erik Johnston | 2015-06-30 | 2 | -1/+6 |
| | | |||||
* | | Add Content-Disposition headers to media repo v1 downloads | Erik Johnston | 2015-06-30 | 3 | -7/+30 |
|/ | |||||
* | Remove access_token from synapse.rest.client.v1.transactions ↵ | Erik Johnston | 2015-06-16 | 1 | -3/+3 |
| | | | | {get,store}_response logging | ||||
* | Merge pull request #175 from matrix-org/erikj/thumbnail_thread | Erik Johnston | 2015-06-03 | 1 | -45/+53 |
|\ | | | | | Thumbnail images on a seperate thread | ||||
| * | Thumbnail images on a seperate thread | Erik Johnston | 2015-06-02 | 1 | -45/+53 |
| | | |||||
* | | SYN-403: Make content repository use its own http client. | Erik Johnston | 2015-06-03 | 1 | -1/+2 |
|/ | |||||
* | Add config option to turn off freezing events. Use new encode_json api and ↵ | Erik Johnston | 2015-05-29 | 2 | -2/+2 |
| | | | | ujson.loads | ||||
* | Merge pull request #165 from matrix-org/bugs/SYN-390 | Erik Johnston | 2015-05-26 | 1 | -5/+8 |
|\ | | | | | SYN-390: Don't modify the dictionary returned from the data store | ||||
| * | SYN-390: Don't modify the dictionary returned from the data store | Mark Haines | 2015-05-26 | 1 | -5/+8 |
| | | |||||
* | | Make shared secret registration work again | David Baker | 2015-05-14 | 1 | -1/+4 |
| | | |||||
* | | Change the way we create observers to deferreds so that we don't get spammed ↵ | Erik Johnston | 2015-05-08 | 1 | -2/+6 |
|/ | | | | by 'unhandled errors' | ||||
* | user_id now in user_threepids | David Baker | 2015-05-01 | 1 | -3/+3 |
| | |||||
* | Merge branch 'develop' into key_distribution | Mark Haines | 2015-04-29 | 7 | -4/+576 |
|\ | | | | | | | | | Conflicts: synapse/config/homeserver.py | ||||
| * | Merge pull request #126 from matrix-org/csauth | Mark Haines | 2015-04-28 | 7 | -4/+576 |
| |\ | | | | | | | Client / Server Auth Refactor | ||||
| | * | pep8 | David Baker | 2015-04-27 | 1 | -1/+2 |
| | | | |||||
| | * | logging args | David Baker | 2015-04-27 | 1 | -2/+2 |
| | | | |||||
| | * | More underscores | David Baker | 2015-04-24 | 2 | -4/+4 |
| | | | |||||
| | * | Use underscores instead of camelcase for id server stuff | David Baker | 2015-04-24 | 1 | -2/+2 |
| | | | |||||
| | * | Merge branch 'develop' into csauth | David Baker | 2015-04-24 | 5 | -140/+74 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: synapse/http/server.py | ||||
| | * | | Dedicated error code for failed 3pid auth verification | David Baker | 2015-04-23 | 1 | -1/+3 |
| | | | | |||||
| | * | | Password reset, finally. | David Baker | 2015-04-17 | 1 | -5/+16 |
| | | | | |||||
| | * | | Add endpoint to get threepids from server | David Baker | 2015-04-17 | 1 | -0/+12 |
| | | | | |||||
| | * | | make add3pid servlet work | David Baker | 2015-04-17 | 2 | -12/+64 |
| | | | | |||||
| | * | | just the once would probably be fine | David Baker | 2015-04-17 | 1 | -1/+0 |
| | | | | |||||
| | * | | Merge branch 'develop' into csauth | David Baker | 2015-04-17 | 5 | -162/+93 |
| | |\ \ | |||||
| | * | | | Register the 3pid servlet | David Baker | 2015-04-17 | 1 | -1/+3 |
| | | | | | |||||
| | * | | | password -> account servlet and add start of an 'add 3pid' endpoint | David Baker | 2015-04-17 | 2 | -2/+17 |
| | | | | | |||||
| | * | | | Return user ID in use error straight away | David Baker | 2015-04-16 | 1 | -2/+23 |
| | | | | | |||||
| | * | | | Dummy login so we can do the first POST request to get login flows without ↵ | David Baker | 2015-04-15 | 1 | -4/+14 |
| | | | | | | | | | | | | | | | | | | | | it just succeeding | ||||
| | * | | | Regstration with email in v2 | David Baker | 2015-04-15 | 2 | -7/+7 |
| | | | | | |||||
| | * | | | Add app service auth back in to v2 register | David Baker | 2015-04-02 | 1 | -2/+7 |
| | | | | | |||||
| | * | | | Throw sensible errors on not-json when allowing empty body | David Baker | 2015-04-02 | 1 | -1/+4 |
| | | | | | |||||
| | * | | | pep8 | David Baker | 2015-04-02 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Add shared secret auth into register v2 and switch the script over. | David Baker | 2015-04-02 | 1 | -11/+58 |
| | | | | | |||||
| | * | | | Completely replace fallback auth for C/S V2: | David Baker | 2015-04-01 | 3 | -2/+193 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Now only the auth part goes to fallback, not the whole operation * Auth fallback is a normal API endpoint, not a static page * Params like the recaptcha pubkey can just live in the config Involves a little engineering on JsonResource so its servlets aren't always forced to return JSON. I should document this more, in fact I'll do that now. | ||||
| | * | | | pep8 | David Baker | 2015-03-31 | 2 | -3/+4 |
| | | | | | |||||
| | * | | | New registration for C/S API v2. Only ReCAPTCHA working currently. | David Baker | 2015-03-30 | 3 | -1/+95 |
| | | | | | |||||
| | * | | | Allow multiple pushers for a single app ID & pushkey, honouring the 'append' ↵ | David Baker | 2015-03-25 | 1 | -1/+12 |
| | | | | | | | | | | | | | | | | | | | | flag in the API. | ||||
| | * | | | 1) Pushers are now associated with an access token | David Baker | 2015-03-24 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | 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. | ||||
| | * | | | Make deleting other access tokens when you change your password actually work | David Baker | 2015-03-24 | 1 | -1/+4 |
| | | | | | |||||
| | * | | | pep8 / pyflakes | David Baker | 2015-03-23 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Implement password changing (finally) along with a start on making ↵ | David Baker | 2015-03-23 | 3 | -1/+91 |
| | | | | | | | | | | | | | | | | | | | | client/server auth more general. | ||||
* | | | | | Implement minimum_valid_until_ts in the remote key resource | Mark Haines | 2015-04-29 | 1 | -4/+55 |
| | | | | | |||||
* | | | | | Merge branch 'develop' into key_distribution | Mark Haines | 2015-04-27 | 1 | -1/+3 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/crypto/keyring.py | ||||
| * | | | | Implement locks using create_observer for fetching media and server keys | Erik Johnston | 2015-04-27 | 1 | -1/+3 |
| | | | | | |||||
* | | | | | Copyright notice | Mark Haines | 2015-04-24 | 1 | -0/+14 |
| | | | | | |||||
* | | | | | Merge branch 'develop' into key_distribution | Mark Haines | 2015-04-24 | 1 | -0/+14 |
|\| | | | | |||||
| * | | | | Copyright notices | Mark Haines | 2015-04-24 | 1 | -0/+14 |
| | |_|/ | |/| | | |||||
* | | | | Update to match the specification for key/v2 | Mark Haines | 2015-04-23 | 2 | -19/+24 |
| | | | | |||||
* | | | | Implement remote key lookup api | Mark Haines | 2015-04-22 | 3 | -8/+185 |
| | | | | |||||
* | | | | Merge branch 'develop' into key_distribution | Mark Haines | 2015-04-21 | 5 | -140/+74 |
|\| | | | |||||
| * | | | Set a version_string in BaseMediaResource so that the request_handler ↵ | Mark Haines | 2015-04-21 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | wrapper works | ||||
| * | | | Combine the request wrappers in rest/media/v1 and http/server into a single ↵ | Mark Haines | 2015-04-21 | 5 | -140/+73 |
| | |/ | |/| | | | | | | | wrapper decorator | ||||
* | | | Implement v2 key lookup | Mark Haines | 2015-04-20 | 1 | -1/+3 |
| | | | |||||
* | | | Return a sha256 fingerprint rather than the entire tls certificate | Mark Haines | 2015-04-14 | 1 | -2/+8 |
| | | | |||||
* | | | Add a version 2 of the key server api | Mark Haines | 2015-04-14 | 2 | -0/+137 |
|/ / | |||||
* | | Move server key api into rest/key/v1 | Mark Haines | 2015-04-14 | 3 | -0/+121 |
| | | |||||
* | | Remove appservice REST servlets | Kegan Dougal | 2015-03-31 | 4 | -190/+0 |
|/ | |||||
* | Factor out user id validation checks | Erik Johnston | 2015-03-18 | 1 | -9/+5 |
| | |||||
* | Do more validation of incoming request | Erik Johnston | 2015-03-18 | 1 | -3/+3 |
| | |||||
* | Use 403 instead of 400 | Erik Johnston | 2015-03-16 | 1 | -1/+1 |
| | |||||
* | Implement registering with shared secret. | Erik Johnston | 2015-03-13 | 1 | -2/+55 |
| | |||||
* | bump dep on syweb 0.6.5 | Matthew Hodgson | 2015-03-12 | 1 | -2/+3 |
| | |||||
* | Add the master push rule for the break-my-push button. Allow server default ↵ | David Baker | 2015-03-10 | 1 | -1/+4 |
| | | | | rules to be disabled by default. | ||||
* | Merge branch 'develop' into pushrules2 | David Baker | 2015-03-04 | 1 | -29/+6 |
|\ | |||||
| * | Convert expected format for AS regex to include exclusivity. | Kegan Dougal | 2015-02-27 | 1 | -29/+6 |
| | | | | | | | | | | Previously you just specified the regex as a string, now it expects a JSON object with a 'regex' key and an 'exclusive' boolean, as per spec. | ||||
* | | s/user_name/user/ as per mjark's comment | David Baker | 2015-03-02 | 1 | -3/+3 |
| | | |||||
* | | Oops, missed a replacement. | David Baker | 2015-03-02 | 1 | -1/+1 |
| | | |||||
* | | Blank lines | David Baker | 2015-03-02 | 1 | -0/+1 |
| | | |||||
* | | It's set_tweak now, not set_sound | David Baker | 2015-02-27 | 1 | -1/+1 |
| | | |||||
* | | Add API for getting/setting enabled-ness of push rules. | David Baker | 2015-02-26 | 1 | -5/+49 |
|/ | |||||
* | SYWEB-278 Don't allow rules with no rule_id. | David Baker | 2015-02-25 | 1 | -1/+1 |
| | |||||
* | Always allow AS to register | Erik Johnston | 2015-02-20 | 1 | -3/+5 |
| | |||||
* | Disable registration if config option was set. | Erik Johnston | 2015-02-19 | 1 | -0/+4 |
| | |||||
* | SYN-282: Don't log tracebacks for client errors | Mark Haines | 2015-02-18 | 1 | -1/+1 |
| | |||||
* | Merge pull request #50 from matrix-org/application-services | Mark Haines | 2015-02-13 | 6 | -14/+282 |
|\ | | | | | Application Services | ||||
| * | Fix newline on __init__ | Kegan Dougal | 2015-02-11 | 1 | -1/+0 |
| | | |||||
| * | PEP8-ify | Kegan Dougal | 2015-02-11 | 1 | -1/+1 |
| | | |||||
| * | Add newline to EOF | Kegan Dougal | 2015-02-11 | 1 | -0/+1 |
| | | |||||
| * | Notify ASes for events sent by other users in a room which an AS user is a ↵ | Kegan Dougal | 2015-02-11 | 1 | -2/+2 |
| | | | | | | | | part of. | ||||
| * | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-11 | 5 | -14/+23 |
| |\ | |||||
| * \ | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-09 | 5 | -28/+36 |
| |\ \ | |||||
| * | | | Grant ASes the ability to delete aliases in their own namespace. | Kegan Dougal | 2015-02-06 | 1 | -2/+29 |
| | | | | |||||
| * | | | Grant ASes the ability to create alias in their own namespace. | Kegan Dougal | 2015-02-06 | 1 | -11/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | -1/+23 |
| | | | | | | | | | | | | | | | | | | | | This allows known application services to register any user ID under their own user namespace(s). | ||||
| * | | | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-05 | 1 | -4/+0 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-05 | 1 | -149/+150 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-05 | 2 | -20/+20 |
| |\ \ \ \ \ | |||||
| * | | | | | | Add hs_token column and generate a different token f.e application service. | Kegan Dougal | 2015-02-05 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-04 | 2 | -0/+53 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-02 | 16 | -44/+868 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/__init__.py synapse/storage/__init__.py | ||||
| * | | | | | | | | Add basic application_services SQL, and hook up parts of the appservice ↵ | Kegan Dougal | 2015-01-28 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | store to read from it. | ||||
| * | | | | | | | | Use ApplicationService when registering. | Kegan Dougal | 2015-01-27 | 1 | -2/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | Add appservice handler and store. Glue together rest > handler > store. | Kegan Dougal | 2015-01-27 | 2 | -3/+8 |
| | | | | | | | | | |||||
| * | | | | | | | | Parse /register and /unregister request JSON. | Kegan Dougal | 2015-01-27 | 1 | -2/+78 |
| | | | | | | | | | |||||
| * | | | | | | | | Add stub application services REST API. | Kegan Dougal | 2015-01-27 | 4 | -0/+127 |
| | | | | | | | | | |||||
* | | | | | | | | | Blunty replace json with simplejson | Erik Johnston | 2015-02-11 | 10 | -10/+10 |
| |_|_|_|_|_|_|/ |/| | | | | | | | |||||
* | | | | | | | | Fix code-style | Mark Haines | 2015-02-10 | 3 | -4/+4 |
| | | | | | | | | |||||
* | | | | | | | | Code-style fixes | Mark Haines | 2015-02-10 | 3 | -10/+19 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Log when we receive a request, when we send a response and how long it took ↵ | Erik Johnston | 2015-02-09 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | to process it. | ||||
* | | | | | | | ...and here's the actual impl. git fail. | Matthew Hodgson | 2015-02-07 | 1 | -25/+32 |
| | | | | | | | |||||
* | | | | | | | thou shalt specify a content-length | Matthew Hodgson | 2015-02-07 | 1 | -0/+1 |
| | | | | | | | |||||
* | | | | | | | i hate weakly typed languages | Matthew Hodgson | 2015-02-07 | 1 | -1/+1 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | priority class now dealt with in namespaced rule_id | David Baker | 2015-02-05 | 1 | -4/+0 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Give server default rules the 'default' attribute and fix various brokenness. | David Baker | 2015-02-05 | 1 | -1/+3 |
| | | | | | |||||
* | | | | | Server default rules now of all kinds rather than all being at lowest prio. | David Baker | 2015-02-05 | 1 | -39/+32 |
| | | | | | |||||
* | | | | | namespace rule IDs to be unique within their scope and rule type. | David Baker | 2015-02-05 | 1 | -123/+129 |
| |_|_|/ |/| | | | |||||
* | | | | More s/instance_handle/profile_tag/ | David Baker | 2015-02-04 | 1 | -5/+5 |
| | | | | |||||
* | | | | s/instance_handle/profile_tag/ | David Baker | 2015-02-03 | 2 | -16/+16 |
| |_|/ |/| | | |||||
* | | | Add Cache-Control header to identicon | Mark Haines | 2015-02-02 | 1 | -0/+3 |
| | | | |||||
* | | | Fix setting identicon width and height | Mark Haines | 2015-02-02 | 1 | -2/+2 |
| | | | |||||
* | | | Spell height more correctly | Mark Haines | 2015-02-02 | 1 | -1/+1 |
| | | | |||||
* | | | Add a media/v1/identicon resource for generating identicons using pydenticon | Mark Haines | 2015-02-02 | 2 | -0/+50 |
| |/ |/| | |||||
* | | Spit out server default rules too. | David Baker | 2015-01-30 | 1 | -4/+12 |
| | | |||||
* | | Merge pull request #41 from matrix-org/client_v2_sync | Mark Haines | 2015-01-30 | 2 | -2/+209 |
|\ \ | | | | | | | Client v2 sync | ||||
| * | | Pass client info to the sync_config | Mark Haines | 2015-01-30 | 1 | -1/+1 |
| | | | |||||
| * | | Filter the recent events before applying the limit when doing an incremental ↵ | Mark Haines | 2015-01-30 | 1 | -1/+1 |
| | | | | | | | | | | | | sync with a gap | ||||
| * | | Add basic filtering support | Mark Haines | 2015-01-29 | 1 | -5/+14 |
| | | | |||||
| * | | Merge branch 'client_v2_filter' into client_v2_sync | Mark Haines | 2015-01-29 | 1 | -1/+1 |
| |\ \ | |||||
| * | | | Move typing notifs to an "emphermal" event list on the room object | Mark Haines | 2015-01-29 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'client_v2_filter' into client_v2_sync | Mark Haines | 2015-01-29 | 2 | -8/+23 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'client_v2_filter' into client_v2_sync | Mark Haines | 2015-01-29 | 1 | -2/+2 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'client_v2_filter' into client_v2_sync | Mark Haines | 2015-01-29 | 4 | -5/+110 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/rest/client/v2_alpha/__init__.py | ||||
| * | | | | | | Add typing notifications to sync | Mark Haines | 2015-01-29 | 1 | -10/+8 |
| | | | | | | | |||||
| * | | | | | | Include transaction ids in unsigned section of events in the sync results ↵ | Mark Haines | 2015-01-29 | 1 | -7/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | for the clients that made those requests | ||||
| * | | | | | | Add ports back to demo/start.sh | Mark Haines | 2015-01-28 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'develop' into client_v2_sync | Mark Haines | 2015-01-28 | 14 | -44/+523 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Fix Formatting | Mark Haines | 2015-01-27 | 1 | -3/+2 |
| | | | | | | | | |||||
| * | | | | | | | Start implementing the non-incremental sync portion of the v2 /sync API | Mark Haines | 2015-01-26 | 1 | -28/+77 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'develop' into client_v2_sync | Mark Haines | 2015-01-26 | 2 | -2/+15 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| * | | | | | | | Start implementing the v2_alpha sync API | Mark Haines | 2015-01-23 | 3 | -0/+214 |
| | | | | | | | | |||||
* | | | | | | | | Add glob asterisks when running rules. | David Baker | 2015-01-30 | 1 | -4/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Means that now you can't do exact matches even in override rules, but I think we can live with that. Advantage is that you'll now always get back what was put in to the API. | ||||
* | | | | | | | | Merge pull request #37 from matrix-org/client_v2_filter | Erik Johnston | 2015-01-30 | 2 | -1/+110 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | Client v2 filter | ||||
| * | | | | | | | Create a separate filter object to do the actual filtering, so that we can | Mark Haines | 2015-01-29 | 1 | -1/+1 |
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -8/+23 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Merge in auth changes from develop | Mark Haines | 2015-01-29 | 1 | -2/+2 |
| | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Merge changes from develop | Mark Haines | 2015-01-29 | 14 | -44/+523 |
| |\ \ \ \ \ | |||||
| * | | | | | | Add filter JSON sanity checks. | Kegan Dougal | 2015-01-28 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Have the Filtering API return Deferreds, so we can do the Datastore ↵ | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | implementation nicely | ||||
| * | | | | | | Initial trivial implementation of an actual 'Filtering' object; move storage ↵ | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -13/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | of user filters into there | ||||
| * | | | | | | Merge branch 'develop' into client_v2_filter | Paul "LeoNerd" Evans | 2015-01-27 | 2 | -2/+15 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | Initial minimal attempt at /user/:user_id/filter API - in-memory storage, no ↵ | Paul "LeoNerd" Evans | 2015-01-26 | 2 | -1/+109 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | actual filter implementation | ||||
* | | | | | | | Renumber priority classes so we can use 0 for defaults. | David Baker | 2015-01-29 | 1 | -5/+5 |
| | | | | | | | |||||
* | | | | | | | Allow kind to be set to null to delete a pusher. | David Baker | 2015-01-29 | 1 | -1/+10 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | Code style fixes. | Mark Haines | 2015-01-29 | 2 | -8/+23 |
| |_|/ / / |/| | | | | |||||
* | | | | | Change uses of get_user_by_req because it returns a tuple now. | David Baker | 2015-01-28 | 2 | -4/+4 |
| |_|_|/ |/| | | | |||||
* | | | | Merge pull request #36 from matrix-org/device_id_from_access_token | Mark Haines | 2015-01-28 | 10 | -41/+53 |
|\ \ \ \ | | | | | | | | | | | Extract the device id and token id from the access token when autheniticating users | ||||
| * | | | | Extract the id token of the token when authing users, include the token and ↵ | Mark Haines | 2015-01-28 | 10 | -41/+53 |
| | | | | | | | | | | | | | | | | | | | | 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 | 10 | -27/+27 |
| | |/ / | |/| | | |||||
* | | | | spaces | David Baker | 2015-01-28 | 1 | -2/+2 |
| | | | | |||||
* | | | | Unnecessary newlines. | David Baker | 2015-01-28 | 1 | -5/+0 |
| | | | | |||||
* | | | | Unnecessary newline. | David Baker | 2015-01-28 | 1 | -1/+0 |
| | | | | |||||
* | | | | Better style | David Baker | 2015-01-28 | 1 | -2/+5 |
| | | | | |||||
* | | | | Another superfluous newline | David Baker | 2015-01-28 | 1 | -1/+0 |
| | | | | |||||
* | | | | Ah, the comma of doom. | David Baker | 2015-01-28 | 1 | -1/+1 |
| | | | | |||||
* | | | | Brackets are nicer | David Baker | 2015-01-28 | 1 | -2/+2 |
| | | | | |||||
* | | | | Unnecessary new line | David Baker | 2015-01-28 | 1 | -1/+0 |
| | | | | |||||
* | | | | Oops, bad merge: needed to change the base class of the rest servlets too. | David Baker | 2015-01-28 | 2 | -4/+4 |
| | | | | |||||
* | | | | Merge branch 'develop' into pushers | David Baker | 2015-01-28 | 14 | -104/+158 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/events.py synapse/server.py | ||||
| * | | | Pass the current time to serialize event, rather than passing an | Mark Haines | 2015-01-26 | 2 | -2/+15 |
| |/ / | | | | | | | | | | | | | | | | HS and getting a clock from it and calling time_msec on the clock. Remove the serialize_event method from the HS since it is no longer needed. | ||||
| * / | Add client v2_alpha resource to synapse server resource tree | Mark Haines | 2015-01-23 | 2 | -0/+67 |
| |/ | |||||
| * | Extract the client v1 base RestServlet to a separate class | Mark Haines | 2015-01-23 | 11 | -72/+44 |
| | | |||||
| * | Replace hs.parse_roomalias with RoomAlias.from_string | Mark Haines | 2015-01-23 | 2 | -6/+7 |
| | | |||||
| * | Replace hs.parse_roomid with RoomID.from_string | Mark Haines | 2015-01-23 | 1 | -2/+2 |
| | |