Merge remote-tracking branch 'origin/release-v0.34.0' into matrix-org-hotfixes

2018-12-19 10:24:26 +00:00 · 2018-12-19 10:24:26 +00:00 · 4c238a9a91
parent 002db39a36 128294d3e5
commit 4c238a9a91
46 changed files with 131 additions and 98 deletions
--- 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
--- a/CHANGES.md
+++ b/CHANGES.md
@ -1,3 +1,19 @@
+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)
 ==============================

--- 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 )::

--- 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
 ====================
--- a/changelog.d/3830.feature
+++ b/changelog.d/3830.feature
@ -1 +0,0 @@
-Add option to track MAU stats (but not limit people)
--- a/changelog.d/3831.feature
+++ b/changelog.d/3831.feature
@ -1 +0,0 @@
-Add an option to enable recording IPs for appservice users
--- a/changelog.d/4165.bugfix
+++ b/changelog.d/4165.bugfix
@ -1 +0,0 @@
-Pushrules can now again be made with non-ASCII rule IDs.
--- a/changelog.d/4176.bugfix
+++ b/changelog.d/4176.bugfix
@ -1 +0,0 @@
-The media repository now no longer fails to decode UTF-8 filenames when downloading remote media.
--- a/changelog.d/4180.misc
+++ b/changelog.d/4180.misc
@ -1 +0,0 @@
-A coveragerc file, as well as the py36-coverage tox target, have been added.
--- a/changelog.d/4182.misc
+++ b/changelog.d/4182.misc
@ -1 +0,0 @@
-Add a GitHub pull request template and add multiple issue templates
--- a/changelog.d/4183.bugfix
+++ b/changelog.d/4183.bugfix
@ -1 +0,0 @@
-URL previews now correctly decode non-UTF-8 text if the header contains a `<meta http-equiv="Content-Type"` header.
--- a/changelog.d/4188.misc
+++ b/changelog.d/4188.misc
@ -1 +0,0 @@
-Update README to reflect the fact that #1491 is fixed
--- a/changelog.d/4189.misc
+++ b/changelog.d/4189.misc
@ -1,2 +0,0 @@
-Run the AS senders as background processes to fix warnings
-
--- a/changelog.d/4190.misc
+++ b/changelog.d/4190.misc
@ -1 +0,0 @@
-Add some diagnostics to the tests to detect logcontext problems
--- a/changelog.d/4192.bugfix
+++ b/changelog.d/4192.bugfix
@ -1 +0,0 @@
-Fix an issue where public consent URLs had two slashes.
--- a/changelog.d/4193.misc
+++ b/changelog.d/4193.misc
@ -1 +0,0 @@
-Add missing `jpeg` package prerequisite for OpenBSD in README.
--- a/changelog.d/4197.bugfix
+++ b/changelog.d/4197.bugfix
@ -1 +0,0 @@
-Fallback auth now accepts the session parameter on Python 3.
--- a/changelog.d/4200.misc
+++ b/changelog.d/4200.misc
@ -1 +0,0 @@
-Add a note saying you need to manually reclaim disk space after using the Purge History API
--- a/changelog.d/4204.misc
+++ b/changelog.d/4204.misc
@ -1 +0,0 @@
-Fix logcontext leaks in EmailPusher and in tests
--- a/changelog.d/4205.misc
+++ b/changelog.d/4205.misc
@ -1 +0,0 @@
-More logcontext checking in unittests
--- a/changelog.d/4207.bugfix
+++ b/changelog.d/4207.bugfix
@ -1 +0,0 @@
-Remove riot.im from the list of trusted Identity Servers in the default configuration
--- a/changelog.d/4209.misc
+++ b/changelog.d/4209.misc
@ -1 +0,0 @@
-Fix logcontext leaks in EmailPusher and in tests
--- a/changelog.d/4211.bugfix
+++ b/changelog.d/4211.bugfix
@ -1,2 +0,0 @@
-fix start up failure when mau_limit_reserved_threepids set and db is postgres 
-
--- a/changelog.d/4214.misc
+++ b/changelog.d/4214.misc
@ -1 +0,0 @@
-Ignore __pycache__ directories in the database schema folder
--- a/changelog.d/4220.feature
+++ b/changelog.d/4220.feature
@ -1 +0,0 @@
-Rename login type m.login.cas to m.login.sso
--- a/changelog.d/4223.bugfix
+++ b/changelog.d/4223.bugfix
@ -1 +0,0 @@
-Fix auto join failures for servers that require user consent
--- a/changelog.d/4224.misc
+++ b/changelog.d/4224.misc
@ -1 +0,0 @@
-Add note to UPGRADE.rst about removing riot.im from list of trusted identity servers
--- a/changelog.d/4225.misc
+++ b/changelog.d/4225.misc
@ -1 +0,0 @@
-Added automated coverage reporting to CI.
--- a/changelog.d/4227.misc
+++ b/changelog.d/4227.misc
@ -1 +0,0 @@
-Garbage-collect after each unit test to fix logcontext leaks
--- a/changelog.d/4230.feature
+++ b/changelog.d/4230.feature
@ -1 +0,0 @@
-Add an option to disable search for homeservers that may not be interested in it.
--- a/changelog.d/4234.misc
+++ b/changelog.d/4234.misc
@ -1 +0,0 @@
-add more detail to logging regarding "More than one row matched" error
--- a/changelog.d/4241.bugfix
+++ b/changelog.d/4241.bugfix
@ -1 +0,0 @@
-Fix exception caused by non-ascii event IDs
--- a/changelog.d/4244.misc
+++ b/changelog.d/4244.misc
@ -1 +0,0 @@
-Drop sent_transactions table
--- a/changelog.d/4250.bugfix
+++ b/changelog.d/4250.bugfix
@ -1 +0,0 @@
-Pushers can now be unsubscribed from on Python 3.
--- a/changelog.d/4253.bugfix
+++ b/changelog.d/4253.bugfix
@ -1 +0,0 @@
-Fix UnicodeDecodeError when postgres is configured to give non-English errors
--- a/changelog.d/4257.misc
+++ b/changelog.d/4257.misc
@ -1 +0,0 @@
-Add a basic .editorconfig
--- a/changelog.d/4260.misc
+++ b/changelog.d/4260.misc
@ -1 +0,0 @@
-Update README.rst and UPGRADE.rst for Python 3.
--- a/changelog.d/4261.misc
+++ b/changelog.d/4261.misc
@ -1 +0,0 @@
-Remove obsolete `verbose` and `log_file` settings from `homeserver.yaml` for Docker image.
--- a/changelog.d/4294.bugfix
+++ b/changelog.d/4294.bugfix
@ -0,0 +1 @@
+Make the new landing page prettier.
--- a/changelog.d/4295.bugfix
+++ b/changelog.d/4295.bugfix
@ -0,0 +1 @@
+Fix deleting E2E room keys when using old SQLite versions.
--- a/synapse/init.py
+++ b/synapse/init.py
@ -27,4 +27,4 @@ try:
 except ImportError:
    pass

-__version__ = "0.34.0rc1"
+__version__ = "0.34.0rc2"
--- 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
@ -79,36 +79,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

@ -137,8 +107,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()

@ -237,7 +210,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)
--- 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
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@ -69,9 +69,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"],
--- a/synapse/static/index.html
+++ b/synapse/static/index.html
@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+   <title>Synapse is running</title>
+   <style>
+       body {
+         font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;
+         max-width: 40em;
+         margin: auto;
+         text-align: center;
+       }
+       h1, p {
+         margin: 1.5em;
+       }
+       hr {
+        border: none;
+        background-color: #ccc;
+        color: #ccc;
+        height: 1px;
+        width: 7em;
+        margin-top: 4em;
+      }
+       .logo {
+         display: block;
+         width: 12em;
+         margin: 4em auto;
+       }
+   </style>
+  </head>
+  <body>
+    <div class="logo">
+       <svg role="img" aria-label="[Matrix logo]" viewBox="0 0 200 85" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+          <g id="parent" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+              <g id="child" transform="translate(-122.000000, -6.000000)" fill="#000000" fill-rule="nonzero">
+                  <g id="matrix-logo" transform="translate(122.000000, 6.000000)">
+                      <polygon id="left-bracket" points="2.24708861 1.93811009 2.24708861 82.7268844 8.10278481 82.7268844 8.10278481 84.6652459 0 84.6652459 0 0 8.10278481 0 8.10278481 1.93811009"></polygon>
+                      <path d="M24.8073418,27.5493174 L24.8073418,31.6376991 L24.924557,31.6376991 C26.0227848,30.0814294 27.3455696,28.8730642 28.8951899,28.0163743 C30.4437975,27.1611927 32.2189873,26.7318422 34.218481,26.7318422 C36.1394937,26.7318422 37.8946835,27.102622 39.4825316,27.8416679 C41.0708861,28.5819706 42.276962,29.8856073 43.1005063,31.7548404 C44.0017722,30.431345 45.2270886,29.2629486 46.7767089,28.2506569 C48.3253165,27.2388679 50.158481,26.7318422 52.2764557,26.7318422 C53.8843038,26.7318422 55.3736709,26.9269101 56.7473418,27.3162917 C58.1189873,27.7056734 59.295443,28.3285835 60.2759494,29.185022 C61.255443,30.0422147 62.02,31.1615927 62.5701266,32.5426532 C63.1187342,33.9262275 63.3936709,35.5898349 63.3936709,37.5372459 L63.3936709,57.7443688 L55.0410127,57.7441174 L55.0410127,40.6319376 C55.0410127,39.6201486 55.0020253,38.6661761 54.9232911,37.7700202 C54.8440506,36.8751211 54.6293671,36.0968606 54.2764557,35.4339817 C53.9232911,34.772611 53.403038,34.2464807 52.7177215,33.8568477 C52.0313924,33.4689743 51.0997468,33.2731523 49.9235443,33.2731523 C48.7473418,33.2731523 47.7962025,33.4983853 47.0706329,33.944578 C46.344557,34.393033 45.7764557,34.9774826 45.3650633,35.6969211 C44.9534177,36.4181193 44.6787342,37.2353431 44.5417722,38.150855 C44.4037975,39.0653615 44.3356962,39.9904257 44.3356962,40.9247908 L44.3356962,57.7443688 L35.9835443,57.7443688 L35.9835443,40.8079009 C35.9835443,39.9124991 35.963038,39.0263982 35.9253165,38.150855 C35.8853165,37.2743064 35.7192405,36.4666349 35.424557,35.7263321 C35.1303797,34.9872862 34.64,34.393033 33.9539241,33.944578 C33.2675949,33.4983853 32.2579747,33.2731523 30.9248101,33.2731523 C30.5321519,33.2731523 30.0126582,33.3608826 29.3663291,33.5365945 C28.7192405,33.7118037 28.0913924,34.0433688 27.4840506,34.5292789 C26.875443,35.0164459 26.3564557,35.7172826 25.9250633,36.6315376 C25.4934177,37.5470495 25.2779747,38.7436 25.2779747,40.2229486 L25.2779747,57.7441174 L16.9260759,57.7443688 L16.9260759,27.5493174 L24.8073418,27.5493174 Z" id="m"></path>
+                      <path d="M68.7455696,31.9886202 C69.6075949,30.7033339 70.7060759,29.672189 72.0397468,28.8926716 C73.3724051,28.1141596 74.8716456,27.5596239 76.5387342,27.2283101 C78.2050633,26.8977505 79.8817722,26.7315908 81.5678481,26.7315908 C83.0974684,26.7315908 84.6458228,26.8391798 86.2144304,27.0525982 C87.7827848,27.2675248 89.2144304,27.6865688 90.5086076,28.3087248 C91.8025316,28.9313835 92.8610127,29.7983798 93.6848101,30.9074514 C94.5083544,32.0170257 94.92,33.4870734 94.92,35.3173431 L94.92,51.026844 C94.92,52.3913138 94.998481,53.6941963 95.1556962,54.9400165 C95.3113924,56.1865908 95.5863291,57.120956 95.9787342,57.7436147 L87.5091139,57.7436147 C87.3518987,57.276055 87.2240506,56.7996972 87.1265823,56.3125303 C87.0278481,55.8266202 86.9592405,55.3301523 86.9207595,54.8236294 C85.5873418,56.1865908 84.0182278,57.1405633 82.2156962,57.6857982 C80.4113924,58.2295248 78.5683544,58.503022 76.6860759,58.503022 C75.2346835,58.503022 73.8817722,58.3275615 72.6270886,57.9776459 C71.3718987,57.6269761 70.2744304,57.082244 69.3334177,56.3411872 C68.3921519,55.602644 67.656962,54.6680275 67.1275949,53.5390972 C66.5982278,52.410167 66.3331646,51.065556 66.3331646,49.5087835 C66.3331646,47.7961578 66.6367089,46.384178 67.2455696,45.2756092 C67.8529114,44.1652807 68.6367089,43.2799339 69.5987342,42.6173064 C70.5589873,41.9556844 71.6567089,41.4592165 72.8924051,41.1284055 C74.1273418,40.7978459 75.3721519,40.5356606 76.6270886,40.3398385 C77.8820253,40.1457761 79.116962,39.9896716 80.3329114,39.873033 C81.5483544,39.7558917 82.6270886,39.5804312 83.5681013,39.3469028 C84.5093671,39.1133743 85.2536709,38.7732624 85.8032911,38.3250587 C86.3513924,37.8773578 86.6063291,37.2252881 86.5678481,36.3680954 C86.5678481,35.4731963 86.4210127,34.7620532 86.1268354,34.2366771 C85.8329114,33.7113009 85.4405063,33.3018092 84.9506329,33.0099615 C84.4602532,32.7181138 83.8916456,32.5232972 83.2450633,32.4255119 C82.5977215,32.3294862 81.9010127,32.2797138 81.156962,32.2797138 C79.5098734,32.2797138 78.2159494,32.6303835 77.2746835,33.3312202 C76.3339241,34.0320569 75.7837975,35.2007046 75.6275949,36.8354037 L67.275443,36.8354037 C67.3924051,34.8892495 67.8817722,33.2726495 68.7455696,31.9886202 Z M85.2440506,43.6984752 C84.7149367,43.873433 84.1460759,44.0189798 83.5387342,44.1361211 C82.9306329,44.253011 82.2936709,44.350545 81.6270886,44.4279688 C80.96,44.5066495 80.2934177,44.6034294 79.6273418,44.7203193 C78.9994937,44.8362037 78.3820253,44.9933138 77.7749367,45.1871248 C77.1663291,45.3829468 76.636962,45.6451321 76.1865823,45.9759431 C75.7349367,46.3070055 75.3724051,46.7263009 75.0979747,47.2313156 C74.8232911,47.7375872 74.6863291,48.380356 74.6863291,49.1588679 C74.6863291,49.8979138 74.8232911,50.5218294 75.0979747,51.026844 C75.3724051,51.5338697 75.7455696,51.9328037 76.2159494,52.2246514 C76.6863291,52.5164991 77.2349367,52.7213706 77.8632911,52.8375064 C78.4898734,52.9546477 79.136962,53.012967 79.8037975,53.012967 C81.4506329,53.012967 82.724557,52.740978 83.6273418,52.1952404 C84.5288608,51.6507596 85.1949367,50.9981872 85.6270886,50.2382771 C86.0579747,49.4793725 86.323038,48.7119211 86.4212658,47.9321523 C86.518481,47.1536404 86.5681013,46.5304789 86.5681013,46.063422 L86.5681013,42.9677248 C86.2146835,43.2799339 85.7736709,43.5230147 85.2440506,43.6984752 Z" id="a"></path>
+                      <path d="M116.917975,27.5493174 L116.917975,33.0976917 L110.801266,33.0976917 L110.801266,48.0492936 C110.801266,49.4502128 111.036203,50.3850807 111.507089,50.8518862 C111.976962,51.3191945 112.918734,51.5527229 114.33038,51.5527229 C114.801013,51.5527229 115.251392,51.5336183 115.683038,51.4944037 C116.114177,51.4561945 116.526076,51.3968697 116.917975,51.3194459 L116.917975,57.7438661 C116.212152,57.860756 115.427595,57.9381798 114.565316,57.9778972 C113.702785,58.0153523 112.859747,58.0357138 112.036203,58.0357138 C110.742278,58.0357138 109.516456,57.9477321 108.36,57.7722716 C107.202785,57.5975651 106.183544,57.2577046 105.301519,56.7509303 C104.418987,56.2454128 103.722785,55.5242147 103.213418,54.5898495 C102.703038,53.6562385 102.448608,52.4292716 102.448608,50.9099541 L102.448608,33.0976917 L97.3903797,33.0976917 L97.3903797,27.5493174 L102.448608,27.5493174 L102.448608,18.4967596 L110.801013,18.4967596 L110.801013,27.5493174 L116.917975,27.5493174 Z" id="t"></path>
+                      <path d="M128.857975,27.5493174 L128.857975,33.1565138 L128.975696,33.1565138 C129.367089,32.2213945 129.896203,31.3559064 130.563544,30.557033 C131.23038,29.7596679 131.99443,29.0776844 132.857215,28.5130936 C133.719241,27.9495083 134.641266,27.5113596 135.622532,27.1988991 C136.601772,26.8879468 137.622025,26.7315908 138.681013,26.7315908 C139.229873,26.7315908 139.836962,26.8296275 140.504304,27.0239413 L140.504304,34.7336477 C140.111646,34.6552183 139.641013,34.586844 139.092658,34.5290275 C138.543291,34.4704569 138.014177,34.4410459 137.504304,34.4410459 C135.974937,34.4410459 134.681013,34.6949358 133.622785,35.2004532 C132.564051,35.7067248 131.711392,36.397255 131.064051,37.2735523 C130.417215,38.1501009 129.955443,39.1714422 129.681266,40.3398385 C129.407089,41.5074807 129.269873,42.7736624 129.269873,44.1361211 L129.269873,57.7438661 L120.917722,57.7438661 L120.917722,27.5493174 L128.857975,27.5493174 Z" id="r"></path>
+                      <path d="M144.033165,22.8767376 L144.033165,16.0435798 L152.386076,16.0435798 L152.386076,22.8767376 L144.033165,22.8767376 Z M152.386076,27.5493174 L152.386076,57.7438661 L144.033165,57.7438661 L144.033165,27.5493174 L152.386076,27.5493174 Z" id="i"></path>
+                      <polygon id="x" points="156.738228 27.5493174 166.266582 27.5493174 171.619494 35.4337303 176.913418 27.5493174 186.147848 27.5493174 176.148861 41.6831927 187.383544 57.7441174 177.85443 57.7441174 171.501772 48.2245028 165.148861 57.7441174 155.797468 57.7441174 166.737468 41.8589046"></polygon>
+                      <polygon id="right-bracket" points="197.580759 82.7268844 197.580759 1.93811009 191.725063 1.93811009 191.725063 0 199.828354 0 199.828354 84.6652459 191.725063 84.6652459 191.725063 82.7268844"></polygon>
+                  </g>
+              </g>
+          </g>
+      </svg>
+    </div>
+    <h1>It works! Synapse is running</h1>
+    <p>Your Synapse server is listening on this port and is ready for messages.</p>
+    <p>To use this server you'll need <a href="https://matrix.org/docs/projects/try-matrix-now.html#clients" target="_blank">a Matrix client</a>.
+    </p>
+    <p>Welcome to the Matrix universe :)</p>
+    <hr>
+    <p>
+      <small>
+        <a href="https://matrix.org" target="_blank">
+          matrix.org
+        </a>
+      </small>
+    </p>
+  </body>
+</html>
--- a/synapse/storage/e2e_room_keys.py
+++ b/synapse/storage/e2e_room_keys.py
@ -182,7 +182,7 @@ class EndToEndRoomKeyStore(SQLBaseStore):

        keyvalues = {
            "user_id": user_id,
-            "version": version,
+            "version": int(version),
        }
        if room_id:
            keyvalues['room_id'] = room_id
				`@ -1 +0,0 @@`
				`Add option to track MAU stats (but not limit people)`
				`@ -1 +0,0 @@`
				`Add an option to enable recording IPs for appservice users`
				`@ -1 +0,0 @@`
				`Pushrules can now again be made with non-ASCII rule IDs.`
				`@ -1 +0,0 @@`
				`The media repository now no longer fails to decode UTF-8 filenames when downloading remote media.`
				`@ -1 +0,0 @@`
				`A coveragerc file, as well as the py36-coverage tox target, have been added.`
				`@ -1 +0,0 @@`
				`Add a GitHub pull request template and add multiple issue templates`
				`@ -1 +0,0 @@`
				URL previews now correctly decode non-UTF-8 text if the header contains a `<meta http-equiv="Content-Type"` header.
				`@ -1 +0,0 @@`
				`Update README to reflect the fact that #1491 is fixed`
				`@ -1,2 +0,0 @@`
				`Run the AS senders as background processes to fix warnings`
				`@ -1 +0,0 @@`
				`Add some diagnostics to the tests to detect logcontext problems`