From 92f3989f2b00627201cb16a5fdfd2ee1fa095180 Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Thu, 5 Jul 2018 11:37:06 +0100 Subject: [PATCH 1/4] Dirty replace of DNS name -> hostname --- specification/server_server_api.rst | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/specification/server_server_api.rst b/specification/server_server_api.rst index 3738ea05..70d495d3 100644 --- a/specification/server_server_api.rst +++ b/specification/server_server_api.rst @@ -18,7 +18,7 @@ Federation API Matrix homeservers use the Federation APIs (also known as server-server APIs) to communicate with each other. Homeservers use these APIs to push messages to -each other in real-time, to +each other in real-time, to historic messages from each other, and to query profile and presence information about users on each other's servers. @@ -73,22 +73,22 @@ Server Discovery Resolving Server Names ~~~~~~~~~~~~~~~~~~~~~~ -Each matrix homeserver is identified by a server name consisting of a DNS name +Each matrix homeserver is identified by a server name consisting of a hostname and an optional TLS port. .. code:: - server_name = dns_name [ ":" tls_port] + server_name = hostname [ ":" tls_port] dns_name = tls_port = *DIGIT .. ** If the port is present then the server is discovered by looking up an AAAA or -A record for the DNS name and connecting to the specified TLS port. If the port +A record for the hostname and connecting to the specified TLS port. If the port is absent then the server is discovered by looking up a ``_matrix._tcp`` SRV -record for the DNS name. If this record does not exist then the server is -discovered by looking up an AAAA or A record on the DNS name and taking the +record for the hostname. If this record does not exist then the server is +discovered by looking up an AAAA or A record on the hostname and taking the default fallback port number of 8448. Homeservers may use SRV records to load balance requests between multiple TLS endpoints or to failover to another endpoint if an endpoint fails. @@ -165,7 +165,7 @@ events sent by that server can still be checked. ==================== =================== ====================================== Key Type Description ==================== =================== ====================================== -``server_name`` String DNS name of the homeserver. +``server_name`` String hostname of the homeserver. ``verify_keys`` Object Public keys of the homeserver for verifying digital signatures. ``old_verify_keys`` Object The public keys that the server used @@ -273,7 +273,7 @@ at ``/_matrix/key/v1``. ==================== =================== ====================================== Key Type Description ==================== =================== ====================================== -``server_name`` String DNS name of the homeserver. +``server_name`` String hostname of the homeserver. ``verify_keys`` Object Public keys of the homeserver for verifying digital signatures. ``signatures`` Object Digital signatures for this object @@ -897,10 +897,10 @@ the resident homeserver. The required fields are: ======================== ============ ========================================= ``type`` String The value ``m.room.member``. ``auth_events`` List An event-reference list containing the - authorization events that would allow + authorization events that would allow this member to join. ``content`` Object The event content. -``depth`` Integer (this field must be present but is +``depth`` Integer (this field must be present but is ignored; it may be 0) ``origin`` String The name of the resident homeserver. ``origin_server_ts`` Integer A timestamp added by the resident From 26505533dd497859ae69b18ecd008fa56a14d563 Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Tue, 24 Jul 2018 16:06:59 +0100 Subject: [PATCH 2/4] drop dns_name = host in favour of host --- specification/appendices/identifier_grammar.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/specification/appendices/identifier_grammar.rst b/specification/appendices/identifier_grammar.rst index e85bf410..3abcfae2 100644 --- a/specification/appendices/identifier_grammar.rst +++ b/specification/appendices/identifier_grammar.rst @@ -25,8 +25,7 @@ number of identifiers, as described below. The server name represents the address at which the homeserver in question can be reached by other homeservers. The complete grammar is:: - server_name = dns_name [ ":" port] - dns_name = host + server_name = host [ ":" port] port = *DIGIT where ``host`` is as defined by `RFC3986, section 3.2.2 From 7a46bdae02b841dfd3f400b4382064a1c178a5b9 Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Sun, 5 Aug 2018 14:43:05 +0100 Subject: [PATCH 3/4] Spacing --- specification/server_server_api.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/server_server_api.rst b/specification/server_server_api.rst index 653d75ed..38b25328 100644 --- a/specification/server_server_api.rst +++ b/specification/server_server_api.rst @@ -139,6 +139,7 @@ certificate fingerprints to validate any connection made to the homeserver. {{keys_server_ss_http_api}} + Querying Keys Through Another Server ++++++++++++++++++++++++++++++++++++ From c826edf23b4ae77e29189a54e9ab3109fa5f3ab3 Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Sun, 5 Aug 2018 14:46:42 +0100 Subject: [PATCH 4/4] Remove dns_name from S2S Api --- specification/server_server_api.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/specification/server_server_api.rst b/specification/server_server_api.rst index 38b25328..30cf45ab 100644 --- a/specification/server_server_api.rst +++ b/specification/server_server_api.rst @@ -84,7 +84,6 @@ and an optional TLS port. .. code:: server_name = hostname [ ":" tls_port] - dns_name = tls_port = *DIGIT .. **