summary refs log tree commit diff
path: root/synapse/handlers (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Add API for setting account_data globaly or on a per room basisMark Haines2015-12-013-22/+111
|
* Merge pull request #404 from matrix-org/markjh/trivial_renameMark Haines2015-12-011-1/+1
|\ | | | | Rename presence_handler.send_invite
| * Rename presence_handler.send_invite to presence_handler.send_presence_invite ↵Mark Haines2015-12-011-1/+1
| | | | | | | | to distinguish it from normal invites
* | Tidy up a bitErik Johnston2015-12-011-8/+9
| |
* | Allow paginating search ordered by recentsErik Johnston2015-11-301-68/+60
|/
* Return words to highlight in search resultsErik Johnston2015-11-271-3/+16
|
* Merge pull request #375 from matrix-org/daniel/guestroominitialsyncDaniel Wagner-Hall2015-11-231-10/+15
|\ | | | | Clean up room initialSync for guest users
| * Clean up room initialSync for guest usersDaniel Wagner-Hall2015-11-131-10/+15
| |
* | Merge pull request #385 from matrix-org/daniel/forgetroomsMark Haines2015-11-202-1/+12
|\ \ | | | | | | Allow users to forget rooms
| * \ Merge branch 'develop' into daniel/forgetroomsPaul "LeoNerd" Evans2015-11-194-24/+24
| |\ \
| * | | Simplify codeDaniel Wagner-Hall2015-11-191-1/+1
| | | |
| * | | Apply forgetting properly to historical eventsDaniel Wagner-Hall2015-11-181-1/+9
| | | |
| * | | Allow users to forget roomsDaniel Wagner-Hall2015-11-171-0/+3
| | | |
* | | | Add option to include the current room stateErik Johnston2015-11-201-0/+24
| | | |
* | | | Optionally include historic profile infoErik Johnston2015-11-201-1/+30
| |/ / |/| |
* | | Merge pull request #386 from matrix-org/markjh/rename_pud_to_account_dataMark Haines2015-11-193-23/+23
|\ \ \ | | | | | | | | s/private_user_data/account_data/
| * | | s/private_user_data/account_data/Mark Haines2015-11-183-23/+23
| |/ /
* / / Take a boolean not a list of lambdasDaniel Wagner-Hall2015-11-191-1/+1
|/ /
* | Merge branch 'develop' into sh-cas-auth-via-homeserverSteven Hammerton2015-11-176-140/+278
|\|
| * Fix a few race conditions in the state calculationRichard van der Hoff2015-11-131-60/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Be a bit more careful about how we calculate the state to be returned by /sync. In a few places, it was possible for /sync to return slightly later state than that represented by the next_batch token and the timeline. In particular, the following cases were susceptible: * On a full state sync, for an active room * During a per-room incremental sync with a timeline gap * When the user has just joined a room. (Refactor check_joined_room to make it less magical) Also, use store.get_state_for_events() (and thus the existing stategroups) to calculate the state corresponding to a particular sync position, rather than state_handler.compute_event_context(), which recalculates from first principles (and tends to miss some state). Merged from PR https://github.com/matrix-org/synapse/pull/372
| * Make handlers.sync return a state dictionary, instead of an event list.Richard van der Hoff2015-11-131-31/+39
| | | | | | | | | | | | | | | | | | Basically this moves the process of flattening the existing dictionary into a list up to rest.client.*, instead of doing it in handlers.sync. This simplifies a bit of the code in handlers.sync, but it is also going to be somewhat beneficial in the next stage of my hacking on SPEC-254. Merged from PR #371
| * Update some commentsRichard van der Hoff2015-11-132-10/+30
| | | | | | | | | | | | | | Add a couple of type annotations, docstrings, and other comments, in the interest of keeping track of what types I have. Merged from pull request #370.
| * Fix missing profile data in federation joinsErik Johnston2015-11-122-5/+9
| | | | | | | | | | There was a regression where we stopped including profile data in initial joins for rooms joined over federation.
| * Merge pull request #367 from matrix-org/daniel/readafterleaveDaniel Wagner-Hall2015-11-121-10/+11
| |\ | | | | | | | | | | | | Merge pull request #367 from matrix-org/daniel/readafterleave Tweak guest access permissions
| | * Tweak guest access permissionsDaniel Wagner-Hall2015-11-121-10/+11
| | | | | | | | | | | | | | | | | | * Allow world_readable rooms to be read by guests who have joined and left * Allow regular users to access world_readable rooms
| * | Merge pull request #360 from matrix-org/daniel/guestroominitialsyncDaniel Wagner-Hall2015-11-121-23/+32
| |\ \ | | |/ | |/| | | | | | | 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-23/+32
| | |
| * | Consider joined guest users as joined usersDaniel Wagner-Hall2015-11-121-12/+21
| | | | | | | | | | | | | | | Otherwise they're inconveniently allowed to write events to the room but not to read them from the room.
| * | Allow guests to access room context APIDaniel Wagner-Hall2015-11-111-3/+9
| |/
| * Allow guest users to join and message roomsDaniel Wagner-Hall2015-11-105-9/+81
| |
| * Merge pull request #356 from matrix-org/daniel/3pidyetagainDaniel Wagner-Hall2015-11-101-5/+3
| |\ | | | | | | Get display name from identity server, not client
| | * Get display name from identity server, not clientDaniel Wagner-Hall2015-11-091-5/+3
| | |
| * | Don't fiddle with results returned by event sourcesRichard van der Hoff2015-11-091-4/+12
| | | | | | | | | | | | | | | | | | Overwriting hashes returned by other methods is poor form. Fixes: SYN-516
| * | SYN-513: Include updates for rooms that have had all their tags deletedMark Haines2015-11-091-1/+1
| |/
* | Minor review fixesSteven Hammerton2015-11-111-4/+4
| |
* | Share more code between macaroon validationSteven Hammerton2015-11-111-48/+7
| |
* | Merge branch 'develop' into sh-cas-auth-via-homeserverSteven Hammerton2015-11-0511-91/+357
|\|
| * Merge pull request #350 from matrix-org/erikj/searchErik Johnston2015-11-051-18/+183
| |\ | | | | | | Implement pagination, order by and groups in search
| | * Be explicit about what we're doingErik Johnston2015-11-051-1/+1
| | |
| | * Remove redundant testErik Johnston2015-11-051-1/+0
| | |
| | * Increment by one, not fiveErik Johnston2015-11-051-1/+1
| | |
| | * COMMENTSErik Johnston2015-11-051-4/+26
| | |
| | * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/searchErik Johnston2015-11-0512-119/+165
| | |\
| | * | Implement basic pagination for search resultsErik Johnston2015-11-051-13/+65
| | | |
| | * | Implement order and group byErik Johnston2015-11-041-17/+109
| | | |
| * | | Exchange 3pid invites for m.room.member invitesDaniel Wagner-Hall2015-11-053-37/+92
| | |/ | |/|
| * | Open up /events to anonymous users for room events onlyDaniel Wagner-Hall2015-11-059-36/+82
| | | | | | | | | | | | 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-3/+73
|/ / | | | | | | that can be redeemed for the usual successful login response
* | Merge branch 'develop' of github.com:matrix-org/synapse into developDaniel Wagner-Hall2015-11-044-30/+2
|\ \
| * \ Merge branch 'develop' into daniel/removesomeliesMark Haines2015-11-044-24/+151
| |\ \ | | | | | | | | | | | | | | | | Conflicts: synapse/notifier.py
| | * | Remove the LockManager class because it wasn't being usedMark Haines2015-11-041-2/+0
| | |/
| * | Remove more unused parametersDaniel Wagner-Hall2015-11-022-2/+0
| | |
| * | Remove unused arguments and codeDaniel Wagner-Hall2015-11-022-26/+2
| | |
* | | Allow guests to register and call /events?room_id=Daniel Wagner-Hall2015-11-044-55/+83
| |/ |/| | | | | | | | | | | 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.
* | Merge branch 'develop' into markjh/v2_sync_receiptsMark Haines2015-11-033-12/+126
|\ \ | | | | | | | | | | | | Conflicts: synapse/handlers/sync.py
| * | Include room tags in v2 /syncMark Haines2015-11-021-11/+58
| | |
| * | Store room tag content and return the content in the m.tag eventMark Haines2015-11-021-4/+2
| | |
| * | Merge branch 'develop' into markjh/room_tagsMark Haines2015-11-024-23/+152
| |\|
| * | Include tags in v1 room initial syncMark Haines2015-10-301-0/+11
| | |
| * | Include room tags v1 /initialSyncMark Haines2015-10-301-0/+12
| | |
| * | Inform the client of new room tags using v1 /eventsMark Haines2015-10-291-0/+46
| | |
* | | Include read receipts in v2 syncMark Haines2015-11-021-15/+30
| |/ |/|
* | Update the other place check_joined_room is calledMark Haines2015-10-301-1/+1
| |
* | Don't mark newly joined room timelines as limited in an incremental syncMark Haines2015-10-291-3/+5
| |
* | Make search API honour limit set in filterErik Johnston2015-10-291-0/+3
| |
* | Merge pull request #336 from matrix-org/erikj/searchErik Johnston2015-10-281-1/+52
|\ \ | | | | | | Optionally return event contexts with search results
| * | Optionally return event contexts with search resultsErik Johnston2015-10-281-1/+52
| | |
* | | Merge pull request #334 from matrix-org/erikj/context_apiErik Johnston2015-10-282-1/+57
|\| | | | | | | | Add room context api
| * | DocsErik Johnston2015-10-281-0/+13
| | |
| * | Add room context apiErik Johnston2015-10-282-1/+44
| |/
* / Implement full_state incremental syncRichard van der Hoff2015-10-261-17/+34
|/ | | | | | | | A hopefully-complete implementation of the full_state incremental sync, as specced at https://github.com/matrix-org/matrix-doc/pull/133. This actually turns out to be a relatively simple modification to the initial sync implementation.
* Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into developErik Johnston2015-10-231-7/+1
|\
| * Fix receipts for room initial syncErik Johnston2015-10-221-7/+1
| |
* | RenameErik Johnston2015-10-221-3/+3
| |
* | Use namedtuple as return valueErik Johnston2015-10-221-1/+3
| |
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/searchErik Johnston2015-10-221-17/+168
|\ \
| * \ Merge branch 'develop' into markjh/v2_sync_typingMark Haines2015-10-215-85/+451
| |\ \ | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/sync.py
| | * \ Merge pull request #316 from matrix-org/markjh/v2_sync_archivedMark Haines2015-10-211-3/+127
| | |\ \ | | | | | | | | | | Add rooms that the user has left under archived in v2 sync.
| | | * | Include banned rooms in the archived section of v2 syncMark Haines2015-10-211-6/+9
| | | | |
| | | * | Fix pep8Mark Haines2015-10-191-1/+0
| | | | |
| | | * | Add rooms that the user has left under archived in v2 sync.Mark Haines2015-10-191-3/+125
| | | | |
| * | | | Doc string for the SyncHandler.typing_by_room methodMark Haines2015-10-211-0/+12
| | | | |
| * | | | Include typing events in initial v2 syncMark Haines2015-10-201-14/+29
| | |/ / | |/| |
* | | | Filter room ids before hitting the databaseErik Johnston2015-10-211-1/+1
| | | |
* | | | Filter search resultsErik Johnston2015-10-211-2/+7
| |/ / |/| |
* | | Allow rejecting invitesDaniel Wagner-Hall2015-10-202-82/+229
| | | | | | | | | | | | | | | This is done by using the same /leave flow as you would use if you had already accepted the invite and wanted to leave.
* | | Merge pull request #307 from matrix-org/erikj/searchErik Johnston2015-10-192-0/+95
|\ \ \ | |/ / |/| | Add basic search API
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/searchErik Johnston2015-10-163-5/+192
| |\ \
| * | | Remove unused importErik Johnston2015-10-161-3/+1
| | | |
| * | | Remove duplicate _filter_events_for_clientErik Johnston2015-10-161-46/+0
| | | |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/searchErik Johnston2015-10-163-97/+51
| |\ \ \
| * | | | docstringErik Johnston2015-10-161-0/+10
| | | | |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/searchErik Johnston2015-10-151-92/+105
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Make 'keys' optionalErik Johnston2015-10-141-1/+3
| | | | |
| * | | | More TODO markersErik Johnston2015-10-141-0/+3
| | | | |
| * | | | Add TODO markersErik Johnston2015-10-141-1/+4
| | | | |
| * | | | Remove constraints in preperation of using filtersErik Johnston2015-10-131-51/+10
| | | | |
| * | | | Search left rooms tooErik Johnston2015-10-131-5/+2
| | | | |
| * | | | Filter events to only thsoe that the user is allowed to seeErik Johnston2015-10-121-6/+10
| | | | |
| * | | | Merge remote-tracking branch 'origin/develop' into erikj/searchErik Johnston2015-10-124-43/+100
| |\ \ \ \
| * | | | | Remove unused room_id parameterErik Johnston2015-10-124-8/+56
| | | | | |
| * | | | | PEP8Erik Johnston2015-10-121-2/+9
| | | | | |
| * | | | | Keep FTS indexes up to date. Only search through rooms currently joinedErik Johnston2015-10-121-9/+22
| | | | | |
| * | | | | Add basic full text search impl.Erik Johnston2015-10-092-0/+97
| | | | | |
* | | | | | Merge pull request #310 from matrix-org/markjh/bcrypt_roundsMark Haines2015-10-161-1/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Add config for how many bcrypt rounds to use for password hashes
| * | | | | Add config for how many bcrypt rounds to use for password hashesMark Haines2015-10-161-1/+2
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | By default we leave it at the default value of 12. But now we can reduce it for preparing users for loadtests or running integration tests.
* | | | | Merge pull request #302 from matrix-org/daniel/3pidinvitesDaniel Wagner-Hall2015-10-163-5/+192
|\ \ \ \ \ | |_|_|_|/ |/| | | | Implement third party identifier invites
| * | | | Verify third party ID server certificatesDaniel Wagner-Hall2015-10-161-2/+29
| | | | |
| * | | | Use non-placeholder name for endpointDaniel Wagner-Hall2015-10-151-1/+1
| | | | |
| * | | | Look for keys on the right objectsDaniel Wagner-Hall2015-10-151-2/+2
| | | | |
| * | | | Merge branch 'develop' into daniel/3pidinvitesDaniel Wagner-Hall2015-10-153-99/+112
| |\| | |
| * | | | Remove unnecessary class-wrappingDaniel Wagner-Hall2015-10-132-9/+10
| | | | |
| * | | | Move logic into handlerDaniel Wagner-Hall2015-10-131-0/+132
| | | | |
| * | | | Re-add accidentally removed codeDaniel Wagner-Hall2015-10-131-1/+1
| | | | |
| * | | | Move event contents into third_party_layout fieldDaniel Wagner-Hall2015-10-133-7/+11
| | | | |
| * | | | Merge branch 'develop' into daniel/3pidinvitesDaniel Wagner-Hall2015-10-134-43/+100
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Remove merge thinkoDaniel Wagner-Hall2015-10-061-4/+0
| | | | |
| * | | | Revert "Revert "Merge pull request #283 from ↵Daniel Wagner-Hall2015-10-061-76/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/erikj/atomic_join_federation"" This reverts commit 34d26d36874ab0bc7fa4dab0db08bd37ba4936ae.
| * | | | Merge branch 'develop' into daniel/3pidinvitesDaniel Wagner-Hall2015-10-061-1/+2
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Revert "Merge pull request #283 from matrix-org/erikj/atomic_join_federation"Daniel Wagner-Hall2015-10-051-131/+76
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5879edbb097d19c2b5f5e064841909e67d6018fe, reversing changes made to b43930d4c9479973fb7225818e2e51bec022c4e6.
| * | | | Merge branch 'develop' into daniel/3pidinvitesDaniel Wagner-Hall2015-10-054-78/+182
| |\ \ \ \
| * | | | | Implement third party identifier invitesDaniel Wagner-Hall2015-10-013-4/+27
| | | | | |
* | | | | | Amalgamate _filter_events_for_clientErik Johnston2015-10-163-97/+51
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #305 from matrix-org/markjh/v2_sync_apiMark Haines2015-10-141-92/+105
|\ \ \ \ \ | | | | | | | | | | | | Update the v2 sync API to work as specified in the current spec.
| * | | | | Fix v2 sync pollingMark Haines2015-10-141-3/+3
| | | | | |
| * | | | | Add a get_invites_for_user method to the storage to find out the rooms a ↵Mark Haines2015-10-131-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | user is invited to
| * | | | | Include invites in incremental syncMark Haines2015-10-131-6/+25
| | | | | |
| * | | | | Include invited rooms in the initial syncMark Haines2015-10-131-10/+6
| | | | | |
| * | | | | Merge branch 'develop' into markjh/v2_sync_apiMark Haines2015-10-132-5/+40
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Start spliting out the rooms into joined and invited in v2 syncMark Haines2015-10-131-18/+40
| | | | | |
| * | | | | Update the filters to match the latest spec.Mark Haines2015-10-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply the filter the 'timeline' and 'ephemeral' keys of rooms. Apply the filter to the 'presence' key of a sync response.
| * | | | | Merge branch 'markjh/presence_races' into markjh/v2_sync_apiMark Haines2015-10-091-3/+8
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'markjh/eventstream_presence' into markjh/v2_sync_apiMark Haines2015-10-095-118/+236
| |\ \ \ \ \ \
| * | | | | | | Update the v2 room sync format to match the current v2 specMark Haines2015-10-081-14/+11
| | | | | | | |
| * | | | | | | Move the rooms out into a room_map mapping from room_id to room.Mark Haines2015-10-051-18/+9
| | | | | | | |
| * | | | | | | Start updating the sync API to match the specificationMark Haines2015-10-011-36/+28
| | |_|_|/ / / | |/| | | | |
* | | | | | | Remove unused room_id argErik Johnston2015-10-143-7/+7
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #296 from matrix-org/markjh/eventstream_presenceMark Haines2015-10-121-35/+52
|\ \ \ \ \ \ | | |/ / / / | |/| | | | Split the sections of EventStreamHandler.get_stream that handle presence
| * | | | | Split the sections of EventStreamHandler.get_stream that handle presenceMark Haines2015-10-091-35/+52
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | into separate functions. This makes the code a bit easier to read, and means that we can reuse the logic when implementing the v2 sync API.
* | | | | Merge pull request #297 from matrix-org/markjh/presence_racesMark Haines2015-10-121-3/+8
|\ \ \ \ \ | | |_|/ / | |/| | | Fix some races in the synapse presence handler caused by not yielding…
| * | | | Fix some races in the synapse presence handler caused by not yielding on ↵Mark Haines2015-10-091-3/+8
| |/ / / | | | | | | | | | | | | deferreds
* | | | Formatting changesSteven Hammerton2015-10-101-1/+2
| | | |
* | | | Provide ability to login using CASSteven Hammerton2015-10-101-0/+31
| | | |
* | | | Add a flag to initial sync to indicate we want rooms that the user has leftMark Haines2015-10-081-5/+8
|/ / /
* | / Explicitly add Create event as auth eventErik Johnston2015-10-021-2/+3
| |/ |/|
* | Add 'trusted_private_chat' to room creation presetsErik Johnston2015-10-021-0/+5
| |
* | Merge pull request #275 from matrix-org/erikj/invite_stateErik Johnston2015-10-022-4/+30
|\ \ | | | | | | Bundle in some room state in invites.
| * | Also bundle in senderErik Johnston2015-10-021-0/+1
| | |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/invite_stateErik Johnston2015-09-253-88/+160
| |\ \
| * | | Bundle in some room state in the unsigned bit of the invite when sending to ↵Erik Johnston2015-09-102-4/+29
| | | | | | | | | | | | | | | | invited servers
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatableErik Johnston2015-10-024-240/+302
|\ \ \ \
| * \ \ \ Merge pull request #283 from matrix-org/erikj/atomic_join_federationErik Johnston2015-10-021-76/+131
| |\ \ \ \ | | | | | | | | | | | | Atomically persist events when joining a room over federation/
| | * | | | CommentErik Johnston2015-09-301-0/+8
| | | | | |
| | * | | | Rename varErik Johnston2015-09-301-3/+3
| | | | | |
| | * | | | Fix getting an event for a room the server forgot it was inErik Johnston2015-09-171-47/+59
| | | | | |
| | * | | | Also persist stateErik Johnston2015-09-171-1/+1
| | | | | |
| | * | | | Capture errErik Johnston2015-09-171-2/+2
| | | | | |
| | * | | | Also handle stateErik Johnston2015-09-171-3/+3
| | | | | |
| | * | | | Don't bail out of joining if we encounter a rejected eventErik Johnston2015-09-171-13/+20
| | | | | |
| | * | | | Refactor do_invite_joinErik Johnston2015-09-171-28/+56
| | | | | |
| * | | | | Merge pull request #287 from matrix-org/erikj/canonical_aliasErik Johnston2015-09-301-1/+10
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | Set m.room.canonical_alias on room creation.
| | * | | | Remove double indentationErik Johnston2015-09-301-7/+6
| | | | | |
| | * | | | Set m.room.canonical_alias on room creation.Erik Johnston2015-09-231-1/+11
| | | |_|/ | | |/| |
| * | | | Merge pull request #288 from matrix-org/markjh/unused_definitionsMark Haines2015-09-282-75/+0
| |\ \ \ \ | | |/ / / | |/| | | Remove some of the unused definitions from synapse
| | * | | synapse/handlers/room.py:_should_invite_join was unusedMark Haines2015-09-231-26/+0
| | | | |
| | * | | synapse/handlers/federation.py:_handle_auth_events was unusedMark Haines2015-09-231-49/+0
| | | | |
| * | | | Merge pull request #271 from matrix-org/erikj/default_historyErik Johnston2015-09-231-1/+1
| |\ \ \ \ | | |/ / / | |/| | | Change default history visibility for private rooms
| | * | | Change default history visibility for private roomsErik Johnston2015-09-091-1/+1
| | | |/ | | |/|
| * | | Merge pull request #276 from ↵Mark Haines2015-09-212-85/+158
| |\ \ \ | | |_|/ | |/| | | | | | | | | | 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 that room_initial_sync returns a python dictMark Haines2015-09-211-1/+1
| | | |
| | * | Fix doc string to point at the right classMark Haines2015-09-211-2/+3
| | | |
| | * | Add explicit "elif event.membership == Membership.LEAVE" for clarityMark Haines2015-09-211-1/+2
| | | |
| | * | Clamp the "to" token for /rooms/{roomId}/messages to when the user leftMark Haines2015-09-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the room. There isn't a way for the client to learn a valid "to" token for a room that they have left in the C-S API but that doesn't stop a client making one up.
| | * | Allow users to GET individual state events for rooms that they have leftMark Haines2015-09-101-7/+13
| | | |
| | * | Allow users that have left a room to get the messages that happend in the ↵Mark Haines2015-09-091-4/+27
| | | | | | | | | | | | | | | | room before they left
| | * | Remove undocumented and unimplemented 'feedback' parameter from the ↵Mark Haines2015-09-092-19/+3
| | | | | | | | | | | | | | | | Client-Server API
| | * | Allow users that have left the room to view the member list from the point ↵Mark Haines2015-09-091-36/+0
| | | | | | | | | | | | | | | | they left
| | * | Allow rooms/{roomId}/state for a room that has been leftMark Haines2015-09-091-5/+13
| | | |
| | * | Allow room initialSync for users that have left the room, returning a ↵Mark Haines2015-09-091-9/+76
| | | | | | | | | | | | | | | | snapshot of how the room was when they left it
| | * | Include rooms that a user has left in an initialSync. Include the state and ↵Mark Haines2015-09-081-6/+21
| | |/ | | | | | | | | | messages at the point they left the room
| * / Allow configuration to ignore invalid SSL certsDaniel Wagner-Hall2015-09-091-2/+1
| |/ | | | | | | | | This will be useful for sytest, and sytest only, hence the aggressive config key name.
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatableErik Johnston2015-09-141-1/+16
|\|
| * Merge pull request #262 from matrix-org/redactyoselfDaniel Wagner-Hall2015-09-021-1/+16
| |\ | | | | | | Allow users to redact their own events
| | * Merge branch 'develop' into redactyoselfDaniel Wagner-Hall2015-08-283-27/+29
| | |\ | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/_base.py
| | * | Allow users to redact their own eventsDaniel Wagner-Hall2015-08-281-2/+17
| | | |
* | | | Add flag which disables federation of the roomErik Johnston2015-09-011-2/+6
|/ / /
* | | Merge pull request #258 from matrix-org/slowtestsmakemesadDaniel Wagner-Hall2015-08-282-4/+26
|\ \ \ | |_|/ |/| | Swap out bcrypt for md5 in tests
| * | Remove unused importDaniel Wagner-Hall2015-08-261-1/+0
| | |
| * | Swap out bcrypt for md5 in testsDaniel Wagner-Hall2015-08-262-3/+26
| |/ | | | | | | This reduces our ~8 second sequential test time down to ~7 seconds
* | Merge branch 'release-v0.10.0' into developMark Haines2015-08-283-27/+29
|\ \ | |/ |/| | | | | | | | | Conflicts: synapse/handlers/auth.py synapse/python_dependencies.py synapse/rest/client/v1/login.py
| * Remove needless existence checksErik Johnston2015-08-261-7/+3
| |
| * Don't loop over all rooms ever in typing.get_new_events_for_userErik Johnston2015-08-261-2/+2
| |
| * Do auth checks *before* persisting the eventErik Johnston2015-08-241-16/+16
| |
| * Don't make pushers handle presence/typing eventsErik Johnston2015-08-241-2/+8
| |
| * Doc stringErik Johnston2015-08-211-0/+6
| |
| * When logging in fetch user by user_id case insensitively, *unless* there are ↵Erik Johnston2015-08-211-8/+23
| | | | | | | | multiple case insensitive matches, in which case require the exact user_id
| * Don't allow people to register user ids which only differ by case to an ↵Erik Johnston2015-08-211-2/+2
| | | | | | | | existing one
* | Merge erikj/user_dedup to developDaniel Wagner-Hall2015-08-262-10/+33
| |
* | Fix up one more referenceDaniel Wagner-Hall2015-08-251-1/+0
| |
* | Remove completely unused concepts from codebaseDaniel Wagner-Hall2015-08-252-6/+4
| | | | | | | | | | | | | | | | | | | | Removes device_id and ClientInfo device_id is never actually written, and the matrix.org DB has no non-null entries for it. Right now, it's just cluttering up code. This doesn't remove the columns from the database, because that's fiddly.
* | Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into developErik Johnston2015-08-211-1/+1
|\|
| * Add missing param in store.get_state_groups invocationErik Johnston2015-08-211-1/+1
| |
* | Fix bad mergeDaniel Wagner-Hall2015-08-201-8/+1
| |
* | Fix indentationDaniel Wagner-Hall2015-08-201-1/+2
| |
* | Fix flake8 warningsDaniel Wagner-Hall2015-08-201-4/+6
| |
* | Merge branch 'auth' into refreshDaniel Wagner-Hall2015-08-201-3/+3
|\ \ | | | | | | | | | | | | Conflicts: synapse/handlers/register.py
| * | Remove incorrect whitespaceDaniel Wagner-Hall2015-08-201-3/+3
| | |
| * | Merge branch 'develop' into authDaniel Wagner-Hall2015-08-206-15/+78
| |\|
* | | Merge branch 'develop' into refreshDaniel Wagner-Hall2015-08-204-3/+46
|\ \ \ | | |/ | |/| | | | | | | Conflicts: synapse/rest/client/v1/login.py
| * | Merge pull request #235 from matrix-org/erikj/room_avatarsErik Johnston2015-08-201-2/+3
| |\ \ | | | | | | | | Add m.room.avatar to default power levels.
| | * | Add m.room.avatar to default power levels. Change default required power ↵Erik Johnston2015-08-201-2/+3
| | | | | | | | | | | | | | | | levels of such events to 50
| * | | Another use of check_password that got missed in the yield fixDavid Baker2015-08-201-1/+1
| |/ /
| * | Merge pull request #233 from matrix-org/erikj/canonical_aliasErik Johnston2015-08-202-1/+18
| |\ \ | | | | | | | | Add server side support for canonical aliases
| | * | Check that the canonical room alias actually points to the roomErik Johnston2015-08-201-1/+17
| | | |
| | * | Add canonical alias to the default power levelsErik Johnston2015-08-191-0/+1
| | | |
| * | | Merge pull request #211 from matrix-org/email_in_useMark Haines2015-08-201-0/+25
| |\ \ \ | | | | | | | | | | Changes for unique emails
| | * | | Add endpoint that proxies ID server request token and errors if the given ↵David Baker2015-08-041-0/+25
| | | | | | | | | | | | | | | | | | | | email is in use on this Home Server.
* | | | | /tokenrefresh POST endpointDaniel Wagner-Hall2015-08-201-5/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Move token generation to auth handlerDaniel Wagner-Hall2015-08-202-24/+31
| | | | | | | | | | | | | | | | | | | | | | | | | I prefer the auth handler to worry about all auth, and register to call into it as needed, than to smatter auth logic between the two.
* | | | | Merge branch 'auth' into refreshDaniel Wagner-Hall2015-08-201-6/+13
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Merge branch 'develop' into authDaniel Wagner-Hall2015-08-192-4/+3
| |\ \ \ | | | |/ | | |/|
| * | | Re-add whitespace around caveat operatorsDaniel Wagner-Hall2015-08-191-4/+4
| | | |
| * | | Remove padding space around caveat operatorsDaniel Wagner-Hall2015-08-181-4/+4
| | | |
| * | | Fix some formatting to use tuplesDaniel Wagner-Hall2015-08-181-4/+4
| | | |
| * | | Merge branch 'develop' into authDaniel Wagner-Hall2015-08-184-49/+136
| |\ \ \
| * | | | Issue macaroons as opaque auth tokensDaniel Wagner-Hall2015-08-181-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This just replaces random bytes with macaroons. The macaroons are not inspected by the client or server. In particular, they claim to have an expiry time, but nothing verifies that they have not expired. Follow-up commits will actually enforce the expiration, and allow for token refresh. See https://bit.ly/matrix-auth for more information
* | | | | Don't get apservice interested rooms in RoomHandler.get_joined_rooms_for_usersErik Johnston2015-08-193-12/+32
| |_|/ / |/| | |
* | | | Remove an access token log lineErik Johnston2015-08-191-1/+1
| | | |
* | | | Fix regression where we incorrectly responded with a 200 to /loginErik Johnston2015-08-191-1/+2
| | | |
* | | | Merge pull request #227 from matrix-org/erikj/receipts_take2Erik Johnston2015-08-181-2/+0
|\ \ \ \ | |_|/ / |/| | | Re-enable receipts API.
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-08-174-122/+86
| |\ \ \ | | | | | | | | | | | | | | | erikj/receipts_take2
| * \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-08-131-7/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | erikj/receipts_take2
| * | | | | Re-enable receiptsErik Johnston2015-08-131-2/+0
| | | | | |
* | | | | | TypoErik Johnston2015-08-181-1/+1
| | | | | |
* | | | | | None checkErik Johnston2015-08-181-0/+2
| | | | | |
* | | | | | More helpful variable namesErik Johnston2015-08-181-7/+7
| | | | | |
* | | | | | Doc stringsErik Johnston2015-08-181-0/+28
| | | | | |
* | | | | | Remove debug try/catchErik Johnston2015-08-181-47/+43
| | | | | |
* | | | | | Implement a batched presence_handler.get_state and use itErik Johnston2015-08-172-12/+69
| |_|/ / / |/| | | |
* | | | | Merge pull request #221 from matrix-org/authDaniel Wagner-Hall2015-08-144-122/+86
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | Simplify LoginHander and AuthHandler
| * | | Merge password checking implementationsDaniel Wagner-Hall2015-08-121-20/+15
| | | |
| * | | Simplify LoginHander and AuthHandlerDaniel Wagner-Hall2015-08-124-108/+77
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | * 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 pointless mapErik Johnston2015-08-131-7/+3
| |/ |/|
* | Fix _filter_events_for_clientErik Johnston2015-08-122-6/+2
| |
* | Simplify staggered deferred listsErik Johnston2015-08-121-2/+2
| |
* | Use list comprehension instead of filterErik Johnston2015-08-122-20/+6
| |
* | Remove debug loggersErik Johnston2015-08-112-6/+0
| |
* | Fix application of ACLsErik Johnston2015-08-113-14/+30
| |
* | Don't be too enthusiatic with defer.gatherResultsErik Johnston2015-08-071-4/+8
| |
* | Use dictionary cache to do group -> state fetchingErik Johnston2015-08-051-1/+1
| |