summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Allow alias creators to delete aliasesErik Johnston2016-03-014-10/+51
|
* Merge pull request #611 from matrix-org/erikj/expiring_cache_sizeErik Johnston2016-03-011-2/+14
|\ | | | | Report size of ExpiringCache
| * Reraise exceptionErik Johnston2016-03-011-0/+1
| |
| * Correct cache miss detectionErik Johnston2016-03-011-1/+1
| |
| * Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2016-03-0111-30/+227
| |\ | |/ |/| | | erikj/expiring_cache_size
* | Merge pull request #607 from matrix-org/dbkr/send_inviter_member_eventDavid Baker2016-02-261-1/+7
|\ \ | | | | | | Send the invier's member event in room invite state
| * \ Merge remote-tracking branch 'origin/develop' into ↵David Baker2016-02-261-2/+4
| |\ \ | | | | | | | | | | | | dbkr/send_inviter_member_event
| * | | Empty to commit to force re-testDavid Baker2016-02-260-0/+0
| | | |
| * | | Send the invier's member event in room invite state so the invitee has their ↵David Baker2016-02-251-1/+7
| | | | | | | | | | | | | | | | display name and avatar.
* | | | Merge pull request #609 from matrix-org/markjh/change_actionMark Haines2016-02-263-11/+102
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Add support for changing the actions for default rules 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``
| * | | Add support for changing the actions for default rulesMark Haines2016-02-263-11/+102
|/ / / | | | | | | | | | | | | | | | 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``
* | | Merge pull request #608 from gergelypolonkai/syn-638David Baker2016-02-261-2/+4
|\ \ \ | |/ / |/| | Add error codes for malformed/bad JSON in /login
| * | 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>
* | Merge pull request #606 from matrix-org/markjh/get_enabledMark Haines2016-02-251-1/+3
|\ \ | | | | | | | | | | | | Make sure we return a JSON object when returning the values of specif… …ic keys from a push rule
| * | 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
* | Merge pull request #605 from matrix-org/markjh/dead_codeMark Haines2016-02-241-8/+0
|\ \ | | | | | | Remove unused get_rule_attr method
| * \ Merge branch 'develop' into markjh/dead_codeMark Haines2016-02-244-0/+91
| |\ \ | |/ / |/| |
* | | Merge pull request #604 from matrix-org/daniel/guestaccesstokenDaniel Wagner-Hall2016-02-244-0/+91
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate guest access token on 3pid invites This means that following the same link across multiple sessions or devices can re-use the same guest account. Note that this is somewhat of an abuse vector; we can't throw up captchas on this flow, so this is a way of registering ephemeral accounts for spam, whose sign-up we don't rate limit.
| * | | Generate guest access token on 3pid invitesDaniel Wagner-Hall2016-02-244-0/+91
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | This means that following the same link across multiple sessions or devices can re-use the same guest account. Note that this is somewhat of an abuse vector; we can't throw up captchas on this flow, so this is a way of registering ephemeral accounts for spam, whose sign-up we don't rate limit.
| * / Remove unused get_rule_attr methodMark Haines2016-02-241-8/+0
|/ /
* | Ignore invalid POST bodies when joining roomsDaniel Wagner-Hall2016-02-241-2/+12
| |
* | Merge pull request #603 from matrix-org/erikj/presenceErik Johnston2016-02-231-6/+9
|\ \ | | | | | | Create a new stream_id per presence update
| * | Create a new stream_id per presence updateErik Johnston2016-02-231-6/+9
| | |
| | * Report size of ExpiringCacheErik Johnston2016-02-231-2/+13
| |/ |/|
* | Check presence token interval is less than 100, rather than the token itselfErik Johnston2016-02-231-4/+4
| |
* | Merge pull request #602 from matrix-org/erikj/presenceErik Johnston2016-02-232-19/+61
|\| | | | | Change the way we figure out presence updates for small deltas
| * Handle get_all_entities_changed returning NoneErik Johnston2016-02-231-0/+3
| |
| * Add commentsErik Johnston2016-02-231-0/+4
| |
| * Change the way we figure out presence updates for small deltasErik Johnston2016-02-232-17/+52
| |
* | Set WORKSPACE if not setDaniel Wagner-Hall2016-02-231-0/+2
| |
* | Merge pull request #584 from matrix-org/daniel/ephemeralthreepidsDaniel Wagner-Hall2016-02-237-54/+196
|\ \ | | | | | | Allow third_party_signed to be specified on /join
| * | Allow third_party_signed to be specified on /joinDaniel Wagner-Hall2016-02-237-54/+196
|/ /
* | Merge pull request #600 from matrix-org/erikj/presenceErik Johnston2016-02-231-26/+30
|\| | | | | Measure PresenceEventSource.get_new_events
| * Don't include defer.returnValue in Measure blockErik Johnston2016-02-231-9/+12
| |
| * Measure PresenceEventSource.get_new_eventsErik Johnston2016-02-231-34/+35
| |
* | Merge pull request #601 from Rugvip/pep8Daniel Wagner-Hall2016-02-231-1/+5
|\ \ | | | | | | handlers/sync: style fix, line too long
| * | handlers/sync: style fix, line too longPatrik Oldsberg2016-02-231-1/+5
|/ / | | | | | | Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
* | Merge pull request #595 from matrix-org/markjh/coverageMark Haines2016-02-231-0/+21
|\ \ | | | | | | Check that the disable_registration config key is handled correctly
| * | Check that the disable_registration config key is handled correctlyMark Haines2016-02-221-0/+21
| | |
* | | Pick up currently_active across federationErik Johnston2016-02-231-0/+1
| | |
* | | Merge pull request #597 from Rugvip/account-data-syncErik Johnston2016-02-231-1/+1
|\ \ \ | | | | | | | | handlers/sync: fix SyncResult not counting account_data change when converting to bool
| * | | handlers/sync: fix SyncResult not counting account_data change when ↵Patrik Oldsberg2016-02-231-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | converting to bool This fixes account_data events not triggering an immediate /sync response Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
* | | Merge pull request #587 from matrix-org/rav/guest_access_after_room_joinRichard van der Hoff2016-02-223-16/+41
|\ \ \ | | | | | | | | Allow guest users access to messages in rooms they have joined
| * | | address review commentsRichard van der Hoff2016-02-221-7/+2
| | | | | | | | | | | | | | | | drop commented-out special casing for historyvisibility event s/he/they/ for users
| * | | Interpret unknown visibilities the same as sharedRichard van der Hoff2016-02-191-11/+13
| | | |
| * | | Merge branch 'develop' into rav/guest_access_after_room_joinRichard van der Hoff2016-02-1946-3610/+1937
| |\ \ \
| * | | | Allow guest users access to messages in rooms they have joinedRichard van der Hoff2016-02-193-14/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There should be no difference between guest users and non-guest users in terms of access to messages. Define the semantics of the is_peeking argument to filter_events_for_clients (slightly) better; interpret it appropriately, and set it correctly from /sync.
* | | | | Merge pull request #594 from matrix-org/markjh/coverageMark Haines2016-02-222-0/+9
|\ \ \ \ \ | | |_|/ / | |/| | | Add a test for TreeCache.__contains__
| * | | | Add a test for TreeCache.__contains__Mark Haines2016-02-222-0/+9
| | | | |
* | | | | Merge pull request #591 from matrix-org/markjh/coverageMark Haines2016-02-221-0/+18
|\| | | | | |_|_|/ |/| | | Test Filter.filter_rooms
| * | | Test Filter.filter_roomsMark Haines2016-02-191-0/+18
| | | | | | | | | | | | | | | | | | | | Also check that the __repr__ method for FilterCollection does something sensible.
* | | | Remove superfluous call to get_state_at when we already have an event for ↵Erik Johnston2016-02-221-4/+12
| | | | | | | | | | | | | | | | that stream position
* | | | Merge pull request #589 from matrix-org/erikj/presenceErik Johnston2016-02-221-2/+10
|\ \ \ \ | |/ / / |/| | | Only send presence updates to remote hosts if user is ours
| * | | Correctly filter statesErik Johnston2016-02-191-2/+2
| | | |
| * | | Only send presence updates to remote hosts if user is oursErik Johnston2016-02-191-2/+10
| | | |
* | | | Merge pull request #590 from matrix-org/markjh/formattingMark Haines2016-02-1939-364/+359
|\ \ \ \ | |/ / / |/| | | Fix flake8 warnings for tests
| * | | Fix flake8 warnings for testsMark Haines2016-02-1939-364/+359
|/ / /
* | / Add Measures to presenceErik Johnston2016-02-191-57/+62
| |/ |/|
* | Add presence metricErik Johnston2016-02-191-0/+3
| |
* | Remove spurious extra metricsErik Johnston2016-02-191-1/+0
| |
* | Merge pull request #586 from matrix-org/erikj/presenceErik Johnston2016-02-193-10/+47
|\ \ | | | | | | Fix presence `currently_active`. Add presence metrics.
| * | Don't set currently_active for remote presenceErik Johnston2016-02-192-10/+27
| | |
| * | More metricsErik Johnston2016-02-191-0/+6
| | |
| * | Add presence metricsErik Johnston2016-02-192-0/+14
| | |
* | | Merge pull request #582 from matrix-org/erikj/presenceErik Johnston2016-02-1930-3102/+1450
|\| | | | | | | | Rewrite presence for performance.
| * | "You are not..."Erik Johnston2016-02-181-1/+1
| | |
| * | Close cursorErik Johnston2016-02-181-0/+1
| | |
| * | Remove unused param from get_max_tokenErik Johnston2016-02-186-13/+11
| | |
| * | WheelTimer: Don't scan list, use index.Erik Johnston2016-02-181-5/+8
| | |
| * | Remove invalid arg.Erik Johnston2016-02-181-1/+0
| | |
| * | Add unit testErik Johnston2016-02-182-93/+560
| | |
| * | Remove old tests.Erik Johnston2016-02-186-2098/+0
| | |
| * | Add stuff pulled from the DB to the cacheErik Johnston2016-02-181-2/+4
| | |
| * | PEP8Erik Johnston2016-02-181-2/+2
| | |
| * | Prefix TS fields with _tsErik Johnston2016-02-184-43/+44
| | |
| * | Remove status_msg when going offline. Don't offline -> online if you send a ↵Erik Johnston2016-02-181-5/+15
| | | | | | | | | | | | message
| * | Check presence state is a valid oneErik Johnston2016-02-182-1/+6
| | |
| * | Move if statementErik Johnston2016-02-181-8/+8
| | |
| * | CommentErik Johnston2016-02-181-0/+2
| | |
| * | Remove spurious commentErik Johnston2016-02-171-1/+0
| | |
| * | Initial cutErik Johnston2016-02-1716-1136/+933
| | |
| * | Add wheeltimer implErik Johnston2016-02-172-0/+162
| | |
* | | Merge pull request #573 from matrix-org/erikj/sync_fixErik Johnston2016-02-181-5/+12
|\ \ \ | | | | | | | | Mitigate against incorrect old state in /sync.
| * | | Mitigate against incorrect old state in /sync.Erik Johnston2016-02-121-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There have been reports from the field that servers occasionally have incorrect notions of what the old state of a room is. This proves problematic as /sync relies on a correct old state. This patch makes /sync specifically include in the 'state' key any current state events that haven't been correctly included.
* | | | Merge pull request #579 from matrix-org/markjh/dead_codeMark Haines2016-02-1810-141/+45
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove dead code for setting device specific rules. 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.
| * | | | Remove dead code for setting device specific rules.Mark Haines2016-02-1810-141/+45
|/ / / / | | | | | | | | | | | | | | | | | | | | 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 pull request #583 from matrix-org/daniel/roomcleanupincrementalDaniel Wagner-Hall2016-02-189-364/+393
|\ \ \ \ | |_|_|/ |/| | | Merge all of the room membership codepaths into one
| * | | Review commentsDaniel Wagner-Hall2016-02-183-7/+7
| | | |
| * | | Merge branch 'develop' into daniel/roomcleanupincrementalDaniel Wagner-Hall2016-02-174-85/+92
| |\ \ \ | |/ / / |/| | | | | | | | | | | Conflicts: synapse/rest/client/v1/room.py
* | | | Merge pull request #580 from Rugvip/developErik Johnston2016-02-171-1/+4
|\ \ \ \ | |_|_|/ |/| | | api/filtering: don't assume that event content will always be a dict
| * | | api/filtering: don't assume that event content will always be a dictPatrik Oldsberg2016-02-171-1/+4
| | | | | | | | | | | | | | | | Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
* | | | Merge pull request #581 from Rugvip/event_idErik Johnston2016-02-171-2/+2
|\ \ \ \ | |/ / / |/| | | client/v1/room: include event_id in response to state event PUT
| * | | 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
| | |
* | | Merge pull request #578 from matrix-org/markjh/idempotent_rulesMark Haines2016-02-161-82/+86
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Make adding push rules idempotent Also remove the **kwargs from the add_push_rule method. Fixes https://matrix.org/jira/browse/SYN-391
| * | | Make adding push rules idempotentMark Haines2016-02-161-82/+86
|/ / / | | | | | | | | | | | | | | | Also remove the **kwargs from the add_push_rule method. Fixes https://matrix.org/jira/browse/SYN-391
| * | Some cleanupDaniel Wagner-Hall2016-02-172-69/+61
| | | | | | | | | | | | | | | 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... :(
| * | Respond to federated invite with non-empty contextDaniel Wagner-Hall2016-02-173-46/+65
| | | | | | | | | | | | | | | | | | | | | Currently, we magically perform an extra database hit to find the inviter, and use this to guess where we should send the event. Instead, fill in a valid context, so that other callers relying on the context actually have one.
| * | Some cleanup, some TODOs, more to doDaniel Wagner-Hall2016-02-161-68/+60
| | |
| * | Some cleanupDaniel Wagner-Hall2016-02-162-23/+30
| | |
| * | Tidy? up room creation event sendingDaniel Wagner-Hall2016-02-161-63/+72
| | |
| * | Add commentDaniel Wagner-Hall2016-02-161-1/+1
| | |
| * | Merge branch 'develop' into daniel/roomcleanupincrementalDaniel Wagner-Hall2016-02-161-3/+3
| |\ \ | |/ / |/| | | | | | | | Conflicts: synapse/handlers/room.py
* | | Merge pull request #577 from matrix-org/daniel/createroomDaniel Wagner-Hall2016-02-162-55/+31
|\ \ \ | | | | | | | | Simplify room creation code
| * | | Simplify room creation codeDaniel Wagner-Hall2016-02-152-55/+31
|/ / /
| * | Branch off member and non member sendsDaniel Wagner-Hall2016-02-155-74/+99
| | | | | | | | | | | | Unclean, needs tidy-up, but works
| * | Simplify room creation codeDaniel Wagner-Hall2016-02-152-52/+28
| | |
| * | Use update_membership for profile updatesDaniel Wagner-Hall2016-02-152-20/+12
| | |
| * | Use update_membership to kick guestsDaniel Wagner-Hall2016-02-152-16/+19
| | |
| * | Reuse update_membership from /joinDaniel Wagner-Hall2016-02-152-19/+14
| | |
| * | Inline _do_local_membership_updateDaniel Wagner-Hall2016-02-151-18/+7
| | |
| * | Inline _do_join as it now only has one callerDaniel Wagner-Hall2016-02-151-48/+47
| | | | | | | | | | | | | | | | | | Also, consistently apply rate limiting. Again, ugly, but a step in the right direction.
| * | Merge implementation of /join by alias or IDDaniel Wagner-Hall2016-02-155-70/+71
| | | | | | | | | | | | | | | 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-152-5/+11
|/ / | | | | | | | | | | 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-125-73/+69
| | | | | | | | | | | | This reverts commit cf81375b94c4763766440471e632fc4b103450ab. It subtly violates a guest joining auth check
* | Merge pull request #575 from matrix-org/daniel/roomcleanupDaniel Wagner-Hall2016-02-125-69/+73
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge two of the room join codepaths 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.
| * | Merge two of the room join codepathsDaniel Wagner-Hall2016-02-125-69/+73
|/ / | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge pull request #574 from matrix-org/markjh/connection_closedMark Haines2016-02-125-11/+33
|\ \ | | | | | | Catch the exceptions thrown by twisted when you write to a closed con…
| * | Catch the exceptions thrown by twisted when you write to a closed connectionMark Haines2016-02-125-11/+33
|/ /
* | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2016-02-122-1/+12
|\|
| * Merge branch 'release-v0.13.3' of github.com:matrix-org/synapse v0.13.3Erik Johnston2016-02-113-2/+7
| |\
| | * Bump version and changelogErik Johnston2016-02-112-1/+6
| | |
| | * Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2016-02-112-1/+7
| | |\ | | |/ | |/|
| * | Merge branch 'release-v0.13.2' of github.com:matrix-org/synapse v0.13.2Erik Johnston2016-02-115-9/+29
| |\ \
| | * | Bump version and changelogErik Johnston2016-02-112-1/+7
| | | |
* | | | Merge pull request #572 from matrix-org/daniel/exclusivityDaniel Wagner-Hall2016-02-111-5/+12
|\ \ \ \ | |_|_|/ |/| | | Enforce user_id exclusivity for AS registrations
| * | | Enforce user_id exclusivity for AS registrationsDaniel Wagner-Hall2016-02-111-5/+12
|/ / / | | | | | | | | | | | | This whole set of checks is kind of an ugly mess, which I may clean up at some point, but for now let's be correct.
* | / Fix SYN-627, events are in incorrect room in /syncErik Johnston2016-02-111-1/+1
| |/ |/|
* | Merge pull request #570 from matrix-org/erikj/events_fixesErik Johnston2016-02-112-8/+12
|\ \ | | | | | | Return events in correct order for /events
| * | Return events in correct order for /eventsErik Johnston2016-02-112-8/+12
|/ /
* | Add some paranoia loggingErik Johnston2016-02-111-0/+10
| |
* | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2016-02-103-2/+9
|\|
| * 0.13.1 v0.13.1Matthew Hodgson2016-02-101-1/+1
| |
| * bump for 0.13.1Matthew Hodgson2016-02-101-0/+7
| |
| * Merge branch 'master' of git+ssh://github.com/matrix-org/synapseMatthew Hodgson2016-02-10339-3968/+5722
| |\
| | * Merge branch 'release-v0.13.0' of github.com:matrix-org/synapse v0.13.0Erik Johnston2016-02-10339-3968/+5714
| | |\ | |_|/ |/| |
* | | Update CHANGESErik Johnston2016-02-101-2/+4
| | |
* | | Bump version and changelogErik Johnston2016-02-102-1/+23
| | |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.13.0Erik Johnston2016-02-1091-1106/+1801
|\ \ \
| * \ \ Merge pull request #569 from matrix-org/erikj/initial_syncErik Johnston2016-02-102-72/+73
| |\ \ \ | | | | | | | | | | Improvements to initial /syncs
| | * | | Batch fetch _get_state_groups_from_groupsErik Johnston2016-02-101-32/+34
| | | | |
| | * | | Use _simple_select_many for _get_state_group_for_eventsErik Johnston2016-02-102-17/+11
| | | | |
| | * | | Only calculate initial sync for 10 rooms at a timeErik Johnston2016-02-101-24/+29
| |/ / / | | | | | | | | | | | | This helps to ensure we don't completely starve other requests.
| * | | Merge pull request #566 from matrix-org/erikj/logcontextErik Johnston2016-02-102-25/+14
| |\ \ \ | | | | | | | | | | Don't bother copying records on parent context
| | * | | Remove commentErik Johnston2016-02-101-1/+1
| | | | |
| | * | | s/parent_context/previous_context/Erik Johnston2016-02-101-9/+9
| | | | |
| | * | | Set parent context on instansiationErik Johnston2016-02-101-2/+7
| | | | |
| | * | | Fix testErik Johnston2016-02-091-9/+1
| | | | |
| | * | | Don't bother copying records on parent contextErik Johnston2016-02-091-8/+0
| | | | |
| * | | | Merge pull request #568 from matrix-org/erikj/unread_notifErik Johnston2016-02-107-89/+66
| |\ \ \ \ | | | | | | | | | | | | Atomically persit push actions when we persist the event
| | * | | | Rename functionsErik Johnston2016-02-102-4/+4
| | | | | |
| | * | | | Atomically persit push actions when we persist the eventErik Johnston2016-02-096-65/+49
| | | | | |
| | * | | | Pass in current state to push action handlerErik Johnston2016-02-093-27/+20
| | | | | |
| * | | | | Merge pull request #532 from floviolleau/floviolleau/documentationErik Johnston2016-02-102-1/+25
| |\ \ \ \ \ | | | | | | | | | | | | | | Update documentation
| | * | | | | Update documentationFlorent VIOLLEAU2016-01-272-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Florent VIOLLEAU <floviolleau@gmail.com>
| * | | | | | Merge pull request #565 from matrix-org/erikj/macaroon_configErik Johnston2016-02-093-19/+34
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Derive macaroon_secret_key from signing key.
| | * | | | | | TypoErik Johnston2016-02-091-1/+1
| | | | | | | |
| | * | | | | | Fix testErik Johnston2016-02-091-3/+4
| | | | | | | |
| | * | | | | | Derive macaroon_secret_key from signing key.Erik Johnston2016-02-082-16/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unfortunately, there are people that are running synapse without a `macaroon_sercret_key` set. Mandating they set one is a good solution, except that breaking auto upgrades is annoying.
| * | | | | | | Change a log from debug to infoErik Johnston2016-02-091-1/+1
| | |_|/ / / / | |/| | | | |
| * | | | | | Remove dead codeErik Johnston2016-02-091-12/+0
| | | | | | |
| * | | | | | Invalidate get_last_receipt_event_id_for_user cacheErik Johnston2016-02-091-0/+5
| | | | | | |
| * | | | | | Merge pull request #567 from matrix-org/erikj/sync_ephemeralErik Johnston2016-02-092-14/+20
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Don't load all ephemeral state for a room on every sync
| | * | | | | | Don't load all ephemeral state for a room on every syncErik Johnston2016-02-092-14/+20
| |/ / / / / /
| * | | | | | Fix unit testsErik Johnston2016-02-092-5/+9
| | | | | | |
| * | | | | | Merge pull request #560 from matrix-org/daniel/toxDaniel Wagner-Hall2016-02-091-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove pyc files before running tests
| | * | | | | | Remove pyc files before running testsDaniel Wagner-Hall2016-02-091-1/+1
| |/ / / / / /
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into developErik Johnston2016-02-093-6/+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.
| * | | | | | Measure some /sync related thingsErik Johnston2016-02-092-150/+162
| | | | | | |
| * | | | | | Revert to putting it around the entire blockErik Johnston2016-02-091-124/+124
| | | | | | |
| * | | | | | Don't create new logging contextErik Johnston2016-02-091-12/+15
| |/ / / / /
| * | | | | Fix bug in util.metrics.MeasureErik Johnston2016-02-091-1/+3
| | | | | |
| * | | | | Create new context when measuringErik Johnston2016-02-091-2/+5
| | | | | |
| * | | | | Don't measure across event stream call, as it lasts for a long time.Erik Johnston2016-02-091-124/+124
| | | | | |
| * | | | | Change logcontext warns to debugErik Johnston2016-02-091-3/+3
| |/ / / /
| * | | | Merge pull request #564 from matrix-org/erikj/logcontextErik Johnston2016-02-0831-229/+356
| |\ \ \ \ | | | | | | | | | | | | Fix up logcontexts
| | * | | | Fix up logcontextsErik Johnston2016-02-0831-229/+356
| | | | | |
| * | | | | Merge pull request #562 from matrix-org/erikj/push_metricErik Johnston2016-02-083-31/+149
| |\| | | | | | | | | | | | | | | | Add metrics to pushers
| | * | | | Add metrics to pushersErik Johnston2016-02-083-31/+149
| | | | | |
| * | | | | Merge pull request #563 from matrix-org/daniel/dollarzDaniel Wagner-Hall2016-02-083-6/+6
| |\ \ \ \ \ | | |/ / / / | |/| | | | Reject additional path segments
| | * | | | Reject additional path segmentsDaniel Wagner-Hall2016-02-083-6/+6
| |/ / / /
| * | | | Report the v1 and v2 patterns separatelyMark Haines2016-02-051-4/+12
| | | | |
| * | | | List the URL patterns in synapseMark Haines2016-02-051-0/+54
| | | | |
| * | | | Merge pull request #550 from matrix-org/daniel/guestnamesDaniel Wagner-Hall2016-02-052-19/+72
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allocate guest user IDs numericcally The current random IDs are ugly and confusing when presented in UIs. This makes them prettier and easier to read. Also, disable non-automated registration of numeric IDs so that we don't need to worry so much about people carving out our automated address space and us needing to keep retrying ID registration.
| | * | | | Allocate guest user IDs numericcallyDaniel Wagner-Hall2016-02-052-19/+72
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current random IDs are ugly and confusing when presented in UIs. This makes them prettier and easier to read. Also, disable non-automated registration of numeric IDs so that we don't need to worry so much about people carving out our automated address space and us needing to keep retrying ID registration.
| * | | | Merge pull request #559 from matrix-org/daniel/mediaDaniel Wagner-Hall2016-02-052-3/+6
| |\ \ \ \ | | | | | | | | | | | | Host /media/r0 as well as /media/v1
| | * | | | Host /media/r0 as well as /media/v1Daniel Wagner-Hall2016-02-052-3/+6
| |/ / / /
| * | | | Merge pull request #558 from matrix-org/daniel/configDaniel Wagner-Hall2016-02-057-23/+198
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Error if macaroon key is missing from config Currently we store all access tokens in the DB, and fall back to that check if we can't validate the macaroon, so our fallback works here, but for guests, their macaroons don't get persisted, so we don't get to find them in the database. Each restart, we generate a new ephemeral key, so guests lose access after each server restart. I tried to fix up the config stuff to be less insane, but gave up, so instead I bolt on yet another piece of custom one-off insanity. Also, add some basic tests for config generation and loading.
| | * | | | Error if macaroon key is missing from configDaniel Wagner-Hall2016-02-057-23/+198
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we store all access tokens in the DB, and fall back to that check if we can't validate the macaroon, so our fallback works here, but for guests, their macaroons don't get persisted, so we don't get to find them in the database. Each restart, we generate a new ephemeral key, so guests lose access after each server restart. I tried to fix up the config stuff to be less insane, but gave up, so instead I bolt on yet another piece of custom one-off insanity. Also, add some basic tests for config generation and loading.
| * | | | 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
| * | | | | Actually return something sensibleErik Johnston2016-02-031-1/+1
| | | | | |
| * | | | | Remove old log lineErik Johnston2016-02-031-2/+0
| | | | | |
| * | | | | We return dicts now.Erik Johnston2016-02-031-1/+1
| | | | | |
| * | | | | Add descriptionsErik Johnston2016-02-034-1/+5
| | | | | |
| * | | | | Preserve log context over when deferring to thread pool in media repoErik Johnston2016-02-031-4/+7
| | | | | |
| * | | | | Merge pull request #555 from matrix-org/erikj/logcontextErik Johnston2016-02-033-16/+42
| |\ \ \ \ \ | | | | | | | | | | | | | | Allowing tagging log contexts
| | * | | | | Allowing tagging log contextsErik Johnston2016-02-033-16/+42
| | | | | | |
| * | | | | | Merge pull request #554 from matrix-org/erikj/event_pushErik Johnston2016-02-035-21/+67
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | Change event_push_actions_rm_tokens schema
| | * | | | | Change event_push_actions_rm_tokens schemaErik Johnston2016-02-035-21/+67
| | |/ / / /
| * | | | | Merge pull request #556 from matrix-org/daniel/configDaniel Wagner-Hall2016-02-036-10/+10
| |\ \ \ \ \ | | | | | | | | | | | | | | Rename config field to reflect yaml name
| | * | | | | Rename config field to reflect yaml nameDaniel Wagner-Hall2016-02-036-10/+10
| | | | | | |
| * | | | | | Merge pull request #552 from matrix-org/erikj/public_room_fixErik Johnston2016-02-035-136/+88
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Change the way we do public room list fetching
| | * | | | | Simplify get_roomsErik Johnston2016-02-033-105/+9
| | | | | | |
| | * | | | | PEP8Erik Johnston2016-02-031-1/+1
| | | | | | |
| | * | | | | Remove unused methodErik Johnston2016-02-031-8/+0
| | | | | | |
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2016-02-0336-238/+216
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | erikj/public_room_fix
| | * | | | | Unused importErik Johnston2016-02-031-1/+1
| | | | | | |
| | * | | | | Change the way we do public room list fetchingErik Johnston2016-02-023-24/+80
| | | | | | |
| * | | | | | Add macaroon inspection scriptDaniel Wagner-Hall2016-02-031-0/+24
| | |/ / / / | |/| | | |
| * | | | | Merge pull request #553 from matrix-org/daniel/accesstokenloggingDaniel Wagner-Hall2016-02-021-0/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | Log more diagnostics for unrecognised access tokens
| | * | | | | Log more diagnostics for unrecognised access tokensDaniel Wagner-Hall2016-02-021-0/+2
| |/ / / / /
| * | | | | Explain what W503 isDaniel Wagner-Hall2016-02-021-1/+1
| | | | | |
| * | | | | Merge pull request #551 from matrix-org/daniel/flake8Daniel Wagner-Hall2016-02-0234-66/+73
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix flake8 warnings for new flake8
| | * | | | | Fix flake8 warnings for new flake8Daniel Wagner-Hall2016-02-0234-66/+73
| |/ / / / /
| * | | | | Merge pull request #549 from matrix-org/erikj/syncErik Johnston2016-02-023-29/+32
| |\ \ \ \ \ | | | | | | | | | | | | | | Fetch events in a separate transaction.
| | * | | | | s/get_room_changes_for_user/get_membership_changes_for_user/Erik Johnston2016-02-023-4/+4
| | | | | | |
| | * | | | | Fetch events in a separate transaction.Erik Johnston2016-02-021-26/+29
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has a couple of benefits: - It reduces the time of transactions, allowing other database requests to run. - Fetching events is given a dedicated database thread, and so can't starve other database requests.
| * | | | | Merge pull request #545 from matrix-org/erikj/syncErik Johnston2016-02-022-141/+99
| |\ \ \ \ \ | | | | | | | | | | | | | | Move /sync state calculations from rest to handler
| | * | | | | CommentsErik Johnston2016-02-011-5/+6
| | | | | | |
| | * | | | | Move state calculations from rest to handlerErik Johnston2016-02-012-141/+98
| | | | | | |
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/syncErik Johnston2016-02-011-5/+0
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/syncErik Johnston2016-02-011-6/+3
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge pull request #548 from matrix-org/dbkr/fix_guest_db_columnDavid Baker2016-02-021-1/+3
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Pass make_guest when we autogen a user ID
| | * | | | | | | | Pass make_guest whne we autogen a user IDDavid Baker2016-02-021-1/+3
| |/ / / / / / / /
| * | | | | | | | WARN if we get a topo token instead of stream.Erik Johnston2016-02-021-1/+6
| | | | | | | | |
| * | | | | | | | Merge pull request #547 from matrix-org/dbkr/fix_guest_upgradeDavid Baker2016-02-021-0/+1
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | Pull guest access token out of the auth session params
| | * | | | | | | Pull guest access token out of the auth session params, otherwise it will ↵David Baker2016-02-011-0/+1
| | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | break if you open the email on a different device.
| * | | | | | | Merge pull request #546 from matrix-org/erikj/eventsErik Johnston2016-02-012-7/+26
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | Switch over /events to use per room caches
| | * | | | | | Order things correctlyErik Johnston2016-02-012-1/+5
| | | | | | | |
| | * | | | | | Switch over /events to use per room cachesErik Johnston2016-02-012-7/+22
| |/ / / / / /
| * | | | | | Merge pull request #543 from matrix-org/erikj/syncErik Johnston2016-02-013-0/+15
| |\| | | | | | | | | | | | | | | | | | | Cache get_room_changes_for_user
| | * | | | | Cache get_room_changes_for_userErik Johnston2016-01-293-0/+15
| | | | | | |
| * | | | | | Merge pull request #544 from matrix-org/erikj/stream_roomsErik Johnston2016-02-011-5/+0
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | Only use room_ids if in get_room_events_stream if is_guest
| | * | | | | Only use room_ids if in get_room_events_stream if is_guestErik Johnston2016-02-011-5/+0
| |/ / / / /
| * | | | | Don't use before_token. Its wrong. Use actual limit.Erik Johnston2016-01-311-6/+3
| | | | | |
| * | | | | Merge pull request #542 from matrix-org/erikj/cache_fixErik Johnston2016-01-292-8/+7
| |\| | | | | | | | | | | | | | | | Cache fixes
| | * | | | Invalidate _account_data_stream_cache correctlyErik Johnston2016-01-291-0/+4
| | | | | |
| | * | | | If stream pos is greater then earliest known key and entity hasn't changed, ↵Erik Johnston2016-01-291-8/+3
| |/ / / / | | | | | | | | | | | | | | | then entity hasn't changed
| * | | | Merge pull request #540 from matrix-org/erikj/syncErik Johnston2016-01-294-19/+56
| |\ \ \ \ | | | | | | | | | | | | Prefill stream change caches
| | * | | | Comment. Remove superfluous order byErik Johnston2016-01-291-1/+3
| | | | | |
| | * | | | Don't prefill account dataErik Johnston2016-01-291-8/+1
| | | | | |
| | * | | | Actually use cacheErik Johnston2016-01-291-7/+13
| | | | | |
| | * | | | Max is not a functionErik Johnston2016-01-291-1/+1
| | | | | |
| | * | | | Convert param styleErik Johnston2016-01-291-0/+3
| | | | | |
| | * | | | Prefill stream change cachesErik Johnston2016-01-294-19/+52
| | | | | |
| * | | | | Merge pull request #541 from matrix-org/erikj/fixsomeofpushErik Johnston2016-01-291-9/+14
| |\ \ \ \ \ | | | | | | | | | | | | | | Make /events always return a newer token, if one exists
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-27 01:36:25 +0000