Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' into pushers | David Baker | 2014-11-20 | 2 | -9/+6 |
|\ | |||||
| * | Fix pep8 codestyle warnings | Mark Haines | 2014-11-20 | 1 | -1/+0 |
| | | |||||
| * | Add a few missing yields, Move deferred lists inside PreserveLoggingContext ↵ | Mark Haines | 2014-11-20 | 1 | -8/+6 |
| | | | | | | | | because they don't interact well with the logging contexts | ||||
* | | Start creating a module to do generic notifications (just prints them to ↵ | David Baker | 2014-11-19 | 2 | -1/+73 |
|/ | | | | stdout currently!) | ||||
* | Remember also to UTF-8 decode bytes in room alias names in directory server URLs | Paul "LeoNerd" Evans | 2014-11-18 | 1 | -3/+9 |
| | |||||
* | Remember to URL decode the room_id in room initialSync | Paul "LeoNerd" Evans | 2014-11-18 | 1 | -1/+1 |
| | |||||
* | Ensure to parse a real pagination config object out of room initialSync ↵ | Paul "LeoNerd" Evans | 2014-11-18 | 1 | -2/+4 |
| | | | | request and pass it on | ||||
* | Rename message handler's new snapshot_room to room_initial_sync() as that ↵ | Paul "LeoNerd" Evans | 2014-11-18 | 1 | -1/+1 |
| | | | | better suits its purpose | ||||
* | Merge remote-tracking branch 'origin/develop' into room-initial-sync | Paul "LeoNerd" Evans | 2014-11-18 | 1 | -1/+3 |
|\ | |||||
| * | Split out sending the room alias events from creating the alias so that we ↵ | Mark Haines | 2014-11-18 | 1 | -1/+3 |
| | | | | | | | | can do them in the right point when creating a room | ||||
* | | Merge branch 'develop' into room-initial-sync | Paul "LeoNerd" Evans | 2014-11-17 | 3 | -13/+43 |
|\| | | | | | | | | | Conflicts: synapse/handlers/message.py | ||||
| * | Add an EventValidator. Fix bugs in auth ++ storage | Erik Johnston | 2014-11-10 | 2 | -0/+15 |
| | | |||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2014-11-07 | 1 | -3/+3 |
| |\ | | | | | | | | | | federation_authorization | ||||
| * | | Implement new replace_state and changed prev_state | Erik Johnston | 2014-11-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | `prev_state` is now a list of previous state ids, similiar to prev_events. `replace_state` now points to what we think was replaced. | ||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2014-10-30 | 5 | -60/+84 |
| |\ \ | | | | | | | | | | | | | federation_authorization | ||||
| * \ \ | Merge branch 'event_signing' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2014-10-27 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | federation_authorization Conflicts: synapse/storage/__init__.py | ||||
| * \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2014-10-27 | 2 | -3/+3 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | federation_authorization Conflicts: synapse/federation/transport.py synapse/handlers/message.py | ||||
| * | | | | | Use state groups to get current state. Make join dance actually work. | Erik Johnston | 2014-10-17 | 2 | -12/+27 |
| | | | | | | |||||
* | | | | | | Have room initialSync return the room's room_id | Paul "LeoNerd" Evans | 2014-11-10 | 1 | -21/+6 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Fix url decoding bugs with /redact and /send APIs. | Kegan Dougal | 2014-11-05 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Be sure to urlencode/decode event types correctly in both the web client and HS. | Kegan Dougal | 2014-11-05 | 1 | -1/+1 |
| |_|_|/ |/| | | | |||||
* | | | | Fix pep8 warnings | Mark Haines | 2014-10-30 | 5 | -60/+84 |
| |_|/ |/| | | |||||
* | | | Fix pyflakes warnings | Mark Haines | 2014-10-27 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Coturn's timestamps are in seconds, not milliseconds | David Baker | 2014-10-21 | 1 | -1/+1 |
| | | |||||
* | | Make sure to return an empty JSON object ({}) from presence PUT/POST ↵ | Paul "LeoNerd" Evans | 2014-10-14 | 1 | -2/+2 |
|/ | | | | requests rather than an empty string ("") because most deserialisers won't like the latter | ||||
* | SYN-2: Allow server admins to delete room aliases | Erik Johnston | 2014-09-30 | 1 | -1/+19 |
| | |||||
* | SYN-48: Fix typo. Get the whois for requested user rather tahan the requester | Erik Johnston | 2014-09-29 | 1 | -1/+1 |
| | |||||
* | SYN-48: Implement WHOIS rest servlet | Erik Johnston | 2014-09-29 | 2 | -1/+50 |
| | |||||
* | Track the IP users connect with. Add an admin column to users table. | Erik Johnston | 2014-09-26 | 1 | -7/+1 |
| | |||||
* | Merge branch 'deletions' of github.com:matrix-org/synapse into develop | Erik Johnston | 2014-09-25 | 1 | -1/+37 |
|\ | |||||
| * | Rename deletions to redactions | Erik Johnston | 2014-09-24 | 1 | -6/+6 |
| | | |||||
| * | Add m.room.deletion. If an event is deleted it will be returned to clients ↵ | Erik Johnston | 2014-09-23 | 1 | -1/+37 |
| | | | | | | | | 'pruned', i.e. all client specified keys will be removed. | ||||
* | | Merge branch 'turn' into develop | David Baker | 2014-09-25 | 2 | -1/+62 |
|\ \ | |||||
| * | | Make turn server endpoint return an empty object if no turn servers to | David Baker | 2014-09-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | match the normal response. Don't break if the turn_uris option isn't present. | ||||
| * | | The REST API spec only alows for returning a single server so name the | David Baker | 2014-09-24 | 1 | -1/+1 |
| | | | | | | | | | | | | endpoint appropriately. | ||||
| * | | Oops | David Baker | 2014-09-24 | 1 | -1/+1 |
| | | | |||||
| * | | rename endpoint to better reflect what it is and allow specifying multiple uris | David Baker | 2014-09-24 | 1 | -5/+3 |
| | | | |||||
| * | | Use standard base64 encoding with padding to get the same result as | David Baker | 2014-09-24 | 1 | -2/+5 |
| | | | | | | | | | | | | coturn. | ||||
| * | | The config is not hierarchical | David Baker | 2014-09-23 | 1 | -3/+3 |
| | | | |||||
| * | | Add support for TURN servers as per the TURN REST API ↵ | David Baker | 2014-09-23 | 2 | -1/+61 |
| |/ | | | | | | | (http://tools.ietf.org/html/draft-uberti-behave-turn-rest-00) | ||||
* | | Bugfix for older Pythons that lack hmac.compare_digest() | Paul "LeoNerd" Evans | 2014-09-23 | 1 | -1/+11 |
| | | |||||
* | | Merge branch 'jira/SYN-60' into develop | Paul "LeoNerd" Evans | 2014-09-23 | 1 | -5/+38 |
|\ \ | |||||
| * | | Send an HMAC(SHA1) protecting the User ID for the ReCAPTCHA bypass, rather ↵ | Paul "LeoNerd" Evans | 2014-09-23 | 1 | -7/+26 |
| | | | | | | | | | | | | than simply the secret itself, so it's useless if that HMAC leaks | ||||
| * | | Config values are almost never 'None', but they might be empty string. ↵ | Paul "LeoNerd" Evans | 2014-09-23 | 1 | -1/+1 |
| | | | | | | | | | | | | Detect their presence by truth | ||||
| * | | Make sure the config actually /has/ a captcha_bypass_secret set before ↵ | Paul "LeoNerd" Evans | 2014-09-23 | 1 | -2/+3 |
| | | | | | | | | | | | | trying to compare it | ||||
| * | | Allow a (hidden undocumented) key to m.login.recaptcha to specify a shared ↵ | Paul "LeoNerd" Evans | 2014-09-23 | 1 | -5/+18 |
| |/ | | | | | | | secret to allow bots to bypass the ReCAPTCHA test (SYN-60) | ||||
* / | Implemented /rooms/$roomid/state API. | Kegan Dougal | 2014-09-23 | 1 | -6/+7 |
|/ | |||||
* | Comment out password reset for now, until the mechanism is fully discussed ↵ | Kegan Dougal | 2014-09-16 | 1 | -1/+1 |
| | | | | (IS token auth vs HS auth) | ||||
* | Added PasswordResetRestServlet. Hit the IS to confirm the email/user. Need ↵ | Kegan Dougal | 2014-09-16 | 1 | -0/+22 |
| | | | | to send email. | ||||
* | More helpful 400 error messages. | Kegan Dougal | 2014-09-15 | 1 | -1/+5 |
| | |||||
* | Be consistent when associating keys with login types for registration/login. | Kegan Dougal | 2014-09-15 | 1 | -1/+1 |
| | |||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Kegan Dougal | 2014-09-15 | 2 | -2/+2 |
|\ | | | | | | | registration-api-changes in preparation for re-merge to develop. | ||||
| * | Correctly handle the 'age' key in events and pdus | Erik Johnston | 2014-09-15 | 2 | -2/+2 |
| | | |||||
* | | Make captcha work again with the new registration logic. | Kegan Dougal | 2014-09-15 | 1 | -0/+1 |
| | | |||||
* | | Split out password/captcha/email logic. | Kegan Dougal | 2014-09-15 | 1 | -84/+153 |
| | | |||||
* | | Added LoginType constants. Created general structure for processing ↵ | Kegan Dougal | 2014-09-15 | 1 | -20/+75 |
|/ | | | | registrations. | ||||
* | Added captcha support on both the HS and web client. | Kegan Dougal | 2014-09-05 | 1 | -2/+34 |
|\ | | | | | | | Merge branch 'captcha' of github.com:matrix-org/synapse into develop | ||||
| * | 80 chars please | Kegan Dougal | 2014-09-05 | 1 | -2/+4 |
| | | |||||
| * | Add config opion for XFF headers when performing ReCaptcha auth. | Kegan Dougal | 2014-09-05 | 1 | -2/+5 |
| | | |||||
| * | Captchas now work on registration. Missing x-forwarded-for config arg ↵ | Kegan Dougal | 2014-09-05 | 1 | -3/+26 |
| | | | | | | | | support. Missing reloading a new captcha on the web client / displaying a sensible error message. | ||||
| * | Added a captcha config to the HS, to enable registration captcha checking ↵ | Kegan Dougal | 2014-09-05 | 1 | -1/+5 |
| | | | | | | | | and for the recaptcha private key. | ||||
* | | Generate m.room.aliases event when the HS creates a room alias | Erik Johnston | 2014-09-05 | 1 | -1/+4 |
|/ | |||||
* | Empty string is not a valid JSON object, so don't return them in HTTP responses. | Erik Johnston | 2014-09-05 | 3 | -7/+7 |
| | |||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into develop | David Baker | 2014-09-03 | 11 | -29/+67 |
|\ | | | | | | | | | Conflicts: synapse/http/client.py | ||||
| * | Implement a kick api | Erik Johnston | 2014-09-03 | 1 | -2/+5 |
| | | |||||
| * | fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org ↵ | Matthew Hodgson | 2014-09-03 | 11 | -11/+11 |
| | | | | | | | | hasn't been incorporated in time for launch. | ||||
| * | Bubble up SynapseErrors so expected failures aren't masked. | Kegan Dougal | 2014-09-03 | 1 | -0/+2 |
| | | |||||
| * | Add exception handling to directory servlet, so we don't 500. Mark directory ↵ | Kegan Dougal | 2014-09-03 | 1 | -2/+16 |
| | | | | | | | | API as volatile in the api docs. | ||||
| * | Fix up directory server to not require uploading room hosts. Update the room ↵ | Erik Johnston | 2014-09-03 | 1 | -1/+1 |
| | | | | | | | | hosts table with the current room hosts (if we have them) on GET. | ||||
| * | Kill the state | Paul "LeoNerd" Evans | 2014-09-03 | 1 | -5/+1 |
| | | | | | | | | ... key from all the Presence messages | ||||
| * | apidocs: mtime_age > last_active_ago. Presence REST: Sanity check values in ↵ | Kegan Dougal | 2014-09-03 | 1 | -0/+8 |
| | | | | | | | | invite/drop arrays. | ||||
| * | Edited /presence REST servlet to raise SynapseErrors to return a standard ↵ | Kegan Dougal | 2014-09-03 | 1 | -7/+12 |
| | | | | | | | | error response, rather than a string. | ||||
| * | Fixed /presence APIs to urldecode user IDs. | Kegan Dougal | 2014-09-03 | 1 | -1/+5 |
| | | |||||
| * | URL decode user IDs for /profile REST path segments. | Kegan Dougal | 2014-09-03 | 1 | -0/+6 |
| | | |||||
* | | Add support for registering with a threepid to the HS (get credentials from ↵ | David Baker | 2014-09-03 | 1 | -1/+6 |
|/ | | | | the client and check them against an ID server). | ||||
* | Add ban support: /rooms/$roomid/ban with { user_id : foo } | Kegan Dougal | 2014-09-03 | 1 | -2/+2 |
| | |||||
* | Order matters when adding REST servlets | Paul "LeoNerd" Evans | 2014-09-02 | 1 | -21/+21 |
| | |||||
* | Add rest endpoint for the whole user profile | David Baker | 2014-09-02 | 1 | -0/+21 |
| | |||||
* | Rename 'state' presence key to the much more obvious 'presence'; maintain a ↵ | Paul "LeoNerd" Evans | 2014-09-01 | 1 | -1/+5 |
| | | | | legacy 'state' copy for now | ||||
* | Support multiple login flows when deciding how to login. Updated cmdclient ↵ | Kegan Dougal | 2014-08-28 | 1 | -1/+1 |
| | | | | and spec. Webclient doesn't need updating for this. | ||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into develop | Erik Johnston | 2014-08-27 | 1 | -0/+46 |
|\ | |||||
| * | Added RestServlet for /rooms/$roomid/initialSync | Kegan Dougal | 2014-08-27 | 1 | -0/+30 |
| | | |||||
| * | Added RestServlet for /rooms/$roomid/state | Kegan Dougal | 2014-08-27 | 1 | -0/+16 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor | Erik Johnston | 2014-08-27 | 4 | -37/+14 |
|\| | |||||
| * | Renamed /ds to /directory | Kegan Dougal | 2014-08-27 | 1 | -1/+1 |
| | | |||||
| * | Renamed /public/rooms to /publicRooms | Kegan Dougal | 2014-08-27 | 3 | -36/+13 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor | Erik Johnston | 2014-08-27 | 3 | -31/+81 |
|\| | | | | | | | | | | | | | Conflicts: synapse/handlers/events.py synapse/rest/events.py synapse/rest/room.py | ||||
| * | Final url modifications: renamed /presence_list to /presence/list to keep ↵ | Kegan Dougal | 2014-08-27 | 1 | -1/+1 |
| | | | | | | | | the top-level namespace clean. Updated tests. | ||||
| * | Renamed /rooms to /createRoom. Removed ability to PUT raw room IDs, and ↵ | Kegan Dougal | 2014-08-27 | 1 | -17/+14 |
| | | | | | | | | removed tests which tested that. Updated cmdclient and webclient. | ||||
| * | Added support for GET /events/$eventid with auth checks. | Kegan Dougal | 2014-08-27 | 1 | -0/+17 |
| | | |||||
| * | Modified /join/$identifier to support $identifier being a room ID in ↵ | Kegan Dougal | 2014-08-27 | 1 | -13/+50 |
| | | | | | | | | addition to a room alias. | ||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor | Erik Johnston | 2014-08-26 | 2 | -112/+47 |
|\| | |||||
| * | Pepper UT TODOs | Kegan Dougal | 2014-08-26 | 2 | -0/+6 |
| | | |||||
| * | Feedback: Removed FeedbackRestServlet. Modified keys on FeedbackEvent. ↵ | Kegan Dougal | 2014-08-26 | 1 | -70/+0 |
| | | | | | | | | Expanded the feedback constants to fully explain what type of feedback they are. | ||||
| * | Removed MessageRestServlet, use RoomSendEventRestServlet instead. Updated ↵ | Kegan Dougal | 2014-08-26 | 1 | -49/+0 |
| | | | | | | | | cmdclient, tests and webclient. All appears to work. | ||||
| * | Added RoomSendEventRestServlet to send generic non-state events. It even ↵ | Kegan Dougal | 2014-08-26 | 1 | -2/+50 |
| | | | | | | | | appears to work..! | ||||
* | | WIP: Completely change how event streaming and pagination work. This ↵ | Erik Johnston | 2014-08-26 | 3 | -3/+5 |
|/ | | | | reflects the change in the underlying storage model. | ||||
* | Renaming: /im/sync >> /initialSync. /rooms/$roomid/members/list >> ↵ | Kegan Dougal | 2014-08-26 | 3 | -7/+8 |
| | | | | /rooms/$roomid/members. /rooms$roomid/messages/list >> /room/$roomid/messages. Updated cmdclient, tests and webclient. | ||||
* | Fix pyflakes errors | Mark Haines | 2014-08-26 | 1 | -1/+1 |
| | |||||
* | Implemented /rooms/$roomid/[invite|join|leave] with POST / PUT (incl txn ids) | Kegan Dougal | 2014-08-26 | 2 | -8/+35 |
| | |||||
* | Added basic in-memory REST transaction storage. Only the latest transaction ↵ | Kegan Dougal | 2014-08-26 | 3 | -2/+103 |
| | | | | for a given path/access_token combo is stored in order to prevent storing ALL request/response pairs. | ||||
* | Added servlet for /rooms/$roomid/[invite|join|leave] | Kegan Dougal | 2014-08-26 | 1 | -0/+40 |
| | |||||
* | Adjusted webclient to use new state paths. Updated membership msg template ↵ | Kegan Dougal | 2014-08-26 | 1 | -1/+2 |
| | | | | to actually show the person invited. Factored out common membership functions in matrix service. | ||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Kegan Dougal | 2014-08-26 | 1 | -2/+2 |
|\ | | | | | | | client_server_url_rename | ||||
| * | Encode unicode from json as utf-8. This was required to allow people to ↵ | Erik Johnston | 2014-08-24 | 1 | -2/+2 |
| | | | | | | | | register on my laptop | ||||
* | | Removed member list servlet: now using generic state paths. | Kegan Dougal | 2014-08-26 | 1 | -81/+22 |
| | | |||||
* | | Impl: /rooms/roomid/state/eventtype/state_key - Renamed RoomTopicRestServlet ↵ | Kegan Dougal | 2014-08-22 | 1 | -12/+35 |
|/ | | | | to RoomStateEventRestServlet. Support generic state event sending. | ||||
* | Kill the "_homeserver_" injected messages for room membership changes | Paul "LeoNerd" Evans | 2014-08-20 | 1 | -2/+2 |
| | |||||
* | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor | Erik Johnston | 2014-08-19 | 1 | -8/+10 |
|\ | | | | | | | | | | | | | Conflicts: tests/rest/test_presence.py tests/rest/test_rooms.py tests/utils.py | ||||
| * | More unquotes. Also, don't return the room_id on membership state changes, ↵ | Kegan Dougal | 2014-08-19 | 1 | -6/+8 |
| | | | | | | | | they already know it. | ||||
| * | Unquote sender IDs. | Kegan Dougal | 2014-08-19 | 1 | -2/+2 |
| | | |||||
* | | Add a 'backfill room' button | Erik Johnston | 2014-08-19 | 1 | -0/+16 |
| | | |||||
* | | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor | Erik Johnston | 2014-08-18 | 2 | -5/+9 |
|\| | |||||
| * | Update the default longpoll timeout time. | Kegan Dougal | 2014-08-18 | 1 | -1/+1 |
| | | |||||
| * | Precent lack of presence visiblity from causing room /members/list to fail | Paul "LeoNerd" Evans | 2014-08-18 | 1 | -4/+8 |
| | | |||||
* | | We don't need to do a json.loads here | Erik Johnston | 2014-08-18 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor | Erik Johnston | 2014-08-15 | 1 | -0/+7 |
|\| | |||||
| * | Also include users' presence when responding to /rooms/:room_id/members/list | Paul "LeoNerd" Evans | 2014-08-15 | 1 | -0/+7 |
| | | |||||
* | | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor | Erik Johnston | 2014-08-15 | 4 | -62/+19 |
|\| | | | | | | | | | Conflicts: synapse/storage/stream.py | ||||
| * | Pass back the user_id in the response to /login in case it has changed. ↵ | Kegan Dougal | 2014-08-14 | 1 | -0/+6 |
| | | | | | | | | Store and use that on the webclient rather than the input field. | ||||
| * | Added a urls module for keeping client and federation prefixes. | Kegan Dougal | 2014-08-14 | 1 | -2/+1 |
| | | |||||
| * | Make federation use resource_for_federation as well. | Kegan Dougal | 2014-08-14 | 2 | -47/+1 |
| | | |||||
| * | Start phasing out HttpServer: we should be using Resources instead. Added ↵ | Kegan Dougal | 2014-08-14 | 2 | -15/+13 |
| | | | | | | | | resource_for_client/federation/web_client to the HomeServer and hooked the C-S servlets to operate on resource_for_client. Dynamically construct the Resource tree. | ||||
* | | Start fixing places that use the data store. | Erik Johnston | 2014-08-14 | 1 | -18/+21 |
|/ | |||||
* | Implement directory service federation by Federation Queries; avoid ↵ | Paul "LeoNerd" Evans | 2014-08-13 | 1 | -7/+1 |
| | | | | local_only hack; add unit tests | ||||
* | Add a HomeServer.parse_roomalias() to avoid having to ↵ | Paul "LeoNerd" Evans | 2014-08-13 | 2 | -13/+6 |
| | | | | RoomAlias.from_sring(..., hs=hs) - similar to parse_userid() | ||||
* | Now that HS->HS Profile lookups use Federation Queries, we don't need the ↵ | Paul "LeoNerd" Evans | 2014-08-13 | 1 | -2/+0 |
| | | | | 'local_only' antirecursion hack | ||||
* | Added a -w flag which will host the web client if specified. Currently this ↵ | Kegan Dougal | 2014-08-13 | 3 | -43/+52 |
| | | | | just delegates to the webclient RestServlet. | ||||
* | add in whitespace after copyright statements to improve legibility | Matthew Hodgson | 2014-08-13 | 11 | -0/+11 |
| | |||||
* | actually register the login servlet (uncommitted code thinko?) | Matthew Hodgson | 2014-08-13 | 1 | -3/+2 |
| | |||||
* | Reference Matrix Home Server | matrix.org | 2014-08-12 | 11 | -0/+1129 |