wholetrans/docs-matrix-spec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Incorporate MSC1831

Browse source 
Original proposal: https://github.com/matrix-org/matrix-doc/pull/1831

Implementation proof: pending
This commit is contained in:
Travis Ralston 2019-01-31 11:17:56 -07:00
parent 0347e873ef
commit d2f012f4ea
1 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
specification/server_server_api.rst
View file

@ -112,14 +112,7 @@ The process overall is as follows:
IP address on all requests. Requests must be made with a ``Host`` IP address on all requests. Requests must be made with a ``Host``
header containing the IP address, without port. header containing the IP address, without port.
2. If the hostname is not an IP literal, a server is found by resolving 2. If the hostname is not an IP literal, a ``/.well-known`` request is
an SRV record for ``_matrix._tcp.<hostname>``. This may result in
a hostname (to be resolved using AAAA or A records) and port. Requests
are made to the resolved IP address and port, using 8448 as a default
port, with a ``Host`` header of ``<hostname>``. A valid TLS certificate
for ``<hostname>`` must be provided by the target server on all requests.
3. If the SRV record yielded no results, a ``/.well-known`` request is
made to the hostname (using port 443 exclusively, ignoring the port made to the hostname (using port 443 exclusively, ignoring the port
provided in the server name). The target must present a valid TLS provided in the server name). The target must present a valid TLS
certificate for the hostname, and a ``Host`` header containing the certificate for the hostname, and a ``Host`` header containing the
@ -156,12 +149,19 @@ The process overall is as follows:
A valid TLS certificate for ``<delegated_server_name>`` must be A valid TLS certificate for ``<delegated_server_name>`` must be
provided by the target server. provided by the target server.
4. If the `/.well-known` request was invalid or returned an error response, 3. If the `/.well-known` request returned an error response, a server is
and the SRV record was not found, an IP address is resolved using AAAA found by resolving an SRV record for ``_matrix._tcp.<hostname>``. This
and A records. Requests are made to the resolved IP address using port may result in a hostname (to be resolved using AAAA or A records) and
8448 and a ``Host`` header containing the ``<hostname>``. A valid TLS port. Requests are made to the resolved IP address and port, using 8448
certificate for ``<hostname>`` must be provided by the target server as a default port, with a ``Host`` header of ``<hostname>``. A valid TLS
on all requests. certificate for ``<hostname>`` must be provided by the target server on
all requests.
4. If the `/.well-known` request returned an error response, and the SRV
record was not found, an IP address is resolved using AAAA and A records.
Requests are made to the resolved IP address using port 8448 and a ``Host``
header containing the ``<hostname>``. A valid TLS certificate for
``<hostname>`` must be provided by the target server on all requests.
The TLS certificate provided by the target server must be present on all The TLS certificate provided by the target server must be present on all