summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Delete old, unused methods and rename new one to just be ↵David Baker2016-03-112-16/+3
| | | | `user_delete_access_tokens` with an `except_token_ids` argument doing what it says on the tin.
* Dear PyCharm, please indent sensibly for me. Thx.David Baker2016-03-112-3/+3
|
* Fix cache invalidation so deleting access tokens (which we did when changing ↵David Baker2016-03-114-17/+34
| | | | password) actually takes effect without HS restart. Reinstate the code to avoid logging out the session that changed the password, removed in 415c2f05491ce65a4fc34326519754cd1edd9c54
* Merge pull request #638 from matrix-org/daniel/appserviceidDaniel Wagner-Hall2016-03-102-7/+38
|\ | | | | Store appservice ID on register
| * Store appservice ID on registerDaniel Wagner-Hall2016-03-102-7/+38
|/
* Merge pull request #639 from matrix-org/erikj/as_user_update_batchErik Johnston2016-03-101-9/+14
|\ | | | | Update users table in a batched manner
| * Update users table in a batched mannerErik Johnston2016-03-101-9/+14
|/
* Merge pull request #637 from blide/developErik Johnston2016-03-102-11/+20
|\ | | | | SYN-646 - Register endpoint returns refresh_token
| * Flake8 fixblide2016-03-101-6/+6
| |
| * Register endpoint returns refresh_tokenblide2016-03-102-17/+26
|/ | | | Guest registration still doesn't return refresh_token
* Merge pull request #634 from matrix-org/erikj/pin_saml2_versionErik Johnston2016-03-091-1/+1
|\ | | | | Pin pysaml2 version to 3.x
| * Pin pysaml2 version to 3.xErik Johnston2016-03-091-1/+1
| | | | | | | | | | This is due to the fact that `from saml2 import config` fails in version 4.x
* | Merge pull request #628 from matrix-org/markjh/parse_jsonMark Haines2016-03-0911-121/+97
|\ \ | |/ |/| | | | | | | Add a parse_json_object function to deduplicate all the copy+pasted _parse_json functions. Also document the parse_.* functions.
| * Add a parse_json_object functionMark Haines2016-03-0911-121/+97
|/ | | | | to deduplicate all the copy+pasted _parse_json functions. Also document the parse_.* functions.
* Ensure integer is an integerErik Johnston2016-03-091-1/+1
|
* Reinstate coverage checks for integ testsRichard van der Hoff2016-03-092-2/+4
|
* Specify synapse-directory for integ testsRichard van der Hoff2016-03-092-2/+6
|
* Only build py27 tox env for integ testsRichard van der Hoff2016-03-082-2/+2
|
* Use sytest build scripts, rather than reinventing the wheelRichard van der Hoff2016-03-082-52/+7
|
* Merge pull request #632 from matrix-org/markjh/py3v2Mark Haines2016-03-0817-22/+22
|\ | | | | Fix relative imports so they work in both py3 and py27
| * Fix relative imports so they work in both py3 and py27Mark Haines2016-03-0817-22/+22
| |
* | Merge pull request #633 from matrix-org/daniel/ickDaniel Wagner-Hall2016-03-081-1/+5
|\ \ | | | | | | Idempotent-ise schema update script
| * \ Merge branch 'develop' into daniel/ickDaniel Wagner-Hall2016-03-0849-336/+1061
| |\ \ | |/ / |/| |
* | | Merge pull request #630 from matrix-org/dbkr/post_urlencoded_encode_paramsDavid Baker2016-03-081-2/+15
|\ \ \ | |_|/ |/| | Encode unicode objects given to post_urlencode*
| * | pep8David Baker2016-03-081-2/+5
| | |
| * | Encode unicode objects given to post_urlencode* otherwise urllib.urlencode ↵David Baker2016-03-081-2/+12
| | | | | | | | | | | | chokes.
* | | Merge pull request #631 from matrix-org/markjh/py3v1Mark Haines2016-03-088-10/+10
|\ \ \ | | | | | | | | Use syntax that's valid on both py2.7 and py3
| * | | Use syntax that works on both py2.7 and py3Mark Haines2016-03-078-10/+10
| |/ /
* | | Merge pull request #627 from matrix-org/dbkr/guest_reuse_send_user_idDavid Baker2016-03-085-22/+27
|\ \ \ | |/ / |/| | Send the user ID matching the guest access token
| * | Fix testsDavid Baker2016-03-073-20/+20
| | |
| * | Send the user ID matching the guest access token, since there is no Matrix ↵David Baker2016-03-072-2/+7
|/ / | | | | | | API to discover what user ID an access token is for.
* | Merge pull request #626 from matrix-org/erikj/visibilityErik Johnston2016-03-071-0/+26
|\ \ | | | | | | Send history visibility on boundary changes
| * | Send history visibility on boundary changesErik Johnston2016-03-041-0/+26
| | |
* | | Merge pull request #618 from matrix-org/markjh/pushrule_streamMark Haines2016-03-0415-193/+483
|\ \ \ | | | | | | | | Add a stream for push rule updates
| * | | Prefill from the correct streamMark Haines2016-03-041-1/+1
| | | |
| * | | prefill the push rules stream change cacheMark Haines2016-03-041-2/+9
| | | |
| * | | s/stream_ordering/event_stream_ordering/ in pushMark Haines2016-03-043-27/+31
| | | |
| * | | /FNARG/dMark Haines2016-03-041-1/+0
| | | |
| * | | poke jenkinsMark Haines2016-03-040-0/+0
| | | |
| * | | Fix unit testsMark Haines2016-03-041-2/+2
| | | |
| * | | Merge branch 'develop' into markjh/pushrule_streamMark Haines2016-03-0441-148/+641
| |\| |
| * | | Hook up the push rules stream to account_data in /syncMark Haines2016-03-044-69/+85
| | | |
| * | | Move the code for formatting push rules into a separate functionMark Haines2016-03-032-86/+116
| | | |
| * | | Hook up the push rules to the notifierMark Haines2016-03-035-18/+43
| | | |
| * | | Hook push rules up to the replication APIMark Haines2016-03-023-4/+36
| | | |
| * | | Add a stream for push rule updatesMark Haines2016-03-015-74/+251
| | | |
* | | | Merge pull request #625 from matrix-org/erikj/kick_ban_syncErik Johnston2016-03-041-3/+9
|\ \ \ \ | | | | | | | | | | Always include kicks and bans in full /sync
| * | | | Always include kicks and bans in full /syncErik Johnston2016-03-041-3/+9
| | |/ / | |/| |
* | | | Merge pull request #624 from matrix-org/erikj/invite_profileErik Johnston2016-03-043-3/+17
|\ \ \ \ | |/ / / |/| | | Add profile information to invites
| * | | SpellingErik Johnston2016-03-041-1/+1
| | | |
| * | | Add profile information to invitesErik Johnston2016-03-043-3/+17
|/ / /
* | | Merge pull request #598 from Rugvip/invite-stateErik Johnston2016-03-044-7/+45
|\ \ \ | | | | | | | | config,handlers/_base: added homeserver config for what state is included in a room invite
| * | | tests/utils: added room_invite_state_types to test configPatrik Oldsberg2016-03-041-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
| * | | config,handlers/_base: added homeserver config for what state is included in ↵Patrik Oldsberg2016-03-043-7/+44
| | | | | | | | | | | | | | | | | | | | | | | | a room invite Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
* | | | Merge pull request #596 from Rugvip/createErik Johnston2016-03-041-0/+6
|\ \ \ \ | |/ / / |/| | | handlers/_base: don't allow room create event to be changed
| * | | handlers/_base: don't allow room create event to be changedPatrik Oldsberg2016-02-231-0/+6
| | | | | | | | | | | | | | | | Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
* | | | Merge pull request #610 from Rugvip/unique-userErik Johnston2016-03-041-0/+1
|\ \ \ \ | | | | | | | | | | handlers/register: make sure another user id is generated when a collision occurs
| * | | | handlers/register: make sure another user id is generated when a collision ↵Patrik Oldsberg2016-02-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | occurs Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
* | | | | Merge pull request #623 from matrix-org/rav/fix_createroom_raceRichard van der Hoff2016-03-041-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Make sure we add all invited members before returning from createRoom
| * | | | | Make sure we add all invited members before returning from createRoomRichard van der Hoff2016-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | add a missing yield.
* | | | | | Merge pull request #614 from matrix-org/erikj/alias_deleteErik Johnston2016-03-044-10/+51
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow alias creators to delete aliases
| * | | | | | Allow alias creators to delete aliasesErik Johnston2016-03-014-10/+51
| | | | | | |
* | | | | | | Merge pull request #615 from matrix-org/rav/SYN-642Richard van der Hoff2016-03-042-8/+42
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Handle rejections of invites from local users locally
| * | | | | | Merge branch 'develop' into rav/SYN-642Richard van der Hoff2016-03-034-4/+12
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | jenkins-*.sh: set -xRichard van der Hoff2016-03-034-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also move the options from the shebang line to the body of the script, so that they take effect even if somebody explicitly runs "bash jenkins.sh"
| * | | | | | Merge remote-tracking branch 'origin/develop' into rav/SYN-642Richard van der Hoff2016-03-0328-112/+440
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #621 from matrix-org/daniel/ratelimitingDaniel Wagner-Hall2016-03-0313-76/+124
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Pass whole requester to ratelimiting
| * | | | | | | Pass whole requester to ratelimitingDaniel Wagner-Hall2016-03-0313-76/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will enable more detailed decisions
* | | | | | | | Merge pull request #620 from matrix-org/erikj/jenkinsErik Johnston2016-03-035-0/+195
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add some jenkins tests
| * | | | | | | | Split up jenkins testsErik Johnston2016-03-032-0/+43
| | | | | | | | |
| * | | | | | | | MkdirErik Johnston2016-03-031-0/+3
| | | | | | | | |
| * | | | | | | | Add jenkins-postgres.shErik Johnston2016-03-031-0/+87
| | | | | | | | |
| * | | | | | | | Change port-base in jenkins-sqlite.shErik Johnston2016-03-031-1/+1
| | | | | | | | |
| * | | | | | | | Use different PORT_BASEErik Johnston2016-03-031-1/+1
| | | | | | | | |
| * | | | | | | | Exclude all jenkins build scriptsErik Johnston2016-03-031-0/+1
| | | | | | | | |
| * | | | | | | | Add jenkins-sqlite.shErik Johnston2016-03-031-0/+61
|/ / / / / / / /
* | | | | | | | Merge pull request #619 from matrix-org/dbkr/dont_use_checkpwErik Johnston2016-03-031-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Stop using checkpw as it seems to have vanished from bcrypt.
| * | | | | | | Stop using checkpw as it seems to have vanished from bcrypt. Use ↵David Baker2016-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `bcrypt.hashpw(password, hashed) == hashed` as per the bcrypt README.
| | * | | | | | Empty commitRichard van der Hoff2016-03-030-0/+0
| | | | | | | |
| | * | | | | | Merge branch 'develop' into rav/SYN-642Richard van der Hoff2016-03-0330-93/+959
| | |\ \ \ \ \ \
| | * | | | | | | Fix typoRichard van der Hoff2016-03-031-1/+1
| | | | | | | | |
| | * | | | | | | Move arg default to the start of the functionRichard van der Hoff2016-03-021-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also don't overwrite the list that gets passed in.
| | * | | | | | | fix pyflakes quibbleRichard van der Hoff2016-03-021-1/+2
| | | | | | | | |
| | * | | | | | | Address review commentsRichard van der Hoff2016-03-022-8/+17
| | | | | | | | |
| | * | | | | | | Fix pyflakes warningRichard van der Hoff2016-03-011-1/+1
| | | | | | | | |
| | * | | | | | | Handle rejections of invites from local users locallyRichard van der Hoff2016-03-012-8/+31
| | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Slightly hacky fix to SYN-642, which avoids the federation codepath when trying to reject invites from local users.
| | | | | | | * Idempotent-ise schema update scriptDaniel Wagner-Hall2016-03-081-1/+5
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | If any ASes don't have an ID, the schema will fail, and then it will error when trying to add the column again.
* | | | | | | Merge pull request #571 from matrix-org/daniel/asidsDaniel Wagner-Hall2016-03-0310-35/+120
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Mark AS users with their AS's ID
| * | | | | | Mark AS users with their AS's IDDaniel Wagner-Hall2016-02-1110-36/+121
| | | | | | |
* | | | | | | jenkins.sh: set -xRichard van der Hoff2016-03-031-1/+3
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Also move the options from the shebang line to the body of the script, so that they take effect even if somebody explicitly runs "bash jenkins.sh"
* | | | | | Merge pull request #616 from matrix-org/matthew/800x600Matthew Hodgson2016-03-021-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | add 800x600 thumbnails to make vector look prettier (and anyone else …
| * | | | | | add 800x600 thumbnails to make vector look prettier (and anyone else who ↵Matthew Hodgson2016-03-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | likes big thumbnails)
* | | | | | | Merge pull request #612 from matrix-org/erikj/cache_sizeErik Johnston2016-03-027-9/+41
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Add environment variable SYNAPSE_CACHE_FACTOR, default it to 0.1
| * | | | | | Set SYNAPSE_CACHE_FACTOR=1 in jenkinsErik Johnston2016-03-021-0/+1
| | | | | | |
| * | | | | | Add SYNAPSE_CACHE_FACTOR to READMEErik Johnston2016-03-021-1/+18
| | | | | | |
| * | | | | | Limit stream change cache size tooErik Johnston2016-03-011-1/+5
| | | | | | |
| * | | | | | Move cache size fiddling to descriptors only. Fix testsErik Johnston2016-03-012-7/+9
| | | | | | |
| * | | | | | Add enviroment variable SYNAPSE_CACHE_FACTOR, default it to 0.1Erik Johnston2016-03-013-2/+10
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #489 from matrix-org/markjh/replicationMark Haines2016-03-0115-4/+846
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add a /replication API for extracting the updates that happened on synapse.
| * | | | | | Add a /replication API for extracting the updates that happened onMark Haines2016-03-0115-4/+846
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | synapse This is necessary for replicating the data in synapse to be visible to a separate service because presence and typing notifications aren't stored in a database so won't be visible to another process. This API can be used to either get the raw data by requesting the tables themselves or to just receive notifications for updates by following the streams meta-stream. Returns updates for each table requested a JSON array of arrays with a row for each row in the table. Each table is prefixed by a header row with the: name of the table, current stream_id position for the table, number of rows, number of columns and the names of the columns. This is followed by the rows that have been added to the server since the requester last asked. The API has a timeout and is hooked up to the notifier so that a slave can long poll for updates.
* | | | | | Merge pull request #613 from matrix-org/markjh/yieldMark Haines2016-03-0112-77/+52
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Load the current id in the IdGenerator constructor
| * | | | | Load the current id in the IdGenerator constructorMark Haines2016-03-0112-77/+52
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than loading them lazily. This allows us to remove all the yield statements and spurious arguments for the get_next methods. It also allows us to replace all instances of get_next_txn with get_next since get_next no longer needs to access the db.
* | | | | 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
| | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-11 22:37:26 +0000