summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* fix regexp for log redaction to actually redact AS access_tokens etc github/matthew/fix-log-redaction matthew/fix-log-redactionMatthew Hodgson2017-10-091-1/+1
|
* Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2017-10-023-3/+10
|\
| * Merge branch 'release-v0.23.0' of github.com:matrix-org/synapse v0.23.0Erik Johnston2017-10-0252-859/+1833
| |\
| | * Bump version and change log github/release-v0.23.0 release-v0.23.0Erik Johnston2017-10-022-1/+7
| | |
| * | Merge pull request #2464 from rnbdsh/patch-4Richard van der Hoff2017-09-251-2/+3
| |\ \ | | | | | | | | Remove non-existing files, add stop, use synctl
| | * | Start traditionally, stop synctlrnbdsh2017-09-241-1/+2
| | | | | | | | | | | | | | | | Starting with synctl lead to "no config file found" Stopping also leads to some (code=exited, status=1/FAILURE), but at least now we can stop the service.
| | * | Remove non-existing files, add stop, use synctlrnbdsh2017-09-241-2/+2
| |/ / | | | | | | | | | | | | | | | | | | Non-existing files, when running the suggested from https://github.com/matrix-org/synapse#configuring-synapse /etc/synapse/log_config.yaml so the --log-config leads to an error /etc/sysconfig/synapse The environment-file or even the /etc/sysconfig does not exist in arch linux Also instead of calling python2 we use synctl, as this seems to be the proper way to start it, and it gives us a more useful error in the systemctl status. And we now allow stop (and therefore restart).
* | | Merge pull request #2480 from matrix-org/rav/federation_client_loggingRichard van der Hoff2017-09-291-7/+6
|\ \ \ | | | | | | | | Improve logging of failures in matrixfederationclient
| * | | Improve logging of failures in matrixfederationclientRichard van der Hoff2017-09-281-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | * don't log exception types twice * not all exceptions have a meaningful 'message'. Use the repr rather than attempting to build a string ourselves.
* | | | Only log if we've removed mediaErik Johnston2017-09-281-2/+4
|/ / /
* | | Handle SERVFAILs when doing AAAA lookups for federation (#2477)Richard van der Hoff2017-09-281-5/+17
| | | | | | | | | | | | | | | ... to cope with people with broken dnssec setups, mostly
* | | Up the limits on number of url cache entries to delete at one timeErik Johnston2017-09-281-2/+2
| | |
* | | Add old indicesErik Johnston2017-09-281-0/+2
| | |
* | | Clear up expired url cache every 10sErik Johnston2017-09-281-1/+1
| | |
* | | Actually assign result to variableErik Johnston2017-09-281-1/+1
| | |
* | | Only pull out local media that were for url cacheErik Johnston2017-09-281-1/+1
| | |
* | | Fix typo in url cache expiry timerErik Johnston2017-09-281-1/+1
| | |
* | | Merge pull request #2479 from matrix-org/erikj/expire_url_cache_thumbnailsErik Johnston2017-09-281-31/+81
|\ \ \ | | | | | | | | Support new and old style media id formats
| * | | Support new and old style media id formatsErik Johnston2017-09-281-31/+81
| | | |
* | | | Fix typoErik Johnston2017-09-281-3/+3
| | | |
* | | | Merge pull request #2478 from matrix-org/erikj/expire_url_cache_thumbnailsErik Johnston2017-09-285-12/+234
|\| | | | | | | | | | | Delete expired url cache data
| * | | Change expires column to expires_tsErik Johnston2017-09-283-10/+29
| | | |
| * | | More bracketsErik Johnston2017-09-281-1/+1
| | | |
| * | | Delete expired url cache dataErik Johnston2017-09-285-5/+208
|/ / /
* | | Merge pull request #2476 from matrix-org/erikj/joined_members_authErik Johnston2017-09-282-13/+26
|\ \ \ | | | | | | | | Fix /joined_members to work with AS users
| * | | Fix /joined_members to work with AS usersErik Johnston2017-09-282-13/+26
| | | |
* | | | Merge pull request #2475 from matrix-org/erikj/joined_members_authErik Johnston2017-09-272-10/+38
|\| | | | | | | | | | | Fix bug where /joined_members didn't check user was in room
| * | | Fix bug where /joined_members didn't check user was in roomErik Johnston2017-09-272-10/+38
|/ / /
* | | Merge pull request #2474 from matrix-org/dbkr/spam_check_moduleDavid Baker2017-09-276-23/+74
|\ \ \ | | | | | | | | Make the spam checker a module
| * | | Don't test is spam_checker not NoneDavid Baker2017-09-271-1/+7
| | | | | | | | | | | | | | | | | | | | Sometimes it's a Mock object which is not none but is still not what we're after
| * | | Remove unintentional debuggingDavid Baker2017-09-271-1/+0
| | | |
| * | | pep8David Baker2017-09-272-0/+2
| | | |
| * | | Forgot the new file again :(David Baker2017-09-271-0/+35
| | | |
| * | | Make the spam checker a moduleDavid Baker2017-09-265-23/+33
| | | |
* | | | pep8David Baker2017-09-261-0/+1
|/ / /
* | | Merge pull request #2473 from matrix-org/dbkr/factor_out_module_loadingDavid Baker2017-09-262-12/+51
|\ \ \ | |_|/ |/| | Factor out module loading to a separate place
| * | unnecessary parensDavid Baker2017-09-261-1/+1
| | |
| * | Add module_loader.pyDavid Baker2017-09-261-0/+41
| | |
| * | Factor out module loading to a separate placeDavid Baker2017-09-261-12/+10
|/ / | | | | | | So it can be reused
* | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.23.0 v0.23.0-rc2Erik Johnston2017-09-263-19/+39
|\ \
| * \ Merge pull request #2470 from matrix-org/erikj/sync_speed_fixErik Johnston2017-09-251-5/+18
| |\ \ | | | | | | | | Refactor to speed up incremental syncs
| | * | Refactor to speed up incremental syncsErik Johnston2017-09-251-5/+18
| |/ /
| * | Merge pull request #2468 from maxidor/developRichard van der Hoff2017-09-251-13/+20
| |\ \ | | | | | | | | Clarify recommended network setup
| | * | Include review feedbackMax Dor2017-09-251-5/+3
| | | |
| | * | Clarify recommended network setupMax Dor2017-09-251-15/+24
| |/ /
| * | Merge branch 'release-v0.23.0' of github.com:matrix-org/synapse into developErik Johnston2017-09-252-1/+33
| |\ \
| * \ \ Merge pull request #2390 from r3dey3/developRichard van der Hoff2017-09-251-1/+1
| |\ \ \ | | | | | | | | | | Fix iteration of requests_missing_keys; list doesn't have .values()
| | * \ \ Merge branch 'develop' into developRichard van der Hoff2017-09-2548-805/+1855
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Fix iteration of requests_missing_keys; list doesn't have .values()Kenny Keslar2017-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kenny Keslar <r3dey3@r3dey3.com>
* | | | | Bump changelog and versionErik Johnston2017-09-262-1/+9
| |_|/ / |/| | |
* | | | Update CHANGES v0.23.0-rc1Erik Johnston2017-09-251-3/+11
| | | |
* | | | Bump version and changesErik Johnston2017-09-252-1/+25
|/ / /
* | | Fix logcontxt leak in keyclient (#2465)Richard van der Hoff2017-09-251-12/+5
| | | | | | | | | preserve_context_over_function doesn't do what you want it to do.
* | | Do an AAAA lookup on SRV record targets (#2462)Richard van der Hoff2017-09-222-24/+118
| | | | | | | | | | | | | | | Support SRV records which point at AAAA records, as well as A records. Fixes https://github.com/matrix-org/synapse/issues/2405
* | | fix thinko'd docstringMatthew Hodgson2017-09-221-1/+1
| | |
* | | Fix device list when rejoining room (#2461)Erik Johnston2017-09-221-2/+14
| | |
* | | Merge pull request #2459 from matrix-org/rav/keyring_cleanupsRichard van der Hoff2017-09-205-214/+353
|\ \ \ | | | | | | | | Clean up Keyring code
| * | | Fix logcontexts in _check_sigs_and_hashesRichard van der Hoff2017-09-202-60/+62
| | | |
| * | | Add some more tests for KeyringRichard van der Hoff2017-09-201-37/+140
| | | |
| * | | Fix logcontext handling in verify_json_objects_for_serverRichard van der Hoff2017-09-201-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | preserve_context_over_fn is essentially broken, because (a) it pointlessly drops the current logcontext before calling its wrapped function, which means we don't get any useful logcontexts for _handle_key_deferred; (b) it wraps the resulting deferred in a _PreservingContextDeferred, which is very dangerous because you then can't yield on it without leaking context back into the reactor. Instead, let's specify that the resultant deferreds call their callbacks with no logcontext.
| * | | Turn _start_key_lookups into an inlineCallbacks functionRichard van der Hoff2017-09-201-40/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... which means that logcontexts can be correctly preserved for the stuff it does. get_server_verify_keys is now called with the logcontext, so needs to preserve_fn when it fires off its nested inlineCallbacks function. Also renames get_server_verify_keys to reflect the fact it's meant to be private.
| * | | Fix potential race in _start_key_lookupsRichard van der Hoff2017-09-201-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the verify_request.deferred has already completed, then `remove_deferreds` will be called immediately. It therefore might resolve the server_to_deferred deferred while there are still other requests for that server in flight. To avoid that, we should build the complete list of requests, and *then* add the callbacks.
| * | | Add some comments to _start_key_lookupsRichard van der Hoff2017-09-201-0/+8
| | | |
| * | | Consistency for how verify_request.deferred is calledRichard van der Hoff2017-09-201-13/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define that it is run with no log context, and make sure that happens. If we aren't careful to reset the logcontext, we can't bung the deferreds into defer.gatherResults etc. We don't actually do that directly, but we *do* resolve other deferreds from affected callbacks (notably the server_to_deferred map in _start_key_lookups), and those *do* get passed into defer.gatherResults. It turns out that this way ends up being least confusing.
| * | | Factor out _start_key_lookupsRichard van der Hoff2017-09-201-7/+17
| | | | | | | | | | | | | | | | ... to make it easier to see what's going on.
| * | | Replace `server_and_json` with `verify_requests`Richard van der Hoff2017-09-201-3/+3
| | | | | | | | | | | | | | | | This is a precursor to factoring some of this code out.
| * | | pull out handle_key_deferred to top levelRichard van der Hoff2017-09-201-43/+44
| | | | | | | | | | | | | | | | | | | | | | | | There's no need for this to be a nested definition; pulling it out not only makes it more efficient, but makes it easier to check that it's not accessing any local variables it shouldn't be.
| * | | Fix incorrect key_ids in error messageRichard van der Hoff2017-09-201-1/+1
| | | |
| * | | Invalidate signing key cache when we gat an updateRichard van der Hoff2017-09-201-17/+24
| | | | | | | | | | | | | | | | This might make the cache slightly more efficient.
| * | | Remove redundant `preserve_fn`Richard van der Hoff2017-09-201-2/+2
|/ / / | | | | | | | | | | | | | | | preserve_fn is a no-op unless the wrapped function returns a Deferred. verify_json_objects_for_server returns a list, so this is doing nothing.
* | | Fix concurrent server_key requests (#2458)Richard van der Hoff2017-09-192-4/+58
| | | | | | | | | | | | Fix a bug where we could end up firing off multiple requests for server_keys for the same server at the same time.
* | | Add a config option to block all room invites (#2457)Richard van der Hoff2017-09-195-0/+44
| | | | | | | | | | | | | | | - allows sysadmins the ability to lock down their servers so that people can't send their users room invites.
* | | add some comments to on_exchange_third_party_invite_requestRichard van der Hoff2017-09-191-0/+11
| | |
* | | PoC for filtering spammy events (#2456)Richard van der Hoff2017-09-193-17/+69
| | | | | | | | | Demonstration of how you might add some hooks to filter out spammy events.
* | | Fix overzealous kicking of guest users (#2453)Richard van der Hoff2017-09-191-1/+1
| | | | | | | | | We should only kick guest users if the guest access event is authorised.
* | | Clean up and document handling of logcontexts in Keyring (#2452)Richard van der Hoff2017-09-182-28/+110
| | | | | | | | | | | | | | | | | | I'm still unclear on what the intended behaviour for `verify_json_objects_for_server` is, but at least I now understand the behaviour of most of the things it calls...
* | | Merge pull request #2451 from matrix-org/erikj/add_state_to_timelineErik Johnston2017-09-182-3/+18
|\ \ \ | | | | | | | | Don't filter out current state events from timeline
| * | | Don't filter out current state events from timelineErik Johnston2017-09-182-3/+18
| | | |
* | | | Merge pull request #2450 from matrix-org/dbkr/push_event_id_onlyDavid Baker2017-09-181-0/+20
|\ \ \ \ | |/ / / |/| | | Add support for event_id_only push format
| * | | Also include the room_idDavid Baker2017-09-181-0/+1
| | | | | | | | | | | | | | | | as really it's part of the event ID
| * | | Use .get - it's much shorterDavid Baker2017-09-181-1/+1
| | | |
| * | | Add support for event_id_only push formatDavid Baker2017-09-181-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Param in the data dict of a pusher that tells an HTTP pusher to send just the event_id of the event it's notifying about and the notification counts. For clients that want to go & fetch the body of the event themselves anyway.
* | | | Merge pull request #2449 from matrix-org/erikj/rejoin_device_listsErik Johnston2017-09-181-13/+12
|\ \ \ \ | |/ / / |/| | | Correctly handle leaving room in /key/changes
| * | | Correctly handle leaving room in /key/changesErik Johnston2017-09-181-13/+12
| | | |
* | | | Merge pull request #2443 from matrix-org/erikj/rejoin_device_listsErik Johnston2017-09-184-29/+153
|\| | | | | | | | | | | Send down device list change notif when member leaves/rejoins room
| * | | Fix typoErik Johnston2017-09-151-1/+1
| | | |
| * | | Actually hook leave notifs upErik Johnston2017-09-141-2/+3
| | | |
| * | | Handle joining/leaving rooms in /keys/changesErik Johnston2017-09-131-1/+38
| | | |
| * | | Get left roomsErik Johnston2017-09-131-3/+32
| | | |
| * | | In sync handle device lists for newly joined/left roomsErik Johnston2017-09-121-2/+10
| | | |
| * | | Add left section to /keys/changesErik Johnston2017-09-083-11/+19
| | | |
| * | | Send down device list change notif when member leaves/rejoins roomErik Johnston2017-09-073-14/+55
|/ / /
* | | Merge pull request #2439 from matrix-org/rav/tox_tweaksRichard van der Hoff2017-09-061-5/+29
|\ \ \ | | | | | | | | do tox install with pip -e
| * | | do tox install with pip -eRichard van der Hoff2017-09-051-5/+29
| | | | | | | | | | | | | | | | | | | | - this ensures we end up with a working virtualenv which we can use for other things.
* | | | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2017-09-053-0/+3
|\ \ \ \ | | |_|/ | |/| |
| * | | Exclude the github issue template from our sdist (#2440)Richard van der Hoff2017-09-052-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PR #2413 added an issue template, but just adding files to the project directory upsets the packaging scripts: we need to explicitly include or exclude them. Move the template into a .github directory to make that easy, and to de-clutter the root a bit.
| * | | Merge pull request #2433 from ptman/patch-1Erik Johnston2017-09-011-0/+2
| |\ \ \ | | | | | | | | | | Document known to work postgres version
| | * | | Document known to work postgres versionPaul Tötterman2017-09-011-0/+2
| |/ / /
* | / / Merge branch 'master' into developRichard van der Hoff2017-09-054-0/+483
|\| | | | |/ / |/| |
| * | Set --python when running sytestRichard van der Hoff2017-09-014-0/+4
| | | | | | | | | | | | | | | | | | .. because I want to make the 'install_and_run' script useful for non-synapse jobs, which do not accept --python. In any case we set up the path here, so sytest shouldn't be guessing it.
| * | Merge pull request #2416 from matrix-org/rav/prometheus_configRichard van der Hoff2017-08-223-0/+436
| |\ \ | | | | | | | | Add prometheus config
| | * | Add prometheus configRichard van der Hoff2017-08-163-0/+436
| | | | | | | | | | | | | | | | ... from https://github.com/matrix-org/synapse-prometheus-config.
| * | | Merge pull request #2413 from matrix-org/toml-issue-templateTom Lant2017-08-211-0/+47
| |\ \ \ | | |/ / | |/| | Issue template for Synapse
| | * | Update ISSUE_TEMPLATE.mdTom Lant2017-08-171-1/+5
| | | | | | | | | | | | Added instructions for checking server version.
| | * | Update ISSUE_TEMPLATE.mdTom Lant2017-08-171-3/+10
| | | | | | | | | | | | Responding to review comments.
| | * | Update ISSUE_TEMPLATE.mdTom Lant2017-08-141-2/+2
| | | | | | | | | | | | Removed the sentence encouraging people not to file a bug - if people are in doubt we'd rather they filed a bug than gave up entirely.
| | * | Update ISSUE_TEMPLATE.mdTom Lant2017-08-141-1/+1
| | | | | | | | | | | | Oops capital L.
| | * | Create ISSUE_TEMPLATE.mdTom Lant2017-08-141-0/+36
| |/ / | | | | | | A new issue template proposed to try and steer people towards #matrix:matrix.org for support queries relating to running their own homeserver.
* | | fix python path in jenkins scriptsRichard van der Hoff2017-09-014-4/+4
| | |
* | | Set --python when running sytestRichard van der Hoff2017-09-014-0/+4
| | | | | | | | | | | | | | | | | | .. because I want to make the 'install_and_run' script useful for non-synapse jobs, which do not accept --python. In any case we set up the path here, so sytest shouldn't be guessing it.
* | | Merge pull request #2428 from matrix-org/rav/update_upgradeRichard van der Hoff2017-08-241-33/+42
|\ \ \ | | | | | | | | Tweaks to the upgrade instructions
| * | | Tweaks to the upgrade instructionsRichard van der Hoff2017-08-231-33/+42
|/ / /
* | | Merge pull request #2417 from matrix-org/rav/federation_clientRichard van der Hoff2017-08-231-8/+79
|\ \ \ | | | | | | | | Improvements to the federation test client
| * | | test federation client: Allow server-name and key-file as optionsRichard van der Hoff2017-08-221-8/+28
| | | | | | | | | | | | | | | | so that you don't necessarily need a config file.
| * | | Improvements to the federation test clientRichard van der Hoff2017-08-171-7/+58
| | | | | | | | | | | | | | | | Make it read the config file, primarily.
* | | | Merge pull request #2288 from kyrias/bcryptRichard van der Hoff2017-08-231-1/+1
|\ \ \ \ | |/ / / |/| | | python_dependencies: Use bcrypt module instead of py-bcrypt
| * | | python_dependencies: Use bcrypt module instead of py-bcryptJohannes Löthberg2017-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | py-bcrypt has been unmaintained for a long while, while bcrypt is actively maintained. And since ff8b87118dcfb153d972e29c2b77b195244d5ddc we're compatible with the bcrypt anyway. Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
* | | | Fix user_dir startupRichard van der Hoff2017-08-161-1/+1
| | | | | | | | | | | | | | | | Add missing parameter to _base.start_worker_reactor
* | | | Fix process startupRichard van der Hoff2017-08-161-10/+13
| | | | | | | | | | | | | | | | escape the % that got added in 92168cb so that the process starts up ok.
* | | | explain why CPU affinity is a good ideaMatthew Hodgson2017-08-151-0/+8
| | | |
* | | | Merge pull request #2415 from matrix-org/rav/synctl_cpu_affinityRichard van der Hoff2017-08-1514-465/+271
|\ \ \ \ | | | | | | | | | | Allow configuration of CPU affinity
| * | | | Allow configuration of CPU affinityRichard van der Hoff2017-08-155-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | Make it possible to set the CPU affinity in the config file, so that we don't need to remember to do it manually every time.
| * | | | Factor out common application startRichard van der Hoff2017-08-1511-464/+248
|/ / / / | | | | | | | | | | | | | | | | We have 10 copies of this code, and I don't really want to update each one separately.
* | | | fix englishhera2017-08-041-7/+7
| | | |
* | | | typohera2017-08-041-1/+1
| | | |
* | | | Reduce spammy log line in synchrotronsErik Johnston2017-08-021-1/+1
| |_|/ |/| |
* | | Merge pull request #2375 from matrix-org/erikj/port_scriptErik Johnston2017-07-201-0/+19
|\ \ \ | | | | | | | | Fix port script for user directory tables
| * | | Extend commentErik Johnston2017-07-201-1/+2
| | | |
| * | | Fix port script for user directory tablesErik Johnston2017-07-201-0/+18
|/ / /
* | | Merge pull request #2371 from matrix-org/erikj/push_cache_hitErik Johnston2017-07-171-0/+8
|\ \ \ | | | | | | | | Increase cache hit ratio for push
| * | | Increase cache hit ratio for pushErik Johnston2017-07-141-0/+8
|/ / / | | | | | | | | | | | | We don't update the cache in all code paths, which causes subsequent calls to miss the cache
* | | Merge pull request #2366 from matrix-org/erikj/push_metricsErik Johnston2017-07-141-2/+42
|\ \ \ | | | | | | | | Add more metrics to push rule evaluation
| * | | Add more metrics to push rule evaluationErik Johnston2017-07-131-2/+42
|/ / /
* | | Merge pull request #2365 from matrix-org/erikj/push_skip_lockErik Johnston2017-07-131-0/+4
|\ \ \ | | | | | | | | Push: Don't acquire lock unless necessary
| * | | Push: Don't acquire lock unless necessaryErik Johnston2017-07-131-0/+4
|/ / /
* | | Merge pull request #2362 from matrix-org/erikj/sync_user_users_who_shareErik Johnston2017-07-121-8/+7
|\ \ \ | | | | | | | | Use less DB for device list handling in sync
| * | | Use less DB for device list handling in syncErik Johnston2017-07-121-8/+7
|/ / /
* | | Merge pull request #2354 from krombel/reduce_static_sync_replyErik Johnston2017-07-111-16/+25
|\ \ \ | | | | | | | | encode sync-response statically
| * | | split out reducing stuff; just make encode_* staticKrombel2017-07-111-35/+27
| | | |
| * | | fix testKrombel2017-07-101-1/+3
| | | |
| * | | encode sync-response statically; omit empty objects from sync-responseKrombel2017-07-101-33/+48
| | | |
* | | | Merge pull request #2357 from matrix-org/erikj/pushErik Johnston2017-07-111-1/+1
|\ \ \ \ | | | | | | | | | | Don't compute push actions for backfilled events
| * | | | Don't compute push actions for backfilled eventsErik Johnston2017-07-111-1/+1
| | | | |
* | | | | Reduce log levels in tcp replicationErik Johnston2017-07-111-2/+2
|/ / / /
* | | | Include registration and as stores in frontend proxyErik Johnston2017-07-071-0/+4
| | | |
* | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2017-07-072-1/+10
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'hotfixes-v0.22.1' of github.com:matrix-org/synapse v0.22.1Erik Johnston2017-07-065-11/+21
| |\ \ \
| | * | | Bump version and changelogErik Johnston2017-07-062-1/+10
| | | | |
* | | | | Merge pull request #2344 from matrix-org/erikj/frontend_proxyErik Johnston2017-07-072-0/+269
|\ \ \ \ \ | | | | | | | | | | | | Add a frontend proxy
| * | | | | Add a frontend proxyErik Johnston2017-07-072-0/+269
|/ / / / /
* | | | | Merge pull request #2343 from matrix-org/erikj/fastpushErik Johnston2017-07-073-36/+21
|\ \ \ \ \ | |_|_|/ / |/| | | | Perf: Don't filter events for push
| * | | | Perf: Don't filter events for pushErik Johnston2017-07-073-36/+21
|/ / / / | | | | | | | | | | | | | | | | We know the users are joined and we can explicitly check for if they are ignoring the user, so lets do that.
* | | | Merge pull request #2342 from matrix-org/erikj/pusher_pool_instantiateErik Johnston2017-07-063-10/+11
|\ \ \ \ | | |/ / | |/| | Fix bug where pusherpool didn't start and broke some rooms
| * | | Fix bug where pusherpool didn't start and broke some roomsErik Johnston2017-07-063-10/+11
| |/ / | | | | | | | | | | | | | | | | | | | | | Since we didn't instansiate the PusherPool at start time it could fail at run time, which it did for some users. This may or may not fix things for those users, but it should happen at start time and stop the server from starting.
* | | Merge pull request #2309 from matrix-org/erikj/user_ip_replErik Johnston2017-07-066-17/+18
|\ \ \ | | | | | | | | Fix up user_ip replication commands
| * | | Serialize user ip command as jsonErik Johnston2017-06-271-5/+9
| | | |
| * | | Fix upErik Johnston2017-06-275-12/+9
| | | |
* | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2017-07-062-1/+23
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'release-v0.22.0' of github.com:matrix-org/synapse v0.22.0Erik Johnston2017-07-0691-488/+3929
| |\ \ \
| | * | | Bump version and changelog github/release-v0.22.0 release-v0.22.0Erik Johnston2017-07-062-1/+7
| | | | |
| | * | | Bump version and changelog v0.22.0-rc2Erik Johnston2017-07-042-1/+17
| | | | |
* | | | | Merge pull request #2334 from matrix-org/erikj/refactor_transport_serverErik Johnston2017-07-051-8/+16
|\ \ \ \ \ | | | | | | | | | | | | Separate federation servlet into different lists
| * | | | | Separate federation servlet into different listsErik Johnston2017-07-051-8/+16
| | |/ / / | |/| | |
* | | | | Merge pull request #2332 from matrix-org/rav/fix_pushesRichard van der Hoff2017-07-051-1/+3
|\ \ \ \ \ | |/ / / / |/| | | | Fix caching error in the push evaluator
| * | | | Fix caching error in the push evaluatorRichard van der Hoff2017-07-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initialising `result` to `{}` in the parameters meant that every call to _flatten_dict used the *same* target dictionary. I'm hopeful this will fix https://github.com/matrix-org/synapse/issues/2270, but I suspect it won't. (This code seems to have been here since forever, unlike the bug, and I don't really think it explains the observed behaviour). Still, it makes it hard to investigate the problem.
* | | | | Merge pull request #2330 from matrix-org/erikj/cache_size_factorErik Johnston2017-07-048-30/+12
|\ \ \ \ \ | | | | | | | | | | | | Increase default cache size
| * | | | | Update testErik Johnston2017-07-041-1/+1
| | | | | |
| * | | | | Update READMEErik Johnston2017-07-041-7/+4
| | | | | |
| * | | | | Increase default cache factor size.Erik Johnston2017-07-041-1/+1
| | | | | |
| * | | | | Define CACHE_SIZE_FACTOR onceErik Johnston2017-07-045-21/+6
| | | | | |
* | | | | | Merge pull request #2323 from matrix-org/markjh/invite_checksMark Haines2017-07-041-2/+17
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Improve the error handling for bad invites received over federation
| * | | | | Improve the error handling for bad invites received over federationMark Haines2017-06-301-2/+17
|/ / / / /
* | | | | Merge pull request #2321 from matrix-org/erikj/prefill_forwardErik Johnston2017-06-302-2/+13
|\ \ \ \ \ | | | | | | | | | | | | Prefill forward extrems and event to state groups
| * | | | | Make into listErik Johnston2017-06-291-1/+1
| | | | | |
| * | | | | Prefill forward extrems and event to state groupsErik Johnston2017-06-292-2/+13
|/ / / / /
* | | | | Merge pull request #2320 from matrix-org/erikj/cache_macaroon_parseErik Johnston2017-06-291-13/+60
|\ \ \ \ \ | | | | | | | | | | | | Cache macaroon parse and validation
| * | | | | Cache macaroon parse and validationErik Johnston2017-06-291-13/+60
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Turns out this can be quite expensive for requests, and is easily cachable. We don't cache the lookup to the DB so invalidation still works.
* | | | | Merge pull request #2319 from matrix-org/erikj/prune_sessionsErik Johnston2017-06-292-11/+13
|\ \ \ \ \ | | | | | | | | | | | | Use an ExpiringCache for storing registration sessions
| * | | | | Use an ExpiringCache for storing registration sessionsErik Johnston2017-06-292-11/+13
|/ / / / / | | | | | | | | | | | | | | | | | | | | This is because pruning them was a significant performance drain on matrix.org
* | | | | Merge branch 'release-v0.22.0' of github.com:matrix-org/synapse into developErik Johnston2017-06-272-1/+35
|\ \ \ \ \
| * | | | | Update version and changelog v0.22.0-rc1Erik Johnston2017-06-262-1/+35
| | | | | |
* | | | | | Merge pull request #2308 from matrix-org/erikj/user_ip_replErik Johnston2017-06-279-8/+111
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | Make workers report to master for user ip updates
| * | | | | Make workers report to master for user ip updatesErik Johnston2017-06-279-8/+111
| | | | | |
* | | | | | Merge pull request #2307 from matrix-org/erikj/user_ip_batchErik Johnston2017-06-275-48/+101
|\| | | | | | | | | | | | | | | | | Batch upsert user ips
| * | | | | Fix up client ips to read from pending dataErik Johnston2017-06-274-27/+62
| | | | | |
| * | | | | Batch upsert user ipsErik Johnston2017-06-272-21/+39
| |/ / / /
* | | | | Merge pull request #2290 from matrix-org/erikj/ensure_round_tripErik Johnston2017-06-261-0/+9
|\ \ \ \ \ | |/ / / / |/| | | | Reject local events that don't round trip the DB
| * | | | Remove unused variablesErik Johnston2017-06-261-1/+1
| | | | |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2017-06-2626-58/+535
| |\ \ \ \ | | | | | | | | | | | | | | | | | | erikj/ensure_round_trip
| * | | | | Reject local events that don't round trip the DBErik Johnston2017-06-191-0/+9
| | |_|_|/ | |/| | |
* | | | | Merge pull request #2304 from matrix-org/erikj/users_share_fixErik Johnston2017-06-261-1/+2
|\ \ \ \ \ | |_|/ / / |/| | | | Fix up indices for users_who_share_rooms
| * | | | Fix up indices for users_who_share_roomsErik Johnston2017-06-261-1/+2
|/ / / /
* | | | Merge pull request #2301 from xwiki-labs/push-redact-contentErik Johnston2017-06-243-2/+48
|\ \ \ \ | | | | | | | | | | Add configuration parameter to allow redaction of content from push m…
| * | | | Change the config file generator to more descriptive explanation of ↵Caleb James DeLisle2017-06-241-3/+11
| | | | | | | | | | | | | | | | | | | | push.redact_content
| * | | | Fix TravisCI tests for PR #2301 - Fat finger mistakeCaleb James DeLisle2017-06-231-0/+0
| | | | |
| * | | | Fix TravisCI tests for PR #2301Caleb James DeLisle2017-06-233-5/+2
| | | | |
| * | | | Add configuration parameter to allow redaction of content from push messages ↵Caleb James DeLisle2017-06-233-2/+43
| | | | | | | | | | | | | | | | | | | | for google/apple devices
* | | | | Merge pull request #2299 from matrix-org/erikj/segregate_url_cache_downloadsErik Johnston2017-06-237-20/+94
|\ \ \ \ \ | |/ / / / |/| | | | Store URL cache preview downloads separately
| * | | | Store URL cache preview downloads seperatelyErik Johnston2017-06-237-20/+94
|/ / / / | | | | | | | | | | | | This makes it easier to clear old media out at a later date
* | | | Merge pull request #2297 from matrix-org/erikj/user_dir_fixErik Johnston2017-06-221-7/+10
|\ \ \ \ | | | | | | | | | | Fix thinko in initial public room user spam
| * | | | Make some more params configurableErik Johnston2017-06-221-5/+8
| | | | |
| * | | | Typo. ARGH.Erik Johnston2017-06-221-1/+1
| | | | |
| * | | | Fix thinko in unhandled user spamErik Johnston2017-06-221-2/+2
|/ / / /
* | | | Merge branch 'master' into developMatthew Hodgson2017-06-222-1/+9
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #2282 from matrix-org/release-v0.21.1 v0.21.1Erik Johnston2017-06-157-218/+97
| |\ \ \ | | | | | | | | | | Release v0.21.1
| | * | | Bump version and changelogErik Johnston2017-06-152-1/+9
| | | | |
* | | | | Add descErik Johnston2017-06-221-0/+1
| | | | |
* | | | | Merge pull request #2296 from matrix-org/erikj/dont_appserver_sharErik Johnston2017-06-214-18/+37
|\ \ \ \ \ | | | | | | | | | | | | Don't work out users who share room with appservice users
| * | | | | Initialise exclusive_user_regexErik Johnston2017-06-212-15/+22
| | | | | |
| * | | | | Fix for workersErik Johnston2017-06-212-1/+4
| | | | | |
| * | | | | Don't work out users who share room with appservice usersErik Johnston2017-06-211-2/+11
| | | | | |
* | | | | | Merge pull request #2219 from krombel/avoid_duplicate_filtersErik Johnston2017-06-211-1/+11
|\ \ \ \ \ \ | |/ / / / / |/| | | | | only add new filter when not existent prevoisly
| * | | | | Merge branch 'develop' into avoid_duplicate_filtersKrombel2017-06-2175-593/+3545
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #2292 from matrix-org/erikj/quarantine_mediaErik Johnston2017-06-197-5/+121
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add API to quarantine media
| * | | | | | Handle thumbnail urlsErik Johnston2017-06-191-12/+14
| | | | | | |
| * | | | | | Add API to quarantine mediaErik Johnston2017-06-197-5/+119
| | | | | | |
* | | | | | | Merge pull request #2291 from matrix-org/erikj/shutdown_roomErik Johnston2017-06-197-5/+205
|\| | | | | | | |_|_|_|/ / |/| | | | | Add shutdown room API
| * | | | | Handle all cases of sending membership eventsErik Johnston2017-06-191-0/+5
| | | | | |
| * | | | | Remove unused importErik Johnston2017-06-191-1/+1
| | | | | |
| * | | | | Change to create new room and join other usersErik Johnston2017-06-192-10/+70
| | | | | |
| * | | | | Forget roomErik Johnston2017-06-191-0/+2
| | | | | |
| * | | | | Add shutdown room APIErik Johnston2017-06-196-1/+134
|/ / / / /
* | | | | add missing boolean to synapse_port_dbMatthew2017-06-161-0/+1
| | | | |
* | | | | fix synapse_port scriptMatthew2017-06-161-1/+1
| | | | |
* | | | | Merge pull request #2286 from matrix-org/erikj/split_out_user_dirErik Johnston2017-06-166-7/+328
|\ \ \ \ \ | | | | | | | | | | | | Split out user directory to a separate process
| * | | | | Initial worker implErik Johnston2017-06-166-7/+328
| | | | | |
* | | | | | Merge pull request #2280 from matrix-org/erikj/share_room_user_dirErik Johnston2017-06-165-60/+508
|\| | | | | | | | | | | | | | | | | Include users who you share a room with in user directory
| * | | | | Include users who share room with requester in user directoryErik Johnston2017-06-153-26/+47
| | | | | |
| * | | | | Implement updating users who share rooms on the flyErik Johnston2017-06-152-24/+235
| | | | | |
| * | | | | Implement initial population of users who share rooms tableErik Johnston2017-06-152-9/+193
| | | | | |
| * | | | | Add DB schema for tracking users who share roomsErik Johnston2017-06-152-1/+33
| | | | | |
* | | | | | Merge pull request #2285 from krombel/allow_authorization_headerErik Johnston2017-06-161-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | allow Authorization header
| * | | | | | allow Authorization header which handling got implemented in #1098Krombel2017-06-161-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Kesler <krombel@krombel.de>
* | | | | | Merge pull request #2281 from matrix-org/erikj/phone_home_statsErik Johnston2017-06-155-217/+88
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | Fix phone home stats
| * | | | | TypoErik Johnston2017-06-151-1/+3
| | | | | |
| * | | | | Add some more statsErik Johnston2017-06-153-0/+35
| | | | | |
| * | | | | Remove unhelpful testErik Johnston2017-06-151-115/+0
| | | | | |
| * | | | | Fix phone home statsErik Johnston2017-06-143-107/+56
| | |_|/ / | |/| | |
* | | | | add notes on running out of FDsMatthew Hodgson2017-06-141-0/+24
| |/ / / |/| | |
* | | | Merge pull request #2279 from matrix-org/erikj/fix_user_dirErik Johnston2017-06-132-4/+9
|\ \ \ \ | | | | | | | | | | Fix user directory insertion due to missing room_id
| * | | | Fix user directory insertion due to missing room_idErik Johnston2017-06-132-4/+9
| | | | |
* | | | | Merge pull request #2278 from matrix-org/erikj/fix_user_dirErik Johnston2017-06-131-24/+41
|\| | | | | | | | | | | | | | Fix user dir to not assume existence of user
| * | | | Fix up sqlErik Johnston2017-06-131-10/+12
| | | | |
| * | | | Fix user dir to not assume existence of userErik Johnston2017-06-131-22/+37
|/ / / /
* | | | Merge pull request #2274 from matrix-org/erikj/cache_is_host_joinedErik Johnston2017-06-133-2/+7
|\ \ \ \ | | | | | | | | | | Add cache for is_host_joined
| * | | | Add cache for is_host_joinedErik Johnston2017-06-133-2/+7
| | | | |
* | | | | Merge pull request #2275 from matrix-org/erikj/tweark_user_directory_searchErik Johnston2017-06-131-13/+40
|\ \ \ \ \ | | | | | | | | | | | | Tweak the ranking of PG user dir search
| * | | | | Tweak the ranking of PG user dir searchErik Johnston2017-06-131-13/+40
| |/ / / /
* | | | | Merge pull request #2276 from matrix-org/erikj/fix_user_diErik Johnston2017-06-131-3/+6
|\ \ \ \ \ | | | | | | | | | | | | Don't assume existence of events when updating user directory
| * | | | | Don't assume existance of events when updating user directoryErik Johnston2017-06-131-3/+6
| |/ / / /
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-03 16:52:15 +0000