diff options
49 files changed, 154 insertions, 102 deletions
diff --git a/.circleci/merge_base_branch.sh b/.circleci/merge_base_branch.sh index b2c8c40f4c..4c19fa70d7 100755 --- a/.circleci/merge_base_branch.sh +++ b/.circleci/merge_base_branch.sh @@ -20,7 +20,7 @@ else fi # Show what we are before -git show -s +git --no-pager show -s # Set up username so it can do a merge git config --global user.email bot@matrix.org @@ -31,4 +31,4 @@ git fetch -u origin $GITBASE git merge --no-edit origin/$GITBASE # Show what we are after. -git show -s +git --no-pager show -s diff --git a/CHANGES.md b/CHANGES.md index 1c3d575c37..68210a7d60 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,73 @@ +Synapse 0.34.0rc2 (2018-12-11) +============================== + +Features +-------- + +- Add a welcome page for the client API port. Credit to @krombel! ([\#4289](https://github.com/matrix-org/synapse/issues/4289)) +- Remove Matrix console from the default distribution ([\#4290](https://github.com/matrix-org/synapse/issues/4290)) + + +Internal Changes +---------------- + +- Disable pager when running git-show in CI ([\#4291](https://github.com/matrix-org/synapse/issues/4291)) + + +Synapse 0.34.0rc1 (2018-12-04) +============================== + +Synapse 0.34 is the first release to fully support Python 3. We recommend +upgrading to Python 3, but make sure to read the +[upgrade notes](UPGRADE.rst#upgrading-to-v0340) when doing so. + +Features +-------- + +- Add option to track MAU stats (but not limit people) ([\#3830](https://github.com/matrix-org/synapse/issues/3830)) +- Add an option to enable recording IPs for appservice users ([\#3831](https://github.com/matrix-org/synapse/issues/3831)) +- Rename login type m.login.cas to m.login.sso ([\#4220](https://github.com/matrix-org/synapse/issues/4220)) +- Add an option to disable search for homeservers that may not be interested in it. ([\#4230](https://github.com/matrix-org/synapse/issues/4230)) + + +Bugfixes +-------- + +- Pushrules can now again be made with non-ASCII rule IDs. ([\#4165](https://github.com/matrix-org/synapse/issues/4165)) +- The media repository now no longer fails to decode UTF-8 filenames when downloading remote media. ([\#4176](https://github.com/matrix-org/synapse/issues/4176)) +- URL previews now correctly decode non-UTF-8 text if the header contains a `<meta http-equiv="Content-Type"` header. ([\#4183](https://github.com/matrix-org/synapse/issues/4183)) +- Fix an issue where public consent URLs had two slashes. ([\#4192](https://github.com/matrix-org/synapse/issues/4192)) +- Fallback auth now accepts the session parameter on Python 3. ([\#4197](https://github.com/matrix-org/synapse/issues/4197)) +- Remove riot.im from the list of trusted Identity Servers in the default configuration ([\#4207](https://github.com/matrix-org/synapse/issues/4207)) +- fix start up failure when mau_limit_reserved_threepids set and db is postgres ([\#4211](https://github.com/matrix-org/synapse/issues/4211)) +- Fix auto join failures for servers that require user consent ([\#4223](https://github.com/matrix-org/synapse/issues/4223)) +- Fix exception caused by non-ascii event IDs ([\#4241](https://github.com/matrix-org/synapse/issues/4241)) +- Pushers can now be unsubscribed from on Python 3. ([\#4250](https://github.com/matrix-org/synapse/issues/4250)) +- Fix UnicodeDecodeError when postgres is configured to give non-English errors ([\#4253](https://github.com/matrix-org/synapse/issues/4253)) + + +Internal Changes +---------------- + +- A coveragerc file, as well as the py36-coverage tox target, have been added. ([\#4180](https://github.com/matrix-org/synapse/issues/4180)) +- Add a GitHub pull request template and add multiple issue templates ([\#4182](https://github.com/matrix-org/synapse/issues/4182)) +- Update README to reflect the fact that #1491 is fixed ([\#4188](https://github.com/matrix-org/synapse/issues/4188)) +- Run the AS senders as background processes to fix warnings ([\#4189](https://github.com/matrix-org/synapse/issues/4189)) +- Add some diagnostics to the tests to detect logcontext problems ([\#4190](https://github.com/matrix-org/synapse/issues/4190)) +- Add missing `jpeg` package prerequisite for OpenBSD in README. ([\#4193](https://github.com/matrix-org/synapse/issues/4193)) +- Add a note saying you need to manually reclaim disk space after using the Purge History API ([\#4200](https://github.com/matrix-org/synapse/issues/4200)) +- More logcontext checking in unittests ([\#4205](https://github.com/matrix-org/synapse/issues/4205)) +- Ignore __pycache__ directories in the database schema folder ([\#4214](https://github.com/matrix-org/synapse/issues/4214)) +- Add note to UPGRADE.rst about removing riot.im from list of trusted identity servers ([\#4224](https://github.com/matrix-org/synapse/issues/4224)) +- Added automated coverage reporting to CI. ([\#4225](https://github.com/matrix-org/synapse/issues/4225)) +- Garbage-collect after each unit test to fix logcontext leaks ([\#4227](https://github.com/matrix-org/synapse/issues/4227)) +- add more detail to logging regarding "More than one row matched" error ([\#4234](https://github.com/matrix-org/synapse/issues/4234)) +- Drop sent_transactions table ([\#4244](https://github.com/matrix-org/synapse/issues/4244)) +- Add a basic .editorconfig ([\#4257](https://github.com/matrix-org/synapse/issues/4257)) +- Update README.rst and UPGRADE.rst for Python 3. ([\#4260](https://github.com/matrix-org/synapse/issues/4260)) +- Remove obsolete `verbose` and `log_file` settings from `homeserver.yaml` for Docker image. ([\#4261](https://github.com/matrix-org/synapse/issues/4261)) + + Synapse 0.33.9 (2018-11-19) =========================== @@ -71,7 +141,7 @@ Synapse 0.33.8rc2 (2018-10-31) Bugfixes -------- -- Searches that request profile info now no longer fail with a 500. Fixes +- Searches that request profile info now no longer fail with a 500. Fixes a regression in 0.33.8rc1. ([\#4122](https://github.com/matrix-org/synapse/issues/4122)) diff --git a/README.rst b/README.rst index 664a0ea03f..02b3db1bc6 100644 --- a/README.rst +++ b/README.rst @@ -289,10 +289,6 @@ go back in your web client and proceed further. If all goes well you should at least be able to log in, create a room, and start sending messages. -(The homeserver runs a web client by default at https://localhost:8448/, though -as of the time of writing it is somewhat outdated and not really recommended - -https://github.com/matrix-org/synapse/issues/1527). - .. _`client-user-reg`: Registering a new user from a client @@ -372,10 +368,7 @@ ArchLinux The quickest way to get up and running with ArchLinux is probably with the community package https://www.archlinux.org/packages/community/any/matrix-synapse/, which should pull in most of -the necessary dependencies. If the default web client is to be served (enabled by default in -the generated config), -https://www.archlinux.org/packages/community/any/python2-matrix-angular-sdk/ will also need to -be installed. +the necessary dependencies. pip may be outdated (6.0.7-1 and needs to be upgraded to 6.0.8-1 ):: diff --git a/UPGRADE.rst b/UPGRADE.rst index 9d68a64058..95f4e33300 100644 --- a/UPGRADE.rst +++ b/UPGRADE.rst @@ -115,6 +115,10 @@ Upgrading to v0.34.0 case a hypothetical future identity server was put there. If you don't remove it, users may be unable to deactivate their accounts. +3. This release no longer installs the (unmaintained) Matrix Console web client + as part of the default installation. It is possible to re-enable it by + installing it separately and setting the ``web_client_location`` config + option, but please consider switching to another client. Upgrading to v0.33.7 ==================== diff --git a/changelog.d/3830.feature b/changelog.d/3830.feature deleted file mode 100644 index af472cf763..0000000000 --- a/changelog.d/3830.feature +++ /dev/null @@ -1 +0,0 @@ -Add option to track MAU stats (but not limit people) diff --git a/changelog.d/3831.feature b/changelog.d/3831.feature deleted file mode 100644 index 6395586458..0000000000 --- a/changelog.d/3831.feature +++ /dev/null @@ -1 +0,0 @@ -Add an option to enable recording IPs for appservice users diff --git a/changelog.d/4165.bugfix b/changelog.d/4165.bugfix deleted file mode 100644 index fe31c60683..0000000000 --- a/changelog.d/4165.bugfix +++ /dev/null @@ -1 +0,0 @@ -Pushrules can now again be made with non-ASCII rule IDs. diff --git a/changelog.d/4176.bugfix b/changelog.d/4176.bugfix deleted file mode 100644 index 3846f8a27b..0000000000 --- a/changelog.d/4176.bugfix +++ /dev/null @@ -1 +0,0 @@ -The media repository now no longer fails to decode UTF-8 filenames when downloading remote media. diff --git a/changelog.d/4180.misc b/changelog.d/4180.misc deleted file mode 100644 index 80194b3dc0..0000000000 --- a/changelog.d/4180.misc +++ /dev/null @@ -1 +0,0 @@ -A coveragerc file, as well as the py36-coverage tox target, have been added. diff --git a/changelog.d/4182.misc b/changelog.d/4182.misc deleted file mode 100644 index 62949a065a..0000000000 --- a/changelog.d/4182.misc +++ /dev/null @@ -1 +0,0 @@ -Add a GitHub pull request template and add multiple issue templates diff --git a/changelog.d/4183.bugfix b/changelog.d/4183.bugfix deleted file mode 100644 index 3e9ba3826f..0000000000 --- a/changelog.d/4183.bugfix +++ /dev/null @@ -1 +0,0 @@ -URL previews now correctly decode non-UTF-8 text if the header contains a `<meta http-equiv="Content-Type"` header. diff --git a/changelog.d/4188.misc b/changelog.d/4188.misc deleted file mode 100644 index 80c3995870..0000000000 --- a/changelog.d/4188.misc +++ /dev/null @@ -1 +0,0 @@ -Update README to reflect the fact that #1491 is fixed diff --git a/changelog.d/4189.misc b/changelog.d/4189.misc deleted file mode 100644 index 4a41357d94..0000000000 --- a/changelog.d/4189.misc +++ /dev/null @@ -1,2 +0,0 @@ -Run the AS senders as background processes to fix warnings - diff --git a/changelog.d/4190.misc b/changelog.d/4190.misc deleted file mode 100644 index 6700a5150d..0000000000 --- a/changelog.d/4190.misc +++ /dev/null @@ -1 +0,0 @@ -Add some diagnostics to the tests to detect logcontext problems diff --git a/changelog.d/4192.bugfix b/changelog.d/4192.bugfix deleted file mode 100644 index f346fe026a..0000000000 --- a/changelog.d/4192.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix an issue where public consent URLs had two slashes. diff --git a/changelog.d/4193.misc b/changelog.d/4193.misc deleted file mode 100644 index 23d86eab24..0000000000 --- a/changelog.d/4193.misc +++ /dev/null @@ -1 +0,0 @@ -Add missing `jpeg` package prerequisite for OpenBSD in README. diff --git a/changelog.d/4197.bugfix b/changelog.d/4197.bugfix deleted file mode 100644 index c7c01da0f3..0000000000 --- a/changelog.d/4197.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fallback auth now accepts the session parameter on Python 3. diff --git a/changelog.d/4200.misc b/changelog.d/4200.misc deleted file mode 100644 index 505c98edcf..0000000000 --- a/changelog.d/4200.misc +++ /dev/null @@ -1 +0,0 @@ -Add a note saying you need to manually reclaim disk space after using the Purge History API diff --git a/changelog.d/4204.misc b/changelog.d/4204.misc deleted file mode 100644 index efd1f4abd6..0000000000 --- a/changelog.d/4204.misc +++ /dev/null @@ -1 +0,0 @@ -Fix logcontext leaks in EmailPusher and in tests \ No newline at end of file diff --git a/changelog.d/4205.misc b/changelog.d/4205.misc deleted file mode 100644 index bbdce2c7aa..0000000000 --- a/changelog.d/4205.misc +++ /dev/null @@ -1 +0,0 @@ -More logcontext checking in unittests diff --git a/changelog.d/4207.bugfix b/changelog.d/4207.bugfix deleted file mode 100644 index c1ec9f6329..0000000000 --- a/changelog.d/4207.bugfix +++ /dev/null @@ -1 +0,0 @@ -Remove riot.im from the list of trusted Identity Servers in the default configuration diff --git a/changelog.d/4209.misc b/changelog.d/4209.misc deleted file mode 100644 index efd1f4abd6..0000000000 --- a/changelog.d/4209.misc +++ /dev/null @@ -1 +0,0 @@ -Fix logcontext leaks in EmailPusher and in tests \ No newline at end of file diff --git a/changelog.d/4211.bugfix b/changelog.d/4211.bugfix deleted file mode 100644 index 376f80c55a..0000000000 --- a/changelog.d/4211.bugfix +++ /dev/null @@ -1,2 +0,0 @@ -fix start up failure when mau_limit_reserved_threepids set and db is postgres - diff --git a/changelog.d/4214.misc b/changelog.d/4214.misc deleted file mode 100644 index b2f62060e3..0000000000 --- a/changelog.d/4214.misc +++ /dev/null @@ -1 +0,0 @@ -Ignore __pycache__ directories in the database schema folder diff --git a/changelog.d/4220.feature b/changelog.d/4220.feature deleted file mode 100644 index e7a3e40483..0000000000 --- a/changelog.d/4220.feature +++ /dev/null @@ -1 +0,0 @@ -Rename login type m.login.cas to m.login.sso diff --git a/changelog.d/4223.bugfix b/changelog.d/4223.bugfix deleted file mode 100644 index bab591a765..0000000000 --- a/changelog.d/4223.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix auto join failures for servers that require user consent diff --git a/changelog.d/4224.misc b/changelog.d/4224.misc deleted file mode 100644 index 1bfe2e5c31..0000000000 --- a/changelog.d/4224.misc +++ /dev/null @@ -1 +0,0 @@ -Add note to UPGRADE.rst about removing riot.im from list of trusted identity servers diff --git a/changelog.d/4225.misc b/changelog.d/4225.misc deleted file mode 100644 index 39062696ea..0000000000 --- a/changelog.d/4225.misc +++ /dev/null @@ -1 +0,0 @@ -Added automated coverage reporting to CI. diff --git a/changelog.d/4227.misc b/changelog.d/4227.misc deleted file mode 100644 index 7ebd51b6a4..0000000000 --- a/changelog.d/4227.misc +++ /dev/null @@ -1 +0,0 @@ -Garbage-collect after each unit test to fix logcontext leaks \ No newline at end of file diff --git a/changelog.d/4230.feature b/changelog.d/4230.feature deleted file mode 100644 index 0ecb1d5ec6..0000000000 --- a/changelog.d/4230.feature +++ /dev/null @@ -1 +0,0 @@ -Add an option to disable search for homeservers that may not be interested in it. diff --git a/changelog.d/4234.misc b/changelog.d/4234.misc deleted file mode 100644 index b5a01d38af..0000000000 --- a/changelog.d/4234.misc +++ /dev/null @@ -1 +0,0 @@ -add more detail to logging regarding "More than one row matched" error \ No newline at end of file diff --git a/changelog.d/4241.bugfix b/changelog.d/4241.bugfix deleted file mode 100644 index 1158a5aa16..0000000000 --- a/changelog.d/4241.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix exception caused by non-ascii event IDs diff --git a/changelog.d/4244.misc b/changelog.d/4244.misc deleted file mode 100644 index 8236bbc28d..0000000000 --- a/changelog.d/4244.misc +++ /dev/null @@ -1 +0,0 @@ -Drop sent_transactions table diff --git a/changelog.d/4250.bugfix b/changelog.d/4250.bugfix deleted file mode 100644 index 1f60f5bd0a..0000000000 --- a/changelog.d/4250.bugfix +++ /dev/null @@ -1 +0,0 @@ -Pushers can now be unsubscribed from on Python 3. diff --git a/changelog.d/4253.bugfix b/changelog.d/4253.bugfix deleted file mode 100644 index 1796e95b86..0000000000 --- a/changelog.d/4253.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix UnicodeDecodeError when postgres is configured to give non-English errors diff --git a/changelog.d/4257.misc b/changelog.d/4257.misc deleted file mode 100644 index 43ac24cb7d..0000000000 --- a/changelog.d/4257.misc +++ /dev/null @@ -1 +0,0 @@ -Add a basic .editorconfig diff --git a/changelog.d/4260.misc b/changelog.d/4260.misc deleted file mode 100644 index 0f7c4faf28..0000000000 --- a/changelog.d/4260.misc +++ /dev/null @@ -1 +0,0 @@ -Update README.rst and UPGRADE.rst for Python 3. diff --git a/changelog.d/4261.misc b/changelog.d/4261.misc deleted file mode 100644 index 2a88c8c856..0000000000 --- a/changelog.d/4261.misc +++ /dev/null @@ -1 +0,0 @@ -Remove obsolete `verbose` and `log_file` settings from `homeserver.yaml` for Docker image. \ No newline at end of file diff --git a/changelog.d/4279.bugfix b/changelog.d/4279.bugfix new file mode 100644 index 0000000000..12de4f44c4 --- /dev/null +++ b/changelog.d/4279.bugfix @@ -0,0 +1 @@ +Send CORS headers for /media/config diff --git a/changelog.d/4283.misc b/changelog.d/4283.misc new file mode 100644 index 0000000000..21de5eb509 --- /dev/null +++ b/changelog.d/4283.misc @@ -0,0 +1 @@ +Make isort tox check print diff when it fails diff --git a/changelog.d/4284.bugfix b/changelog.d/4284.bugfix new file mode 100644 index 0000000000..4a9478fa28 --- /dev/null +++ b/changelog.d/4284.bugfix @@ -0,0 +1 @@ +Add 'sandbox' to CSP for media reprository diff --git a/synapse/__init__.py b/synapse/__init__.py index 5a28fe2b82..d5f6dc2094 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -27,4 +27,4 @@ try: except ImportError: pass -__version__ = "0.33.9" +__version__ = "0.34.0rc2" diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 1e495a38b9..023e32fed2 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -54,7 +54,7 @@ from synapse.metrics import RegistryProxy from synapse.metrics.background_process_metrics import run_as_background_process from synapse.metrics.resource import METRICS_PREFIX, MetricsResource from synapse.module_api import ModuleApi -from synapse.python_dependencies import CONDITIONAL_REQUIREMENTS, check_requirements +from synapse.python_dependencies import check_requirements from synapse.replication.http import REPLICATION_PREFIX, ReplicationRestResource from synapse.replication.tcp.resource import ReplicationStreamProtocolFactory from synapse.rest import ClientRestResource @@ -80,36 +80,6 @@ def gz_wrap(r): return EncodingResourceWrapper(r, [GzipEncoderFactory()]) -def build_resource_for_web_client(hs): - webclient_path = hs.get_config().web_client_location - if not webclient_path: - try: - import syweb - except ImportError: - quit_with_error( - "Could not find a webclient.\n\n" - "Please either install the matrix-angular-sdk or configure\n" - "the location of the source to serve via the configuration\n" - "option `web_client_location`\n\n" - "To install the `matrix-angular-sdk` via pip, run:\n\n" - " pip install '%(dep)s'\n" - "\n" - "You can also disable hosting of the webclient via the\n" - "configuration option `web_client`\n" - % {"dep": CONDITIONAL_REQUIREMENTS["web_client"].keys()[0]} - ) - syweb_path = os.path.dirname(syweb.__file__) - webclient_path = os.path.join(syweb_path, "webclient") - # GZip is disabled here due to - # https://twistedmatrix.com/trac/ticket/7678 - # (It can stay enabled for the API resources: they call - # write() with the whole body and then finish() straight - # after and so do not trigger the bug. - # GzipFile was removed in commit 184ba09 - # return GzipFile(webclient_path) # TODO configurable? - return File(webclient_path) # TODO configurable? - - class SynapseHomeServer(HomeServer): DATASTORE_CLASS = DataStore @@ -138,8 +108,11 @@ class SynapseHomeServer(HomeServer): handler = handler_cls(config, module_api) resources[path] = AdditionalResource(self, handler.handle_request) + # try to find something useful to redirect '/' to if WEB_CLIENT_PREFIX in resources: root_resource = RootRedirect(WEB_CLIENT_PREFIX) + elif STATIC_PREFIX in resources: + root_resource = RootRedirect(STATIC_PREFIX) else: root_resource = NoResource() @@ -243,7 +216,16 @@ class SynapseHomeServer(HomeServer): resources[SERVER_KEY_V2_PREFIX] = KeyApiV2Resource(self) if name == "webclient": - resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self) + webclient_path = self.get_config().web_client_location + + if webclient_path is None: + logger.warning( + "Not enabling webclient resource, as web_client_location is unset." + ) + else: + # GZip is disabled here due to + # https://twistedmatrix.com/trac/ticket/7678 + resources[WEB_CLIENT_PREFIX] = File(webclient_path) if name == "metrics" and self.get_config().enable_metrics: resources[METRICS_PREFIX] = MetricsResource(RegistryProxy) diff --git a/synapse/config/server.py b/synapse/config/server.py index 4a5b902f8e..a9154ad462 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -34,7 +34,6 @@ class ServerConfig(Config): raise ConfigError(str(e)) self.pid_file = self.abspath(config.get("pid_file")) - self.web_client = config["web_client"] self.web_client_location = config.get("web_client_location", None) self.soft_file_limit = config["soft_file_limit"] self.daemonize = config.get("daemonize") @@ -128,6 +127,9 @@ class ServerConfig(Config): elif not bind_addresses: bind_addresses.append('') + if not self.web_client_location: + _warn_if_webclient_configured(self.listeners) + self.gc_thresholds = read_gc_thresholds(config.get("gc_thresholds", None)) bind_port = config.get("bind_port") @@ -136,8 +138,6 @@ class ServerConfig(Config): bind_host = config.get("bind_host", "") gzip_responses = config.get("gzip_responses", True) - names = ["client", "webclient"] if self.web_client else ["client"] - self.listeners.append({ "port": bind_port, "bind_addresses": [bind_host], @@ -145,7 +145,7 @@ class ServerConfig(Config): "type": "http", "resources": [ { - "names": names, + "names": ["client"], "compress": gzip_responses, }, { @@ -164,7 +164,7 @@ class ServerConfig(Config): "type": "http", "resources": [ { - "names": names, + "names": ["client"], "compress": gzip_responses, }, { @@ -247,13 +247,9 @@ class ServerConfig(Config): # # cpu_affinity: 0xFFFFFFFF - # Whether to serve a web client from the HTTP/HTTPS root resource. - web_client: True - - # The root directory to server for the above web client. - # If left undefined, synapse will serve the matrix-angular-sdk web client. - # Make sure matrix-angular-sdk is installed with pip if web_client is True - # and web_client_location is undefined + # The path to the web client which will be served at /_matrix/client/ + # if 'webclient' is configured under the 'listeners' configuration. + # # web_client_location: "/path/to/web/root" # The public-facing base URL for the client API (not including _matrix/...) @@ -320,8 +316,8 @@ class ServerConfig(Config): - # List of resources to host on this listener. names: - - client # The client-server APIs, both v1 and v2 - - webclient # The bundled webclient. + - client # The client-server APIs, both v1 and v2 + # - webclient # A web client. Requires web_client_location to be set. # Should synapse compress HTTP responses to clients that support it? # This should be disabled if running synapse behind a load balancer @@ -348,7 +344,7 @@ class ServerConfig(Config): x_forwarded: false resources: - - names: [client, webclient] + - names: [client] compress: true - names: [federation] compress: false @@ -452,3 +448,19 @@ def read_gc_thresholds(thresholds): raise ConfigError( "Value of `gc_threshold` must be a list of three integers if set" ) + + +NO_MORE_WEB_CLIENT_WARNING = """ +Synapse no longer includes a web client. To enable a web client, configure +web_client_location. To remove this warning, remove 'webclient' from the 'listeners' +configuration. +""" + + +def _warn_if_webclient_configured(listeners): + for listener in listeners: + for res in listener.get("resources", []): + for name in res.get("names", []): + if name == 'webclient': + logger.warning(NO_MORE_WEB_CLIENT_WARNING) + return diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index db631e0c6c..72a92cc462 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -68,9 +68,6 @@ REQUIREMENTS = { } CONDITIONAL_REQUIREMENTS = { - "web_client": { - "matrix_angular_sdk>=0.6.8": ["syweb>=0.6.8"], - }, "email.enable_notifs": { "Jinja2>=2.8": ["Jinja2>=2.8"], "bleach>=1.4.2": ["bleach>=1.4.2"], diff --git a/synapse/rest/media/v1/config_resource.py b/synapse/rest/media/v1/config_resource.py index d6605b6027..77316033f7 100644 --- a/synapse/rest/media/v1/config_resource.py +++ b/synapse/rest/media/v1/config_resource.py @@ -41,7 +41,7 @@ class MediaConfigResource(Resource): @defer.inlineCallbacks def _async_render_GET(self, request): yield self.auth.get_user_by_req(request) - respond_with_json(request, 200, self.limits_dict) + respond_with_json(request, 200, self.limits_dict, send_cors=True) def render_OPTIONS(self, request): respond_with_json(request, 200, {}, send_cors=True) diff --git a/synapse/rest/media/v1/download_resource.py b/synapse/rest/media/v1/download_resource.py index f911b120b1..bdc5daecc1 100644 --- a/synapse/rest/media/v1/download_resource.py +++ b/synapse/rest/media/v1/download_resource.py @@ -48,7 +48,8 @@ class DownloadResource(Resource): set_cors_headers(request) request.setHeader( b"Content-Security-Policy", - b"default-src 'none';" + b"sandbox;" + b" default-src 'none';" b" script-src 'none';" b" plugin-types application/pdf;" b" style-src 'unsafe-inline';" diff --git a/synapse/static/index.html b/synapse/static/index.html new file mode 100644 index 0000000000..d664239983 --- /dev/null +++ b/synapse/static/index.html @@ -0,0 +1,26 @@ +<html> + <head> + <title>Synapse is running</title> + <style> + body { + width: 30em; + margin: 0 auto; + font-family: Tahoma, Verdana, Arial, sans-serif; + } + h1 { + text-align: center; + } + </style> + </head> + <body> + <h1>Synapse is running</h1> + <p>Congratulations!</p> + <p>Your Synapse server is listening on this port and is ready for messages.</p> + <p>To use this server you'll need a client - e.g. one of + <a href="https://matrix.org/docs/projects/try-matrix-now.html#clients">this list of Matrix clients</a>.</p> + <p>You can find (federated) rooms that might be of interest to you on + <a href="https://view.matrix.org/">view.matrix.org</a>.</p> + <p>Or you just start creating your own rooms with your friends.</p> + <p>Welcome to the Matrix universe :)</p> + </body> +</html> diff --git a/tox.ini b/tox.ini index 731094b5da..3c398dc3ba 100644 --- a/tox.ini +++ b/tox.ini @@ -134,7 +134,7 @@ commands = /bin/sh -c "flake8 synapse tests scripts scripts-dev scripts/hash_pas [testenv:check_isort] skip_install = True deps = isort -commands = /bin/sh -c "isort -c -sp setup.cfg -rc synapse tests" +commands = /bin/sh -c "isort -c -df -sp setup.cfg -rc synapse tests" [testenv:check-newsfragment] skip_install = True @@ -150,4 +150,4 @@ deps = codecov commands = coverage combine - codecov -X gcov \ No newline at end of file + codecov -X gcov |