summary refs log tree commit diff
path: root/synapse/rest/client/v1 (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Store Promise<Response> instead of Response for HTTP API transactionsKegan Dougal2016-11-103-82/+56
| | | | | | | | | | | | | | | | | | This fixes a race whereby: - User hits an endpoint. - No cached transaction so executes main code. - User hits same endpoint. - No cache transaction so executes main code. - Main code finishes executing and caches response and returns. - Main code finishes executing and caches response and returns. This race is common in the wild when Synapse is struggling under load. This commit fixes the race by: - User hits an endpoint. - Caches the promise to execute the main code and executes main code. - User hits same endpoint. - Yields on the same promise as the first request. - Main code finishes executing and returns, unblocking both requests.
* rest/client/v1/register: use the correct requester in createUserPatrik Oldsberg2016-10-061-3/+6
| | | | Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
* storage/appservice: make appservice methods only relying on the cache ↵Patrik Oldsberg2016-10-061-1/+1
| | | | synchronous
* Time out typing over federationErik Johnston2016-09-231-1/+4
|
* Support /initialSync in synchrotron workerErik Johnston2016-09-212-5/+4
|
* Enable guest access to POST /publicRoomsErik Johnston2016-09-171-2/+2
|
* Make POST /publicRooms require authErik Johnston2016-09-161-2/+1
|
* Change the way we calculate new_limit in /publicRooms and add POST APIErik Johnston2016-09-151-0/+29
|
* Remove default public rooms limitErik Johnston2016-09-151-1/+1
|
* By default limit /publicRooms to 100 entriesErik Johnston2016-09-151-1/+1
|
* Pass since/from parameters over federationErik Johnston2016-09-151-3/+3
|
* Allow paginating both forwards and backwardsErik Johnston2016-09-151-3/+15
|
* Remove support for aggregate room listsErik Johnston2016-09-151-1/+1
|
* Conform better to the CAS protocol specificationShell Turner2016-09-091-5/+2
| | | | | | | Redirect to CAS's /login endpoint properly, and don't require an <attributes> element. Signed-off-by: Shell Turner <cam.turn@gmail.com>
* Merge pull request #1096 from matrix-org/markjh/get_access_tokenMark Haines2016-09-093-16/+10
|\ | | | | Add helper function for getting access_tokens from requests
| * Add helper function for getting access_tokens from requestsMark Haines2016-09-093-16/+10
| | | | | | | | | | | | 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.
* | Filter returned events for client-facing formatPaul "LeoNerd" Evans2016-09-091-2/+3
| |
* | Allow clients to specify the format a room state event is returned inPaul "LeoNerd" Evans2016-09-091-1/+7
|/
* Use parse_stringErik Johnston2016-09-081-2/+2
|
* Add server param to /publicRoomsErik Johnston2016-09-081-5/+16
|
* Pass through user-supplied content in /join/$room_idKegan Dougal2016-08-231-0/+1
| | | | | | | It was always intended to allow custom keys on the join event, but this has at some point been lost. Restore it. If the user specifies keys like "avatar_url" then they will be clobbered.
* Make synchrotron accept /eventsErik Johnston2016-08-121-5/+4
|
* Dont invoke get_handlers fromClientV1RestServletErik Johnston2016-08-129-1/+86
| | | | | | hs.get_handlers() can not be invoked from split out processes. Moving the invocations down a level means that we can slowly split out individual servlets.
* Merge pull request #995 from matrix-org/rav/clean_up_cas_loginDavid Baker2016-08-091-125/+33
|\ | | | | Clean up CAS login code
| * Clean up CAS login codeRichard van der Hoff2016-08-081-125/+33
| | | | | | | | | | | | | | Remove some apparently unused code. Clean up parse_cas_response, mostly to catch the exception if the CAS response isn't valid XML.
* | Fix CAS loginRichard van der Hoff2016-08-081-0/+1
|/ | | | Attempting to log in with CAS was giving a 500 error.
* Implement deleting devicesRichard van der Hoff2016-07-261-3/+10
|
* Merge pull request #933 from matrix-org/rav/type_annotationsRichard van der Hoff2016-07-202-0/+8
|\ | | | | Type annotations
| * Type annotationsRichard van der Hoff2016-07-192-0/+8
| | | | | | | | | | Add some type annotations to help PyCharm (in particular) to figure out the types of a bunch of things.
* | Merge pull request #932 from matrix-org/rav/register_refactorDavid Baker2016-07-201-1/+3
|\ \ | | | | | | Further registration refactoring
| * | Further registration refactoringRichard van der Hoff2016-07-191-1/+3
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * `RegistrationHandler.appservice_register` no longer issues an access token: instead it is left for the caller to do it. (There are two of these, one in `synapse/rest/client/v1/register.py`, which now simply calls `AuthHandler.issue_access_token`, and the other in `synapse/rest/client/v2_alpha/register.py`, which is covered below). * In `synapse/rest/client/v2_alpha/register.py`, move the generation of access_tokens into `_create_registration_details`. This means that the normal flow no longer needs to call `AuthHandler.issue_access_token`; the shared-secret flow can tell `RegistrationHandler.register` not to generate a token; and the appservice flow continues to work despite the above change.
* | Merge pull request #922 from matrix-org/erikj/file_api2Erik Johnston2016-07-201-1/+10
|\ \ | |/ |/| Feature: Add filter to /messages. Add 'contains_url' to filter.
| * Add filter param to /messages APIErik Johnston2016-07-141-1/+10
| |
* | Add device_id support to /loginRichard van der Hoff2016-07-181-3/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | Add a 'devices' table to the storage, as well as a 'device_id' column to refresh_tokens. Allow the client to pass a device_id, and initial_device_display_name, to /login. If login is successful, then register the device in the devices table if it wasn't known already. If no device_id was supplied, make one up. Associate the device_id with the access token and refresh token, so that we can get at it again later. Ensure that the device_id is copied from the refresh token to the access_token when the token is refreshed.
* | Refactor login flowRichard van der Hoff2016-07-181-18/+23
| | | | | | | | | | | | | | | | | | | | Make sure that we have the canonical user_id *before* calling get_login_tuple_for_user_id. Replace login_with_password with a method which just validates the password, and have the caller call get_login_tuple_for_user_id. This brings the password flow into line with the other flows, and will give us a place to register the device_id if necessary.
* | Bug fix: expire invalid access tokensNegar Fazeli2016-07-131-1/+1
|/
* Add rest servlet. Fix SQL.Erik Johnston2016-07-061-0/+1
|
* Merge branch 'erikj/shared_secret' into erikj/test2Erik Johnston2016-07-061-4/+16
|\
| * Check that there are no null bytes in user and passswordErik Johnston2016-07-061-0/+6
| |
| * Add null separator to hmacErik Johnston2016-07-061-0/+2
| |
| * Add an admin option to shared secret registrationErik Johnston2016-07-051-0/+1
| |
| * Protect password when registering using shared secretErik Johnston2016-07-051-4/+7
| |
* | Add purge_history APIErik Johnston2016-07-051-0/+18
|/
* Fix style violationsKent Shikama2016-07-041-1/+2
| | | | Signed-off-by: Kent Shikama <kent@kentshikama.com>
* Use .get() instead of [] to access password_hashKent Shikama2016-07-041-1/+1
|
* Optionally include password hash in createUser endpointKent Shikama2016-07-031-1/+3
| | | | Signed-off-by: Kent Shikama <kent@kentshikama.com>
* Feature: Add deactivate account admin APIErik Johnston2016-06-301-0/+26
| | | | | | | | | | Allows server admins to "deactivate" accounts, which: - Revokes all access tokens - Removes all threepids - Removes password The API is a POST to `/admin/deactivate/<user_id>`
* Implement purge_media_cache admin APIErik Johnston2016-06-291-0/+32
|
* Remove redundant exception log in /eventsErik Johnston2016-06-091-24/+21
|
* Don't make rooms visibile by defaultErik Johnston2016-06-081-2/+0
|
* Log user that is making /publicRooms callsErik Johnston2016-06-081-0/+7
|
* Load push rules in storage layer, so that they get cachedErik Johnston2016-06-031-4/+2
|
* Working unsubscribe links going straight to the HSDavid Baker2016-06-021-1/+3
| | | | and authed by macaroons that let you delete pushers and nothing else
* Merge branch 'dbkr/split_out_auth_handler' into dbkr/email_unsubscribeDavid Baker2016-06-021-5/+6
|\
| * Split out the auth handlerDavid Baker2016-06-021-5/+6
| |
* | WIP on unsubscribing email notifs without logging inDavid Baker2016-06-011-1/+54
|/
* Basic, un-cached support for secondary_directory_serversDavid Baker2016-05-311-1/+2
|
* Split out the room list handlerDavid Baker2016-05-311-1/+1
| | | | So I can use it from federation bits without pulling in all the handlers.
* Allow clients to specify a server_name to avoid 'No known servers'Kegan Dougal2016-05-191-1/+4
| | | | Multiple server_names are supported via ?server_name=foo&server_name=bar
* Move typing handler out of the Handlers objectMark Haines2016-05-171-4/+3
|
* Move the presence handler out of the Handlers objectMark Haines2016-05-162-7/+15
|
* Create user with expiryNegi Fazeli2016-05-131-0/+71
| | | | | | - Add unittests for client, api and handler Signed-off-by: Negar Fazeli <negar.fazeli@ericsson.com>
* Make pyjwt dependency optionalErik Johnston2016-04-251-5/+7
|
* Merge pull request #687 from nikriek/jwt-fixErik Johnston2016-04-211-3/+6
|\ | | | | Fix issues with JWT login
| * Fix issues with JWT loginNiklas Riekenbrauck2016-04-211-3/+6
| |
* | Make the /set part mandatoryDavid Baker2016-04-121-1/+1
| |
* | Mis-named functionDavid Baker2016-04-121-1/+1
| |
* | Split into separate servlet classesDavid Baker2016-04-121-11/+16
| |
* | Add get endpoint for pushersDavid Baker2016-04-111-1/+34
|/ | | | As per https://github.com/matrix-org/matrix-doc/pull/308
* Remove spurious commentErik Johnston2016-03-301-1/+0
|
* Require user to have left room to forget roomErik Johnston2016-03-301-0/+38
| | | | | This dramatically simplifies the forget API code - in particular it no longer generates a leave event.
* Add JWT supportNiklas Riekenbrauck2016-03-291-0/+53
|
* Add published room list edit APIErik Johnston2016-03-211-0/+42
|
* Update aliases event after deletionErik Johnston2016-03-171-1/+2
| | | | | | | | Attempt to update the appropriate `m.room.aliases` event after deleting an alias. This may fail due to the deleter not being in the room. Will also check if the canonical alias of the event is set to the deleted alias, and if so will attempt to delete it.
* Hook up adding a pusher to the notifier for replication.Mark Haines2016-03-151-0/+6
|
* Fix regression where synapse checked whether push rules were valid JSON ↵Mark Haines2016-03-141-2/+2
| | | | before the compatibility hack that handled clients sending invalid JSON
* Merge pull request #642 from matrix-org/erikj/logoutErik Johnston2016-03-111-0/+72
|\ | | | | Implement logout
| * Implement logoutErik Johnston2016-03-111-0/+72
| |
* | Use parse_json_object_from_request to parse JSON out of request bodiesMark Haines2016-03-113-22/+13
|/
* Add a parse_json_object functionMark Haines2016-03-096-83/+21
| | | | | to deduplicate all the copy+pasted _parse_json functions. Also document the parse_.* functions.
* Fix relative imports so they work in both py3 and py27Mark Haines2016-03-086-6/+6
|
* Use syntax that works on both py2.7 and py3Mark Haines2016-03-071-1/+1
|
* Merge branch 'develop' into markjh/pushrule_streamMark Haines2016-03-043-10/+11
|\
| * Merge pull request #614 from matrix-org/erikj/alias_deleteErik Johnston2016-03-041-3/+0
| |\ | | | | | | Allow alias creators to delete aliases
| | * Allow alias creators to delete aliasesErik Johnston2016-03-011-3/+0
| | |
| * | Pass whole requester to ratelimitingDaniel Wagner-Hall2016-03-033-7/+11
| |/ | | | | | | This will enable more detailed decisions
* | Hook up the push rules stream to account_data in /syncMark Haines2016-03-041-1/+1
| |
* | Move the code for formatting push rules into a separate functionMark Haines2016-03-031-86/+4
| |
* | Hook up the push rules to the notifierMark Haines2016-03-031-15/+29
|/
* Add support for changing the actions for default rulesMark Haines2016-02-261-4/+27
| | | | | | See matrix-org/matrix-doc#283 Works by adding dummy rules to the push rules table with a negative priority class and then using those rules to clobber the default rule actions when adding the default rules in ``list_with_base_rules``
* Fix to appease the PEP8 dragonGergely Polonkai2016-02-261-1/+3
|
* Add error codes for malformed/bad JSON in /loginGergely Polonkai2016-02-261-2/+2
| | | | Signed-off-by: Gergely Polonkai <gergely@polonkaieu>
* Make sure we return a JSON object when returning the values of specif…Mark Haines2016-02-251-1/+3
| | | | …ic keys from a push rule
* Remove unused get_rule_attr methodMark Haines2016-02-241-8/+0
|
* Ignore invalid POST bodies when joining roomsDaniel Wagner-Hall2016-02-241-2/+12
|
* Allow third_party_signed to be specified on /joinDaniel Wagner-Hall2016-02-231-0/+4
|
* Merge pull request #582 from matrix-org/erikj/presenceErik Johnston2016-02-192-22/+22
|\ | | | | Rewrite presence for performance.
| * "You are not..."Erik Johnston2016-02-181-1/+1
| |
| * Initial cutErik Johnston2016-02-172-22/+22
| |
* | Remove dead code for setting device specific rules.Mark Haines2016-02-182-88/+8
| | | | | | | | | | | | It wasn't possible to hit the code from the API because of a typo in parsing the request path. Since no-one was using the feature we might as well remove the dead code.
* | Merge branch 'develop' into daniel/roomcleanupincrementalDaniel Wagner-Hall2016-02-172-2/+2
|\| | | | | | | | | Conflicts: synapse/rest/client/v1/room.py
| * client/v1/room: include event_id in response to state event PUT, in ↵Patrik Oldsberg2016-02-171-2/+2
| | | | | | | | | | | | accordance with the spec Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
| * Fix typo in request validation for adding push rules.Mark Haines2016-02-161-1/+1
| |
| * Simplify room creation codeDaniel Wagner-Hall2016-02-151-15/+3
| |
* | Some cleanupDaniel Wagner-Hall2016-02-171-3/+3
| | | | | | | | | | I'm not particularly happy with the "action" switching, but there's no convenient way to defer the work that needs to happen after it, so... :(
* | Branch off member and non member sendsDaniel Wagner-Hall2016-02-151-5/+16
| | | | | | | | Unclean, needs tidy-up, but works
* | Simplify room creation codeDaniel Wagner-Hall2016-02-151-15/+3
| |
* | Reuse update_membership from /joinDaniel Wagner-Hall2016-02-151-16/+5
| |
* | Merge implementation of /join by alias or IDDaniel Wagner-Hall2016-02-151-37/+31
| | | | | | | | | | This code is kind of rough (passing the remote servers down a long chain), but is a step towards improvement.
* | Merge some room joining codepathsDaniel Wagner-Hall2016-02-151-1/+1
|/ | | | | | Force joining by alias to go through the send_membership_event checks, rather than bypassing them straight into _do_join. This is the first of many stages of cleanup.
* Revert "Merge two of the room join codepaths"Daniel Wagner-Hall2016-02-121-13/+55
| | | | | | This reverts commit cf81375b94c4763766440471e632fc4b103450ab. It subtly violates a guest joining auth check
* Merge two of the room join codepathsDaniel Wagner-Hall2016-02-121-55/+13
| | | | | | | | | | | | | There's at least one more to merge in. Side-effects: * Stop reporting None as displayname and avatar_url in some cases * Joining a room by alias populates guest-ness in join event * Remove unspec'd PUT version of /join/<room_id_or_alias> which has not been called on matrix.org according to logs * Stop recording access_token_id on /join/room_id - currently we don't record it on /join/room_alias; I can try to thread it through at some point.
* Catch the exceptions thrown by twisted when you write to a closed connectionMark Haines2016-02-121-4/+6
|
* Revert "Reject additional path segments"Daniel Wagner-Hall2016-02-093-6/+6
| | | | | | This reverts commit 1d19a5ec0fff73af9cee8c21118020b31be47379. iOS Console is apparently relying on these paths.
* Reject additional path segmentsDaniel Wagner-Hall2016-02-083-6/+6
|
* Merge pull request #557 from matrix-org/dbkr/profile_dont_return_nullDavid Baker2016-02-041-6/+17
|\ | | | | Omit keys rather then returning null in profile API
| * No braces hereDavid Baker2016-02-031-1/+1
| |
| * Don't return null if profile display name / avatar url isn't set: omit them ↵David Baker2016-02-031-6/+17
| | | | | | | | instead
* | Remove old log lineErik Johnston2016-02-031-2/+0
|/
* Rename config field to reflect yaml nameDaniel Wagner-Hall2016-02-031-2/+2
|
* Fix flake8 warnings for new flake8Daniel Wagner-Hall2016-02-023-4/+5
|
* Fix adding push rules relative to other rulesMark Haines2016-01-271-5/+10
|
* Add missing yield in push_rules set enabledMark Haines2016-01-251-2/+2
|
* Allow non-guests to peek on rooms using /eventsDaniel Wagner-Hall2016-01-202-4/+3
|
* Take a deepcopy of push rules before mutating themErik Johnston2016-01-191-1/+3
|
* Use static for const dictsErik Johnston2016-01-181-1/+7
|
* Remove internal idsErik Johnston2016-01-181-0/+4
|
* Require unbanning before other membership changesDaniel Wagner-Hall2016-01-151-39/+12
|
* Merge branch 'release-v0.12.1' into developRichard van der Hoff2016-01-141-0/+6
|\
| * Add 'event' result to 'context' endpointRichard van der Hoff2016-01-131-0/+6
| | | | | | | | ... because the context isn't much use without the event.
* | Fix enabling & disabling push rulesDavid Baker2016-01-141-1/+1
| |
* | Rename 'user_name' to 'user_id' in push to make it consistent with the rest ↵Mark Haines2016-01-132-7/+7
| | | | | | | | of the code
* | Introduce a Requester objectDaniel Wagner-Hall2016-01-1110-85/+113
| | | | | | | | | | | | | | | | | | 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.
* | copyrightsMatthew Hodgson2016-01-0715-15/+15
|/
* Expose /login under r0Richard van der Hoff2016-01-021-1/+1
| | | | The spec says /login should be available at r0 and 'unstable', so make it so.
* Missing yieldMark Haines2015-12-101-1/+1
|
* Actually host r0 and unstable prefixesDaniel Wagner-Hall2015-12-081-30/+0
|
* also do more structured loggingDavid Baker2015-12-071-0/+1
|
* pep8David Baker2015-12-071-0/+1
|
* Add logging to pushers API to log the body of the requestDavid Baker2015-12-071-0/+4
|
* Take object not boolDaniel Wagner-Hall2015-12-071-0/+5
| | | | | | Allows bool as legacy fallback See https://github.com/matrix-org/matrix-doc/pull/212
* Merge pull request #415 from matrix-org/daniel/endpointsDaniel Wagner-Hall2015-12-034-32/+8
|\ | | | | Merge pull request #415 from matrix-org/daniel/endpoints
| * Update endpoints to reflect current specDaniel Wagner-Hall2015-12-024-32/+8
| |
* | Fix implementation of /admin/whoisDaniel Wagner-Hall2015-12-021-1/+1
|/
* Reuse a single http client, rather than creating new onesMark Haines2015-12-021-5/+2
|
* Host /unstable and /r0 versions of r0 APIsDaniel Wagner-Hall2015-12-0113-77/+83
|
* Rename presence_handler.send_invite to presence_handler.send_presence_invite ↵Mark Haines2015-12-011-1/+1
| | | | to distinguish it from normal invites
* Merge pull request #385 from matrix-org/daniel/forgetroomsMark Haines2015-11-201-3/+10
|\ | | | | Allow users to forget rooms
| * Allow users to forget roomsDaniel Wagner-Hall2015-11-171-3/+10
| |
* | CommentErik Johnston2015-11-201-0/+8
| |
* | Remove m.login.token from advertised flows.Erik Johnston2015-11-191-1/+2
|/
* Merge branch 'develop' into sh-cas-auth-via-homeserverSteven Hammerton2015-11-172-13/+31
|\
| * Allow guests to /room/:room_id/{join,leave}Daniel Wagner-Hall2015-11-131-3/+14
| |
| * Merge pull request #360 from matrix-org/daniel/guestroominitialsyncDaniel Wagner-Hall2015-11-121-1/+2
| |\ | | | | | | | | | | | | Merge pull request #360 from matrix-org/daniel/guestroominitialsync Allow guest access to room initialSync
| | * Allow guest access to room initialSyncDaniel Wagner-Hall2015-11-111-1/+2
| | |
| * | Allow guests to set their display namesDaniel Wagner-Hall2015-11-121-1/+1
| | | | | | | | | | | | | | | Depends: https://github.com/matrix-org/synapse/pull/363 Tests in https://github.com/matrix-org/sytest/pull/66
| * | Allow guests to access room context APIDaniel Wagner-Hall2015-11-111-2/+2
| |/
| * Allow guest users to join and message roomsDaniel Wagner-Hall2015-11-101-3/+10
| |
| * Merge pull request #356 from matrix-org/daniel/3pidyetagainDaniel Wagner-Hall2015-11-101-2/+1
| |\ | | | | | | Get display name from identity server, not client
| | * Get display name from identity server, not clientDaniel Wagner-Hall2015-11-091-2/+1
| | |
| * | Add a couple of unit tests for room/<x>/messagesRichard van der Hoff2015-11-091-1/+1
| |/ | | | | | | ... merely because I was trying to figure out how it worked, and couldn't.
* | Snakes not camelsSteven Hammerton2015-11-111-5/+5
| |
* | Minor review fixesSteven Hammerton2015-11-111-13/+10
| |
* | Merge branch 'develop' into sh-cas-auth-via-homeserverSteven Hammerton2015-11-052-17/+25
|\|
| * Merge pull request #350 from matrix-org/erikj/searchErik Johnston2015-11-051-1/+2
| |\ | | | | | | Implement pagination, order by and groups in search
| | * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/searchErik Johnston2015-11-0510-31/+43
| | |\
| | * | Implement basic pagination for search resultsErik Johnston2015-11-051-1/+2
| | | |
| * | | Exchange 3pid invites for m.room.member invitesDaniel Wagner-Hall2015-11-051-12/+8
| | |/ | |/|
| * | Open up /events to anonymous users for room events onlyDaniel Wagner-Hall2015-11-052-4/+15
| | | | | | | | | | | | Squash-merge of PR #345 from daniel/anonymousevents
* | | Allow hs to do CAS login completely and issue the client with a login token ↵Steven Hammerton2015-11-051-1/+144
|/ / | | | | | | that can be redeemed for the usual successful login response
* / Allow guests to register and call /events?room_id=Daniel Wagner-Hall2015-11-0410-30/+31
|/ | | | | | | 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.
* Add room context apiErik Johnston2015-10-281-0/+36
|
* Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into developErik Johnston2015-10-231-1/+7
|\
| * Add config option to disable password loginErik Johnston2015-10-221-1/+7
| |
* | Use 403 and message to match handlers/authKegan Dougal2015-10-211-3/+1
| |
* | Don't 500 when the email doesn't map to a valid user ID.Kegan Dougal2015-10-201-0/+4
| |
* | Merge pull request #307 from matrix-org/erikj/searchErik Johnston2015-10-191-0/+17
|\ \ | | | | | | Add basic search API
| * \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/searchErik Johnston2015-10-161-5/+31
| |\ \
| * \ \ Merge branch 'erikj/store_engine' into erikj/searchErik Johnston2015-10-131-27/+57
| |\ \ \ | | | |/ | | |/|
| * | | Merge remote-tracking branch 'origin/develop' into erikj/searchErik Johnston2015-10-122-2/+78
| |\ \ \
| * | | | Keep FTS indexes up to date. Only search through rooms currently joinedErik Johnston2015-10-121-1/+1
| | | | |
| * | | | Add basic full text search impl.Erik Johnston2015-10-091-0/+17
| | | | |
* | | | | Merge pull request #306 from matrix-org/markjh/unused_methodsMark Haines2015-10-161-30/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | | Remove some login classes from synapse.
| * | | | synapse.client.v1.login.LoginFallbackRestServlet and ↵Mark Haines2015-10-151-30/+0
| | |_|/ | |/| | | | | | | | | | synapse.client.v1.login.PasswordResetRestServlet are unused
* | | | Remove unnecessary class-wrappingDaniel Wagner-Hall2015-10-131-5/+6
| | | |
* | | | Move logic into handlerDaniel Wagner-Hall2015-10-131-115/+18
| | | |
* | | | Add loggingDaniel Wagner-Hall2015-10-131-2/+2
| | | |
* | | | Move event contents into third_party_layout fieldDaniel Wagner-Hall2015-10-131-1/+2
| | | |
* | | | Merge branch 'develop' into daniel/3pidinvitesDaniel Wagner-Hall2015-10-132-2/+108
|\| | |
| * | | Add a comment to clarify why we split on closing curly brace when reading ↵Steven Hammerton2015-10-121-0/+5
| | | | | | | | | | | | | | | | CAS attribute tags
| * | | Unpack dictionary in for loop for nicer syntaxSteven Hammerton2015-10-121-4/+4
| | | |
| * | | Remove not required parenthesisSteven Hammerton2015-10-121-1/+1
| | | |
| * | | Support multiple required attributes in CAS response, and in a nicer config ↵Steven Hammerton2015-10-121-7/+6
| | | | | | | | | | | | | | | | format too
| * | | Allow optional config params for a required attribute and it's value, if ↵Steven Hammerton2015-10-121-1/+15
| | | | | | | | | | | | | | | | specified any CAS user must have the given attribute and the value must equal
| * | | Parse both user and attributes from CAS responseSteven Hammerton2015-10-121-26/+38
| | |/ | |/|
| * | Raise LoginError if CasResponse doensn't contain userSteven Hammerton2015-10-101-1/+1
| | |
| * | Fix my broken line splittingSteven Hammerton2015-10-101-4/+6
| | |
| * | Use UserId to create FQ user idSteven Hammerton2015-10-101-1/+1
| | |
| * | Add get_raw method to SimpleHttpClient, use this in CAS auth rather than ↵Steven Hammerton2015-10-101-5/+8
| | | | | | | | | | | | requests
| * | Formatting changesSteven Hammerton2015-10-101-5/+12
| | |
| * | Provide ability to login using CASSteven Hammerton2015-10-101-1/+63
| | |
| * | Use 'true' rather than '1' for archived flagMark Haines2015-10-081-1/+1
| | |
| * | Add a flag to initial sync to indicate we want rooms that the user has leftMark Haines2015-10-081-1/+3
| |/
* | Fix lint errorsDaniel Wagner-Hall2015-10-061-3/+4
| |
* | Implement third party identifier invitesDaniel Wagner-Hall2015-10-011-6/+126
|/
* Remove undocumented and unimplemented 'feedback' parameter from the ↵Mark Haines2015-09-092-4/+0
| | | | Client-Server API
* Allow users that have left the room to view the member list from the point ↵Mark Haines2015-09-091-5/+13
| | | | they left
* Merge erikj/user_dedup to developDaniel Wagner-Hall2015-08-261-2/+3
|
* Merge pull request #248 from matrix-org/deviceidDaniel Wagner-Hall2015-08-259-32/+32
|\ | | | | Remove completely unused concepts from codebase
| * Remove completely unused concepts from codebaseDaniel Wagner-Hall2015-08-259-32/+32
| | | | | | | | | | | | | | | | | | | | 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 librariesMark Haines2015-08-241-1/+1
|/
* Return fully qualified user_id as per specDavid Baker2015-08-201-1/+1
|
* Merge branch 'develop' into refreshDaniel Wagner-Hall2015-08-201-4/+11
|\ | | | | | | | | Conflicts: synapse/rest/client/v1/login.py
| * Comma comma comma comma comma chameleonDavid Baker2015-08-201-1/+1
| |
| * Merge branch 'develop' into email_loginDavid Baker2015-08-201-3/+2
| |\
| * | Allow sign in using email addressDavid Baker2015-08-041-5/+12
| | |
* | | /tokenrefresh POST endpointDaniel Wagner-Hall2015-08-201-2/+4
| |/ |/| | | | | | | | | | | | | 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.
* | Simplify LoginHander and AuthHandlerDaniel Wagner-Hall2015-08-121-3/+2
|/ | | | | | | | | * 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
* Remove semicolon.Kegan Dougal2015-07-201-1/+1
|
* Parse the ID given to /invite|ban|kick to make sure it looks like a user ID.Kegan Dougal2015-07-201-0/+2
|
* Small tweaks to SAML2 configuration.Erik Johnston2015-07-101-4/+4
| | | | | - Add saml2 config docs to default config. - Use existence of saml2 config to indicate if saml2 should be enabled.
* Make SAML2 optional and add some references/commentsMuthu Subramanian2015-07-091-4/+9
|
* code beautifyMuthu Subramanian2015-07-091-9/+4
|
* code beautifyMuthu Subramanian2015-07-081-10/+23
|
* Integrate SAML2 basic authentication - uses pysaml2Muthu Subramanian2015-07-081-1/+61
|
* Remove access_token from synapse.rest.client.v1.transactions ↵Erik Johnston2015-06-161-3/+3
| | | | {get,store}_response logging
* Add config option to turn off freezing events. Use new encode_json api and ↵Erik Johnston2015-05-291-1/+1
| | | | ujson.loads
* SYN-390: Don't modify the dictionary returned from the data storeMark Haines2015-05-261-5/+8
|
* Allow multiple pushers for a single app ID & pushkey, honouring the 'append' ↵David Baker2015-03-251-1/+12
| | | | flag in the API.
* 1) Pushers are now associated with an access tokenDavid Baker2015-03-242-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.
* Factor out user id validation checksErik Johnston2015-03-181-9/+5
|
* Do more validation of incoming requestErik Johnston2015-03-181-3/+3
|
* Use 403 instead of 400Erik Johnston2015-03-161-1/+1
|
* Implement registering with shared secret.Erik Johnston2015-03-131-2/+55
|
* Add the master push rule for the break-my-push button. Allow server default ↵David Baker2015-03-101-1/+4
| | | | rules to be disabled by default.
* s/user_name/user/ as per mjark's commentDavid Baker2015-03-021-3/+3
|
* Oops, missed a replacement.David Baker2015-03-021-1/+1
|
* Blank linesDavid Baker2015-03-021-0/+1
|
* It's set_tweak now, not set_soundDavid Baker2015-02-271-1/+1
|
* Add API for getting/setting enabled-ness of push rules.David Baker2015-02-261-5/+49
|
* SYWEB-278 Don't allow rules with no rule_id.David Baker2015-02-251-1/+1
|
* Always allow AS to registerErik Johnston2015-02-201-3/+5
|
* Disable registration if config option was set.Erik Johnston2015-02-191-0/+4
|
* Merge pull request #50 from matrix-org/application-servicesMark Haines2015-02-132-14/+70
|\ | | | | Application Services
| * Merge branch 'develop' into application-servicesKegan Dougal2015-02-113-8/+16
| |\
| * \ Merge branch 'develop' into application-servicesKegan Dougal2015-02-091-1/+1
| |\ \
| * | | Grant ASes the ability to delete aliases in their own namespace.Kegan Dougal2015-02-061-2/+29
| | | |
| * | | Grant ASes the ability to create alias in their own namespace.Kegan Dougal2015-02-061-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 Dougal2015-02-051-1/+23
| | | | | | | | | | | | | | | | | | | | This allows known application services to register any user ID under their own user namespace(s).
* | | | Blunty replace json with simplejsonErik Johnston2015-02-118-8/+8
| |_|/ |/| |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-14 22:03:01 +0000